bugfix-314-error-merging-release-branch-after-successful-deployment: Enhance IssueRepository and publishFindings functionality to support commit SHA watermarks in comments. Updated addComment and updateComment methods to accept an options parameter for commitSha, allowing comments to include a link to the specific commit. Adjusted related tests to verify the inclusion of watermarks in comment bodies.

Author: efraespada

build/cli/index.js

@@ -50335,6 +50335,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.IssueRepository = exports.PROGRESS_LABEL_PATTERN = void 0;
 const core = __importStar(__nccwpck_require__(2186));
 const github = __importStar(__nccwpck_require__(5438));
+const comment_watermark_1 = __nccwpck_require__(4467);
 const logger_1 = __nccwpck_require__(8836);
 const milestone_1 = __nccwpck_require__(2298);
 /** Matches labels that are progress percentages (e.g. "0%", "85%"). Used for setProgressLabel and syncing. */
@@ -50691,23 +50692,27 @@ class IssueRepository {
             });
             return pullRequest.data.head.ref;
         };
-        this.addComment = async (owner, repository, issueNumber, comment, token) => {
+        this.addComment = async (owner, repository, issueNumber, comment, token, options) => {
+            const watermark = (0, comment_watermark_1.getCommentWatermark)(options?.commitSha ? { commitSha: options.commitSha, owner, repo: repository } : undefined);
+            const body = `${comment}\n\n${watermark}`;
             const octokit = github.getOctokit(token);
             await octokit.rest.issues.createComment({
                 owner: owner,
                 repo: repository,
                 issue_number: issueNumber,
-                body: comment,
+                body,
             });
             (0, logger_1.logDebugInfo)(`Comment added to Issue ${issueNumber}.`);
         };
-        this.updateComment = async (owner, repository, issueNumber, commentId, comment, token) => {
+        this.updateComment = async (owner, repository, issueNumber, commentId, comment, token, options) => {
+            const watermark = (0, comment_watermark_1.getCommentWatermark)(options?.commitSha ? { commitSha: options.commitSha, owner, repo: repository } : undefined);
+            const body = `${comment}\n\n${watermark}`;
             const octokit = github.getOctokit(token);
             await octokit.rest.issues.updateComment({
                 owner: owner,
                 repo: repository,
                 comment_id: commentId,
-                body: comment,
+                body,
             });
             (0, logger_1.logDebugInfo)(`Comment ${commentId} updated in Issue ${issueNumber}.`);
         };
@@ -56273,31 +56278,36 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.publishFindings = publishFindings;
 const issue_repository_1 = __nccwpck_require__(57);
 const pull_request_repository_1 = __nccwpck_require__(634);
+const comment_watermark_1 = __nccwpck_require__(4467);
 const logger_1 = __nccwpck_require__(8836);
 const marker_1 = __nccwpck_require__(2401);
 const path_validation_1 = __nccwpck_require__(1999);
 /** Creates or updates issue comments for each finding; creates PR review comments only when finding.file is in prFiles. */
 async function publishFindings(param) {
-    const { execution, context, findings, overflowCount = 0, overflowTitles = [] } = param;
+    const { execution, context, findings, commitSha, overflowCount = 0, overflowTitles = [] } = param;
     const { existingByFindingId, openPrNumbers, prContext } = context;
     const issueNumber = execution.issueNumber;
     const token = execution.tokens.token;
     const owner = execution.owner;
     const repo = execution.repo;
     const issueRepository = new issue_repository_1.IssueRepository();
     const pullRequestRepository = new pull_request_repository_1.PullRequestRepository();
+    const bugbotWatermark = commitSha && owner && repo
+        ? (0, comment_watermark_1.getCommentWatermark)({ commitSha, owner, repo })
+        : (0, comment_watermark_1.getCommentWatermark)();
     const prFiles = prContext?.prFiles ?? [];
     const pathToFirstDiffLine = prContext?.pathToFirstDiffLine ?? {};
     const prCommentsToCreate = [];
     for (const finding of findings) {
         const existing = existingByFindingId[finding.id];
         const commentBody = (0, marker_1.buildCommentBody)(finding, false);
+        const bodyWithWatermark = `${commentBody}\n\n${bugbotWatermark}`;
         if (existing?.issueCommentId != null) {
-            await issueRepository.updateComment(owner, repo, issueNumber, existing.issueCommentId, commentBody, token);
+            await issueRepository.updateComment(owner, repo, issueNumber, existing.issueCommentId, commentBody, token, commitSha ? { commitSha } : undefined);
             (0, logger_1.logDebugInfo)(`Updated bugbot comment for finding ${finding.id} on issue.`);
         }
         else {
-            await issueRepository.addComment(owner, repo, issueNumber, commentBody, token);
+            await issueRepository.addComment(owner, repo, issueNumber, commentBody, token, commitSha ? { commitSha } : undefined);
             (0, logger_1.logDebugInfo)(`Added bugbot comment for finding ${finding.id} on issue.`);
         }
         // PR review comment: only if this finding's file is in the PR changed files (so GitHub can attach the comment).
@@ -56306,10 +56316,10 @@ async function publishFindings(param) {
             if (path) {
                 const line = finding.line ?? pathToFirstDiffLine[path] ?? 1;
                 if (existing?.prCommentId != null && existing.prNumber === openPrNumbers[0]) {
-                    await pullRequestRepository.updatePullRequestReviewComment(owner, repo, existing.prCommentId, commentBody, token);
+                    await pullRequestRepository.updatePullRequestReviewComment(owner, repo, existing.prCommentId, bodyWithWatermark, token);
                 }
                 else {
-                    prCommentsToCreate.push({ path, line, body: commentBody });
+                    prCommentsToCreate.push({ path, line, body: bodyWithWatermark });
                 }
             }
             else if (finding.file != null && String(finding.file).trim() !== "") {
@@ -56327,7 +56337,7 @@ async function publishFindings(param) {
         const overflowBody = `## More findings (comment limit)
 
 There are **${overflowCount}** more finding(s) that were not published as individual comments. Review locally or in the full diff to see the list.${titlesList}`;
-        await issueRepository.addComment(owner, repo, issueNumber, overflowBody, token);
+        await issueRepository.addComment(owner, repo, issueNumber, overflowBody, token, commitSha ? { commitSha } : undefined);
         (0, logger_1.logDebugInfo)(`Added overflow comment: ${overflowCount} additional finding(s) not published individually.`);
     }
 }
@@ -56587,12 +56597,46 @@ exports.CheckChangesIssueSizeUseCase = CheckChangesIssueSizeUseCase;
 /***/ }),
 
 /***/ 7395:
-/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
 
 "use strict";
 
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.DetectPotentialProblemsUseCase = void 0;
+const github = __importStar(__nccwpck_require__(5438));
 const result_1 = __nccwpck_require__(7305);
 const ai_repository_1 = __nccwpck_require__(8307);
 const constants_1 = __nccwpck_require__(8593);
@@ -56671,6 +56715,7 @@ class DetectPotentialProblemsUseCase {
                 execution: param,
                 context,
                 findings: toPublish,
+                commitSha: github.context.sha,
                 overflowCount: overflowCount > 0 ? overflowCount : undefined,
                 overflowTitles: overflowCount > 0 ? overflowTitles : undefined,
             });
@@ -59766,6 +59811,34 @@ ${this.translatedKey}
 exports.CheckPullRequestCommentLanguageUseCase = CheckPullRequestCommentLanguageUseCase;
 
 
+/***/ }),
+
+/***/ 4467:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+/**
+ * Watermark appended to comments (issues and PRs) to attribute Copilot.
+ * Bugbot comments include commit link and note about auto-update on new commits.
+ */
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.COPILOT_MARKETPLACE_URL = void 0;
+exports.getCommentWatermark = getCommentWatermark;
+exports.COPILOT_MARKETPLACE_URL = 'https://github.com/marketplace/actions/copilot-github-with-super-powers';
+const DEFAULT_WATERMARK = `<sup>Made with ❤️ by [vypdev/copilot](${exports.COPILOT_MARKETPLACE_URL})</sup>`;
+function commitUrl(owner, repo, sha) {
+    return `https://github.com/${owner}/${repo}/commit/${sha}`;
+}
+function getCommentWatermark(options) {
+    if (options?.commitSha && options?.owner && options?.repo) {
+        const url = commitUrl(options.owner, options.repo, options.commitSha);
+        return `<sup>Written by [vypdev/copilot](${exports.COPILOT_MARKETPLACE_URL}) for commit [${options.commitSha}](${url}). This will update automatically on new commits.</sup>`;
+    }
+    return DEFAULT_WATERMARK;
+}
+
+
 /***/ }),
 
 /***/ 8593:

build/cli/src/data/repository/issue_repository.d.ts

@@ -37,8 +37,12 @@ export declare class IssueRepository {
     isIssue: (owner: string, repository: string, issueNumber: number, token: string) => Promise<boolean>;
     isPullRequest: (owner: string, repository: string, issueNumber: number, token: string) => Promise<boolean>;
     getHeadBranch: (owner: string, repository: string, issueNumber: number, token: string) => Promise<string | undefined>;
-    addComment: (owner: string, repository: string, issueNumber: number, comment: string, token: string) => Promise<void>;
-    updateComment: (owner: string, repository: string, issueNumber: number, commentId: number, comment: string, token: string) => Promise<void>;
+    addComment: (owner: string, repository: string, issueNumber: number, comment: string, token: string, options?: {
+        commitSha?: string;
+    }) => Promise<void>;
+    updateComment: (owner: string, repository: string, issueNumber: number, commentId: number, comment: string, token: string, options?: {
+        commitSha?: string;
+    }) => Promise<void>;
     /**
      * Lists all comments on an issue (for bugbot: find existing findings by marker).
      * Uses pagination to fetch every comment (default API returns only 30 per page).

build/cli/src/usecase/steps/commit/bugbot/publish_findings_use_case.d.ts

@@ -12,6 +12,8 @@ export interface PublishFindingsParam {
     execution: Execution;
     context: BugbotContext;
     findings: BugbotFinding[];
+    /** Commit SHA for bugbot watermark (commit link). When set, comment uses "for commit ..." watermark. */
+    commitSha?: string;
     /** When findings were limited by max comments, add one summary comment with this overflow info. */
     overflowCount?: number;
     overflowTitles?: string[];

build/cli/src/utils/comment_watermark.d.ts

@@ -0,0 +1,11 @@
+/**
+ * Watermark appended to comments (issues and PRs) to attribute Copilot.
+ * Bugbot comments include commit link and note about auto-update on new commits.
+ */
+export declare const COPILOT_MARKETPLACE_URL = "https://github.com/marketplace/actions/copilot-github-with-super-powers";
+export interface BugbotWatermarkOptions {
+    commitSha: string;
+    owner: string;
+    repo: string;
+}
+export declare function getCommentWatermark(options?: BugbotWatermarkOptions): string;