@desplega.ai/agent-swarm 2.4.5 → 2.5.0

package/src/tests/vcs-bitbucket.test.ts

@@ -0,0 +1,91 @@
+import { describe, expect, test } from "bun:test";
+import { bitbucketFullName, isBitbucketUrl, parseBitbucketRepoUrl } from "../vcs/bitbucket";
+import { detectVcsProvider } from "../vcs/index";
+
+describe("Bitbucket Cloud URL helpers", () => {
+  test("isBitbucketUrl accepts bitbucket.org remotes only", () => {
+    for (const url of [
+      "https://bitbucket.org/ws/repo",
+      "https://BitBucket.org/ws/repo",
+      "https://x-token-auth@bitbucket.org/ws/repo.git",
+      "git@bitbucket.org:ws/repo.git",
+      "ssh://git@bitbucket.org/ws/repo.git",
+    ]) {
+      expect(isBitbucketUrl(url)).toBe(true);
+    }
+    for (const url of [
+      "https://github.com/ws/repo",
+      "https://notbitbucket.org/ws/repo",
+      "https://bitbucket.org.evil.com/ws/repo",
+      "https://example.com/bitbucket.org.html",
+      "https://gitlab.com/bitbucket.org/repo.git",
+      "git@gitlab.com:bitbucket.org/repo.git",
+      "https://github.com/acme/bitbucket.org",
+      "ws/repo",
+    ]) {
+      expect(isBitbucketUrl(url)).toBe(false);
+    }
+  });
+
+  test("parses https remotes with and without user@ and .git", () => {
+    const expected = { workspace: "my-ws", repoSlug: "my-repo" };
+    for (const url of [
+      "https://bitbucket.org/my-ws/my-repo",
+      "https://bitbucket.org/my-ws/my-repo/",
+      "https://bitbucket.org/my-ws/my-repo.git",
+      "https://alice@bitbucket.org/my-ws/my-repo.git",
+      "https://x-token-auth:tok@bitbucket.org/my-ws/my-repo.git",
+      "  https://bitbucket.org/my-ws/my-repo.git  ",
+      "https://bitbucket.org/my-ws/my-repo/pull-requests/7",
+    ]) {
+      expect(parseBitbucketRepoUrl(url)).toEqual(expected);
+    }
+  });
+
+  test("parses ssh remotes", () => {
+    expect(parseBitbucketRepoUrl("git@bitbucket.org:my-ws/my-repo.git")).toEqual({
+      workspace: "my-ws",
+      repoSlug: "my-repo",
+    });
+    expect(parseBitbucketRepoUrl("git@bitbucket.org:my-ws/my-repo")).toEqual({
+      workspace: "my-ws",
+      repoSlug: "my-repo",
+    });
+    expect(parseBitbucketRepoUrl("ssh://git@bitbucket.org/my-ws/my-repo.git")).toEqual({
+      workspace: "my-ws",
+      repoSlug: "my-repo",
+    });
+  });
+
+  test("keeps dots inside repository slugs", () => {
+    expect(parseBitbucketRepoUrl("https://bitbucket.org/ws/my.site.git")).toEqual({
+      workspace: "ws",
+      repoSlug: "my.site",
+    });
+    expect(bitbucketFullName("git@bitbucket.org:ws/my.site.git")).toBe("ws/my.site");
+  });
+
+  test("returns null for non-Bitbucket or incomplete URLs", () => {
+    expect(parseBitbucketRepoUrl("https://github.com/ws/repo")).toBeNull();
+    expect(parseBitbucketRepoUrl("https://bitbucket.org/ws")).toBeNull();
+    expect(parseBitbucketRepoUrl("https://bitbucket.org/")).toBeNull();
+    expect(parseBitbucketRepoUrl("git@bitbucket.org:ws.git")).toBeNull();
+    expect(parseBitbucketRepoUrl("not a url bitbucket.org")).toBeNull();
+    expect(bitbucketFullName("https://gitlab.com/group/project")).toBeNull();
+  });
+
+  test("bitbucketFullName yields workspace/repo_slug", () => {
+    expect(bitbucketFullName("https://bitbucket.org/ws/repo.git")).toBe("ws/repo");
+    expect(bitbucketFullName("git@bitbucket.org:ws/repo.git")).toBe("ws/repo");
+  });
+
+  test("detectVcsProvider checks Bitbucket before the GitHub owner/repo fallback", () => {
+    expect(detectVcsProvider("https://bitbucket.org/ws/repo")).toBe("bitbucket");
+    expect(detectVcsProvider("ws/repo")).toBe("github");
+  });
+
+  test("a bitbucket.org path segment on another host keeps that host's provider", () => {
+    expect(detectVcsProvider("https://gitlab.com/bitbucket.org/repo.git")).toBe("gitlab");
+    expect(parseBitbucketRepoUrl("https://gitlab.com/bitbucket.org/repo.git")).toBeNull();
+  });
+});

