[#314] 🐛 - Error merging release branch after successful deployment

README.md

@@ -23,6 +23,7 @@ Full documentation: **[docs.page/vypdev/copilot](https://docs.page/vypdev/copilo
 | [OpenCode (AI)](https://docs.page/vypdev/copilot/opencode-integration) | Progress, Bugbot, think, AI PR description |
 | [Testing OpenCode locally](https://docs.page/vypdev/copilot/testing-opencode-plan-locally) | Run check-progress, detect-potential-problems, recommend-steps via CLI |
 | [Single actions](https://docs.page/vypdev/copilot/single-actions) | On-demand: check progress, think, create release/tag, deployed |
+| [Deploy label and merge flow](docs/single-actions/deploy-label-and-merge.mdx) | Deploy/deployed labels, post-deploy merges, waiting for checks per PR |
 | [Issues](https://docs.page/vypdev/copilot/issues) | Issue configuration and types (feature, bugfix, hotfix, release, docs, chore) |
 | [Pull requests](https://docs.page/vypdev/copilot/pull-requests) | PR configuration and AI description |
 | [Troubleshooting](https://docs.page/vypdev/copilot/troubleshooting) | Common issues and solutions |

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/data/repository/merge_repository.d.ts

@@ -1,7 +1,13 @@
 import { Result } from '../model/result';
 /**
- * Repository for merging branches (via PR or direct merge).
- * Isolated to allow unit tests with mocked Octokit.
+ * Repository for merging branches: creates a PR, waits for that PR's check runs (or status checks),
+ * then merges the PR; on failure, falls back to a direct Git merge.
+ *
+ * Check runs are filtered by PR (pull_requests) so we only wait for the current PR's checks,
+ * not those of another PR sharing the same head (e.g. release→main vs release→develop).
+ * If the PR has no check runs after a short wait, we proceed to merge (branch may have no required checks).
+ *
+ * @see docs/single-actions/deploy-label-and-merge.mdx for the deploy flow and check-wait behaviour.
  */
 export declare class MergeRepository {
     mergeBranch: (owner: string, repository: string, head: string, base: string, timeout: number, token: string) => Promise<Result[]>;

build/cli/src/usecase/actions/deployed_action_use_case.d.ts

@@ -1,6 +1,16 @@
 import { Execution } from "../../data/model/execution";
 import { Result } from "../../data/model/result";
 import { ParamUseCase } from "../base/param_usecase";
+/**
+ * Single action run after a successful deployment (triggered with the "deployed" action and an issue number).
+ *
+ * Requires the issue to have the "deploy" label and not already have the "deployed" label. Then:
+ * 1. Replaces the "deploy" label with "deployed".
+ * 2. If a release or hotfix branch is configured: merges it into default and develop (each via PR, waiting for that PR's checks).
+ * 3. Closes the issue only when all merges succeed.
+ *
+ * @see docs/single-actions/deploy-label-and-merge.mdx for the full flow and how merge/check waiting works.
+ */
 export declare class DeployedActionUseCase implements ParamUseCase<Execution, Result[]> {
     taskId: string;
     private issueRepository;

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;

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

@@ -4,9 +4,12 @@ export interface LogEntry {
     timestamp: number;
     metadata?: Record<string, unknown>;
 }
+export declare function getAccumulatedLogEntries(): LogEntry[];
+export declare function getAccumulatedLogsAsText(): string;
+export declare function clearAccumulatedLogs(): void;
 export declare function setGlobalLoggerDebug(debug: boolean, isRemote?: boolean): void;
 export declare function setStructuredLogging(enabled: boolean): void;
-export declare function logInfo(message: string, previousWasSingleLine?: boolean, metadata?: Record<string, unknown>): void;
+export declare function logInfo(message: string, previousWasSingleLine?: boolean, metadata?: Record<string, unknown>, skipAccumulation?: boolean): void;
 export declare function logWarn(message: string, metadata?: Record<string, unknown>): void;
 export declare function logWarning(message: string): void;
 export declare function logError(message: unknown, metadata?: Record<string, unknown>): void;