@desplega.ai/agent-swarm 2.5.0 → 2.5.1

package/src/gitlab/handlers.ts

@@ -8,13 +8,21 @@
  * - Detects bot mentions
  */
 
-import { failTask, findTaskByVcs, getAllAgents, incrKv, upsertKv } from "../be/db";
+import {
+  failTask,
+  findActiveTasksByVcs,
+  findTaskByVcs,
+  getAllAgents,
+  incrKv,
+  upsertKv,
+} from "../be/db";
 import { renderIdentity, resolveIdentity } from "../be/identity";
 import { findOrCreateUserByEmail, findUserByExternalId, linkIdentity } from "../be/users";
 import { resolveTemplate } from "../prompts/resolver";
 import { gitlabContextKey } from "../tasks/context-key";
 import { createTaskWithSiblingAwareness } from "../tasks/sibling-awareness";
-import { GITLAB_BOT_NAME } from "./auth";
+import type { AgentTask } from "../types";
+import { getGitLabBotName } from "./auth";
 import { addGitLabNoteReaction, addGitLabReaction } from "./reactions";
 import type { GitLabUser } from "./types";
 // Side-effect import: registers all GitLab event templates in the in-memory registry
@@ -40,11 +48,37 @@ function isDuplicate(key: string): boolean {
 
 function detectMention(text: string | null | undefined): boolean {
   if (!text) return false;
-  return new RegExp(`@${GITLAB_BOT_NAME}\\b`, "i").test(text);
+  return new RegExp(`@${getGitLabBotName()}\\b`, "i").test(text);
 }
 
 function extractMentionContext(text: string): string {
-  return text.replace(new RegExp(`@${GITLAB_BOT_NAME}\\b`, "gi"), "").trim();
+  return text.replace(new RegExp(`@${getGitLabBotName()}\\b`, "gi"), "").trim();
+}
+
+// Legacy rows written before contextKey existed: scoped only on positive evidence.
+const LEGACY_SCOPE = {
+  mr: {
+    taskTypes: new Set(["gitlab-mr", "gitlab-ci"]),
+    eventTypes: new Set(["merge_request", "note_on_mr", "pipeline"]),
+  },
+  issue: {
+    taskTypes: new Set(["gitlab-issue"]),
+    eventTypes: new Set(["issue", "note_on_issue"]),
+  },
+};
+
+/**
+ * GitLab issue and MR iids are separate per-project sequences, so a vcsNumber
+ * match alone hits both issue #N and MR !N. Match on the contextKey instead; a
+ * row without one counts only when its taskType or vcsEventType names the kind.
+ */
+function isScopedTask(task: AgentTask, kind: "mr" | "issue", contextKey: string): boolean {
+  if (task.contextKey) return task.contextKey === contextKey;
+  const legacy = LEGACY_SCOPE[kind];
+  return (
+    (task.taskType !== undefined && legacy.taskTypes.has(task.taskType)) ||
+    (task.vcsEventType !== undefined && legacy.eventTypes.has(task.vcsEventType))
+  );
 }
 
 async function findLeadAgent() {
@@ -206,12 +240,18 @@ export async function handleMergeRequest(
 
     case "close":
     case "merge": {
-      // Cancel existing tasks for this MR
-      const existingTask = await findTaskByVcs(repo, mr.iid, "gitlab");
-      if (existingTask) {
-        const reason = action === "merge" ? "MR was merged" : "MR was closed";
-        console.log(`[GitLab] Cancelling task ${existingTask.id} — ${reason}`);
-        await failTask(existingTask.id, reason);
+      // Every active task, not only the newest: a note task is a child of the
+      // MR task, and failTask does not cascade up to the parent.
+      const reason = action === "merge" ? "MR was merged" : "MR was closed";
+      const mrContextKey = gitlabContextKey({
+        projectId: String(project.id),
+        kind: "mr",
+        iid: mr.iid,
+      });
+      const tasks = await findActiveTasksByVcs(repo, mr.iid, "gitlab");
+      for (const task of tasks.filter((t) => isScopedTask(t, "mr", mrContextKey))) {
+        console.log(`[GitLab] Cancelling task ${task.id} — ${reason}`);
+        await failTask(task.id, reason);
       }
       return { created: false };
     }
@@ -262,7 +302,7 @@ export async function handleIssue(
       if (!hasMention) {
         // Check if bot is in assignees
         const isBotAssigned = event.assignees?.some(
-          (a) => a.username.toLowerCase() === GITLAB_BOT_NAME.toLowerCase(),
+          (a) => a.username.toLowerCase() === getGitLabBotName().toLowerCase(),
         );
         if (!isBotAssigned) {
           console.log(`[GitLab] Issue opened without bot mention/assignment, skipping`);
@@ -318,7 +358,15 @@ export async function handleIssue(
     }
 
     case "close": {
-      const existingTask = await findTaskByVcs(repo, issue.iid, "gitlab");
+      const issueContextKey = gitlabContextKey({
+        projectId: String(project.id),
+        kind: "issue",
+        iid: issue.iid,
+      });
+      // Newest issue-scoped task only; MR !N shares the iid but not the issue.
+      const existingTask = (await findActiveTasksByVcs(repo, issue.iid, "gitlab")).find((t) =>
+        isScopedTask(t, "issue", issueContextKey),
+      );
       if (existingTask) {
         console.log(`[GitLab] Cancelling task ${existingTask.id} — issue closed`);
         await failTask(existingTask.id, "Issue was closed");

package/src/gitlab/index.ts

@@ -1,6 +1,6 @@
 // GitLab Integration
 export {
-  GITLAB_BOT_NAME,
+  getGitLabBotName,
   getGitLabToken,
   getGitLabUrl,
   initGitLab,

package/src/tests/gitlab-auth.test.ts

@@ -1,6 +1,6 @@
 import { afterEach, describe, expect, test } from "bun:test";
 import {
-  GITLAB_BOT_NAME,
+  getGitLabBotName,
   getGitLabToken,
   getGitLabUrl,
   initGitLab,
@@ -100,10 +100,18 @@ describe("GitLab auth", () => {
     });
   });
 
-  describe("GITLAB_BOT_NAME", () => {
-    test("defaults to agent-swarm-bot", () => {
-      // The default is set at module load time from env
-      expect(typeof GITLAB_BOT_NAME).toBe("string");
+  describe("getGitLabBotName", () => {
+    test("defaults to agent-swarm-bot and follows GITLAB_BOT_NAME", () => {
+      const saved = process.env.GITLAB_BOT_NAME;
+      try {
+        delete process.env.GITLAB_BOT_NAME;
+        expect(getGitLabBotName()).toBe("agent-swarm-bot");
+        process.env.GITLAB_BOT_NAME = "renamed-bot";
+        expect(getGitLabBotName()).toBe("renamed-bot");
+      } finally {
+        if (saved === undefined) delete process.env.GITLAB_BOT_NAME;
+        else process.env.GITLAB_BOT_NAME = saved;
+      }
     });
   });
 });

package/src/tests/gitlab-handlers.test.ts

@@ -13,7 +13,7 @@ import {
   initDb,
 } from "../be/db";
 import { findUserByExternalId, linkIdentity } from "../be/users";
-import { GITLAB_BOT_NAME } from "../gitlab/auth";
+import { getGitLabBotName } from "../gitlab/auth";
 import { handleIssue, handleMergeRequest, handleNote, handlePipeline } from "../gitlab/handlers";
 import type { IssueEvent, MergeRequestEvent, NoteEvent, PipelineEvent } from "../gitlab/types";
 
@@ -37,7 +37,7 @@ function makeMREvent(overrides: Partial<MergeRequestEvent> = {}): MergeRequestEv
       id: 100,
       iid: 1,
       title: "Test MR",
-      description: `@${GITLAB_BOT_NAME} please review`,
+      description: `@${getGitLabBotName()} please review`,
       state: "opened",
       action: "open",
       source_branch: "feature",
@@ -66,7 +66,7 @@ function makeIssueEvent(overrides: Partial<IssueEvent> = {}): IssueEvent {
       id: 200,
       iid: 10,
       title: "Test Issue",
-      description: `@${GITLAB_BOT_NAME} fix this`,
+      description: `@${getGitLabBotName()} fix this`,
       state: "opened",
       action: "open",
       url: "https://gitlab.com/group/project/-/issues/10",
@@ -90,7 +90,7 @@ function makeNoteEvent(overrides: Partial<NoteEvent> = {}): NoteEvent {
     },
     object_attributes: {
       id: 300,
-      note: `@${GITLAB_BOT_NAME} can you help?`,
+      note: `@${getGitLabBotName()} can you help?`,
       noteable_type: "MergeRequest",
       noteable_id: 100,
       url: "https://gitlab.com/group/project/-/merge_requests/1#note_300",
@@ -181,7 +181,7 @@ describe("handleMergeRequest", () => {
         id: 101,
         iid: 50,
         title: "MR with mention",
-        description: `@${GITLAB_BOT_NAME} review this please`,
+        description: `@${getGitLabBotName()} review this please`,
         state: "opened",
         action: "open",
         source_branch: "feat-a",
@@ -302,13 +302,207 @@ describe("handleMergeRequest", () => {
     expect(existing).toBeNull();
   });
 
+  test("a merge cancels every active task for the MR, not only the newest", async () => {
+    const mrTask = await createTaskExtended("[GitLab MR #62] Test", {
+      source: "gitlab",
+      vcsProvider: "gitlab",
+      vcsRepo: "group/project",
+      vcsEventType: "merge_request",
+      vcsNumber: 62,
+      agentId: "lead-gl-001",
+    });
+    const noteTask = await createTaskExtended("[GitLab MR #62] Comment", {
+      source: "gitlab",
+      vcsProvider: "gitlab",
+      vcsRepo: "group/project",
+      vcsEventType: "note_on_mr",
+      vcsNumber: 62,
+      agentId: "lead-gl-001",
+      parentTaskId: mrTask.id,
+    });
+
+    const event = makeMREvent({
+      object_attributes: {
+        id: 105,
+        iid: 62,
+        title: "MR to merge",
+        description: null,
+        state: "merged",
+        action: "merge",
+        source_branch: "feat-e",
+        target_branch: "main",
+        url: "https://gitlab.com/group/project/-/merge_requests/62",
+        last_commit: null,
+        author_id: 1,
+      },
+    });
+    await handleMergeRequest(event);
+
+    for (const id of [mrTask.id, noteTask.id]) {
+      const task = await getTaskById(id);
+      expect(task?.status).toBe("failed");
+      expect(task?.failureReason).toBe("MR was merged");
+    }
+  });
+
+  test("closing MR !5 leaves issue #5 and its notes active", async () => {
+    // GitLab issue and MR iids are separate sequences: issue #5 and MR !5 coexist.
+    const issue = await handleIssue(
+      makeIssueEvent({
+        object_attributes: {
+          id: 205,
+          iid: 5,
+          title: "Issue five",
+          description: `@${getGitLabBotName()} fix this`,
+          state: "opened",
+          action: "open",
+          url: "https://gitlab.com/group/project/-/issues/5",
+          author_id: 1,
+        },
+      }),
+    );
+    const issueNote = await handleNote(
+      makeNoteEvent({
+        object_attributes: {
+          id: 395,
+          note: `@${getGitLabBotName()} any update?`,
+          noteable_type: "Issue",
+          noteable_id: 205,
+          url: "https://gitlab.com/group/project/-/issues/5#note_395",
+          author_id: 1,
+          type: null,
+        },
+        merge_request: undefined,
+        issue: {
+          id: 205,
+          iid: 5,
+          title: "Issue five",
+          description: null,
+          state: "opened",
+          action: "open",
+          url: "https://gitlab.com/group/project/-/issues/5",
+          author_id: 1,
+        },
+      }),
+    );
+    const mr = await handleMergeRequest(
+      makeMREvent({
+        object_attributes: {
+          id: 155,
+          iid: 5,
+          title: "MR five",
+          description: `@${getGitLabBotName()} please review`,
+          state: "opened",
+          action: "open",
+          source_branch: "feat-five",
+          target_branch: "main",
+          url: "https://gitlab.com/group/project/-/merge_requests/5",
+          last_commit: null,
+          author_id: 1,
+        },
+      }),
+    );
+    const mrNote = await handleNote(
+      makeNoteEvent({
+        object_attributes: {
+          id: 396,
+          note: `@${getGitLabBotName()} looks good?`,
+          noteable_type: "MergeRequest",
+          noteable_id: 155,
+          url: "https://gitlab.com/group/project/-/merge_requests/5#note_396",
+          author_id: 1,
+          type: null,
+        },
+        merge_request: {
+          id: 155,
+          iid: 5,
+          title: "MR five",
+          description: null,
+          state: "opened",
+          action: "open",
+          source_branch: "feat-five",
+          target_branch: "main",
+          url: "https://gitlab.com/group/project/-/merge_requests/5",
+          last_commit: null,
+          author_id: 1,
+        },
+      }),
+    );
+    // A pre-contextKey issue row must not be swept up either.
+    const legacyIssue = await createTaskExtended("[GitLab Issue #5] Legacy", {
+      source: "gitlab",
+      vcsProvider: "gitlab",
+      vcsRepo: "group/project",
+      vcsEventType: "issue",
+      vcsNumber: 5,
+      agentId: "lead-gl-001",
+    });
+    for (const r of [issue, issueNote, mr, mrNote]) expect(r.created).toBe(true);
+
+    await handleMergeRequest(
+      makeMREvent({
+        object_attributes: {
+          id: 155,
+          iid: 5,
+          title: "MR five",
+          description: null,
+          state: "closed",
+          action: "close",
+          source_branch: "feat-five",
+          target_branch: "main",
+          url: "https://gitlab.com/group/project/-/merge_requests/5",
+          last_commit: null,
+          author_id: 1,
+        },
+      }),
+    );
+
+    for (const id of [mr.taskId!, mrNote.taskId!]) {
+      const task = await getTaskById(id);
+      expect(task?.status).toBe("failed");
+      expect(task?.failureReason).toBe("MR was closed");
+    }
+    for (const id of [issue.taskId!, issueNote.taskId!, legacyIssue.id]) {
+      const task = await getTaskById(id);
+      expect(task?.status).not.toBe("failed");
+    }
+  });
+
+  test("reads GITLAB_BOT_NAME at match time, so a config reload applies", async () => {
+    const mrEvent = (iid: number, description: string) =>
+      makeMREvent({
+        object_attributes: {
+          id: 1000 + iid,
+          iid,
+          title: "MR for renamed bot",
+          description,
+          state: "opened",
+          action: "open",
+          source_branch: "feat-renamed",
+          target_branch: "main",
+          url: `https://gitlab.com/group/project/-/merge_requests/${iid}`,
+          last_commit: null,
+          author_id: 1,
+        },
+      });
+    process.env.GITLAB_BOT_NAME = "renamed-bot";
+    try {
+      expect((await handleMergeRequest(mrEvent(63, "@renamed-bot review"))).created).toBe(true);
+      expect((await handleMergeRequest(mrEvent(64, "@agent-swarm-bot review"))).created).toBe(
+        false,
+      );
+    } finally {
+      delete process.env.GITLAB_BOT_NAME;
+    }
+  });
+
   test("ignores update action when no active task", async () => {
     const event = makeMREvent({
       object_attributes: {
         id: 105,
         iid: 62,
         title: "Updated MR",
-        description: `@${GITLAB_BOT_NAME} review`,
+        description: `@${getGitLabBotName()} review`,
         state: "opened",
         action: "update",
         source_branch: "feat-e",
@@ -329,7 +523,7 @@ describe("handleMergeRequest", () => {
         id: 106,
         iid: 70,
         title: "Dedup MR",
-        description: `@${GITLAB_BOT_NAME} review`,
+        description: `@${getGitLabBotName()} review`,
         state: "opened",
         action: "open",
         source_branch: "feat-dedup",
@@ -360,7 +554,7 @@ describe("handleIssue", () => {
         id: 201,
         iid: 20,
         title: "Issue with mention",
-        description: `@${GITLAB_BOT_NAME} implement this feature`,
+        description: `@${getGitLabBotName()} implement this feature`,
         state: "opened",
         action: "open",
         url: "https://gitlab.com/group/project/-/issues/20",
@@ -391,7 +585,7 @@ describe("handleIssue", () => {
         url: "https://gitlab.com/group/project/-/issues/21",
         author_id: 1,
       },
-      assignees: [{ id: 99, name: "Bot", username: GITLAB_BOT_NAME, avatar_url: "" }],
+      assignees: [{ id: 99, name: "Bot", username: getGitLabBotName(), avatar_url: "" }],
     });
 
     const result = await handleIssue(event);
@@ -447,6 +641,60 @@ describe("handleIssue", () => {
     const task = await findTaskByVcs("group/project", 30, "gitlab");
     expect(task).toBeNull();
   });
+
+  test("closing issue #6 fails the issue task, not the newer MR !6 task", async () => {
+    const issue = await handleIssue(
+      makeIssueEvent({
+        object_attributes: {
+          id: 206,
+          iid: 6,
+          title: "Issue six",
+          description: `@${getGitLabBotName()} fix this`,
+          state: "opened",
+          action: "open",
+          url: "https://gitlab.com/group/project/-/issues/6",
+          author_id: 1,
+        },
+      }),
+    );
+    // Created second, so it is the newest row for vcsNumber 6.
+    const mr = await handleMergeRequest(
+      makeMREvent({
+        object_attributes: {
+          id: 156,
+          iid: 6,
+          title: "MR six",
+          description: `@${getGitLabBotName()} please review`,
+          state: "opened",
+          action: "open",
+          source_branch: "feat-six",
+          target_branch: "main",
+          url: "https://gitlab.com/group/project/-/merge_requests/6",
+          last_commit: null,
+          author_id: 1,
+        },
+      }),
+    );
+    expect(issue.created && mr.created).toBe(true);
+
+    await handleIssue(
+      makeIssueEvent({
+        object_attributes: {
+          id: 206,
+          iid: 6,
+          title: "Issue six",
+          description: null,
+          state: "closed",
+          action: "close",
+          url: "https://gitlab.com/group/project/-/issues/6",
+          author_id: 1,
+        },
+      }),
+    );
+
+    expect((await getTaskById(issue.taskId!))?.failureReason).toBe("Issue was closed");
+    expect((await getTaskById(mr.taskId!))?.status).not.toBe("failed");
+  });
 });
 
 // ═══════════════════════════════════════════════════════
@@ -458,7 +706,7 @@ describe("handleNote", () => {
     const event = makeNoteEvent({
       object_attributes: {
         id: 301,
-        note: `@${GITLAB_BOT_NAME} please check this code`,
+        note: `@${getGitLabBotName()} please check this code`,
         noteable_type: "MergeRequest",
         noteable_id: 100,
         url: "https://gitlab.com/group/project/-/merge_requests/1#note_301",
@@ -493,7 +741,7 @@ describe("handleNote", () => {
     const event = makeNoteEvent({
       object_attributes: {
         id: 302,
-        note: `@${GITLAB_BOT_NAME} what do you think?`,
+        note: `@${getGitLabBotName()} what do you think?`,
         noteable_type: "Issue",
         noteable_id: 200,
         url: "https://gitlab.com/group/project/-/issues/40#note_302",
@@ -542,7 +790,7 @@ describe("handleNote", () => {
     const event = makeNoteEvent({
       object_attributes: {
         id: 304,
-        note: `@${GITLAB_BOT_NAME} review this commit`,
+        note: `@${getGitLabBotName()} review this commit`,
         noteable_type: "Commit",
         noteable_id: 999,
         url: "https://gitlab.com/group/project/-/commit/abc#note_304",
@@ -572,7 +820,7 @@ describe("handleNote", () => {
     const event = makeNoteEvent({
       object_attributes: {
         id: 305,
-        note: `@${GITLAB_BOT_NAME} also fix the linting`,
+        note: `@${getGitLabBotName()} also fix the linting`,
         noteable_type: "MergeRequest",
         noteable_id: 100,
         url: "https://gitlab.com/group/project/-/merge_requests/85#note_305",
@@ -742,7 +990,7 @@ describe("identity resolution — MR handler", () => {
         id: 901,
         iid: 901,
         title: "Known MR",
-        description: `@${GITLAB_BOT_NAME} review`,
+        description: `@${getGitLabBotName()} review`,
         state: "opened",
         action: "open",
         source_branch: "feat-known",
@@ -779,7 +1027,7 @@ describe("identity resolution — MR handler", () => {
         id: 902,
         iid: 902,
         title: "Inline-email MR",
-        description: `@${GITLAB_BOT_NAME} please`,
+        description: `@${getGitLabBotName()} please`,
         state: "opened",
         action: "open",
         source_branch: "feat-inline",
@@ -816,7 +1064,7 @@ describe("identity resolution — MR handler", () => {
         id: 903,
         iid: 903,
         title: "Ghost MR",
-        description: `@${GITLAB_BOT_NAME} ping`,
+        description: `@${getGitLabBotName()} ping`,
         state: "opened",
         action: "open",
         source_branch: "feat-ghost",
@@ -850,7 +1098,7 @@ describe("identity resolution — MR handler", () => {
           id: 910 + i,
           iid: 910 + i,
           title: `Ghost MR ${i}`,
-          description: `@${GITLAB_BOT_NAME} ping`,
+          description: `@${getGitLabBotName()} ping`,
           state: "opened",
           action: "open",
           source_branch: `feat-g-${i}`,
@@ -879,7 +1127,7 @@ describe("identity resolution — MR handler", () => {
         id: 920,
         iid: 920,
         title: "Empty email MR",
-        description: `@${GITLAB_BOT_NAME} review`,
+        description: `@${getGitLabBotName()} review`,
         state: "opened",
         action: "open",
         source_branch: "feat-empty",
@@ -914,7 +1162,7 @@ describe("identity resolution — Issue handler", () => {
         id: 950,
         iid: 950,
         title: "Ghost issue",
-        description: `@${GITLAB_BOT_NAME} fix`,
+        description: `@${getGitLabBotName()} fix`,
         state: "opened",
         action: "open",
         url: "https://gitlab.com/group/project/-/issues/950",
@@ -942,7 +1190,7 @@ describe("identity resolution — Note handler", () => {
   });
 
   test("unknown user WITHOUT email → unmapped entry tagged 'note'", async () => {
-    const noteBody = `@${GITLAB_BOT_NAME} can you look at this comment that is somewhat longer than usual to verify the slice(0,100) truncation downstream`;
+    const noteBody = `@${getGitLabBotName()} can you look at this comment that is somewhat longer than usual to verify the slice(0,100) truncation downstream`;
     const event = makeNoteEvent({
       user: { id: 31, name: "Note Ghost", username: "noteghost", avatar_url: "" },
       object_attributes: {
@@ -976,7 +1224,7 @@ describe("identity resolution — Note handler", () => {
     expect(meta).not.toBeNull();
     expect(meta?.sampleEventType).toBe("note");
     expect((meta?.sampleContext as string).length).toBeLessThanOrEqual(100);
-    expect((meta?.sampleContext as string).startsWith(`@${GITLAB_BOT_NAME}`)).toBe(true);
+    expect((meta?.sampleContext as string).startsWith(`@${getGitLabBotName()}`)).toBe(true);
     expect(await getUnmappedCount("noteghost")).toBe(1);
 
     // The dead-coded `_requestedByUserId` is now wired: undefined for an
@@ -996,7 +1244,7 @@ describe("identity resolution — Note handler", () => {
       user: { id: 32, name: "Known Commenter", username: "knowncommenter", avatar_url: "" },
       object_attributes: {
         id: 961,
-        note: `@${GITLAB_BOT_NAME} please take a look`,
+        note: `@${getGitLabBotName()} please take a look`,
         noteable_type: "MergeRequest",
         noteable_id: 101,
         url: "https://gitlab.com/group/project/-/merge_requests/2#note_961",