fix(worker): include project key in Bitbucket repo identifiers

CHANGELOG.md

@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+- Fixed Bitbucket Server and Cloud repo identifiers to include the project key, preventing collisions across projects. **Note:** Bitbucket Cloud users with `exclude.repos` patterns must update them from `workspace/repo` to `workspace/PROJECT_KEY/repo` format. [#904](https://github.com/sourcebot-dev/sourcebot/pull/904)
+
 ### Added
 - Added optional `visibility` parameter to `/api/chat/blocking` endpoint and MCP `ask_codebase` tool to allow controlling chat session visibility in shared environments. [#903](https://github.com/sourcebot-dev/sourcebot/pull/903)
 

docs/snippets/schemas/v3/bitbucket.schema.mdx

@@ -104,8 +104,8 @@
  },
  "examples": [
  [
- "cloud_workspace/repo1",
- "server_project/repo2"
+ "cloud_workspace/PROJECT_KEY/repo1",
+ "SERVER_PROJECT_KEY/repo2"
  ]
  ],
  "description": "List of specific repos to exclude from syncing."

docs/snippets/schemas/v3/connection.schema.mdx

@@ -781,8 +781,8 @@
  },
  "examples": [
  [
- "cloud_workspace/repo1",
- "server_project/repo2"
+ "cloud_workspace/PROJECT_KEY/repo1",
+ "SERVER_PROJECT_KEY/repo2"
  ]
  ],
  "description": "List of specific repos to exclude from syncing."

docs/snippets/schemas/v3/index.schema.mdx

@@ -1196,8 +1196,8 @@
  },
  "examples": [
  [
- "cloud_workspace/repo1",
- "server_project/repo2"
+ "cloud_workspace/PROJECT_KEY/repo1",
+ "SERVER_PROJECT_KEY/repo2"
  ]
  ],
  "description": "List of specific repos to exclude from syncing."

packages/backend/src/bitbucket.test.ts

@@ -0,0 +1,173 @@
+import { expect, test, describe } from 'vitest';
+import { cloudShouldExcludeRepo, serverShouldExcludeRepo, BitbucketRepository } from './bitbucket';
+import { BitbucketConnectionConfig } from '@sourcebot/schemas/v3/bitbucket.type';
+import { SchemaRepository as CloudRepository } from '@coderabbitai/bitbucket/cloud/openapi';
+import { SchemaRestRepository as ServerRepository } from '@coderabbitai/bitbucket/server/openapi';
+
+const makeCloudRepo = (overrides: Partial<CloudRepository> = {}): BitbucketRepository => ({
+ type: 'repository',
+ full_name: 'myworkspace/my-repo',
+ project: { type: 'project', key: 'PROJ' },
+ is_private: false,
+ ...overrides,
+} as CloudRepository);
+
+const makeServerRepo = (overrides: Partial<ServerRepository> = {}): BitbucketRepository => ({
+ slug: 'my-repo',
+ project: { key: 'PROJ' },
+ archived: false,
+ ...overrides,
+} as ServerRepository);
+
+const baseConfig: BitbucketConnectionConfig = {
+ type: 'bitbucket',
+ deploymentType: 'cloud',
+};
+
+describe('cloudShouldExcludeRepo', () => {
+ test('returns false when no exclusions are configured', () => {
+ expect(cloudShouldExcludeRepo(makeCloudRepo(), baseConfig)).toBe(false);
+ });
+
+ test('returns false when exclude.repos is empty', () => {
+ expect(cloudShouldExcludeRepo(makeCloudRepo(), {
+ ...baseConfig,
+ exclude: { repos: [] },
+ })).toBe(false);
+ });
+
+ test('returns true when repo matches exclude.repos exactly', () => {
+ expect(cloudShouldExcludeRepo(makeCloudRepo(), {
+ ...baseConfig,
+ exclude: { repos: ['myworkspace/PROJ/my-repo'] },
+ })).toBe(true);
+ });
+
+ test('returns false when exclude.repos does not match', () => {
+ expect(cloudShouldExcludeRepo(makeCloudRepo(), {
+ ...baseConfig,
+ exclude: { repos: ['myworkspace/PROJ/other-repo'] },
+ })).toBe(false);
+ });
+
+ test('returns true when repo matches a glob pattern in exclude.repos', () => {
+ expect(cloudShouldExcludeRepo(makeCloudRepo(), {
+ ...baseConfig,
+ exclude: { repos: ['myworkspace/PROJ/*'] },
+ })).toBe(true);
+ });
+
+ test('returns true when repo matches a workspace-level glob in exclude.repos', () => {
+ expect(cloudShouldExcludeRepo(makeCloudRepo(), {
+ ...baseConfig,
+ exclude: { repos: ['myworkspace/**'] },
+ })).toBe(true);
+ });
+
+ test('returns false when exclude.forks is true but repo is not a fork', () => {
+ expect(cloudShouldExcludeRepo(makeCloudRepo(), {
+ ...baseConfig,
+ exclude: { forks: true },
+ })).toBe(false);
+ });
+
+ test('returns true when exclude.forks is true and repo is a fork', () => {
+ const forkedRepo = makeCloudRepo({ parent: { type: 'repository' } as CloudRepository });
+ expect(cloudShouldExcludeRepo(forkedRepo, {
+ ...baseConfig,
+ exclude: { forks: true },
+ })).toBe(true);
+ });
+
+ test('returns false when exclude.forks is false and repo is a fork', () => {
+ const forkedRepo = makeCloudRepo({ parent: { type: 'repository' } as CloudRepository });
+ expect(cloudShouldExcludeRepo(forkedRepo, {
+ ...baseConfig,
+ exclude: { forks: false },
+ })).toBe(false);
+ });
+});
+
+describe('serverShouldExcludeRepo', () => {
+ const serverConfig: BitbucketConnectionConfig = {
+ type: 'bitbucket',
+ deploymentType: 'server',
+ url: 'https://bitbucket.example.com',
+ };
+
+ test('returns false when no exclusions are configured', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo(), serverConfig)).toBe(false);
+ });
+
+ test('returns false when exclude.repos is empty', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo(), {
+ ...serverConfig,
+ exclude: { repos: [] },
+ })).toBe(false);
+ });
+
+ test('returns true when repo matches exclude.repos exactly', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo(), {
+ ...serverConfig,
+ exclude: { repos: ['PROJ/my-repo'] },
+ })).toBe(true);
+ });
+
+ test('returns false when exclude.repos does not match', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo(), {
+ ...serverConfig,
+ exclude: { repos: ['PROJ/other-repo'] },
+ })).toBe(false);
+ });
+
+ test('returns true when repo matches a glob pattern in exclude.repos', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo(), {
+ ...serverConfig,
+ exclude: { repos: ['PROJ/*'] },
+ })).toBe(true);
+ });
+
+ test('returns false when exclude.archived is true but repo is not archived', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo({ archived: false }), {
+ ...serverConfig,
+ exclude: { archived: true },
+ })).toBe(false);
+ });
+
+ test('returns true when exclude.archived is true and repo is archived', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo({ archived: true }), {
+ ...serverConfig,
+ exclude: { archived: true },
+ })).toBe(true);
+ });
+
+ test('returns false when exclude.archived is false and repo is archived', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo({ archived: true }), {
+ ...serverConfig,
+ exclude: { archived: false },
+ })).toBe(false);
+ });
+
+ test('returns false when exclude.forks is true but repo is not a fork', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo(), {
+ ...serverConfig,
+ exclude: { forks: true },
+ })).toBe(false);
+ });
+
+ test('returns true when exclude.forks is true and repo is a fork', () => {
+ const forkedRepo = makeServerRepo({ origin: { slug: 'original-repo' } as ServerRepository });
+ expect(serverShouldExcludeRepo(forkedRepo, {
+ ...serverConfig,
+ exclude: { forks: true },
+ })).toBe(true);
+ });
+
+ test('returns false when exclude.forks is false and repo is a fork', () => {
+ const forkedRepo = makeServerRepo({ origin: { slug: 'original-repo' } as ServerRepository });
+ expect(serverShouldExcludeRepo(forkedRepo, {
+ ...serverConfig,
+ exclude: { forks: false },
+ })).toBe(false);
+ });
+});

packages/backend/src/bitbucket.ts

@@ -345,10 +345,11 @@ async function cloudGetRepos(client: BitbucketClient, repoList: string[]): Promi
  };
 }
 
