Merge pull request #304 from vypdev/bugfix/303-bugbot-first-message-bugs

[#303] 🐛 - Bugbot first message bugs

Author: efraespada

README.md

@@ -1,4 +1,4 @@
-[![GitHub Marketplace](https://img.shields.io/badge/marketplace/actions/copilot-github-with-super-powers?logo=github)](https://github.com/marketplace/actions/copilot-github-with-super-powers)
+[![GitHub Marketplace](https://img.shields.io/badge/Copilot-Github_with_super_powers-white)](https://github.com/marketplace/actions/copilot-github-with-super-powers)
 [![codecov](https://codecov.io/gh/vypdev/copilot/branch/master/graph/badge.svg)](https://codecov.io/gh/vypdev/copilot)
 ![Build](https://github.com/vypdev/copilot/actions/workflows/ci_check.yml/badge.svg)
 ![License](https://img.shields.io/github/license/vypdev/copilot)

build/cli/index.js

@@ -0,0 +1,43 @@
+import { Labels } from '../model/labels';
+import { SizeThresholds } from '../model/size_thresholds';
+export interface BranchComparisonFile {
+    filename: string;
+    status: string;
+    additions: number;
+    deletions: number;
+    changes: number;
+    blobUrl: string;
+    rawUrl: string;
+    contentsUrl: string;
+    patch: string | undefined;
+}
+export interface BranchComparisonCommit {
+    sha: string;
+    message: string;
+    author: {
+        name: string;
+        email: string;
+        date: string;
+    };
+    date: string;
+}
+export interface BranchComparison {
+    aheadBy: number;
+    behindBy: number;
+    totalCommits: number;
+    files: BranchComparisonFile[];
+    commits: BranchComparisonCommit[];
+}
+export interface SizeCategoryResult {
+    size: string;
+    githubSize: string;
+    reason: string;
+}
+/**
+ * Repository for comparing branches and computing size categories.
+ * Isolated to allow unit tests with mocked Octokit and pure size logic.
+ */
+export declare class BranchCompareRepository {
+    getChanges: (owner: string, repository: string, head: string, base: string, token: string) => Promise<BranchComparison>;
+    getSizeCategoryAndReason: (owner: string, repository: string, head: string, base: string, sizeThresholds: SizeThresholds, labels: Labels, token: string) => Promise<SizeCategoryResult>;
+}

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

@@ -1,8 +1,16 @@
-import { Execution } from "../model/execution";
+import { Execution } from '../model/execution';
 import { Labels } from '../model/labels';
-import { Result } from "../model/result";
+import { Result } from '../model/result';
 import { SizeThresholds } from '../model/size_thresholds';
+/**
+ * Facade for branch-related operations. Delegates to focused repositories
+ * (GitCli, Workflow, Merge, BranchCompare) for testability.
+ */
 export declare class BranchRepository {
+    private readonly gitCliRepository;
+    private readonly workflowRepository;
+    private readonly mergeRepository;
+    private readonly branchCompareRepository;
     fetchRemoteBranches: () => Promise<void>;
     getLatestTag: () => Promise<string | undefined>;
     getCommitTag: (latestTag: string | undefined) => Promise<string | undefined>;
@@ -27,35 +35,6 @@ export declare class BranchRepository {
     getListOfBranches: (owner: string, repository: string, token: string) => Promise<string[]>;
     executeWorkflow: (owner: string, repository: string, branch: string, workflow: string, inputs: Record<string, unknown>, token: string) => Promise<import("@octokit/plugin-paginate-rest/dist-types/types").OctokitResponse<never, 204>>;
     mergeBranch: (owner: string, repository: string, head: string, base: string, timeout: number, token: string) => Promise<Result[]>;
-    getChanges: (owner: string, repository: string, head: string, base: string, token: string) => Promise<{
-        aheadBy: number;
-        behindBy: number;
-        totalCommits: number;
-        files: {
-            filename: string;
-            status: "modified" | "added" | "removed" | "renamed" | "copied" | "changed" | "unchanged";
-            additions: number;
-            deletions: number;
-            changes: number;
-            blobUrl: string;
-            rawUrl: string;
-            contentsUrl: string;
-            patch: string | undefined;
-        }[];
-        commits: {
-            sha: string;
-            message: string;
-            author: {
-                name?: string;
-                email?: string;
-                date?: string;
-            };
-            date: string;
-        }[];
-    }>;
-    getSizeCategoryAndReason: (owner: string, repository: string, head: string, base: string, sizeThresholds: SizeThresholds, labels: Labels, token: string) => Promise<{
-        size: string;
-        githubSize: string;
-        reason: string;
-    }>;
+    getChanges: (owner: string, repository: string, head: string, base: string, token: string) => Promise<import("./branch_compare_repository").BranchComparison>;
+    getSizeCategoryAndReason: (owner: string, repository: string, head: string, base: string, sizeThresholds: SizeThresholds, labels: Labels, token: string) => Promise<import("./branch_compare_repository").SizeCategoryResult>;
 }

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

@@ -0,0 +1,9 @@
+/**
+ * Repository for Git operations executed via CLI (exec).
+ * Isolated to allow unit tests with mocked @actions/exec and @actions/core.
+ */
+export declare class GitCliRepository {
+    fetchRemoteBranches: () => Promise<void>;
+    getLatestTag: () => Promise<string | undefined>;
+    getCommitTag: (latestTag: string | undefined) => Promise<string | undefined>;
+}

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

@@ -0,0 +1,8 @@
+import { Result } from '../model/result';
+/**
+ * Repository for merging branches (via PR or direct merge).
+ * Isolated to allow unit tests with mocked Octokit.
+ */
+export declare class MergeRepository {
+    mergeBranch: (owner: string, repository: string, head: string, base: string, timeout: number, token: string) => Promise<Result[]>;
+}

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

@@ -3,4 +3,5 @@ import { WorkflowRun } from "../model/workflow_run";
 export declare class WorkflowRepository {
     getWorkflows: (params: Execution) => Promise<WorkflowRun[]>;
     getActivePreviousRuns: (params: Execution) => Promise<WorkflowRun[]>;
+    executeWorkflow: (owner: string, repository: string, branch: string, workflow: string, inputs: Record<string, unknown>, token: string) => Promise<import("@octokit/plugin-paginate-rest/dist-types/types").OctokitResponse<never, 204>>;
 }

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

@@ -0,0 +1,5 @@
+export type AnswerIssueHelpParams = {
+    description: string;
+    projectContextInstruction: string;
+};
+export declare function getAnswerIssueHelpPrompt(params: AnswerIssueHelpParams): string;

build/cli/src/prompts/answer_issue_help.d.ts

@@ -0,0 +1,11 @@
+export type BugbotParams = {
+    projectContextInstruction: string;
+    owner: string;
+    repo: string;
+    headBranch: string;
+    baseBranch: string;
+    issueNumber: string;
+    ignoreBlock: string;
+    previousBlock: string;
+};
+export declare function getBugbotPrompt(params: BugbotParams): string;

build/cli/src/prompts/bugbot.d.ts

@@ -0,0 +1,13 @@
+export type BugbotFixParams = {
+    projectContextInstruction: string;
+    owner: string;
+    repo: string;
+    headBranch: string;
+    baseBranch: string;
+    issueNumber: string;
+    prNumberLine: string;
+    findingsBlock: string;
+    userComment: string;
+    verifyBlock: string;
+};
+export declare function getBugbotFixPrompt(params: BugbotFixParams): string;