@desplega.ai/agent-swarm 1.20.0 → 1.51.2

package/src/github/handlers.ts

@@ -1,6 +1,9 @@
-import { createTaskExtended, failTask, findTaskByGitHub, getAllAgents } from "../be/db";
+import { createTaskExtended, failTask, findTaskByVcs, getAllAgents } from "../be/db";
+import { resolveTemplate } from "../prompts/resolver";
 import { detectMention, extractMentionContext, GITHUB_BOT_NAME, isBotAssignee } from "./mentions";
 import { addIssueReaction, addReaction } from "./reactions";
+// Side-effect import: registers all GitHub event templates in the in-memory registry
+import "./templates";
 import type {
   CheckRunEvent,
   CheckSuiteEvent,
@@ -15,9 +18,50 @@ import type {
 const processedEvents = new Map<string, number>();
 const EVENT_TTL = 60_000;
 
-// Delegation instruction for lead agents receiving GitHub tasks
-const DELEGATION_INSTRUCTION =
-  "⚠️ As lead, DELEGATE this task to a worker agent - do not tackle it yourself.";
+/**
+ * Get review state emoji and label
+ */
+export function getReviewStateInfo(state: string): { emoji: string; label: string } {
+  switch (state) {
+    case "approved":
+      return { emoji: "✅", label: "APPROVED" };
+    case "changes_requested":
+      return { emoji: "🔄", label: "CHANGES REQUESTED" };
+    case "commented":
+      return { emoji: "💬", label: "COMMENTED" };
+    case "dismissed":
+      return { emoji: "🚫", label: "DISMISSED" };
+    default:
+      return { emoji: "📝", label: state.toUpperCase() };
+  }
+}
+
+/**
+ * Get conclusion emoji and label for CI checks
+ */
+export function getCheckConclusionInfo(conclusion: string | null): {
+  emoji: string;
+  label: string;
+} {
+  switch (conclusion) {
+    case "success":
+      return { emoji: "✅", label: "PASSED" };
+    case "failure":
+      return { emoji: "❌", label: "FAILED" };
+    case "cancelled":
+      return { emoji: "⏹️", label: "CANCELLED" };
+    case "timed_out":
+      return { emoji: "⏱️", label: "TIMED OUT" };
+    case "action_required":
+      return { emoji: "⚠️", label: "ACTION REQUIRED" };
+    case "skipped":
+      return { emoji: "⏭️", label: "SKIPPED" };
+    case "neutral":
+      return { emoji: "➖", label: "NEUTRAL" };
+    default:
+      return { emoji: "❓", label: conclusion?.toUpperCase() ?? "UNKNOWN" };
+  }
+}
 
 /**
  * Get suggested commands based on task type
@@ -99,18 +143,36 @@ export async function handlePullRequest(
 
     // Same task creation flow as mention-based handling
     const lead = findLeadAgent();
-    const suggestions = getCommandSuggestions("github-pr");
-    const taskDescription = `[GitHub PR #${pr.number}] ${pr.title}\n\nAssigned to: @${GITHUB_BOT_NAME}\nFrom: ${sender.login}\nRepo: ${repository.full_name}\nBranch: ${pr.head.ref} → ${pr.base.ref}\nURL: ${pr.html_url}\n\nContext:\n${pr.body || pr.title}\n\n---\n${DELEGATION_INSTRUCTION}\n${suggestions}`;
+    const result = resolveTemplate(
+      "github.pull_request.assigned",
+      {
+        pr_number: pr.number,
+        pr_title: pr.title,
+        bot_name: GITHUB_BOT_NAME,
+        sender_login: sender.login,
+        repo_full_name: repository.full_name,
+        head_ref: pr.head.ref,
+        base_ref: pr.base.ref,
+        pr_url: pr.html_url,
+        context: pr.body || pr.title,
+      },
+      { agentId: lead?.id, repoId: repository.full_name },
+    );
+
+    if (result.skipped) {
+      return { created: false };
+    }
 
-    const task = createTaskExtended(taskDescription, {
+    const task = createTaskExtended(result.text, {
       agentId: lead?.id ?? "",
       source: "github",
+      vcsProvider: "github",
       taskType: "github-pr",
-      githubRepo: repository.full_name,
-      githubEventType: "pull_request",
-      githubNumber: pr.number,
-      githubAuthor: sender.login,
-      githubUrl: pr.html_url,
+      vcsRepo: repository.full_name,
+      vcsEventType: "pull_request",
+      vcsNumber: pr.number,
+      vcsAuthor: sender.login,
+      vcsUrl: pr.html_url,
     });
 
     if (lead) {
@@ -138,7 +200,7 @@ export async function handlePullRequest(
     }
 
     // Find the related task
-    const task = findTaskByGitHub(repository.full_name, pr.number);
+    const task = findTaskByVcs(repository.full_name, pr.number);
     if (!task) {
       console.log(`[GitHub] No active task found for PR #${pr.number} to cancel`);
       return { created: false };
@@ -167,23 +229,47 @@ export async function handlePullRequest(
       return { created: false };
     }
 
-    // Check if there's an existing task for this PR (e.g., bot created it)
-    const existingTask = findTaskByGitHub(repository.full_name, pr.number);
+    // Check if there's an existing active task for this PR — skip duplicate review tasks
+    const existingTask = findTaskByVcs(repository.full_name, pr.number);
+    if (existingTask) {
+      console.log(
+        `[GitHub] Skipping review task for PR #${pr.number} — active task ${existingTask.id} already exists`,
+      );
+      return { created: false };
+    }
 
     // Create review task
     const lead = findLeadAgent();
-    const suggestions = getCommandSuggestions("github-pr");
-    const taskDescription = `[GitHub PR #${pr.number}] ${pr.title}\n\nReview requested from: @${GITHUB_BOT_NAME}\nFrom: ${sender.login}\nRepo: ${repository.full_name}\nBranch: ${pr.head.ref} → ${pr.base.ref}\nURL: ${pr.html_url}\n\nContext:\n${pr.body || pr.title}\n\n---\n${existingTask ? `Related task: ${existingTask.id}\n🔀 Consider routing to the same agent working on the related task.\n` : ""}${DELEGATION_INSTRUCTION}\n${suggestions}`;
+    const result = resolveTemplate(
+      "github.pull_request.review_requested",
+      {
+        pr_number: pr.number,
+        pr_title: pr.title,
+        bot_name: GITHUB_BOT_NAME,
+        sender_login: sender.login,
+        repo_full_name: repository.full_name,
+        head_ref: pr.head.ref,
+        base_ref: pr.base.ref,
+        pr_url: pr.html_url,
+        context: pr.body || pr.title,
+      },
+      { agentId: lead?.id, repoId: repository.full_name },
+    );
+
+    if (result.skipped) {
+      return { created: false };
+    }
 
-    const task = createTaskExtended(taskDescription, {
+    const task = createTaskExtended(result.text, {
       agentId: lead?.id ?? "",
       source: "github",
+      vcsProvider: "github",
       taskType: "github-pr",
-      githubRepo: repository.full_name,
-      githubEventType: "pull_request",
-      githubNumber: pr.number,
-      githubAuthor: sender.login,
-      githubUrl: pr.html_url,
+      vcsRepo: repository.full_name,
+      vcsEventType: "pull_request",
+      vcsNumber: pr.number,
+      vcsAuthor: sender.login,
+      vcsUrl: pr.html_url,
     });
 
     if (lead) {
@@ -211,7 +297,7 @@ export async function handlePullRequest(
     }
 
     // Find the related task
-    const task = findTaskByGitHub(repository.full_name, pr.number);
+    const task = findTaskByVcs(repository.full_name, pr.number);
     if (!task) {
       console.log(`[GitHub] No active task found for PR #${pr.number} to cancel`);
       return { created: false };
@@ -232,7 +318,7 @@ export async function handlePullRequest(
   // Handle closed action - PR was merged or closed without merge
   if (action === "closed") {
     // Find the related task
-    const task = findTaskByGitHub(repository.full_name, pr.number);
+    const task = findTaskByVcs(repository.full_name, pr.number);
     if (!task) {
       // No task for this PR, nothing to notify
       return { created: false };
@@ -249,18 +335,40 @@ export async function handlePullRequest(
     const emoji = wasMerged ? "🎉" : "❌";
     const status = wasMerged ? "MERGED" : "CLOSED";
     const mergedBy = wasMerged && pr.merged_by ? ` by ${pr.merged_by.login}` : "";
+    const followUpSuggestion = wasMerged
+      ? "💡 PR successfully merged! Update any related issues or documentation."
+      : "💡 PR was closed without merging. Review if follow-up is needed.";
+
+    const result = resolveTemplate(
+      "github.pull_request.closed",
+      {
+        status_emoji: emoji,
+        pr_number: pr.number,
+        status,
+        merged_by: mergedBy,
+        pr_title: pr.title,
+        repo_full_name: repository.full_name,
+        pr_url: pr.html_url,
+        related_task_id: task.id,
+        follow_up_suggestion: followUpSuggestion,
+      },
+      { agentId: lead?.id, repoId: repository.full_name },
+    );
 
-    const taskDescription = `${emoji} [GitHub PR #${pr.number}] ${status}${mergedBy}\n\nPR: ${pr.title}\nRepo: ${repository.full_name}\nURL: ${pr.html_url}\n\n---\nRelated task: ${task.id}\n🔀 Consider routing to the same agent working on the related task.\n${wasMerged ? "💡 PR successfully merged! Update any related issues or documentation." : "💡 PR was closed without merging. Review if follow-up is needed."}`;
+    if (result.skipped) {
+      return { created: false };
+    }
 
-    const notifyTask = createTaskExtended(taskDescription, {
+    const notifyTask = createTaskExtended(result.text, {
       agentId: lead?.id ?? "",
       source: "github",
+      vcsProvider: "github",
       taskType: "github-pr-status",
-      githubRepo: repository.full_name,
-      githubEventType: "pull_request",
-      githubNumber: pr.number,
-      githubAuthor: sender.login,
-      githubUrl: pr.html_url,
+      vcsRepo: repository.full_name,
+      vcsEventType: "pull_request",
+      vcsNumber: pr.number,
+      vcsAuthor: sender.login,
+      vcsUrl: pr.html_url,
     });
 
     console.log(
@@ -273,7 +381,7 @@ export async function handlePullRequest(
   // Handle synchronize action - new commits pushed to PR
   if (action === "synchronize") {
     // Find the related task
-    const task = findTaskByGitHub(repository.full_name, pr.number);
+    const task = findTaskByVcs(repository.full_name, pr.number);
     if (!task) {
       // No task for this PR, nothing to notify
       return { created: false };
@@ -286,17 +394,34 @@ export async function handlePullRequest(
     }
 
     const lead = findLeadAgent();
-    const taskDescription = `🔄 [GitHub PR #${pr.number}] New commits pushed\n\nPR: ${pr.title}\nRepo: ${repository.full_name}\nBranch: ${pr.head.ref}\nNew HEAD: ${pr.head.sha.substring(0, 7)}\nURL: ${pr.html_url}\n\n---\nRelated task: ${task.id}\n🔀 Consider routing to the same agent working on the related task.\n💡 New commits were pushed. CI will re-run - monitor for results.`;
+    const result = resolveTemplate(
+      "github.pull_request.synchronize",
+      {
+        pr_number: pr.number,
+        pr_title: pr.title,
+        repo_full_name: repository.full_name,
+        head_ref: pr.head.ref,
+        head_sha_short: pr.head.sha.substring(0, 7),
+        pr_url: pr.html_url,
+        related_task_id: task.id,
+      },
+      { agentId: lead?.id, repoId: repository.full_name },
+    );
 
-    const notifyTask = createTaskExtended(taskDescription, {
+    if (result.skipped) {
+      return { created: false };
+    }
+
+    const notifyTask = createTaskExtended(result.text, {
       agentId: lead?.id ?? "",
       source: "github",
+      vcsProvider: "github",
       taskType: "github-pr-update",
-      githubRepo: repository.full_name,
-      githubEventType: "pull_request",
-      githubNumber: pr.number,
-      githubAuthor: sender.login,
-      githubUrl: pr.html_url,
+      vcsRepo: repository.full_name,
+      vcsEventType: "pull_request",
+      vcsNumber: pr.number,
+      vcsAuthor: sender.login,
+      vcsUrl: pr.html_url,
     });
 
     console.log(
@@ -328,19 +453,36 @@ export async function handlePullRequest(
 
   // Build task description
   const context = extractMentionContext(pr.body) || pr.title;
-  const suggestions = getCommandSuggestions("github-pr");
-  const taskDescription = `[GitHub PR #${pr.number}] ${pr.title}\n\nFrom: ${sender.login}\nRepo: ${repository.full_name}\nBranch: ${pr.head.ref} → ${pr.base.ref}\nURL: ${pr.html_url}\n\nContext:\n${context}\n\n---\n${DELEGATION_INSTRUCTION}\n${suggestions}`;
+  const result = resolveTemplate(
+    "github.pull_request.mentioned",
+    {
+      pr_number: pr.number,
+      pr_title: pr.title,
+      sender_login: sender.login,
+      repo_full_name: repository.full_name,
+      head_ref: pr.head.ref,
+      base_ref: pr.base.ref,
+      pr_url: pr.html_url,
+      context,
+    },
+    { agentId: lead?.id, repoId: repository.full_name },
+  );
+
+  if (result.skipped) {
+    return { created: false };
+  }
 
   // Create task (assigned to lead if available, otherwise unassigned)
-  const task = createTaskExtended(taskDescription, {
+  const task = createTaskExtended(result.text, {
     agentId: lead?.id ?? "",
     source: "github",
+    vcsProvider: "github",
     taskType: "github-pr",
-    githubRepo: repository.full_name,
-    githubEventType: "pull_request",
-    githubNumber: pr.number,
-    githubAuthor: sender.login,
-    githubUrl: pr.html_url,
+    vcsRepo: repository.full_name,
+    vcsEventType: "pull_request",
+    vcsNumber: pr.number,
+    vcsAuthor: sender.login,
+    vcsUrl: pr.html_url,
   });
 
   if (lead) {
@@ -382,18 +524,34 @@ export async function handleIssue(
 
     // Same task creation flow as mention-based handling
     const lead = findLeadAgent();
-    const suggestions = getCommandSuggestions("github-issue");
-    const taskDescription = `[GitHub Issue #${issue.number}] ${issue.title}\n\nAssigned to: @${GITHUB_BOT_NAME}\nFrom: ${sender.login}\nRepo: ${repository.full_name}\nURL: ${issue.html_url}\n\nContext:\n${issue.body || issue.title}\n\n---\n${DELEGATION_INSTRUCTION}\n${suggestions}`;
+    const result = resolveTemplate(
+      "github.issue.assigned",
+      {
+        issue_number: issue.number,
+        issue_title: issue.title,
+        bot_name: GITHUB_BOT_NAME,
+        sender_login: sender.login,
+        repo_full_name: repository.full_name,
+        issue_url: issue.html_url,
+        context: issue.body || issue.title,
+      },
+      { agentId: lead?.id, repoId: repository.full_name },
+    );
 
-    const task = createTaskExtended(taskDescription, {
+    if (result.skipped) {
+      return { created: false };
+    }
+
+    const task = createTaskExtended(result.text, {
       agentId: lead?.id ?? "",
       source: "github",
+      vcsProvider: "github",
       taskType: "github-issue",
-      githubRepo: repository.full_name,
-      githubEventType: "issues",
-      githubNumber: issue.number,
-      githubAuthor: sender.login,
-      githubUrl: issue.html_url,
+      vcsRepo: repository.full_name,
+      vcsEventType: "issues",
+      vcsNumber: issue.number,
+      vcsAuthor: sender.login,
+      vcsUrl: issue.html_url,
     });
 
     if (lead) {
@@ -421,7 +579,7 @@ export async function handleIssue(
     }
 
     // Find the related task
-    const task = findTaskByGitHub(repository.full_name, issue.number);
+    const task = findTaskByVcs(repository.full_name, issue.number);
     if (!task) {
       console.log(`[GitHub] No active task found for issue #${issue.number} to cancel`);
       return { created: false };
@@ -459,19 +617,34 @@ export async function handleIssue(
 
   // Build task description
   const context = extractMentionContext(issue.body) || issue.title;
-  const suggestions = getCommandSuggestions("github-issue");
-  const taskDescription = `[GitHub Issue #${issue.number}] ${issue.title}\n\nFrom: ${sender.login}\nRepo: ${repository.full_name}\nURL: ${issue.html_url}\n\nContext:\n${context}\n\n---\n${DELEGATION_INSTRUCTION}\n${suggestions}`;
+  const result = resolveTemplate(
+    "github.issue.mentioned",
+    {
+      issue_number: issue.number,
+      issue_title: issue.title,
+      sender_login: sender.login,
+      repo_full_name: repository.full_name,
+      issue_url: issue.html_url,
+      context,
+    },
+    { agentId: lead?.id, repoId: repository.full_name },
+  );
+
+  if (result.skipped) {
+    return { created: false };
+  }
 
   // Create task (assigned to lead if available, otherwise unassigned)
-  const task = createTaskExtended(taskDescription, {
+  const task = createTaskExtended(result.text, {
     agentId: lead?.id ?? "",
     source: "github",
+    vcsProvider: "github",
     taskType: "github-issue",
-    githubRepo: repository.full_name,
-    githubEventType: "issues",
-    githubNumber: issue.number,
-    githubAuthor: sender.login,
-    githubUrl: issue.html_url,
+    vcsRepo: repository.full_name,
+    vcsEventType: "issues",
+    vcsNumber: issue.number,
+    vcsAuthor: sender.login,
+    vcsUrl: issue.html_url,
   });
 
   if (lead) {
@@ -526,24 +699,47 @@ export async function handleComment(
   const targetUrl = target?.html_url ?? comment.html_url;
 
   // Check if there's an existing task for this PR/Issue
-  const existingTask = targetNumber ? findTaskByGitHub(repository.full_name, targetNumber) : null;
+  const existingTask = targetNumber ? findTaskByVcs(repository.full_name, targetNumber) : null;
 
   // Build task description
   const context = extractMentionContext(comment.body);
   const suggestions = getCommandSuggestions("github-comment", targetType);
-  const taskDescription = `[GitHub ${targetType} #${targetNumber} Comment] ${targetTitle}\n\nFrom: ${sender.login}\nRepo: ${repository.full_name}\nURL: ${comment.html_url}\n\nComment:\n${context}\n\n---\n${existingTask ? `Related task: ${existingTask.id}\n🔀 Consider routing to the same agent working on the related task.\n` : ""}${DELEGATION_INSTRUCTION}\n${suggestions}`;
+  const relatedTaskSection = existingTask
+    ? `Related task: ${existingTask.id}\n🔀 Consider routing to the same agent working on the related task.\n`
+    : "";
+
+  const result = resolveTemplate(
+    "github.comment.mentioned",
+    {
+      target_type: targetType,
+      target_number: targetNumber,
+      target_title: targetTitle,
+      sender_login: sender.login,
+      repo_full_name: repository.full_name,
+      comment_url: comment.html_url,
+      context,
+      related_task_section: relatedTaskSection,
+      command_suggestions: suggestions,
+    },
+    { agentId: lead?.id, repoId: repository.full_name },
+  );
+
+  if (result.skipped) {
+    return { created: false };
+  }
 
   // Create task (assigned to lead if available, otherwise unassigned)
-  const task = createTaskExtended(taskDescription, {
+  const task = createTaskExtended(result.text, {
     agentId: lead?.id ?? "",
     source: "github",
+    vcsProvider: "github",
     taskType: "github-comment",
-    githubRepo: repository.full_name,
-    githubEventType: eventType,
-    githubNumber: targetNumber,
-    githubCommentId: comment.id,
-    githubAuthor: sender.login,
-    githubUrl: targetUrl,
+    vcsRepo: repository.full_name,
+    vcsEventType: eventType,
+    vcsNumber: targetNumber,
+    vcsCommentId: comment.id,
+    vcsAuthor: sender.login,
+    vcsUrl: targetUrl,
   });
 
   if (lead) {
@@ -562,24 +758,6 @@ export async function handleComment(
   return { created: true, taskId: task.id };
 }
 
-/**
- * Get review state emoji and label
- */
-function getReviewStateInfo(state: string): { emoji: string; label: string } {
-  switch (state) {
-    case "approved":
-      return { emoji: "✅", label: "APPROVED" };
-    case "changes_requested":
-      return { emoji: "🔄", label: "CHANGES REQUESTED" };
-    case "commented":
-      return { emoji: "💬", label: "COMMENTED" };
-    case "dismissed":
-      return { emoji: "🚫", label: "DISMISSED" };
-    default:
-      return { emoji: "📝", label: state.toUpperCase() };
-  }
-}
-
 /**
  * Handle pull_request_review events (submitted, edited, dismissed)
  *
@@ -613,7 +791,7 @@ export async function handlePullRequestReview(
   }
 
   // Find any existing task for this PR
-  const existingTask = findTaskByGitHub(repository.full_name, pr.number);
+  const existingTask = findTaskByVcs(repository.full_name, pr.number);
 
   // Only notify for PRs where bot is creator or already has a task
   const isBotCreator = isBotAssignee(pr.user.login);
@@ -628,26 +806,49 @@ export async function handlePullRequestReview(
   const { emoji, label } = getReviewStateInfo(review.state);
 
   // Build task description
-  const reviewBody = review.body ? `\n\nReview Comment:\n${review.body}` : "";
-  const suggestions =
+  const reviewBodySection = review.body ? `\n\nReview Comment:\n${review.body}` : "";
+  const relatedTaskSection = existingTask
+    ? `Related task: ${existingTask.id}\n🔀 Consider routing to the same agent working on the related task.\n`
+    : "";
+  const reviewSuggestions =
     review.state === "approved"
       ? "💡 Suggested: Merge the PR or wait for additional reviews"
       : review.state === "changes_requested"
         ? "💡 Suggested: Address the requested changes and update the PR"
         : "💡 Suggested: Review the feedback and respond if needed";
 
-  const taskDescription = `${emoji} [GitHub PR #${pr.number} Review] ${label}\n\nPR: ${pr.title}\nReviewer: ${sender.login}\nRepo: ${repository.full_name}\nURL: ${review.html_url}${reviewBody}\n\n---\n${existingTask ? `Related task: ${existingTask.id}\n🔀 Consider routing to the same agent working on the related task.\n` : ""}${DELEGATION_INSTRUCTION}\n${suggestions}`;
+  const result = resolveTemplate(
+    "github.pull_request.review_submitted",
+    {
+      review_emoji: emoji,
+      pr_number: pr.number,
+      review_label: label,
+      pr_title: pr.title,
+      sender_login: sender.login,
+      repo_full_name: repository.full_name,
+      review_url: review.html_url,
+      review_body_section: reviewBodySection,
+      related_task_section: relatedTaskSection,
+      review_suggestions: reviewSuggestions,
+    },
+    { agentId: lead?.id, repoId: repository.full_name },
+  );
+
+  if (result.skipped) {
+    return { created: false };
+  }
 
   // Create task (assigned to lead if available, otherwise unassigned)
-  const task = createTaskExtended(taskDescription, {
+  const task = createTaskExtended(result.text, {
     agentId: lead?.id ?? "",
     source: "github",
+    vcsProvider: "github",
     taskType: "github-review",
-    githubRepo: repository.full_name,
-    githubEventType: "pull_request_review",
-    githubNumber: pr.number,
-    githubAuthor: sender.login,
-    githubUrl: review.html_url,
+    vcsRepo: repository.full_name,
+    vcsEventType: "pull_request_review",
+    vcsNumber: pr.number,
+    vcsAuthor: sender.login,
+    vcsUrl: review.html_url,
   });
 
   if (lead) {
@@ -668,30 +869,6 @@ export async function handlePullRequestReview(
   return { created: true, taskId: task.id };
 }
 
-/**
- * Get conclusion emoji and label for CI checks
- */
-function getCheckConclusionInfo(conclusion: string | null): { emoji: string; label: string } {
-  switch (conclusion) {
-    case "success":
-      return { emoji: "✅", label: "PASSED" };
-    case "failure":
-      return { emoji: "❌", label: "FAILED" };
-    case "cancelled":
-      return { emoji: "⏹️", label: "CANCELLED" };
-    case "timed_out":
-      return { emoji: "⏱️", label: "TIMED OUT" };
-    case "action_required":
-      return { emoji: "⚠️", label: "ACTION REQUIRED" };
-    case "skipped":
-      return { emoji: "⏭️", label: "SKIPPED" };
-    case "neutral":
-      return { emoji: "➖", label: "NEUTRAL" };
-    default:
-      return { emoji: "❓", label: conclusion?.toUpperCase() ?? "UNKNOWN" };
-  }
-}
-
 /**
  * Handle check_run events (CI check completed)
  *
@@ -723,7 +900,7 @@ export async function handleCheckRun(
   let relatedTask = null;
   let prNumber = 0;
   for (const pr of check_run.pull_requests) {
-    const task = findTaskByGitHub(repository.full_name, pr.number);
+    const task = findTaskByVcs(repository.full_name, pr.number);
     if (task) {
       relatedTask = task;
       prNumber = pr.number;
@@ -745,21 +922,39 @@ export async function handleCheckRun(
   const lead = findLeadAgent();
   const { emoji, label } = getCheckConclusionInfo(conclusion);
 
-  const outputSummary = check_run.output.summary
+  const outputSummarySection = check_run.output.summary
     ? `\n\nSummary:\n${check_run.output.summary.substring(0, 500)}`
     : "";
 
-  const taskDescription = `${emoji} [GitHub PR #${prNumber} CI] ${check_run.name} ${label}\n\nRepo: ${repository.full_name}\nCheck: ${check_run.name}\nURL: ${check_run.html_url}${outputSummary}\n\n---\nRelated task: ${relatedTask.id}\n🔀 Consider routing to the same agent working on the related task.\n💡 CI check failed. Review the logs and fix the issue.`;
+  const result = resolveTemplate(
+    "github.check_run.failed",
+    {
+      conclusion_emoji: emoji,
+      pr_number: prNumber,
+      check_name: check_run.name,
+      conclusion_label: label,
+      repo_full_name: repository.full_name,
+      check_url: check_run.html_url,
+      output_summary_section: outputSummarySection,
+      related_task_id: relatedTask.id,
+    },
+    { agentId: lead?.id, repoId: repository.full_name },
+  );
+
+  if (result.skipped) {
+    return { created: false };
+  }
 
-  const task = createTaskExtended(taskDescription, {
+  const task = createTaskExtended(result.text, {
     agentId: lead?.id ?? "",
     source: "github",
+    vcsProvider: "github",
     taskType: "github-ci",
-    githubRepo: repository.full_name,
-    githubEventType: "check_run",
-    githubNumber: prNumber,
-    githubAuthor: "",
-    githubUrl: check_run.html_url,
+    vcsRepo: repository.full_name,
+    vcsEventType: "check_run",
+    vcsNumber: prNumber,
+    vcsAuthor: "",
+    vcsUrl: check_run.html_url,
   });
 
   console.log(
@@ -799,7 +994,7 @@ export async function handleCheckSuite(
   let relatedTask = null;
   let prNumber = 0;
   for (const pr of check_suite.pull_requests) {
-    const task = findTaskByGitHub(repository.full_name, pr.number);
+    const task = findTaskByVcs(repository.full_name, pr.number);
     if (task) {
       relatedTask = task;
       prNumber = pr.number;
@@ -822,17 +1017,34 @@ export async function handleCheckSuite(
   const { emoji, label } = getCheckConclusionInfo(conclusion);
   const branch = check_suite.head_branch ?? "unknown";
 
-  const taskDescription = `${emoji} [GitHub PR #${prNumber} CI Suite] ${label}\n\nRepo: ${repository.full_name}\nBranch: ${branch}\nCommit: ${check_suite.head_sha.substring(0, 7)}\n\n---\nRelated task: ${relatedTask.id}\n🔀 Consider routing to the same agent working on the related task.\n💡 CI suite failed. Check individual check runs for details.`;
+  const result = resolveTemplate(
+    "github.check_suite.failed",
+    {
+      conclusion_emoji: emoji,
+      pr_number: prNumber,
+      conclusion_label: label,
+      repo_full_name: repository.full_name,
+      branch,
+      head_sha_short: check_suite.head_sha.substring(0, 7),
+      related_task_id: relatedTask.id,
+    },
+    { agentId: lead?.id, repoId: repository.full_name },
+  );
+
+  if (result.skipped) {
+    return { created: false };
+  }
 
-  const task = createTaskExtended(taskDescription, {
+  const task = createTaskExtended(result.text, {
     agentId: lead?.id ?? "",
     source: "github",
+    vcsProvider: "github",
     taskType: "github-ci",
-    githubRepo: repository.full_name,
-    githubEventType: "check_suite",
-    githubNumber: prNumber,
-    githubAuthor: "",
-    githubUrl: repository.html_url,
+    vcsRepo: repository.full_name,
+    vcsEventType: "check_suite",
+    vcsNumber: prNumber,
+    vcsAuthor: "",
+    vcsUrl: repository.html_url,
   });
 
   console.log(
@@ -875,7 +1087,7 @@ export async function handleWorkflowRun(
   let relatedTask = null;
   let prNumber = 0;
   for (const pr of workflow_run.pull_requests) {
-    const task = findTaskByGitHub(repository.full_name, pr.number);
+    const task = findTaskByVcs(repository.full_name, pr.number);
     if (task) {
       relatedTask = task;
       prNumber = pr.number;
@@ -897,17 +1109,38 @@ export async function handleWorkflowRun(
   const lead = findLeadAgent();
   const { emoji, label } = getCheckConclusionInfo(conclusion);
 
-  const taskDescription = `${emoji} [GitHub PR #${prNumber} Workflow] ${workflow_run.name} ${label}\n\nRepo: ${repository.full_name}\nWorkflow: ${workflow.name}\nRun #${workflow_run.run_number}\nBranch: ${workflow_run.head_branch}\nTriggered by: ${workflow_run.event}\nLogs: ${workflow_run.html_url}\n\n---\nRelated task: ${relatedTask.id}\n🔀 Consider routing to the same agent working on the related task.\n💡 Workflow failed. Click the logs URL above to see what went wrong and fix the issue.`;
+  const result = resolveTemplate(
+    "github.workflow_run.failed",
+    {
+      conclusion_emoji: emoji,
+      pr_number: prNumber,
+      workflow_run_name: workflow_run.name,
+      conclusion_label: label,
+      repo_full_name: repository.full_name,
+      workflow_name: workflow.name,
+      run_number: workflow_run.run_number,
+      head_branch: workflow_run.head_branch,
+      trigger_event: workflow_run.event,
+      logs_url: workflow_run.html_url,
+      related_task_id: relatedTask.id,
+    },
+    { agentId: lead?.id, repoId: repository.full_name },
+  );
+
+  if (result.skipped) {
+    return { created: false };
+  }
 
-  const task = createTaskExtended(taskDescription, {
+  const task = createTaskExtended(result.text, {
     agentId: lead?.id ?? "",
     source: "github",
+    vcsProvider: "github",
     taskType: "github-ci",
-    githubRepo: repository.full_name,
-    githubEventType: "workflow_run",
-    githubNumber: prNumber,
-    githubAuthor: "",
-    githubUrl: workflow_run.html_url,
+    vcsRepo: repository.full_name,
+    vcsEventType: "workflow_run",
+    vcsNumber: prNumber,
+    vcsAuthor: "",
+    vcsUrl: workflow_run.html_url,
   });
 
   console.log(