-function cloudShouldExcludeRepo(repo: BitbucketRepository, config: BitbucketConnectionConfig): boolean {
+export function cloudShouldExcludeRepo(repo: BitbucketRepository, config: BitbucketConnectionConfig): boolean {
  const cloudRepo = repo as CloudRepository;
  let reason = '';
- const repoName = cloudRepo.full_name!;
+ const [workspace, repoSlug] = cloudRepo.full_name!.split('/');
+ const repoName = `${workspace}/${cloudRepo.project?.key}/${repoSlug}`;
 
  const shouldExclude = (() => {
  if (config.exclude?.repos) {
@@ -552,7 +553,7 @@ async function serverGetRepos(client: BitbucketClient, repoList: string[]): Prom
  };
 }
 
-function serverShouldExcludeRepo(repo: BitbucketRepository, config: BitbucketConnectionConfig): boolean {
+export function serverShouldExcludeRepo(repo: BitbucketRepository, config: BitbucketConnectionConfig): boolean {
  const serverRepo = repo as ServerRepository;
 
  const projectName = serverRepo.project!.key;

packages/backend/src/repoCompileUtils.ts

@@ -454,7 +454,18 @@ export const compileBitbucketConfig = async (
  const repos = bitbucketRepos.map((repo) => {
  const isServer = config.deploymentType === 'server';
  const codeHostType: CodeHostType = isServer ? 'bitbucketServer' : 'bitbucketCloud';
- const displayName = isServer ? (repo as BitbucketServerRepository).name! : (repo as BitbucketCloudRepository).full_name!;
+ const displayName = (() => {
+ if (isServer) {
+ const serverRepo = repo as BitbucketServerRepository;
+ // Server repos are of the format `project/repo`
+ return `${serverRepo.project!.key}/${serverRepo.slug!}`;
+ } else {
+ const cloudRepo = repo as BitbucketCloudRepository;
+ // Cloud repos are of the format `workspace/project/repo`
+ const [workspace, repoSlug] = cloudRepo.full_name!.split('/');
+ return `${workspace}/${cloudRepo.project?.key!}/${repoSlug}`;
+ }
+ })();
  const externalId = isServer ? (repo as BitbucketServerRepository).id!.toString() : (repo as BitbucketCloudRepository).uuid!;
  const isPublic = isServer ? (repo as BitbucketServerRepository).public : (repo as BitbucketCloudRepository).is_private === false;
  const isArchived = isServer ? (repo as BitbucketServerRepository).archived === true : false;

packages/schemas/src/v3/bitbucket.schema.ts

@@ -103,8 +103,8 @@ const schema = {
  },
  "examples": [
  [
- "cloud_workspace/repo1",
- "server_project/repo2"
+ "cloud_workspace/PROJECT_KEY/repo1",
+ "SERVER_PROJECT_KEY/repo2"
  ]
  ],
  "description": "List of specific repos to exclude from syncing."

packages/schemas/src/v3/connection.schema.ts

@@ -780,8 +780,8 @@ const schema = {
  },
  "examples": [
  [
- "cloud_workspace/repo1",
- "server_project/repo2"
+ "cloud_workspace/PROJECT_KEY/repo1",
+ "SERVER_PROJECT_KEY/repo2"
  ]
  ],
  "description": "List of specific repos to exclude from syncing."

packages/schemas/src/v3/index.schema.ts

@@ -1195,8 +1195,8 @@ const schema = {
  },
  "examples": [
  [
- "cloud_workspace/repo1",
- "server_project/repo2"
+ "cloud_workspace/PROJECT_KEY/repo1",
+ "SERVER_PROJECT_KEY/repo2"
  ]
  ],
  "description": "List of specific repos to exclude from syncing."

schemas/v3/bitbucket.json

@@ -72,8 +72,8 @@
  },
  "examples": [
  [
- "cloud_workspace/repo1",
- "server_project/repo2"
+ "cloud_workspace/PROJECT_KEY/repo1",
+ "SERVER_PROJECT_KEY/repo2"
  ]
  ],
  "description": "List of specific repos to exclude from syncing."

CHANGELOG.md

@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+- Fixed Bitbucket Server and Cloud repo identifiers to include the project key, preventing collisions across projects. **Note:** Bitbucket Cloud users with `exclude.repos` patterns must update them from `workspace/repo` to `workspace/PROJECT_KEY/repo` format. [#904](https://github.com/sourcebot-dev/sourcebot/pull/904)
+
 ### Added
 - Added optional `visibility` parameter to `/api/chat/blocking` endpoint and MCP `ask_codebase` tool to allow controlling chat session visibility in shared environments. [#903](https://github.com/sourcebot-dev/sourcebot/pull/903)
 

docs/snippets/schemas/v3/bitbucket.schema.mdx

@@ -104,8 +104,8 @@
  },
  "examples": [
  [
- "cloud_workspace/repo1",
- "server_project/repo2"
+ "cloud_workspace/PROJECT_KEY/repo1",
+ "SERVER_PROJECT_KEY/repo2"
  ]
  ],
  "description": "List of specific repos to exclude from syncing."

docs/snippets/schemas/v3/connection.schema.mdx

@@ -781,8 +781,8 @@
  },
  "examples": [
  [
- "cloud_workspace/repo1",
- "server_project/repo2"
+ "cloud_workspace/PROJECT_KEY/repo1",
+ "SERVER_PROJECT_KEY/repo2"
  ]
  ],
  "description": "List of specific repos to exclude from syncing."

docs/snippets/schemas/v3/index.schema.mdx

@@ -1196,8 +1196,8 @@
  },
  "examples": [
  [
- "cloud_workspace/repo1",
- "server_project/repo2"
+ "cloud_workspace/PROJECT_KEY/repo1",
+ "SERVER_PROJECT_KEY/repo2"
  ]
  ],
  "description": "List of specific repos to exclude from syncing."

packages/backend/src/bitbucket.test.ts

@@ -0,0 +1,173 @@
+import { expect, test, describe } from 'vitest';
+import { cloudShouldExcludeRepo, serverShouldExcludeRepo, BitbucketRepository } from './bitbucket';
+import { BitbucketConnectionConfig } from '@sourcebot/schemas/v3/bitbucket.type';
+import { SchemaRepository as CloudRepository } from '@coderabbitai/bitbucket/cloud/openapi';
+import { SchemaRestRepository as ServerRepository } from '@coderabbitai/bitbucket/server/openapi';
+
+const makeCloudRepo = (overrides: Partial<CloudRepository> = {}): BitbucketRepository => ({
+ type: 'repository',
+ full_name: 'myworkspace/my-repo',
+ project: { type: 'project', key: 'PROJ' },
+ is_private: false,
+ ...overrides,
+} as CloudRepository);
+
+const makeServerRepo = (overrides: Partial<ServerRepository> = {}): BitbucketRepository => ({
+ slug: 'my-repo',
+ project: { key: 'PROJ' },
+ archived: false,
+ ...overrides,
+} as ServerRepository);
+
+const baseConfig: BitbucketConnectionConfig = {
+ type: 'bitbucket',
+ deploymentType: 'cloud',
+};
+
+describe('cloudShouldExcludeRepo', () => {
+ test('returns false when no exclusions are configured', () => {
+ expect(cloudShouldExcludeRepo(makeCloudRepo(), baseConfig)).toBe(false);
+ });
+
+ test('returns false when exclude.repos is empty', () => {
+ expect(cloudShouldExcludeRepo(makeCloudRepo(), {
+ ...baseConfig,
+ exclude: { repos: [] },
+ })).toBe(false);
+ });
+
+ test('returns true when repo matches exclude.repos exactly', () => {
+ expect(cloudShouldExcludeRepo(makeCloudRepo(), {
+ ...baseConfig,
+ exclude: { repos: ['myworkspace/PROJ/my-repo'] },
+ })).toBe(true);
+ });
+
+ test('returns false when exclude.repos does not match', () => {
+ expect(cloudShouldExcludeRepo(makeCloudRepo(), {
+ ...baseConfig,
+ exclude: { repos: ['myworkspace/PROJ/other-repo'] },
+ })).toBe(false);
+ });
+
+ test('returns true when repo matches a glob pattern in exclude.repos', () => {
+ expect(cloudShouldExcludeRepo(makeCloudRepo(), {
+ ...baseConfig,
+ exclude: { repos: ['myworkspace/PROJ/*'] },
+ })).toBe(true);
+ });
+
+ test('returns true when repo matches a workspace-level glob in exclude.repos', () => {
+ expect(cloudShouldExcludeRepo(makeCloudRepo(), {
+ ...baseConfig,
+ exclude: { repos: ['myworkspace/**'] },
+ })).toBe(true);
+ });
+
+ test('returns false when exclude.forks is true but repo is not a fork', () => {
+ expect(cloudShouldExcludeRepo(makeCloudRepo(), {
+ ...baseConfig,
+ exclude: { forks: true },
+ })).toBe(false);
+ });
+
+ test('returns true when exclude.forks is true and repo is a fork', () => {
+ const forkedRepo = makeCloudRepo({ parent: { type: 'repository' } as CloudRepository });
+ expect(cloudShouldExcludeRepo(forkedRepo, {
+ ...baseConfig,
+ exclude: { forks: true },
+ })).toBe(true);
+ });
+
+ test('returns false when exclude.forks is false and repo is a fork', () => {
+ const forkedRepo = makeCloudRepo({ parent: { type: 'repository' } as CloudRepository });
+ expect(cloudShouldExcludeRepo(forkedRepo, {
+ ...baseConfig,
+ exclude: { forks: false },
+ })).toBe(false);
+ });
+});
+
+describe('serverShouldExcludeRepo', () => {
+ const serverConfig: BitbucketConnectionConfig = {
+ type: 'bitbucket',
+ deploymentType: 'server',
+ url: 'https://bitbucket.example.com',
+ };
+
+ test('returns false when no exclusions are configured', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo(), serverConfig)).toBe(false);
+ });
+
+ test('returns false when exclude.repos is empty', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo(), {
+ ...serverConfig,
+ exclude: { repos: [] },
+ })).toBe(false);
+ });
+
+ test('returns true when repo matches exclude.repos exactly', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo(), {
+ ...serverConfig,
+ exclude: { repos: ['PROJ/my-repo'] },
+ })).toBe(true);
+ });
+
+ test('returns false when exclude.repos does not match', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo(), {
+ ...serverConfig,
+ exclude: { repos: ['PROJ/other-repo'] },
+ })).toBe(false);
+ });
+
+ test('returns true when repo matches a glob pattern in exclude.repos', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo(), {
+ ...serverConfig,
+ exclude: { repos: ['PROJ/*'] },
+ })).toBe(true);
+ });
+
+ test('returns false when exclude.archived is true but repo is not archived', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo({ archived: false }), {
+ ...serverConfig,
+ exclude: { archived: true },
+ })).toBe(false);
+ });
+
+ test('returns true when exclude.archived is true and repo is archived', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo({ archived: true }), {
+ ...serverConfig,
+ exclude: { archived: true },
+ })).toBe(true);
+ });
+
+ test('returns false when exclude.archived is false and repo is archived', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo({ archived: true }), {
+ ...serverConfig,
+ exclude: { archived: false },
+ })).toBe(false);
+ });
+
+ test('returns false when exclude.forks is true but repo is not a fork', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo(), {
+ ...serverConfig,
+ exclude: { forks: true },
+ })).toBe(false);
+ });
+
+ test('returns true when exclude.forks is true and repo is a fork', () => {
+ const forkedRepo = makeServerRepo({ origin: { slug: 'original-repo' } as ServerRepository });
+ expect(serverShouldExcludeRepo(forkedRepo, {
+ ...serverConfig,
+ exclude: { forks: true },
+ })).toBe(true);
+ });
+
+ test('returns false when exclude.forks is false and repo is a fork', () => {
+ const forkedRepo = makeServerRepo({ origin: { slug: 'original-repo' } as ServerRepository });
+ expect(serverShouldExcludeRepo(forkedRepo, {
+ ...serverConfig,
+ exclude: { forks: false },
+ })).toBe(false);
+ });
+});

packages/backend/src/bitbucket.ts

@@ -345,10 +345,11 @@ async function cloudGetRepos(client: BitbucketClient, repoList: string[]): Promi
  };
 }
 