package/src/tests/vcs-provider-isolation.test.ts

@@ -0,0 +1,123 @@
+import { afterAll, beforeAll, expect, test } from "bun:test";
+import { unlink } from "node:fs/promises";
+import {
+  closeDb,
+  createAgent,
+  createTaskExtended,
+  findTaskByVcs,
+  getTaskById,
+  initDb,
+} from "../be/db";
+import { handlePullRequestCreated, resetBitbucketDedup } from "../bitbucket/handlers";
+import { handlePullRequest } from "../github/handlers";
+import { GITHUB_BOT_NAME } from "../github/mentions";
+import type { PullRequestEvent } from "../github/types";
+import { handleMergeRequest } from "../gitlab/handlers";
+import type { MergeRequestEvent } from "../gitlab/types";
+import mentionSample from "./fixtures/bitbucket/pullrequest-created-mention.json";
+
+// The same `owner/repo` + number can exist on GitHub, GitLab and Bitbucket at
+// once. Each host's webhook must act only on its own tasks.
+const DB = "./test-vcs-provider-isolation.sqlite";
+beforeAll(async () => {
+  initDb(DB);
+  await createAgent({
+    id: crypto.randomUUID(),
+    name: "Provider isolation lead",
+    status: "idle",
+    isLead: true,
+  });
+  process.env.BITBUCKET_BOT_ACCOUNT_ID = "557058:00000000-0000-4000-8000-0000000000b0";
+});
+afterAll(async () => {
+  closeDb();
+  delete process.env.BITBUCKET_BOT_ACCOUNT_ID;
+  resetBitbucketDedup();
+  for (const suffix of ["", "-wal", "-shm"]) await unlink(DB + suffix).catch(() => {});
+});
+
+async function createBitbucketTask(id: number) {
+  const event = structuredClone(mentionSample);
+  event.pullrequest.id = id;
+  const result = await handlePullRequestCreated(event);
+  expect(result.created).toBe(true);
+  return (await getTaskById(result.taskId!))!;
+}
+
+function gitlabMerge(iid: number): MergeRequestEvent {
+  return {
+    object_kind: "merge_request",
+    event_type: "merge_request",
+    user: { id: 1, name: "Test user", username: "review2339", avatar_url: "" },
+    project: {
+      id: 1,
+      name: "widgets",
+      path_with_namespace: "acme-ws/widgets",
+      web_url: "https://gitlab.com/acme-ws/widgets",
+      default_branch: "main",
+    },
+    object_attributes: {
+      id: 101,
+      iid,
+      title: "Unrelated GitLab MR",
+      description: "",
+      state: "merged",
+      action: "merge",
+      source_branch: "feature",
+      target_branch: "main",
+      url: `https://gitlab.com/acme-ws/widgets/-/merge_requests/${iid}`,
+      last_commit: null,
+      author_id: 1,
+    },
+  };
+}
+
+function githubEvent(number: number, action: string): PullRequestEvent {
+  return {
+    action,
+    pull_request: {
+      number,
+      title: "Unrelated GitHub PR",
+      body: "Please review",
+      html_url: `https://github.com/acme-ws/widgets/pull/${number}`,
+      user: { login: "review2339" },
+      head: { ref: "feature", sha: "abc123" },
+      base: { ref: "main" },
+      merged: false,
+    },
+    repository: { full_name: "acme-ws/widgets", html_url: "https://github.com/acme-ws/widgets" },
+    sender: { login: "review2339" },
+    assignee: { login: GITHUB_BOT_NAME, id: 2 },
+    requested_reviewer: { login: GITHUB_BOT_NAME, id: 2 },
+  };
+}
+
+test("GitLab merge must not cancel a real Bitbucket task", async () => {
+  const task = await createBitbucketTask(701);
+  await handleMergeRequest(gitlabMerge(701));
+  expect((await getTaskById(task.id))?.status).toBe(task.status);
+});
+
+test("GitHub unassignment must not cancel a real Bitbucket task", async () => {
+  const task = await createBitbucketTask(702);
+  await handlePullRequest(githubEvent(702, "unassigned"));
+  expect((await getTaskById(task.id))?.status).toBe(task.status);
+});
+
+test("Bitbucket task must not suppress an unrelated GitHub review request", async () => {
+  await createBitbucketTask(703);
+  const result = await handlePullRequest(githubEvent(703, "review_requested"));
+  expect(result.created).toBe(true);
+});
+
+test("GitHub lookup still matches a legacy task with no vcsProvider", async () => {
+  const legacy = await createTaskExtended("Legacy GitHub PR task", {
+    source: "github",
+    vcsRepo: "acme-ws/legacy",
+    vcsNumber: 704,
+  });
+  expect(legacy.vcsProvider).toBeUndefined();
+  expect((await findTaskByVcs("acme-ws/legacy", 704, "github"))?.id).toBe(legacy.id);
+  expect(await findTaskByVcs("acme-ws/legacy", 704, "bitbucket")).toBeNull();
+  expect(await findTaskByVcs("acme-ws/legacy", 704, "gitlab")).toBeNull();
+});