-function cloudShouldExcludeRepo(repo: BitbucketRepository, config: BitbucketConnectionConfig): boolean {
+export function cloudShouldExcludeRepo(repo: BitbucketRepository, config: BitbucketConnectionConfig): boolean {
  const cloudRepo = repo as CloudRepository;
  let reason = '';
- const repoName = cloudRepo.full_name!;
+ const [workspace, repoSlug] = cloudRepo.full_name!.split('/');
+ const repoName = `${workspace}/${cloudRepo.project?.key}/${repoSlug}`;
 
  const shouldExclude = (() => {
  if (config.exclude?.repos) {
@@ -552,7 +553,7 @@ async function serverGetRepos(client: BitbucketClient, repoList: string[]): Prom
  };
 }
 
-function serverShouldExcludeRepo(repo: BitbucketRepository, config: BitbucketConnectionConfig): boolean {
+export function serverShouldExcludeRepo(repo: BitbucketRepository, config: BitbucketConnectionConfig): boolean {
  const serverRepo = repo as ServerRepository;
 
  const projectName = serverRepo.project!.key;

packages/backend/src/repoCompileUtils.ts

@@ -454,7 +454,18 @@ export const compileBitbucketConfig = async (
  const repos = bitbucketRepos.map((repo) => {
  const isServer = config.deploymentType === 'server';
  const codeHostType: CodeHostType = isServer ? 'bitbucketServer' : 'bitbucketCloud';
- const displayName = isServer ? (repo as BitbucketServerRepository).name! : (repo as BitbucketCloudRepository).full_name!;
+ const displayName = (() => {
+ if (isServer) {
+ const serverRepo = repo as BitbucketServerRepository;
+ // Server repos are of the format `project/repo`
+ return `${serverRepo.project!.key}/${serverRepo.slug!}`;
+ } else {
+ const cloudRepo = repo as BitbucketCloudRepository;
+ // Cloud repos are of the format `workspace/project/repo`
+ const [workspace, repoSlug] = cloudRepo.full_name!.split('/');
+ return `${workspace}/${cloudRepo.project?.key!}/${repoSlug}`;
+ }
+ })();
  const externalId = isServer ? (repo as BitbucketServerRepository).id!.toString() : (repo as BitbucketCloudRepository).uuid!;
  const isPublic = isServer ? (repo as BitbucketServerRepository).public : (repo as BitbucketCloudRepository).is_private === false;
  const isArchived = isServer ? (repo as BitbucketServerRepository).archived === true : false;

packages/schemas/src/v3/bitbucket.schema.ts

@@ -103,8 +103,8 @@ const schema = {
  },
  "examples": [
  [
- "cloud_workspace/repo1",
- "server_project/repo2"
+ "cloud_workspace/PROJECT_KEY/repo1",
+ "SERVER_PROJECT_KEY/repo2"
  ]
  ],
  "description": "List of specific repos to exclude from syncing."

packages/schemas/src/v3/connection.schema.ts

@@ -780,8 +780,8 @@ const schema = {
  },
  "examples": [
  [
- "cloud_workspace/repo1",
- "server_project/repo2"
+ "cloud_workspace/PROJECT_KEY/repo1",
+ "SERVER_PROJECT_KEY/repo2"
  ]
  ],
  "description": "List of specific repos to exclude from syncing."

packages/schemas/src/v3/index.schema.ts

@@ -1195,8 +1195,8 @@ const schema = {
  },
  "examples": [
  [
- "cloud_workspace/repo1",
- "server_project/repo2"
+ "cloud_workspace/PROJECT_KEY/repo1",
+ "SERVER_PROJECT_KEY/repo2"
  ]
  ],
  "description": "List of specific repos to exclude from syncing."

schemas/v3/bitbucket.json

@@ -72,8 +72,8 @@
  },
  "examples": [
  [
- "cloud_workspace/repo1",
- "server_project/repo2"
+ "cloud_workspace/PROJECT_KEY/repo1",
+ "SERVER_PROJECT_KEY/repo2"
  ]
  ],
  "description": "List of specific repos to exclude from syncing."

CHANGELOG.md

@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+- Fixed Bitbucket Server and Cloud repo identifiers to include the project key, preventing collisions across projects. **Note:** Bitbucket Cloud users with `exclude.repos` patterns must update them from `workspace/repo` to `workspace/PROJECT_KEY/repo` format. [#904](https://github.com/sourcebot-dev/sourcebot/pull/904)
+
 ### Added
 - Added optional `visibility` parameter to `/api/chat/blocking` endpoint and MCP `ask_codebase` tool to allow controlling chat session visibility in shared environments. [#903](https://github.com/sourcebot-dev/sourcebot/pull/903)
 

docs/snippets/schemas/v3/bitbucket.schema.mdx

@@ -104,8 +104,8 @@
  },
  "examples": [
  [
- "cloud_workspace/repo1",
- "server_project/repo2"
+ "cloud_workspace/PROJECT_KEY/repo1",
+ "SERVER_PROJECT_KEY/repo2"
  ]
  ],
  "description": "List of specific repos to exclude from syncing."

docs/snippets/schemas/v3/connection.schema.mdx

@@ -781,8 +781,8 @@
  },
  "examples": [
  [
- "cloud_workspace/repo1",
- "server_project/repo2"
+ "cloud_workspace/PROJECT_KEY/repo1",
+ "SERVER_PROJECT_KEY/repo2"
  ]
  ],
  "description": "List of specific repos to exclude from syncing."

docs/snippets/schemas/v3/index.schema.mdx

@@ -1196,8 +1196,8 @@
  },
  "examples": [
  [
- "cloud_workspace/repo1",
- "server_project/repo2"
+ "cloud_workspace/PROJECT_KEY/repo1",
+ "SERVER_PROJECT_KEY/repo2"
  ]
  ],
  "description": "List of specific repos to exclude from syncing."

packages/backend/src/bitbucket.test.ts

@@ -0,0 +1,173 @@
+import { expect, test, describe } from 'vitest';
+import { cloudShouldExcludeRepo, serverShouldExcludeRepo, BitbucketRepository } from './bitbucket';
+import { BitbucketConnectionConfig } from '@sourcebot/schemas/v3/bitbucket.type';
+import { SchemaRepository as CloudRepository } from '@coderabbitai/bitbucket/cloud/openapi';
+import { SchemaRestRepository as ServerRepository } from '@coderabbitai/bitbucket/server/openapi';
+
+const makeCloudRepo = (overrides: Partial<CloudRepository> = {}): BitbucketRepository => ({
+ type: 'repository',
+ full_name: 'myworkspace/my-repo',
+ project: { type: 'project', key: 'PROJ' },
+ is_private: false,
+ ...overrides,
+} as CloudRepository);
+
+const makeServerRepo = (overrides: Partial<ServerRepository> = {}): BitbucketRepository => ({
+ slug: 'my-repo',
+ project: { key: 'PROJ' },
+ archived: false,
+ ...overrides,
+} as ServerRepository);
+
+const baseConfig: BitbucketConnectionConfig = {
+ type: 'bitbucket',
+ deploymentType: 'cloud',
+};
+
+describe('cloudShouldExcludeRepo', () => {
+ test('returns false when no exclusions are configured', () => {
+ expect(cloudShouldExcludeRepo(makeCloudRepo(), baseConfig)).toBe(false);
+ });
+
+ test('returns false when exclude.repos is empty', () => {
+ expect(cloudShouldExcludeRepo(makeCloudRepo(), {
+ ...baseConfig,
+ exclude: { repos: [] },
+ })).toBe(false);
+ });
+
+ test('returns true when repo matches exclude.repos exactly', () => {
+ expect(cloudShouldExcludeRepo(makeCloudRepo(), {
+ ...baseConfig,
+ exclude: { repos: ['myworkspace/PROJ/my-repo'] },
+ })).toBe(true);
+ });
+
+ test('returns false when exclude.repos does not match', () => {
+ expect(cloudShouldExcludeRepo(makeCloudRepo(), {
+ ...baseConfig,
+ exclude: { repos: ['myworkspace/PROJ/other-repo'] },
+ })).toBe(false);
+ });
+
+ test('returns true when repo matches a glob pattern in exclude.repos', () => {
+ expect(cloudShouldExcludeRepo(makeCloudRepo(), {
+ ...baseConfig,
+ exclude: { repos: ['myworkspace/PROJ/*'] },
+ })).toBe(true);
+ });
+
+ test('returns true when repo matches a workspace-level glob in exclude.repos', () => {
+ expect(cloudShouldExcludeRepo(makeCloudRepo(), {
+ ...baseConfig,
+ exclude: { repos: ['myworkspace/**'] },
+ })).toBe(true);
+ });
+
+ test('returns false when exclude.forks is true but repo is not a fork', () => {
+ expect(cloudShouldExcludeRepo(makeCloudRepo(), {
+ ...baseConfig,
+ exclude: { forks: true },
+ })).toBe(false);
+ });
+
+ test('returns true when exclude.forks is true and repo is a fork', () => {
+ const forkedRepo = makeCloudRepo({ parent: { type: 'repository' } as CloudRepository });
+ expect(cloudShouldExcludeRepo(forkedRepo, {
+ ...baseConfig,
+ exclude: { forks: true },
+ })).toBe(true);
+ });
+
+ test('returns false when exclude.forks is false and repo is a fork', () => {
+ const forkedRepo = makeCloudRepo({ parent: { type: 'repository' } as CloudRepository });
+ expect(cloudShouldExcludeRepo(forkedRepo, {
+ ...baseConfig,
+ exclude: { forks: false },
+ })).toBe(false);
+ });
+});
+
+describe('serverShouldExcludeRepo', () => {
+ const serverConfig: BitbucketConnectionConfig = {
+ type: 'bitbucket',
+ deploymentType: 'server',
+ url: 'https://bitbucket.example.com',
+ };
+
+ test('returns false when no exclusions are configured', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo(), serverConfig)).toBe(false);
+ });
+
+ test('returns false when exclude.repos is empty', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo(), {
+ ...serverConfig,
+ exclude: { repos: [] },
+ })).toBe(false);
+ });
+
+ test('returns true when repo matches exclude.repos exactly', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo(), {
+ ...serverConfig,
+ exclude: { repos: ['PROJ/my-repo'] },
+ })).toBe(true);
+ });
+
+ test('returns false when exclude.repos does not match', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo(), {
+ ...serverConfig,
+ exclude: { repos: ['PROJ/other-repo'] },
+ })).toBe(false);
+ });
+
+ test('returns true when repo matches a glob pattern in exclude.repos', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo(), {
+ ...serverConfig,
+ exclude: { repos: ['PROJ/*'] },
+ })).toBe(true);
+ });
+
+ test('returns false when exclude.archived is true but repo is not archived', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo({ archived: false }), {
+ ...serverConfig,
+ exclude: { archived: true },
+ })).toBe(false);
+ });
+
+ test('returns true when exclude.archived is true and repo is archived', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo({ archived: true }), {
+ ...serverConfig,
+ exclude: { archived: true },
+ })).toBe(true);
+ });
+
+ test('returns false when exclude.archived is false and repo is archived', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo({ archived: true }), {
+ ...serverConfig,
+ exclude: { archived: false },
+ })).toBe(false);
+ });
+
+ test('returns false when exclude.forks is true but repo is not a fork', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo(), {
+ ...serverConfig,
+ exclude: { forks: true },
+ })).toBe(false);
+ });
+
+ test('returns true when exclude.forks is true and repo is a fork', () => {
+ const forkedRepo = makeServerRepo({ origin: { slug: 'original-repo' } as ServerRepository });
+ expect(serverShouldExcludeRepo(forkedRepo, {
+ ...serverConfig,
+ exclude: { forks: true },
+ })).toBe(true);
+ });
+
+ test('returns false when exclude.forks is false and repo is a fork', () => {
+ const forkedRepo = makeServerRepo({ origin: { slug: 'original-repo' } as ServerRepository });
+ expect(serverShouldExcludeRepo(forkedRepo, {
+ ...serverConfig,
+ exclude: { forks: false },
+ })).toBe(false);
+ });
+});

packages/backend/src/bitbucket.ts

@@ -345,10 +345,11 @@ async function cloudGetRepos(client: BitbucketClient, repoList: string[]): Promi
  };
 }
 
-function cloudShouldExcludeRepo(repo: BitbucketRepository, config: BitbucketConnectionConfig): boolean {
+export function cloudShouldExcludeRepo(repo: BitbucketRepository, config: BitbucketConnectionConfig): boolean {
  const cloudRepo = repo as CloudRepository;
  let reason = '';
- const repoName = cloudRepo.full_name!;
+ const [workspace, repoSlug] = cloudRepo.full_name!.split('/');
+ const repoName = `${workspace}/${cloudRepo.project?.key}/${repoSlug}`;
 
  const shouldExclude = (() => {
  if (config.exclude?.repos) {
@@ -552,7 +553,7 @@ async function serverGetRepos(client: BitbucketClient, repoList: string[]): Prom
  };
 }
 
-function serverShouldExcludeRepo(repo: BitbucketRepository, config: BitbucketConnectionConfig): boolean {
+export function serverShouldExcludeRepo(repo: BitbucketRepository, config: BitbucketConnectionConfig): boolean {
  const serverRepo = repo as ServerRepository;
 
  const projectName = serverRepo.project!.key;

packages/backend/src/repoCompileUtils.ts

@@ -454,7 +454,18 @@ export const compileBitbucketConfig = async (
  const repos = bitbucketRepos.map((repo) => {
  const isServer = config.deploymentType === 'server';
  const codeHostType: CodeHostType = isServer ? 'bitbucketServer' : 'bitbucketCloud';
- const displayName = isServer ? (repo as BitbucketServerRepository).name! : (repo as BitbucketCloudRepository).full_name!;
+ const displayName = (() => {
+ if (isServer) {
+ const serverRepo = repo as BitbucketServerRepository;
+ // Server repos are of the format `project/repo`
+ return `${serverRepo.project!.key}/${serverRepo.slug!}`;
+ } else {
+ const cloudRepo = repo as BitbucketCloudRepository;
+ // Cloud repos are of the format `workspace/project/repo`
+ const [workspace, repoSlug] = cloudRepo.full_name!.split('/');
+ return `${workspace}/${cloudRepo.project?.key!}/${repoSlug}`;
+ }
+ })();
  const externalId = isServer ? (repo as BitbucketServerRepository).id!.toString() : (repo as BitbucketCloudRepository).uuid!;
  const isPublic = isServer ? (repo as BitbucketServerRepository).public : (repo as BitbucketCloudRepository).is_private === false;
  const isArchived = isServer ? (repo as BitbucketServerRepository).archived === true : false;

packages/schemas/src/v3/bitbucket.schema.ts

@@ -103,8 +103,8 @@ const schema = {
  },
  "examples": [
  [
- "cloud_workspace/repo1",
- "server_project/repo2"
+ "cloud_workspace/PROJECT_KEY/repo1",
+ "SERVER_PROJECT_KEY/repo2"
  ]
  ],
  "description": "List of specific repos to exclude from syncing."

packages/schemas/src/v3/connection.schema.ts

@@ -780,8 +780,8 @@ const schema = {
  },
  "examples": [
  [
- "cloud_workspace/repo1",
- "server_project/repo2"
+ "cloud_workspace/PROJECT_KEY/repo1",
+ "SERVER_PROJECT_KEY/repo2"
  ]
  ],
  "description": "List of specific repos to exclude from syncing."

packages/schemas/src/v3/index.schema.ts

@@ -1195,8 +1195,8 @@ const schema = {
  },
  "examples": [
  [
- "cloud_workspace/repo1",
- "server_project/repo2"
+ "cloud_workspace/PROJECT_KEY/repo1",
+ "SERVER_PROJECT_KEY/repo2"
  ]
  ],
  "description": "List of specific repos to exclude from syncing."

schemas/v3/bitbucket.json

@@ -72,8 +72,8 @@
  },
  "examples": [
  [
- "cloud_workspace/repo1",
- "server_project/repo2"
+ "cloud_workspace/PROJECT_KEY/repo1",
+ "SERVER_PROJECT_KEY/repo2"
  ]
  ],
  "description": "List of specific repos to exclude from syncing."

CHANGELOG.md

@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+- Fixed Bitbucket Server and Cloud repo identifiers to include the project key, preventing collisions across projects. **Note:** Bitbucket Cloud users with `exclude.repos` patterns must update them from `workspace/repo` to `workspace/PROJECT_KEY/repo` format. [#904](https://github.com/sourcebot-dev/sourcebot/pull/904)
+
 ### Added
 - Added optional `visibility` parameter to `/api/chat/blocking` endpoint and MCP `ask_codebase` tool to allow controlling chat session visibility in shared environments. [#903](https://github.com/sourcebot-dev/sourcebot/pull/903)
 

docs/snippets/schemas/v3/bitbucket.schema.mdx

@@ -104,8 +104,8 @@
  },
  "examples": [
  [
- "cloud_workspace/repo1",
- "server_project/repo2"
+ "cloud_workspace/PROJECT_KEY/repo1",
+ "SERVER_PROJECT_KEY/repo2"
  ]
  ],
  "description": "List of specific repos to exclude from syncing."

docs/snippets/schemas/v3/connection.schema.mdx

@@ -781,8 +781,8 @@
  },
  "examples": [
  [
- "cloud_workspace/repo1",
- "server_project/repo2"
+ "cloud_workspace/PROJECT_KEY/repo1",
+ "SERVER_PROJECT_KEY/repo2"
  ]
  ],
  "description": "List of specific repos to exclude from syncing."

docs/snippets/schemas/v3/index.schema.mdx

@@ -1196,8 +1196,8 @@
  },
  "examples": [
  [
- "cloud_workspace/repo1",
- "server_project/repo2"
+ "cloud_workspace/PROJECT_KEY/repo1",
+ "SERVER_PROJECT_KEY/repo2"
  ]
  ],
  "description": "List of specific repos to exclude from syncing."

packages/backend/src/bitbucket.test.ts

@@ -0,0 +1,173 @@
+import { expect, test, describe } from 'vitest';
+import { cloudShouldExcludeRepo, serverShouldExcludeRepo, BitbucketRepository } from './bitbucket';
+import { BitbucketConnectionConfig } from '@sourcebot/schemas/v3/bitbucket.type';
+import { SchemaRepository as CloudRepository } from '@coderabbitai/bitbucket/cloud/openapi';
+import { SchemaRestRepository as ServerRepository } from '@coderabbitai/bitbucket/server/openapi';
+
+const makeCloudRepo = (overrides: Partial<CloudRepository> = {}): BitbucketRepository => ({
+ type: 'repository',
+ full_name: 'myworkspace/my-repo',
+ project: { type: 'project', key: 'PROJ' },
+ is_private: false,
+ ...overrides,
+} as CloudRepository);
+
+const makeServerRepo = (overrides: Partial<ServerRepository> = {}): BitbucketRepository => ({
+ slug: 'my-repo',
+ project: { key: 'PROJ' },
+ archived: false,
+ ...overrides,
+} as ServerRepository);
+
+const baseConfig: BitbucketConnectionConfig = {
+ type: 'bitbucket',
+ deploymentType: 'cloud',
+};
+
+describe('cloudShouldExcludeRepo', () => {
+ test('returns false when no exclusions are configured', () => {
+ expect(cloudShouldExcludeRepo(makeCloudRepo(), baseConfig)).toBe(false);
+ });
+
+ test('returns false when exclude.repos is empty', () => {
+ expect(cloudShouldExcludeRepo(makeCloudRepo(), {
+ ...baseConfig,
+ exclude: { repos: [] },
+ })).toBe(false);
+ });
+
+ test('returns true when repo matches exclude.repos exactly', () => {
+ expect(cloudShouldExcludeRepo(makeCloudRepo(), {
+ ...baseConfig,
+ exclude: { repos: ['myworkspace/PROJ/my-repo'] },
+ })).toBe(true);
+ });
+
+ test('returns false when exclude.repos does not match', () => {
+ expect(cloudShouldExcludeRepo(makeCloudRepo(), {
+ ...baseConfig,
+ exclude: { repos: ['myworkspace/PROJ/other-repo'] },
+ })).toBe(false);
+ });
+
+ test('returns true when repo matches a glob pattern in exclude.repos', () => {
+ expect(cloudShouldExcludeRepo(makeCloudRepo(), {
+ ...baseConfig,
+ exclude: { repos: ['myworkspace/PROJ/*'] },
+ })).toBe(true);
+ });
+
+ test('returns true when repo matches a workspace-level glob in exclude.repos', () => {
+ expect(cloudShouldExcludeRepo(makeCloudRepo(), {
+ ...baseConfig,
+ exclude: { repos: ['myworkspace/**'] },
+ })).toBe(true);
+ });
+
+ test('returns false when exclude.forks is true but repo is not a fork', () => {
+ expect(cloudShouldExcludeRepo(makeCloudRepo(), {
+ ...baseConfig,
+ exclude: { forks: true },
+ })).toBe(false);
+ });
+
+ test('returns true when exclude.forks is true and repo is a fork', () => {
+ const forkedRepo = makeCloudRepo({ parent: { type: 'repository' } as CloudRepository });
+ expect(cloudShouldExcludeRepo(forkedRepo, {
+ ...baseConfig,
+ exclude: { forks: true },
+ })).toBe(true);
+ });
+
+ test('returns false when exclude.forks is false and repo is a fork', () => {
+ const forkedRepo = makeCloudRepo({ parent: { type: 'repository' } as CloudRepository });
+ expect(cloudShouldExcludeRepo(forkedRepo, {
+ ...baseConfig,
+ exclude: { forks: false },
+ })).toBe(false);
+ });
+});
+
+describe('serverShouldExcludeRepo', () => {
+ const serverConfig: BitbucketConnectionConfig = {
+ type: 'bitbucket',
+ deploymentType: 'server',
+ url: 'https://bitbucket.example.com',
+ };
+
+ test('returns false when no exclusions are configured', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo(), serverConfig)).toBe(false);
+ });
+
+ test('returns false when exclude.repos is empty', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo(), {
+ ...serverConfig,
+ exclude: { repos: [] },
+ })).toBe(false);
+ });
+
+ test('returns true when repo matches exclude.repos exactly', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo(), {
+ ...serverConfig,
+ exclude: { repos: ['PROJ/my-repo'] },
+ })).toBe(true);
+ });
+
+ test('returns false when exclude.repos does not match', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo(), {
+ ...serverConfig,
+ exclude: { repos: ['PROJ/other-repo'] },
+ })).toBe(false);
+ });
+
+ test('returns true when repo matches a glob pattern in exclude.repos', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo(), {
+ ...serverConfig,
+ exclude: { repos: ['PROJ/*'] },
+ })).toBe(true);
+ });
+
+ test('returns false when exclude.archived is true but repo is not archived', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo({ archived: false }), {
+ ...serverConfig,
+ exclude: { archived: true },
+ })).toBe(false);
+ });
+
+ test('returns true when exclude.archived is true and repo is archived', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo({ archived: true }), {
+ ...serverConfig,
+ exclude: { archived: true },
+ })).toBe(true);
+ });
+
+ test('returns false when exclude.archived is false and repo is archived', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo({ archived: true }), {
+ ...serverConfig,
+ exclude: { archived: false },
+ })).toBe(false);
+ });
+
+ test('returns false when exclude.forks is true but repo is not a fork', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo(), {
+ ...serverConfig,
+ exclude: { forks: true },
+ })).toBe(false);
+ });
+
+ test('returns true when exclude.forks is true and repo is a fork', () => {
+ const forkedRepo = makeServerRepo({ origin: { slug: 'original-repo' } as ServerRepository });
+ expect(serverShouldExcludeRepo(forkedRepo, {
+ ...serverConfig,
+ exclude: { forks: true },
+ })).toBe(true);
+ });
+
+ test('returns false when exclude.forks is false and repo is a fork', () => {
+ const forkedRepo = makeServerRepo({ origin: { slug: 'original-repo' } as ServerRepository });
+ expect(serverShouldExcludeRepo(forkedRepo, {
+ ...serverConfig,
+ exclude: { forks: false },
+ })).toBe(false);
+ });
+});

packages/backend/src/bitbucket.ts

@@ -345,10 +345,11 @@ async function cloudGetRepos(client: BitbucketClient, repoList: string[]): Promi
  };
 }
 