package/src/tests/vcs-provider.test.ts

@@ -20,8 +20,23 @@ describe("detectVcsProvider", () => {
     expect(detectVcsProvider("https://gitlab.internal/group/project")).toBe("gitlab");
   });
 
+  test("detects bitbucket.org URLs in https, ssh and .git forms", () => {
+    for (const url of [
+      "https://bitbucket.org/org/repo",
+      "https://bitbucket.org/org/repo.git",
+      "https://user@bitbucket.org/org/repo.git",
+      "git@bitbucket.org:org/repo.git",
+      "ssh://git@bitbucket.org/org/repo.git",
+      // A slug containing "github" or "gitlab" must not fall through to those hosts.
+      "https://bitbucket.org/org/github-mirror",
+      "git@bitbucket.org:gitlab-team/repo.git",
+    ]) {
+      expect(detectVcsProvider(url)).toBe("bitbucket");
+    }
+  });
+
   test("returns null for unrecognised URLs", () => {
-    expect(detectVcsProvider("https://bitbucket.org/org/repo")).toBeNull();
     expect(detectVcsProvider("https://example.com")).toBeNull();
+    expect(detectVcsProvider("https://notbitbucket.org/org/repo")).toBeNull();
   });
 });

package/src/tests/vcs-tracking.test.ts

@@ -122,7 +122,7 @@ describe("updateTaskVcs", () => {
     });
 
     // Before update — no VCS fields, shouldn't be found
-    const notFound = await findTaskByVcs("owner/findme", 99);
+    const notFound = await findTaskByVcs("owner/findme", 99, "github");
     expect(notFound).toBeNull();
 
     await updateTaskVcs(task.id, {
@@ -133,7 +133,7 @@ describe("updateTaskVcs", () => {
     });
 
     // After update — should be found (task is pending, not completed/failed)
-    const found = await findTaskByVcs("owner/findme", 99);
+    const found = await findTaskByVcs("owner/findme", 99, "github");
     expect(found).not.toBeNull();
     expect(found!.id).toBe(task.id);
   });
@@ -171,7 +171,7 @@ describe("updateTaskVcs", () => {
       await startTask(task.id);
       await c.terminate(task.id);
 
-      const found = await findTaskByVcs("owner/terminal", c.number);
+      const found = await findTaskByVcs("owner/terminal", c.number, "github");
       expect(found).toBeNull();
     }
   });