-function cloudShouldExcludeRepo(repo: BitbucketRepository, config: BitbucketConnectionConfig): boolean {
+export function cloudShouldExcludeRepo(repo: BitbucketRepository, config: BitbucketConnectionConfig): boolean {
  const cloudRepo = repo as CloudRepository;
  let reason = '';
- const repoName = cloudRepo.full_name!;
+ const [workspace, repoSlug] = cloudRepo.full_name!.split('/');
+ const repoName = `${workspace}/${cloudRepo.project?.key}/${repoSlug}`;
 
  const shouldExclude = (() => {
  if (config.exclude?.repos) {
@@ -552,7 +553,7 @@ async function serverGetRepos(client: BitbucketClient, repoList: string[]): Prom
  };
 }
 
-function serverShouldExcludeRepo(repo: BitbucketRepository, config: BitbucketConnectionConfig): boolean {
+export function serverShouldExcludeRepo(repo: BitbucketRepository, config: BitbucketConnectionConfig): boolean {
  const serverRepo = repo as ServerRepository;
 
  const projectName = serverRepo.project!.key;

packages/backend/src/repoCompileUtils.ts

@@ -454,7 +454,18 @@ export const compileBitbucketConfig = async (
  const repos = bitbucketRepos.map((repo) => {
  const isServer = config.deploymentType === 'server';
  const codeHostType: CodeHostType = isServer ? 'bitbucketServer' : 'bitbucketCloud';
- const displayName = isServer ? (repo as BitbucketServerRepository).name! : (repo as BitbucketCloudRepository).full_name!;
+ const displayName = (() => {
+ if (isServer) {
+ const serverRepo = repo as BitbucketServerRepository;
+ // Server repos are of the format `project/repo`
+ return `${serverRepo.project!.key}/${serverRepo.slug!}`;
+ } else {
+ const cloudRepo = repo as BitbucketCloudRepository;
+ // Cloud repos are of the format `workspace/project/repo`
+ const [workspace, repoSlug] = cloudRepo.full_name!.split('/');
+ return `${workspace}/${cloudRepo.project?.key!}/${repoSlug}`;
+ }
+ })();
  const externalId = isServer ? (repo as BitbucketServerRepository).id!.toString() : (repo as BitbucketCloudRepository).uuid!;
  const isPublic = isServer ? (repo as BitbucketServerRepository).public : (repo as BitbucketCloudRepository).is_private === false;
  const isArchived = isServer ? (repo as BitbucketServerRepository).archived === true : false;

packages/schemas/src/v3/bitbucket.schema.ts

@@ -103,8 +103,8 @@ const schema = {
  },
  "examples": [
  [
- "cloud_workspace/repo1",
- "server_project/repo2"
+ "cloud_workspace/PROJECT_KEY/repo1",
+ "SERVER_PROJECT_KEY/repo2"
  ]
  ],
  "description": "List of specific repos to exclude from syncing."

packages/schemas/src/v3/connection.schema.ts

@@ -780,8 +780,8 @@ const schema = {
  },
  "examples": [
  [
- "cloud_workspace/repo1",
- "server_project/repo2"
+ "cloud_workspace/PROJECT_KEY/repo1",
+ "SERVER_PROJECT_KEY/repo2"
  ]
  ],
  "description": "List of specific repos to exclude from syncing."

packages/schemas/src/v3/index.schema.ts

@@ -1195,8 +1195,8 @@ const schema = {
  },
  "examples": [
  [
- "cloud_workspace/repo1",
- "server_project/repo2"
+ "cloud_workspace/PROJECT_KEY/repo1",
+ "SERVER_PROJECT_KEY/repo2"
  ]
  ],
  "description": "List of specific repos to exclude from syncing."

schemas/v3/bitbucket.json

@@ -72,8 +72,8 @@
  },
  "examples": [
  [
- "cloud_workspace/repo1",
- "server_project/repo2"
+ "cloud_workspace/PROJECT_KEY/repo1",
+ "SERVER_PROJECT_KEY/repo2"
  ]
  ],
  "description": "List of specific repos to exclude from syncing."

CHANGELOG.md

@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+- Fixed Bitbucket Server and Cloud repo identifiers to include the project key, preventing collisions across projects. **Note:** Bitbucket Cloud users with `exclude.repos` patterns must update them from `workspace/repo` to `workspace/PROJECT_KEY/repo` format. [#904](https://github.com/sourcebot-dev/sourcebot/pull/904)
+
 ### Added
 - Added optional `visibility` parameter to `/api/chat/blocking` endpoint and MCP `ask_codebase` tool to allow controlling chat session visibility in shared environments. [#903](https://github.com/sourcebot-dev/sourcebot/pull/903)
 

docs/snippets/schemas/v3/bitbucket.schema.mdx

@@ -104,8 +104,8 @@
  },
  "examples": [
  [
- "cloud_workspace/repo1",
- "server_project/repo2"
+ "cloud_workspace/PROJECT_KEY/repo1",
+ "SERVER_PROJECT_KEY/repo2"
  ]
  ],
  "description": "List of specific repos to exclude from syncing."

docs/snippets/schemas/v3/connection.schema.mdx

@@ -781,8 +781,8 @@
  },
  "examples": [
  [
- "cloud_workspace/repo1",
- "server_project/repo2"
+ "cloud_workspace/PROJECT_KEY/repo1",
+ "SERVER_PROJECT_KEY/repo2"
  ]
  ],
  "description": "List of specific repos to exclude from syncing."

docs/snippets/schemas/v3/index.schema.mdx

@@ -1196,8 +1196,8 @@
  },
  "examples": [
  [
- "cloud_workspace/repo1",
- "server_project/repo2"
+ "cloud_workspace/PROJECT_KEY/repo1",
+ "SERVER_PROJECT_KEY/repo2"
  ]
  ],
  "description": "List of specific repos to exclude from syncing."

packages/backend/src/bitbucket.test.ts

@@ -0,0 +1,173 @@
+import { expect, test, describe } from 'vitest';
+import { cloudShouldExcludeRepo, serverShouldExcludeRepo, BitbucketRepository } from './bitbucket';
+import { BitbucketConnectionConfig } from '@sourcebot/schemas/v3/bitbucket.type';
+import { SchemaRepository as CloudRepository } from '@coderabbitai/bitbucket/cloud/openapi';
+import { SchemaRestRepository as ServerRepository } from '@coderabbitai/bitbucket/server/openapi';
+
+const makeCloudRepo = (overrides: Partial<CloudRepository> = {}): BitbucketRepository => ({
+ type: 'repository',
+ full_name: 'myworkspace/my-repo',
+ project: { type: 'project', key: 'PROJ' },
+ is_private: false,
+ ...overrides,
+} as CloudRepository);
+
+const makeServerRepo = (overrides: Partial<ServerRepository> = {}): BitbucketRepository => ({
+ slug: 'my-repo',
+ project: { key: 'PROJ' },
+ archived: false,
+ ...overrides,
+} as ServerRepository);
+
+const baseConfig: BitbucketConnectionConfig = {
+ type: 'bitbucket',
+ deploymentType: 'cloud',
+};
+
+describe('cloudShouldExcludeRepo', () => {
+ test('returns false when no exclusions are configured', () => {
+ expect(cloudShouldExcludeRepo(makeCloudRepo(), baseConfig)).toBe(false);
+ });
+
+ test('returns false when exclude.repos is empty', () => {
+ expect(cloudShouldExcludeRepo(makeCloudRepo(), {
+ ...baseConfig,
+ exclude: { repos: [] },
+ })).toBe(false);
+ });
+
+ test('returns true when repo matches exclude.repos exactly', () => {
+ expect(cloudShouldExcludeRepo(makeCloudRepo(), {
+ ...baseConfig,
+ exclude: { repos: ['myworkspace/PROJ/my-repo'] },
+ })).toBe(true);
+ });
+
+ test('returns false when exclude.repos does not match', () => {
+ expect(cloudShouldExcludeRepo(makeCloudRepo(), {
+ ...baseConfig,
+ exclude: { repos: ['myworkspace/PROJ/other-repo'] },
+ })).toBe(false);
+ });
+
+ test('returns true when repo matches a glob pattern in exclude.repos', () => {
+ expect(cloudShouldExcludeRepo(makeCloudRepo(), {
+ ...baseConfig,
+ exclude: { repos: ['myworkspace/PROJ/*'] },
+ })).toBe(true);
+ });
+
+ test('returns true when repo matches a workspace-level glob in exclude.repos', () => {
+ expect(cloudShouldExcludeRepo(makeCloudRepo(), {
+ ...baseConfig,
+ exclude: { repos: ['myworkspace/**'] },
+ })).toBe(true);
+ });
+
+ test('returns false when exclude.forks is true but repo is not a fork', () => {
+ expect(cloudShouldExcludeRepo(makeCloudRepo(), {
+ ...baseConfig,
+ exclude: { forks: true },
+ })).toBe(false);
+ });
+
+ test('returns true when exclude.forks is true and repo is a fork', () => {
+ const forkedRepo = makeCloudRepo({ parent: { type: 'repository' } as CloudRepository });
+ expect(cloudShouldExcludeRepo(forkedRepo, {
+ ...baseConfig,
+ exclude: { forks: true },
+ })).toBe(true);
+ });
+
+ test('returns false when exclude.forks is false and repo is a fork', () => {
+ const forkedRepo = makeCloudRepo({ parent: { type: 'repository' } as CloudRepository });
+ expect(cloudShouldExcludeRepo(forkedRepo, {
+ ...baseConfig,
+ exclude: { forks: false },
+ })).toBe(false);
+ });
+});
+
+describe('serverShouldExcludeRepo', () => {
+ const serverConfig: BitbucketConnectionConfig = {
+ type: 'bitbucket',
+ deploymentType: 'server',
+ url: 'https://bitbucket.example.com',
+ };
+
+ test('returns false when no exclusions are configured', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo(), serverConfig)).toBe(false);
+ });
+
+ test('returns false when exclude.repos is empty', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo(), {
+ ...serverConfig,
+ exclude: { repos: [] },
+ })).toBe(false);
+ });
+
+ test('returns true when repo matches exclude.repos exactly', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo(), {
+ ...serverConfig,
+ exclude: { repos: ['PROJ/my-repo'] },
+ })).toBe(true);
+ });
+
+ test('returns false when exclude.repos does not match', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo(), {
+ ...serverConfig,
+ exclude: { repos: ['PROJ/other-repo'] },
+ })).toBe(false);
+ });
+
+ test('returns true when repo matches a glob pattern in exclude.repos', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo(), {
+ ...serverConfig,
+ exclude: { repos: ['PROJ/*'] },
+ })).toBe(true);
+ });
+
+ test('returns false when exclude.archived is true but repo is not archived', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo({ archived: false }), {
+ ...serverConfig,
+ exclude: { archived: true },
+ })).toBe(false);
+ });
+
+ test('returns true when exclude.archived is true and repo is archived', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo({ archived: true }), {
+ ...serverConfig,
+ exclude: { archived: true },
+ })).toBe(true);
+ });
+
+ test('returns false when exclude.archived is false and repo is archived', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo({ archived: true }), {
+ ...serverConfig,
+ exclude: { archived: false },
+ })).toBe(false);
+ });
+
+ test('returns false when exclude.forks is true but repo is not a fork', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo(), {
+ ...serverConfig,
+ exclude: { forks: true },
+ })).toBe(false);
+ });
+
+ test('returns true when exclude.forks is true and repo is a fork', () => {
+ const forkedRepo = makeServerRepo({ origin: { slug: 'original-repo' } as ServerRepository });
+ expect(serverShouldExcludeRepo(forkedRepo, {
+ ...serverConfig,
+ exclude: { forks: true },
+ })).toBe(true);
+ });
+
+ test('returns false when exclude.forks is false and repo is a fork', () => {
+ const forkedRepo = makeServerRepo({ origin: { slug: 'original-repo' } as ServerRepository });
+ expect(serverShouldExcludeRepo(forkedRepo, {
+ ...serverConfig,
+ exclude: { forks: false },
+ })).toBe(false);
+ });
+});

packages/backend/src/bitbucket.ts

@@ -345,10 +345,11 @@ async function cloudGetRepos(client: BitbucketClient, repoList: string[]): Promi
  };
 }
 
-function cloudShouldExcludeRepo(repo: BitbucketRepository, config: BitbucketConnectionConfig): boolean {
+export function cloudShouldExcludeRepo(repo: BitbucketRepository, config: BitbucketConnectionConfig): boolean {
  const cloudRepo = repo as CloudRepository;
  let reason = '';
- const repoName = cloudRepo.full_name!;
+ const [workspace, repoSlug] = cloudRepo.full_name!.split('/');
+ const repoName = `${workspace}/${cloudRepo.project?.key}/${repoSlug}`;
 
  const shouldExclude = (() => {
  if (config.exclude?.repos) {
@@ -552,7 +553,7 @@ async function serverGetRepos(client: BitbucketClient, repoList: string[]): Prom
  };
 }
 
-function serverShouldExcludeRepo(repo: BitbucketRepository, config: BitbucketConnectionConfig): boolean {
+export function serverShouldExcludeRepo(repo: BitbucketRepository, config: BitbucketConnectionConfig): boolean {
  const serverRepo = repo as ServerRepository;
 
  const projectName = serverRepo.project!.key;

packages/backend/src/repoCompileUtils.ts

@@ -454,7 +454,18 @@ export const compileBitbucketConfig = async (
  const repos = bitbucketRepos.map((repo) => {
  const isServer = config.deploymentType === 'server';
  const codeHostType: CodeHostType = isServer ? 'bitbucketServer' : 'bitbucketCloud';
- const displayName = isServer ? (repo as BitbucketServerRepository).name! : (repo as BitbucketCloudRepository).full_name!;
+ const displayName = (() => {
+ if (isServer) {
+ const serverRepo = repo as BitbucketServerRepository;
+ // Server repos are of the format `project/repo`
+ return `${serverRepo.project!.key}/${serverRepo.slug!}`;
+ } else {
+ const cloudRepo = repo as BitbucketCloudRepository;
+ // Cloud repos are of the format `workspace/project/repo`
+ const [workspace, repoSlug] = cloudRepo.full_name!.split('/');
+ return `${workspace}/${cloudRepo.project?.key!}/${repoSlug}`;
+ }
+ })();
  const externalId = isServer ? (repo as BitbucketServerRepository).id!.toString() : (repo as BitbucketCloudRepository).uuid!;
  const isPublic = isServer ? (repo as BitbucketServerRepository).public : (repo as BitbucketCloudRepository).is_private === false;
  const isArchived = isServer ? (repo as BitbucketServerRepository).archived === true : false;

packages/schemas/src/v3/bitbucket.schema.ts

@@ -103,8 +103,8 @@ const schema = {
  },
  "examples": [
  [
- "cloud_workspace/repo1",
- "server_project/repo2"
+ "cloud_workspace/PROJECT_KEY/repo1",
+ "SERVER_PROJECT_KEY/repo2"
  ]
  ],
  "description": "List of specific repos to exclude from syncing."

packages/schemas/src/v3/connection.schema.ts

@@ -780,8 +780,8 @@ const schema = {
  },
  "examples": [
  [
- "cloud_workspace/repo1",
- "server_project/repo2"
+ "cloud_workspace/PROJECT_KEY/repo1",
+ "SERVER_PROJECT_KEY/repo2"
  ]
  ],
  "description": "List of specific repos to exclude from syncing."

packages/schemas/src/v3/index.schema.ts

@@ -1195,8 +1195,8 @@ const schema = {
  },
  "examples": [
  [
- "cloud_workspace/repo1",
- "server_project/repo2"
+ "cloud_workspace/PROJECT_KEY/repo1",
+ "SERVER_PROJECT_KEY/repo2"
  ]
  ],
  "description": "List of specific repos to exclude from syncing."

schemas/v3/bitbucket.json

@@ -72,8 +72,8 @@
  },
  "examples": [
  [
- "cloud_workspace/repo1",
- "server_project/repo2"
+ "cloud_workspace/PROJECT_KEY/repo1",
+ "SERVER_PROJECT_KEY/repo2"
  ]
  ],
  "description": "List of specific repos to exclude from syncing."

CHANGELOG.md

@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+- Fixed Bitbucket Server and Cloud repo identifiers to include the project key, preventing collisions across projects. **Note:** Bitbucket Cloud users with `exclude.repos` patterns must update them from `workspace/repo` to `workspace/PROJECT_KEY/repo` format. [#904](https://github.com/sourcebot-dev/sourcebot/pull/904)
+
 ### Added
 - Added optional `visibility` parameter to `/api/chat/blocking` endpoint and MCP `ask_codebase` tool to allow controlling chat session visibility in shared environments. [#903](https://github.com/sourcebot-dev/sourcebot/pull/903)
 

docs/snippets/schemas/v3/bitbucket.schema.mdx

@@ -104,8 +104,8 @@
  },
  "examples": [
  [
- "cloud_workspace/repo1",
- "server_project/repo2"
+ "cloud_workspace/PROJECT_KEY/repo1",
+ "SERVER_PROJECT_KEY/repo2"
  ]
  ],
  "description": "List of specific repos to exclude from syncing."

docs/snippets/schemas/v3/connection.schema.mdx

@@ -781,8 +781,8 @@
  },
  "examples": [
  [
- "cloud_workspace/repo1",
- "server_project/repo2"
+ "cloud_workspace/PROJECT_KEY/repo1",
+ "SERVER_PROJECT_KEY/repo2"
  ]
  ],
  "description": "List of specific repos to exclude from syncing."

docs/snippets/schemas/v3/index.schema.mdx

@@ -1196,8 +1196,8 @@
  },
  "examples": [
  [
- "cloud_workspace/repo1",
- "server_project/repo2"
+ "cloud_workspace/PROJECT_KEY/repo1",
+ "SERVER_PROJECT_KEY/repo2"
  ]
  ],
  "description": "List of specific repos to exclude from syncing."

packages/backend/src/bitbucket.test.ts

@@ -0,0 +1,173 @@
+import { expect, test, describe } from 'vitest';
+import { cloudShouldExcludeRepo, serverShouldExcludeRepo, BitbucketRepository } from './bitbucket';
+import { BitbucketConnectionConfig } from '@sourcebot/schemas/v3/bitbucket.type';
+import { SchemaRepository as CloudRepository } from '@coderabbitai/bitbucket/cloud/openapi';
+import { SchemaRestRepository as ServerRepository } from '@coderabbitai/bitbucket/server/openapi';
+
+const makeCloudRepo = (overrides: Partial<CloudRepository> = {}): BitbucketRepository => ({
+ type: 'repository',
+ full_name: 'myworkspace/my-repo',
+ project: { type: 'project', key: 'PROJ' },
+ is_private: false,
+ ...overrides,
+} as CloudRepository);
+
+const makeServerRepo = (overrides: Partial<ServerRepository> = {}): BitbucketRepository => ({
+ slug: 'my-repo',
+ project: { key: 'PROJ' },
+ archived: false,
+ ...overrides,
+} as ServerRepository);
+
+const baseConfig: BitbucketConnectionConfig = {
+ type: 'bitbucket',
+ deploymentType: 'cloud',
+};
+
+describe('cloudShouldExcludeRepo', () => {
+ test('returns false when no exclusions are configured', () => {
+ expect(cloudShouldExcludeRepo(makeCloudRepo(), baseConfig)).toBe(false);
+ });
+
+ test('returns false when exclude.repos is empty', () => {
+ expect(cloudShouldExcludeRepo(makeCloudRepo(), {
+ ...baseConfig,
+ exclude: { repos: [] },
+ })).toBe(false);
+ });
+
+ test('returns true when repo matches exclude.repos exactly', () => {
+ expect(cloudShouldExcludeRepo(makeCloudRepo(), {
+ ...baseConfig,
+ exclude: { repos: ['myworkspace/PROJ/my-repo'] },
+ })).toBe(true);
+ });
+
+ test('returns false when exclude.repos does not match', () => {
+ expect(cloudShouldExcludeRepo(makeCloudRepo(), {
+ ...baseConfig,
+ exclude: { repos: ['myworkspace/PROJ/other-repo'] },
+ })).toBe(false);
+ });
+
+ test('returns true when repo matches a glob pattern in exclude.repos', () => {
+ expect(cloudShouldExcludeRepo(makeCloudRepo(), {
+ ...baseConfig,
+ exclude: { repos: ['myworkspace/PROJ/*'] },
+ })).toBe(true);
+ });
+
+ test('returns true when repo matches a workspace-level glob in exclude.repos', () => {
+ expect(cloudShouldExcludeRepo(makeCloudRepo(), {
+ ...baseConfig,
+ exclude: { repos: ['myworkspace/**'] },
+ })).toBe(true);
+ });
+
+ test('returns false when exclude.forks is true but repo is not a fork', () => {
+ expect(cloudShouldExcludeRepo(makeCloudRepo(), {
+ ...baseConfig,
+ exclude: { forks: true },
+ })).toBe(false);
+ });
+
+ test('returns true when exclude.forks is true and repo is a fork', () => {
+ const forkedRepo = makeCloudRepo({ parent: { type: 'repository' } as CloudRepository });
+ expect(cloudShouldExcludeRepo(forkedRepo, {
+ ...baseConfig,
+ exclude: { forks: true },
+ })).toBe(true);
+ });
+
+ test('returns false when exclude.forks is false and repo is a fork', () => {
+ const forkedRepo = makeCloudRepo({ parent: { type: 'repository' } as CloudRepository });
+ expect(cloudShouldExcludeRepo(forkedRepo, {
+ ...baseConfig,
+ exclude: { forks: false },
+ })).toBe(false);
+ });
+});
+
+describe('serverShouldExcludeRepo', () => {
+ const serverConfig: BitbucketConnectionConfig = {
+ type: 'bitbucket',
+ deploymentType: 'server',
+ url: 'https://bitbucket.example.com',
+ };
+
+ test('returns false when no exclusions are configured', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo(), serverConfig)).toBe(false);
+ });
+
+ test('returns false when exclude.repos is empty', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo(), {
+ ...serverConfig,
+ exclude: { repos: [] },
+ })).toBe(false);
+ });
+
+ test('returns true when repo matches exclude.repos exactly', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo(), {
+ ...serverConfig,
+ exclude: { repos: ['PROJ/my-repo'] },
+ })).toBe(true);
+ });
+
+ test('returns false when exclude.repos does not match', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo(), {
+ ...serverConfig,
+ exclude: { repos: ['PROJ/other-repo'] },
+ })).toBe(false);
+ });
+
+ test('returns true when repo matches a glob pattern in exclude.repos', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo(), {
+ ...serverConfig,
+ exclude: { repos: ['PROJ/*'] },
+ })).toBe(true);
+ });
+
+ test('returns false when exclude.archived is true but repo is not archived', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo({ archived: false }), {
+ ...serverConfig,
+ exclude: { archived: true },
+ })).toBe(false);
+ });
+
+ test('returns true when exclude.archived is true and repo is archived', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo({ archived: true }), {
+ ...serverConfig,
+ exclude: { archived: true },
+ })).toBe(true);
+ });
+
+ test('returns false when exclude.archived is false and repo is archived', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo({ archived: true }), {
+ ...serverConfig,
+ exclude: { archived: false },
+ })).toBe(false);
+ });
+
+ test('returns false when exclude.forks is true but repo is not a fork', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo(), {
+ ...serverConfig,
+ exclude: { forks: true },
+ })).toBe(false);
+ });
+
+ test('returns true when exclude.forks is true and repo is a fork', () => {
+ const forkedRepo = makeServerRepo({ origin: { slug: 'original-repo' } as ServerRepository });
+ expect(serverShouldExcludeRepo(forkedRepo, {
+ ...serverConfig,
+ exclude: { forks: true },
+ })).toBe(true);
+ });
+
+ test('returns false when exclude.forks is false and repo is a fork', () => {
+ const forkedRepo = makeServerRepo({ origin: { slug: 'original-repo' } as ServerRepository });
+ expect(serverShouldExcludeRepo(forkedRepo, {
+ ...serverConfig,
+ exclude: { forks: false },
+ })).toBe(false);
+ });
+});

packages/backend/src/bitbucket.ts

@@ -345,10 +345,11 @@ async function cloudGetRepos(client: BitbucketClient, repoList: string[]): Promi
  };
 }
 
-function cloudShouldExcludeRepo(repo: BitbucketRepository, config: BitbucketConnectionConfig): boolean {
+export function cloudShouldExcludeRepo(repo: BitbucketRepository, config: BitbucketConnectionConfig): boolean {
  const cloudRepo = repo as CloudRepository;
  let reason = '';
- const repoName = cloudRepo.full_name!;
+ const [workspace, repoSlug] = cloudRepo.full_name!.split('/');
+ const repoName = `${workspace}/${cloudRepo.project?.key}/${repoSlug}`;
 
  const shouldExclude = (() => {
  if (config.exclude?.repos) {
@@ -552,7 +553,7 @@ async function serverGetRepos(client: BitbucketClient, repoList: string[]): Prom
  };
 }
 
-function serverShouldExcludeRepo(repo: BitbucketRepository, config: BitbucketConnectionConfig): boolean {
+export function serverShouldExcludeRepo(repo: BitbucketRepository, config: BitbucketConnectionConfig): boolean {
  const serverRepo = repo as ServerRepository;
 
  const projectName = serverRepo.project!.key;

packages/backend/src/repoCompileUtils.ts

@@ -454,7 +454,18 @@ export const compileBitbucketConfig = async (
  const repos = bitbucketRepos.map((repo) => {
  const isServer = config.deploymentType === 'server';
  const codeHostType: CodeHostType = isServer ? 'bitbucketServer' : 'bitbucketCloud';
- const displayName = isServer ? (repo as BitbucketServerRepository).name! : (repo as BitbucketCloudRepository).full_name!;
+ const displayName = (() => {
+ if (isServer) {
+ const serverRepo = repo as BitbucketServerRepository;
+ // Server repos are of the format `project/repo`
+ return `${serverRepo.project!.key}/${serverRepo.slug!}`;
+ } else {
+ const cloudRepo = repo as BitbucketCloudRepository;
+ // Cloud repos are of the format `workspace/project/repo`
+ const [workspace, repoSlug] = cloudRepo.full_name!.split('/');
+ return `${workspace}/${cloudRepo.project?.key!}/${repoSlug}`;
+ }
+ })();
  const externalId = isServer ? (repo as BitbucketServerRepository).id!.toString() : (repo as BitbucketCloudRepository).uuid!;
  const isPublic = isServer ? (repo as BitbucketServerRepository).public : (repo as BitbucketCloudRepository).is_private === false;
  const isArchived = isServer ? (repo as BitbucketServerRepository).archived === true : false;

packages/schemas/src/v3/bitbucket.schema.ts

@@ -103,8 +103,8 @@ const schema = {
  },
  "examples": [
  [
- "cloud_workspace/repo1",
- "server_project/repo2"
+ "cloud_workspace/PROJECT_KEY/repo1",
+ "SERVER_PROJECT_KEY/repo2"
  ]
  ],
  "description": "List of specific repos to exclude from syncing."

packages/schemas/src/v3/connection.schema.ts

@@ -780,8 +780,8 @@ const schema = {
  },
  "examples": [
  [
- "cloud_workspace/repo1",
- "server_project/repo2"
+ "cloud_workspace/PROJECT_KEY/repo1",
+ "SERVER_PROJECT_KEY/repo2"
  ]
  ],
  "description": "List of specific repos to exclude from syncing."

packages/schemas/src/v3/index.schema.ts

@@ -1195,8 +1195,8 @@ const schema = {
  },
  "examples": [
  [
- "cloud_workspace/repo1",
- "server_project/repo2"
+ "cloud_workspace/PROJECT_KEY/repo1",
+ "SERVER_PROJECT_KEY/repo2"
  ]
  ],
  "description": "List of specific repos to exclude from syncing."

schemas/v3/bitbucket.json

@@ -72,8 +72,8 @@
  },
  "examples": [
  [
- "cloud_workspace/repo1",
- "server_project/repo2"
+ "cloud_workspace/PROJECT_KEY/repo1",
+ "SERVER_PROJECT_KEY/repo2"
  ]
  ],
  "description": "List of specific repos to exclude from syncing."

CHANGELOG.md

@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+- Fixed Bitbucket Server and Cloud repo identifiers to include the project key, preventing collisions across projects. **Note:** Bitbucket Cloud users with `exclude.repos` patterns must update them from `workspace/repo` to `workspace/PROJECT_KEY/repo` format. [#904](https://github.com/sourcebot-dev/sourcebot/pull/904)
+
 ### Added
 - Added optional `visibility` parameter to `/api/chat/blocking` endpoint and MCP `ask_codebase` tool to allow controlling chat session visibility in shared environments. [#903](https://github.com/sourcebot-dev/sourcebot/pull/903)
 

docs/snippets/schemas/v3/bitbucket.schema.mdx

@@ -104,8 +104,8 @@
  },
  "examples": [
  [
- "cloud_workspace/repo1",
- "server_project/repo2"
+ "cloud_workspace/PROJECT_KEY/repo1",
+ "SERVER_PROJECT_KEY/repo2"
  ]
  ],
  "description": "List of specific repos to exclude from syncing."

docs/snippets/schemas/v3/connection.schema.mdx

@@ -781,8 +781,8 @@
  },
  "examples": [
  [
- "cloud_workspace/repo1",
- "server_project/repo2"
+ "cloud_workspace/PROJECT_KEY/repo1",
+ "SERVER_PROJECT_KEY/repo2"
  ]
  ],
  "description": "List of specific repos to exclude from syncing."

docs/snippets/schemas/v3/index.schema.mdx

@@ -1196,8 +1196,8 @@
  },
  "examples": [
  [
- "cloud_workspace/repo1",
- "server_project/repo2"
+ "cloud_workspace/PROJECT_KEY/repo1",
+ "SERVER_PROJECT_KEY/repo2"
  ]
  ],
  "description": "List of specific repos to exclude from syncing."

packages/backend/src/bitbucket.test.ts

@@ -0,0 +1,173 @@
+import { expect, test, describe } from 'vitest';
+import { cloudShouldExcludeRepo, serverShouldExcludeRepo, BitbucketRepository } from './bitbucket';
+import { BitbucketConnectionConfig } from '@sourcebot/schemas/v3/bitbucket.type';
+import { SchemaRepository as CloudRepository } from '@coderabbitai/bitbucket/cloud/openapi';
+import { SchemaRestRepository as ServerRepository } from '@coderabbitai/bitbucket/server/openapi';
+
+const makeCloudRepo = (overrides: Partial<CloudRepository> = {}): BitbucketRepository => ({
+ type: 'repository',
+ full_name: 'myworkspace/my-repo',
+ project: { type: 'project', key: 'PROJ' },
+ is_private: false,
+ ...overrides,
+} as CloudRepository);
+
+const makeServerRepo = (overrides: Partial<ServerRepository> = {}): BitbucketRepository => ({
+ slug: 'my-repo',
+ project: { key: 'PROJ' },
+ archived: false,
+ ...overrides,
+} as ServerRepository);
+
+const baseConfig: BitbucketConnectionConfig = {
+ type: 'bitbucket',
+ deploymentType: 'cloud',
+};
+
+describe('cloudShouldExcludeRepo', () => {
+ test('returns false when no exclusions are configured', () => {
+ expect(cloudShouldExcludeRepo(makeCloudRepo(), baseConfig)).toBe(false);
+ });
+
+ test('returns false when exclude.repos is empty', () => {
+ expect(cloudShouldExcludeRepo(makeCloudRepo(), {
+ ...baseConfig,
+ exclude: { repos: [] },
+ })).toBe(false);
+ });
+
+ test('returns true when repo matches exclude.repos exactly', () => {
+ expect(cloudShouldExcludeRepo(makeCloudRepo(), {
+ ...baseConfig,
+ exclude: { repos: ['myworkspace/PROJ/my-repo'] },
+ })).toBe(true);
+ });
+
+ test('returns false when exclude.repos does not match', () => {
+ expect(cloudShouldExcludeRepo(makeCloudRepo(), {
+ ...baseConfig,
+ exclude: { repos: ['myworkspace/PROJ/other-repo'] },
+ })).toBe(false);
+ });
+
+ test('returns true when repo matches a glob pattern in exclude.repos', () => {
+ expect(cloudShouldExcludeRepo(makeCloudRepo(), {
+ ...baseConfig,
+ exclude: { repos: ['myworkspace/PROJ/*'] },
+ })).toBe(true);
+ });
+
+ test('returns true when repo matches a workspace-level glob in exclude.repos', () => {
+ expect(cloudShouldExcludeRepo(makeCloudRepo(), {
+ ...baseConfig,
+ exclude: { repos: ['myworkspace/**'] },
+ })).toBe(true);
+ });
+
+ test('returns false when exclude.forks is true but repo is not a fork', () => {
+ expect(cloudShouldExcludeRepo(makeCloudRepo(), {
+ ...baseConfig,
+ exclude: { forks: true },
+ })).toBe(false);
+ });
+
+ test('returns true when exclude.forks is true and repo is a fork', () => {
+ const forkedRepo = makeCloudRepo({ parent: { type: 'repository' } as CloudRepository });
+ expect(cloudShouldExcludeRepo(forkedRepo, {
+ ...baseConfig,
+ exclude: { forks: true },
+ })).toBe(true);
+ });
+
+ test('returns false when exclude.forks is false and repo is a fork', () => {
+ const forkedRepo = makeCloudRepo({ parent: { type: 'repository' } as CloudRepository });
+ expect(cloudShouldExcludeRepo(forkedRepo, {
+ ...baseConfig,
+ exclude: { forks: false },
+ })).toBe(false);
+ });
+});
+
+describe('serverShouldExcludeRepo', () => {
+ const serverConfig: BitbucketConnectionConfig = {
+ type: 'bitbucket',
+ deploymentType: 'server',
+ url: 'https://bitbucket.example.com',
+ };
+
+ test('returns false when no exclusions are configured', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo(), serverConfig)).toBe(false);
+ });
+
+ test('returns false when exclude.repos is empty', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo(), {
+ ...serverConfig,
+ exclude: { repos: [] },
+ })).toBe(false);
+ });
+
+ test('returns true when repo matches exclude.repos exactly', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo(), {
+ ...serverConfig,
+ exclude: { repos: ['PROJ/my-repo'] },
+ })).toBe(true);
+ });
+
+ test('returns false when exclude.repos does not match', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo(), {
+ ...serverConfig,
+ exclude: { repos: ['PROJ/other-repo'] },
+ })).toBe(false);
+ });
+
+ test('returns true when repo matches a glob pattern in exclude.repos', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo(), {
+ ...serverConfig,
+ exclude: { repos: ['PROJ/*'] },
+ })).toBe(true);
+ });
+
+ test('returns false when exclude.archived is true but repo is not archived', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo({ archived: false }), {
+ ...serverConfig,
+ exclude: { archived: true },
+ })).toBe(false);
+ });
+
+ test('returns true when exclude.archived is true and repo is archived', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo({ archived: true }), {
+ ...serverConfig,
+ exclude: { archived: true },
+ })).toBe(true);
+ });
+
+ test('returns false when exclude.archived is false and repo is archived', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo({ archived: true }), {
+ ...serverConfig,
+ exclude: { archived: false },
+ })).toBe(false);
+ });
+
+ test('returns false when exclude.forks is true but repo is not a fork', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo(), {
+ ...serverConfig,
+ exclude: { forks: true },
+ })).toBe(false);
+ });
+
+ test('returns true when exclude.forks is true and repo is a fork', () => {
+ const forkedRepo = makeServerRepo({ origin: { slug: 'original-repo' } as ServerRepository });
+ expect(serverShouldExcludeRepo(forkedRepo, {
+ ...serverConfig,
+ exclude: { forks: true },
+ })).toBe(true);
+ });
+
+ test('returns false when exclude.forks is false and repo is a fork', () => {
+ const forkedRepo = makeServerRepo({ origin: { slug: 'original-repo' } as ServerRepository });
+ expect(serverShouldExcludeRepo(forkedRepo, {
+ ...serverConfig,
+ exclude: { forks: false },
+ })).toBe(false);
+ });
+});

packages/backend/src/bitbucket.ts

@@ -345,10 +345,11 @@ async function cloudGetRepos(client: BitbucketClient, repoList: string[]): Promi
  };
 }
 
-function cloudShouldExcludeRepo(repo: BitbucketRepository, config: BitbucketConnectionConfig): boolean {
+export function cloudShouldExcludeRepo(repo: BitbucketRepository, config: BitbucketConnectionConfig): boolean {
  const cloudRepo = repo as CloudRepository;
  let reason = '';
- const repoName = cloudRepo.full_name!;
+ const [workspace, repoSlug] = cloudRepo.full_name!.split('/');
+ const repoName = `${workspace}/${cloudRepo.project?.key}/${repoSlug}`;
 
  const shouldExclude = (() => {
  if (config.exclude?.repos) {
@@ -552,7 +553,7 @@ async function serverGetRepos(client: BitbucketClient, repoList: string[]): Prom
  };
 }
 
-function serverShouldExcludeRepo(repo: BitbucketRepository, config: BitbucketConnectionConfig): boolean {
+export function serverShouldExcludeRepo(repo: BitbucketRepository, config: BitbucketConnectionConfig): boolean {
  const serverRepo = repo as ServerRepository;
 
  const projectName = serverRepo.project!.key;

packages/backend/src/repoCompileUtils.ts

@@ -454,7 +454,18 @@ export const compileBitbucketConfig = async (
  const repos = bitbucketRepos.map((repo) => {
  const isServer = config.deploymentType === 'server';
  const codeHostType: CodeHostType = isServer ? 'bitbucketServer' : 'bitbucketCloud';
- const displayName = isServer ? (repo as BitbucketServerRepository).name! : (repo as BitbucketCloudRepository).full_name!;
+ const displayName = (() => {
+ if (isServer) {
+ const serverRepo = repo as BitbucketServerRepository;
+ // Server repos are of the format `project/repo`
+ return `${serverRepo.project!.key}/${serverRepo.slug!}`;
+ } else {
+ const cloudRepo = repo as BitbucketCloudRepository;
+ // Cloud repos are of the format `workspace/project/repo`
+ const [workspace, repoSlug] = cloudRepo.full_name!.split('/');
+ return `${workspace}/${cloudRepo.project?.key!}/${repoSlug}`;
+ }
+ })();
  const externalId = isServer ? (repo as BitbucketServerRepository).id!.toString() : (repo as BitbucketCloudRepository).uuid!;
  const isPublic = isServer ? (repo as BitbucketServerRepository).public : (repo as BitbucketCloudRepository).is_private === false;
  const isArchived = isServer ? (repo as BitbucketServerRepository).archived === true : false;

packages/schemas/src/v3/bitbucket.schema.ts

@@ -103,8 +103,8 @@ const schema = {
  },
  "examples": [
  [
- "cloud_workspace/repo1",
- "server_project/repo2"
+ "cloud_workspace/PROJECT_KEY/repo1",
+ "SERVER_PROJECT_KEY/repo2"
  ]
  ],
  "description": "List of specific repos to exclude from syncing."

packages/schemas/src/v3/connection.schema.ts

@@ -780,8 +780,8 @@ const schema = {
  },
  "examples": [
  [
- "cloud_workspace/repo1",
- "server_project/repo2"
+ "cloud_workspace/PROJECT_KEY/repo1",
+ "SERVER_PROJECT_KEY/repo2"
  ]
  ],
  "description": "List of specific repos to exclude from syncing."

packages/schemas/src/v3/index.schema.ts

@@ -1195,8 +1195,8 @@ const schema = {
  },
  "examples": [
  [
- "cloud_workspace/repo1",
- "server_project/repo2"
+ "cloud_workspace/PROJECT_KEY/repo1",
+ "SERVER_PROJECT_KEY/repo2"
  ]
  ],
  "description": "List of specific repos to exclude from syncing."

schemas/v3/bitbucket.json

@@ -72,8 +72,8 @@
  },
  "examples": [
  [
- "cloud_workspace/repo1",
- "server_project/repo2"
+ "cloud_workspace/PROJECT_KEY/repo1",
+ "SERVER_PROJECT_KEY/repo2"
  ]
  ],
  "description": "List of specific repos to exclude from syncing."

CHANGELOG.md

@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+- Fixed Bitbucket Server and Cloud repo identifiers to include the project key, preventing collisions across projects. **Note:** Bitbucket Cloud users with `exclude.repos` patterns must update them from `workspace/repo` to `workspace/PROJECT_KEY/repo` format. [#904](https://github.com/sourcebot-dev/sourcebot/pull/904)
+
 ### Added
 - Added optional `visibility` parameter to `/api/chat/blocking` endpoint and MCP `ask_codebase` tool to allow controlling chat session visibility in shared environments. [#903](https://github.com/sourcebot-dev/sourcebot/pull/903)
 

docs/snippets/schemas/v3/bitbucket.schema.mdx

@@ -104,8 +104,8 @@
  },
  "examples": [
  [
- "cloud_workspace/repo1",
- "server_project/repo2"
+ "cloud_workspace/PROJECT_KEY/repo1",
+ "SERVER_PROJECT_KEY/repo2"
  ]
  ],
  "description": "List of specific repos to exclude from syncing."

docs/snippets/schemas/v3/connection.schema.mdx

@@ -781,8 +781,8 @@
  },
  "examples": [
  [
- "cloud_workspace/repo1",
- "server_project/repo2"
+ "cloud_workspace/PROJECT_KEY/repo1",
+ "SERVER_PROJECT_KEY/repo2"
  ]
  ],
  "description": "List of specific repos to exclude from syncing."

docs/snippets/schemas/v3/index.schema.mdx

@@ -1196,8 +1196,8 @@
  },
  "examples": [
  [
- "cloud_workspace/repo1",
- "server_project/repo2"
+ "cloud_workspace/PROJECT_KEY/repo1",
+ "SERVER_PROJECT_KEY/repo2"
  ]
  ],
  "description": "List of specific repos to exclude from syncing."

packages/backend/src/bitbucket.test.ts

@@ -0,0 +1,173 @@
+import { expect, test, describe } from 'vitest';
+import { cloudShouldExcludeRepo, serverShouldExcludeRepo, BitbucketRepository } from './bitbucket';
+import { BitbucketConnectionConfig } from '@sourcebot/schemas/v3/bitbucket.type';
+import { SchemaRepository as CloudRepository } from '@coderabbitai/bitbucket/cloud/openapi';
+import { SchemaRestRepository as ServerRepository } from '@coderabbitai/bitbucket/server/openapi';
+
+const makeCloudRepo = (overrides: Partial<CloudRepository> = {}): BitbucketRepository => ({
+ type: 'repository',
+ full_name: 'myworkspace/my-repo',
+ project: { type: 'project', key: 'PROJ' },
+ is_private: false,
+ ...overrides,
+} as CloudRepository);
+
+const makeServerRepo = (overrides: Partial<ServerRepository> = {}): BitbucketRepository => ({
+ slug: 'my-repo',
+ project: { key: 'PROJ' },
+ archived: false,
+ ...overrides,
+} as ServerRepository);
+
+const baseConfig: BitbucketConnectionConfig = {
+ type: 'bitbucket',
+ deploymentType: 'cloud',
+};
+
+describe('cloudShouldExcludeRepo', () => {
+ test('returns false when no exclusions are configured', () => {
+ expect(cloudShouldExcludeRepo(makeCloudRepo(), baseConfig)).toBe(false);
+ });
+
+ test('returns false when exclude.repos is empty', () => {
+ expect(cloudShouldExcludeRepo(makeCloudRepo(), {
+ ...baseConfig,
+ exclude: { repos: [] },
+ })).toBe(false);
+ });
+
+ test('returns true when repo matches exclude.repos exactly', () => {
+ expect(cloudShouldExcludeRepo(makeCloudRepo(), {
+ ...baseConfig,
+ exclude: { repos: ['myworkspace/PROJ/my-repo'] },
+ })).toBe(true);
+ });
+
+ test('returns false when exclude.repos does not match', () => {
+ expect(cloudShouldExcludeRepo(makeCloudRepo(), {
+ ...baseConfig,
+ exclude: { repos: ['myworkspace/PROJ/other-repo'] },
+ })).toBe(false);
+ });
+
+ test('returns true when repo matches a glob pattern in exclude.repos', () => {
+ expect(cloudShouldExcludeRepo(makeCloudRepo(), {
+ ...baseConfig,
+ exclude: { repos: ['myworkspace/PROJ/*'] },
+ })).toBe(true);
+ });
+
+ test('returns true when repo matches a workspace-level glob in exclude.repos', () => {
+ expect(cloudShouldExcludeRepo(makeCloudRepo(), {
+ ...baseConfig,
+ exclude: { repos: ['myworkspace/**'] },
+ })).toBe(true);
+ });
+
+ test('returns false when exclude.forks is true but repo is not a fork', () => {
+ expect(cloudShouldExcludeRepo(makeCloudRepo(), {
+ ...baseConfig,
+ exclude: { forks: true },
+ })).toBe(false);
+ });
+
+ test('returns true when exclude.forks is true and repo is a fork', () => {
+ const forkedRepo = makeCloudRepo({ parent: { type: 'repository' } as CloudRepository });
+ expect(cloudShouldExcludeRepo(forkedRepo, {
+ ...baseConfig,
+ exclude: { forks: true },
+ })).toBe(true);
+ });
+
+ test('returns false when exclude.forks is false and repo is a fork', () => {
+ const forkedRepo = makeCloudRepo({ parent: { type: 'repository' } as CloudRepository });
+ expect(cloudShouldExcludeRepo(forkedRepo, {
+ ...baseConfig,
+ exclude: { forks: false },
+ })).toBe(false);
+ });
+});
+
+describe('serverShouldExcludeRepo', () => {
+ const serverConfig: BitbucketConnectionConfig = {
+ type: 'bitbucket',
+ deploymentType: 'server',
+ url: 'https://bitbucket.example.com',
+ };
+
+ test('returns false when no exclusions are configured', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo(), serverConfig)).toBe(false);
+ });
+
+ test('returns false when exclude.repos is empty', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo(), {
+ ...serverConfig,
+ exclude: { repos: [] },
+ })).toBe(false);
+ });
+
+ test('returns true when repo matches exclude.repos exactly', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo(), {
+ ...serverConfig,
+ exclude: { repos: ['PROJ/my-repo'] },
+ })).toBe(true);
+ });
+
+ test('returns false when exclude.repos does not match', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo(), {
+ ...serverConfig,
+ exclude: { repos: ['PROJ/other-repo'] },
+ })).toBe(false);
+ });
+
+ test('returns true when repo matches a glob pattern in exclude.repos', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo(), {
+ ...serverConfig,
+ exclude: { repos: ['PROJ/*'] },
+ })).toBe(true);
+ });
+
+ test('returns false when exclude.archived is true but repo is not archived', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo({ archived: false }), {
+ ...serverConfig,
+ exclude: { archived: true },
+ })).toBe(false);
+ });
+
+ test('returns true when exclude.archived is true and repo is archived', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo({ archived: true }), {
+ ...serverConfig,
+ exclude: { archived: true },
+ })).toBe(true);
+ });
+
+ test('returns false when exclude.archived is false and repo is archived', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo({ archived: true }), {
+ ...serverConfig,
+ exclude: { archived: false },
+ })).toBe(false);
+ });
+
+ test('returns false when exclude.forks is true but repo is not a fork', () => {
+ expect(serverShouldExcludeRepo(makeServerRepo(), {
+ ...serverConfig,
+ exclude: { forks: true },
+ })).toBe(false);
+ });
+
+ test('returns true when exclude.forks is true and repo is a fork', () => {
+ const forkedRepo = makeServerRepo({ origin: { slug: 'original-repo' } as ServerRepository });
+ expect(serverShouldExcludeRepo(forkedRepo, {
+ ...serverConfig,
+ exclude: { forks: true },
+ })).toBe(true);
+ });
+
+ test('returns false when exclude.forks is false and repo is a fork', () => {
+ const forkedRepo = makeServerRepo({ origin: { slug: 'original-repo' } as ServerRepository });
+ expect(serverShouldExcludeRepo(forkedRepo, {
+ ...serverConfig,
+ exclude: { forks: false },
+ })).toBe(false);
+ });
+});

packages/backend/src/bitbucket.ts

@@ -345,10 +345,11 @@ async function cloudGetRepos(client: BitbucketClient, repoList: string[]): Promi
  };
 }
 
-function cloudShouldExcludeRepo(repo: BitbucketRepository, config: BitbucketConnectionConfig): boolean {
+export function cloudShouldExcludeRepo(repo: BitbucketRepository, config: BitbucketConnectionConfig): boolean {
  const cloudRepo = repo as CloudRepository;
  let reason = '';
- const repoName = cloudRepo.full_name!;
+ const [workspace, repoSlug] = cloudRepo.full_name!.split('/');
+ const repoName = `${workspace}/${cloudRepo.project?.key}/${repoSlug}`;
 
  const shouldExclude = (() => {
  if (config.exclude?.repos) {
@@ -552,7 +553,7 @@ async function serverGetRepos(client: BitbucketClient, repoList: string[]): Prom
  };
 }
 
-function serverShouldExcludeRepo(repo: BitbucketRepository, config: BitbucketConnectionConfig): boolean {
+export function serverShouldExcludeRepo(repo: BitbucketRepository, config: BitbucketConnectionConfig): boolean {
  const serverRepo = repo as ServerRepository;
 
  const projectName = serverRepo.project!.key;

packages/backend/src/repoCompileUtils.ts

@@ -454,7 +454,18 @@ export const compileBitbucketConfig = async (
  const repos = bitbucketRepos.map((repo) => {
  const isServer = config.deploymentType === 'server';
  const codeHostType: CodeHostType = isServer ? 'bitbucketServer' : 'bitbucketCloud';
- const displayName = isServer ? (repo as BitbucketServerRepository).name! : (repo as BitbucketCloudRepository).full_name!;
+ const displayName = (() => {
+ if (isServer) {
+ const serverRepo = repo as BitbucketServerRepository;
+ // Server repos are of the format `project/repo`
+ return `${serverRepo.project!.key}/${serverRepo.slug!}`;
+ } else {
+ const cloudRepo = repo as BitbucketCloudRepository;
+ // Cloud repos are of the format `workspace/project/repo`
+ const [workspace, repoSlug] = cloudRepo.full_name!.split('/');
+ return `${workspace}/${cloudRepo.project?.key!}/${repoSlug}`;
+ }
+ })();
  const externalId = isServer ? (repo as BitbucketServerRepository).id!.toString() : (repo as BitbucketCloudRepository).uuid!;
  const isPublic = isServer ? (repo as BitbucketServerRepository).public : (repo as BitbucketCloudRepository).is_private === false;
  const isArchived = isServer ? (repo as BitbucketServerRepository).archived === true : false;

packages/schemas/src/v3/bitbucket.schema.ts

@@ -103,8 +103,8 @@ const schema = {
  },
  "examples": [
  [
- "cloud_workspace/repo1",
- "server_project/repo2"
+ "cloud_workspace/PROJECT_KEY/repo1",
+ "SERVER_PROJECT_KEY/repo2"
  ]
  ],
  "description": "List of specific repos to exclude from syncing."

packages/schemas/src/v3/connection.schema.ts

@@ -780,8 +780,8 @@ const schema = {
  },
  "examples": [
  [
- "cloud_workspace/repo1",
- "server_project/repo2"
+ "cloud_workspace/PROJECT_KEY/repo1",
+ "SERVER_PROJECT_KEY/repo2"
  ]
  ],
  "description": "List of specific repos to exclude from syncing."

packages/schemas/src/v3/index.schema.ts

@@ -1195,8 +1195,8 @@ const schema = {
  },
  "examples": [
  [
- "cloud_workspace/repo1",
- "server_project/repo2"
+ "cloud_workspace/PROJECT_KEY/repo1",
+ "SERVER_PROJECT_KEY/repo2"
  ]
  ],
  "description": "List of specific repos to exclude from syncing."

schemas/v3/bitbucket.json

@@ -72,8 +72,8 @@
  },
  "examples": [
  [
- "cloud_workspace/repo1",
- "server_project/repo2"
+ "cloud_workspace/PROJECT_KEY/repo1",
+ "SERVER_PROJECT_KEY/repo2"
  ]
  ],
  "description": "List of specific repos to exclude from syncing."