@proletariat/cli 0.3.94 → 0.3.95

package/dist/lib/session/watcher.d.ts

@@ -0,0 +1,79 @@
+/**
+ * Session Watcher
+ *
+ * Host-side cron/poll loop that monitors agent heartbeats and takes action
+ * on stale executions. This is the safety net for detecting hung agents
+ * that can't self-report (OOM kills, zombie processes, container crashes).
+ *
+ * Architecture:
+ * 1. Poll: Check all running executions for heartbeat timeout
+ * 2. Update: Record heartbeats for alive agents (tmux pane inspection)
+ * 3. Detect: Find stale executions that exceeded the timeout
+ * 4. Act: Mark failed, kill containers, fire events
+ */
+import type Database from 'better-sqlite3';
+import type { AgentWork } from '../execution/types.js';
+import { type StaleExecution } from './heartbeat.js';
+export interface WatcherOptions {
+    /** Database connection */
+    db: Database.Database;
+    /** Poll interval in minutes (default: 5) */
+    intervalMinutes?: number;
+    /** Heartbeat timeout in minutes (default: 15) */
+    timeoutMinutes?: number;
+    /** Whether to kill containers on timeout (default: true) */
+    autoKill?: boolean;
+    /** Logger function */
+    log?: (msg: string) => void;
+    /** Callback when a stale execution is detected and handled */
+    onStaleDetected?: (execution: AgentWork, reason: string) => void | Promise<void>;
+}
+export interface WatchCycleResult {
+    /** Number of active executions checked */
+    checked: number;
+    /** Number of heartbeats updated (agents confirmed alive) */
+    heartbeatsUpdated: number;
+    /** Stale executions detected and acted upon */
+    staleExecutions: StaleExecution[];
+    /** Number of containers killed */
+    containersKilled: number;
+}
+export declare class SessionWatcher {
+    private storage;
+    private db;
+    private intervalMinutes;
+    private timeoutMinutes;
+    private autoKill;
+    private log;
+    private onStaleDetected?;
+    private timer;
+    private running;
+    constructor(options: WatcherOptions);
+    /**
+     * Run a single watch cycle.
+     * Can be called directly for one-shot checking, or used by the polling loop.
+     */
+    runCycle(): Promise<WatchCycleResult>;
+    /**
+     * Start the polling loop.
+     * Runs an initial cycle immediately, then polls at the configured interval.
+     */
+    start(): void;
+    /**
+     * Stop the polling loop.
+     */
+    stop(): void;
+    /**
+     * Check if the watcher is currently running.
+     */
+    isRunning(): boolean;
+    /**
+     * Get current configuration.
+     */
+    getConfig(): {
+        intervalMinutes: number;
+        timeoutMinutes: number;
+        autoKill: boolean;
+    };
+    private runCycleWithErrorHandling;
+}

package/dist/lib/session/watcher.js

@@ -0,0 +1,142 @@
+/**
+ * Session Watcher
+ *
+ * Host-side cron/poll loop that monitors agent heartbeats and takes action
+ * on stale executions. This is the safety net for detecting hung agents
+ * that can't self-report (OOM kills, zombie processes, container crashes).
+ *
+ * Architecture:
+ * 1. Poll: Check all running executions for heartbeat timeout
+ * 2. Update: Record heartbeats for alive agents (tmux pane inspection)
+ * 3. Detect: Find stale executions that exceeded the timeout
+ * 4. Act: Mark failed, kill containers, fire events
+ */
+import { ExecutionStorage } from '../execution/storage.js';
+import { recordAllHeartbeats, detectStaleExecutions, killContainer, } from './heartbeat.js';
+// =============================================================================
+// Session Watcher
+// =============================================================================
+export class SessionWatcher {
+    storage;
+    db;
+    intervalMinutes;
+    timeoutMinutes;
+    autoKill;
+    log;
+    onStaleDetected;
+    timer = null;
+    running = false;
+    constructor(options) {
+        this.db = options.db;
+        this.storage = new ExecutionStorage(options.db);
+        this.intervalMinutes = options.intervalMinutes ?? 5;
+        this.timeoutMinutes = options.timeoutMinutes ?? 15;
+        this.autoKill = options.autoKill ?? true;
+        this.log = options.log ?? (() => { });
+        this.onStaleDetected = options.onStaleDetected;
+    }
+    /**
+     * Run a single watch cycle.
+     * Can be called directly for one-shot checking, or used by the polling loop.
+     */
+    async runCycle() {
+        const result = {
+            checked: 0,
+            heartbeatsUpdated: 0,
+            staleExecutions: [],
+            containersKilled: 0,
+        };
+        // Phase 1: Record heartbeats for all active executions
+        // This is the "push" side — we check tmux panes and update heartbeats
+        const heartbeats = recordAllHeartbeats(this.storage);
+        result.heartbeatsUpdated = heartbeats.size;
+        result.checked = heartbeats.size;
+        // Phase 2: Detect stale executions that exceeded timeout
+        // This is the "pull" side — safety net for completely dead agents
+        const staleExecutions = detectStaleExecutions(this.storage, this.timeoutMinutes);
+        result.staleExecutions = staleExecutions;
+        // Phase 3: Act on stale executions
+        for (const stale of staleExecutions) {
+            const exec = stale.execution;
+            this.log(`[watcher] Stale agent detected: ${exec.agentName} (${exec.ticketId}) — ${stale.reason}`);
+            // Mark execution as failed due to heartbeat timeout
+            this.storage.markHeartbeatTimeout(exec.id);
+            // Kill container if configured and applicable
+            if (this.autoKill && exec.containerId) {
+                this.log(`[watcher] Killing container ${exec.containerId} for ${exec.agentName}`);
+                const killed = killContainer(exec.containerId);
+                if (killed) {
+                    result.containersKilled++;
+                    this.log(`[watcher] Container ${exec.containerId} killed`);
+                }
+                else {
+                    this.log(`[watcher] Failed to kill container ${exec.containerId}`);
+                }
+            }
+            // Fire callback
+            if (this.onStaleDetected) {
+                await this.onStaleDetected(exec, stale.reason);
+            }
+        }
+        return result;
+    }
+    /**
+     * Start the polling loop.
+     * Runs an initial cycle immediately, then polls at the configured interval.
+     */
+    start() {
+        if (this.running)
+            return;
+        this.running = true;
+        this.log(`[watcher] Starting session watcher (interval: ${this.intervalMinutes}m, timeout: ${this.timeoutMinutes}m, auto-kill: ${this.autoKill})`);
+        // Run initial cycle
+        void this.runCycleWithErrorHandling();
+        // Start polling
+        const intervalMs = this.intervalMinutes * 60 * 1000;
+        this.timer = setInterval(() => {
+            void this.runCycleWithErrorHandling();
+        }, intervalMs);
+    }
+    /**
+     * Stop the polling loop.
+     */
+    stop() {
+        if (!this.running)
+            return;
+        this.running = false;
+        if (this.timer) {
+            clearInterval(this.timer);
+            this.timer = null;
+        }
+        this.log('[watcher] Session watcher stopped');
+    }
+    /**
+     * Check if the watcher is currently running.
+     */
+    isRunning() {
+        return this.running;
+    }
+    /**
+     * Get current configuration.
+     */
+    getConfig() {
+        return {
+            intervalMinutes: this.intervalMinutes,
+            timeoutMinutes: this.timeoutMinutes,
+            autoKill: this.autoKill,
+        };
+    }
+    async runCycleWithErrorHandling() {
+        try {
+            const result = await this.runCycle();
+            if (result.staleExecutions.length > 0) {
+                this.log(`[watcher] Cycle complete: ${result.checked} checked, ${result.heartbeatsUpdated} heartbeats, ` +
+                    `${result.staleExecutions.length} stale, ${result.containersKilled} killed`);
+            }
+        }
+        catch (error) {
+            this.log(`[watcher] Error during watch cycle: ${error instanceof Error ? error.message : error}`);
+        }
+    }
+}
+//# sourceMappingURL=watcher.js.map

package/dist/lib/session/watcher.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"watcher.js","sourceRoot":"","sources":["../../../src/lib/session/watcher.ts"],"names":[],"mappings":"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"}

package/dist/lib/shipping/auto-merge.d.ts

@@ -0,0 +1,57 @@
+/**
+ * Auto-Merge Orchestration
+ *
+ * Implements the --when-green watch loop that polls CI status and
+ * automatically merges a PR once all checks pass. Handles the full
+ * rebase+CI cycle automatically.
+ *
+ * Flow:
+ * 1. Optionally enable native auto-merge as a safety net
+ * 2. Poll CI status at regular intervals
+ * 3. If CI is green and branch is up to date, merge
+ * 4. If branch has conflicts, rebase and wait for CI to rerun
+ * 5. If CI fails, exit with error
+ * 6. If timeout, exit with error
+ */
+import { getPRChecks, mergePR } from '../pr/index.js';
+import type { AutoMergeProvider } from './types.js';
+import type { WhenGreenOptions, WhenGreenResult } from './types.js';
+declare function sleep(ms: number): Promise<void>;
+/**
+ * Check if a PR has merge conflicts with its base branch.
+ */
+declare function checkMergeConflicts(prNumber: number, cwd?: string): boolean;
+/**
+ * Check if a PR has already been merged.
+ */
+declare function isPRMerged(prNumber: number, cwd?: string): boolean;
+/**
+ * Rebase a PR branch onto its base branch and force-push.
+ */
+declare function rebaseOntoBase(headBranch: string, baseBranch: string, cwd?: string): {
+    success: boolean;
+    error?: string;
+};
+export interface WatchAndShipDeps {
+    getPRChecks: typeof getPRChecks;
+    mergePR: typeof mergePR;
+    checkMergeConflicts: typeof checkMergeConflicts;
+    isPRMerged: typeof isPRMerged;
+    rebaseOntoBase: typeof rebaseOntoBase;
+    sleep: typeof sleep;
+}
+/**
+ * Watch a PR and ship it when CI turns green.
+ *
+ * This is the core implementation of `--when-green`. It enters a poll loop
+ * that checks CI status and handles the rebase+merge cycle automatically.
+ *
+ * If a native auto-merge provider is given, it will be enabled as a safety net
+ * so that even if this process dies, the PR will still auto-merge when ready.
+ *
+ * @param options - Watch loop configuration
+ * @param autoMergeProvider - Optional provider for native auto-merge
+ * @param deps - Injectable dependencies for testing
+ */
+export declare function watchAndShip(options: WhenGreenOptions, autoMergeProvider?: AutoMergeProvider | null, deps?: WatchAndShipDeps): Promise<WhenGreenResult>;
+export {};

package/dist/lib/shipping/auto-merge.js

@@ -0,0 +1,311 @@
+/**
+ * Auto-Merge Orchestration
+ *
+ * Implements the --when-green watch loop that polls CI status and
+ * automatically merges a PR once all checks pass. Handles the full
+ * rebase+CI cycle automatically.
+ *
+ * Flow:
+ * 1. Optionally enable native auto-merge as a safety net
+ * 2. Poll CI status at regular intervals
+ * 3. If CI is green and branch is up to date, merge
+ * 4. If branch has conflicts, rebase and wait for CI to rerun
+ * 5. If CI fails, exit with error
+ * 6. If timeout, exit with error
+ */
+import { getPRChecks, mergePR, } from '../pr/index.js';
+import { execSync } from 'node:child_process';
+const DEFAULT_TIMEOUT_MS = 60 * 60 * 1000; // 60 minutes
+const DEFAULT_POLL_INTERVAL_MS = 30 * 1000; // 30 seconds
+function sleep(ms) {
+    return new Promise(resolve => setTimeout(resolve, ms));
+}
+/**
+ * Check if a PR has merge conflicts with its base branch.
+ */
+function checkMergeConflicts(prNumber, cwd) {
+    try {
+        const result = execSync(`gh pr view ${prNumber} --json mergeable -q .mergeable`, {
+            cwd,
+            encoding: 'utf-8',
+            stdio: ['pipe', 'pipe', 'pipe'],
+        }).trim();
+        return result === 'CONFLICTING';
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * Check if a PR has already been merged.
+ */
+function isPRMerged(prNumber, cwd) {
+    try {
+        const result = execSync(`gh pr view ${prNumber} --json state -q .state`, {
+            cwd,
+            encoding: 'utf-8',
+            stdio: ['pipe', 'pipe', 'pipe'],
+        }).trim();
+        return result === 'MERGED';
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * Rebase a PR branch onto its base branch and force-push.
+ */
+function rebaseOntoBase(headBranch, baseBranch, cwd) {
+    try {
+        execSync('git fetch origin', {
+            cwd,
+            stdio: ['pipe', 'pipe', 'pipe'],
+        });
+        execSync(`git checkout ${headBranch}`, {
+            cwd,
+            stdio: ['pipe', 'pipe', 'pipe'],
+        });
+        execSync(`git rebase origin/${baseBranch}`, {
+            cwd,
+            stdio: ['pipe', 'pipe', 'pipe'],
+        });
+        execSync(`git push --force-with-lease origin ${headBranch}`, {
+            cwd,
+            stdio: ['pipe', 'pipe', 'pipe'],
+        });
+        return { success: true };
+    }
+    catch (error) {
+        try {
+            execSync('git rebase --abort', {
+                cwd,
+                stdio: ['pipe', 'pipe', 'pipe'],
+            });
+        }
+        catch {
+            // Ignore abort failures
+        }
+        return {
+            success: false,
+            error: error instanceof Error ? error.message : 'Unknown rebase error',
+        };
+    }
+}
+const defaultDeps = {
+    getPRChecks,
+    mergePR,
+    checkMergeConflicts,
+    isPRMerged,
+    rebaseOntoBase,
+    sleep,
+};
+/**
+ * Watch a PR and ship it when CI turns green.
+ *
+ * This is the core implementation of `--when-green`. It enters a poll loop
+ * that checks CI status and handles the rebase+merge cycle automatically.
+ *
+ * If a native auto-merge provider is given, it will be enabled as a safety net
+ * so that even if this process dies, the PR will still auto-merge when ready.
+ *
+ * @param options - Watch loop configuration
+ * @param autoMergeProvider - Optional provider for native auto-merge
+ * @param deps - Injectable dependencies for testing
+ */
+export async function watchAndShip(options, autoMergeProvider, deps = defaultDeps) {
+    const { prNumber, method, deleteBranch, admin, noRebase, cwd, headBranch, baseBranch, onProgress, onWarning, timeoutMs = DEFAULT_TIMEOUT_MS, pollIntervalMs = DEFAULT_POLL_INTERVAL_MS, } = options;
+    let autoMergeEnabled = false;
+    let pollCycles = 0;
+    let rebasePerformed = false;
+    // Step 1: Try to enable native auto-merge as a safety net
+    if (autoMergeProvider) {
+        const autoResult = autoMergeProvider.enableAutoMerge(prNumber, method, cwd);
+        if (autoResult.success) {
+            autoMergeEnabled = true;
+            if (autoResult.alreadyEnabled) {
+                onProgress?.('Auto-merge already enabled');
+            }
+            else {
+                onProgress?.('Enabled native auto-merge as safety net');
+            }
+        }
+        else {
+            onWarning?.(`Could not enable native auto-merge: ${autoResult.error}. Will poll manually.`);
+        }
+    }
+    // Step 2: Enter poll loop
+    const startTime = Date.now();
+    const maxRebasesPerCycle = 3; // Prevent infinite rebase loops
+    let rebaseCount = 0;
+    while (Date.now() - startTime < timeoutMs) {
+        pollCycles++;
+        // Check if PR was already merged (by auto-merge or someone else)
+        if (deps.isPRMerged(prNumber, cwd)) {
+            onProgress?.('PR was merged (auto-merge or external)');
+            return {
+                merged: true,
+                autoMergeEnabled,
+                pollCycles,
+                rebasePerformed,
+            };
+        }
+        // Check CI status
+        const checks = deps.getPRChecks(prNumber, cwd);
+        // No checks configured — can merge immediately
+        if (checks.length === 0) {
+            onProgress?.('No CI checks configured — merging immediately');
+            const mergeResult = deps.mergePR(prNumber, { method, deleteBranch, admin, cwd });
+            if (mergeResult.success) {
+                return {
+                    merged: true,
+                    autoMergeEnabled,
+                    pollCycles,
+                    rebasePerformed,
+                };
+            }
+            return {
+                merged: false,
+                autoMergeEnabled,
+                pollCycles,
+                rebasePerformed,
+                error: `Merge failed: ${mergeResult.error}`,
+                errorCode: 'MERGE_FAILED',
+            };
+        }
+        const failed = checks.filter(c => c.conclusion === 'FAILURE');
+        const pending = checks.filter(c => !c.conclusion || c.status === 'IN_PROGRESS' || c.status === 'QUEUED');
+        const passed = checks.filter(c => c.conclusion === 'SUCCESS' || c.conclusion === 'SKIPPED');
+        // CI has failures — exit
+        if (pending.length === 0 && failed.length > 0) {
+            const failedNames = failed.map(c => c.name).join(', ');
+            // Disable auto-merge if we enabled it
+            if (autoMergeEnabled && autoMergeProvider) {
+                autoMergeProvider.disableAutoMerge(prNumber, cwd);
+            }
+            return {
+                merged: false,
+                autoMergeEnabled,
+                pollCycles,
+                rebasePerformed,
+                error: `CI checks failed: ${failedNames}. Fix the failures before shipping.`,
+                errorCode: 'CI_FAILED',
+            };
+        }
+        // CI still pending — wait
+        if (pending.length > 0) {
+            if (pollCycles === 1) {
+                onProgress?.(`Waiting for CI (${pending.length} pending, ${passed.length} passed)...`);
+            }
+            else if (pollCycles % 4 === 0) {
+                // Log progress every ~2 minutes
+                const elapsed = Math.round((Date.now() - startTime) / 60_000);
+                onProgress?.(`Still waiting for CI — ${pending.length} pending (${elapsed}m elapsed)`);
+            }
+            await deps.sleep(pollIntervalMs);
+            continue;
+        }
+        // All CI checks passed! Check for merge conflicts.
+        onProgress?.(`CI green (${passed.length} checks passed)`);
+        const hasConflicts = deps.checkMergeConflicts(prNumber, cwd);
+        if (hasConflicts) {
+            if (noRebase) {
+                if (autoMergeEnabled && autoMergeProvider) {
+                    autoMergeProvider.disableAutoMerge(prNumber, cwd);
+                }
+                return {
+                    merged: false,
+                    autoMergeEnabled,
+                    pollCycles,
+                    rebasePerformed,
+                    error: `PR #${prNumber} has merge conflicts. Resolve them manually or run without --no-rebase.`,
+                    errorCode: 'MERGE_CONFLICTS',
+                };
+            }
+            if (rebaseCount >= maxRebasesPerCycle) {
+                if (autoMergeEnabled && autoMergeProvider) {
+                    autoMergeProvider.disableAutoMerge(prNumber, cwd);
+                }
+                return {
+                    merged: false,
+                    autoMergeEnabled,
+                    pollCycles,
+                    rebasePerformed,
+                    error: `Rebase limit reached (${maxRebasesPerCycle}). Base branch is changing too quickly.`,
+                    errorCode: 'REBASE_LIMIT',
+                };
+            }
+            onProgress?.('Merge conflicts detected, rebasing...');
+            const rebaseResult = deps.rebaseOntoBase(headBranch, baseBranch, cwd);
+            if (!rebaseResult.success) {
+                if (autoMergeEnabled && autoMergeProvider) {
+                    autoMergeProvider.disableAutoMerge(prNumber, cwd);
+                }
+                return {
+                    merged: false,
+                    autoMergeEnabled,
+                    pollCycles,
+                    rebasePerformed,
+                    error: `Rebase failed: ${rebaseResult.error}. Resolve conflicts manually.`,
+                    errorCode: 'REBASE_FAILED',
+                };
+            }
+            rebasePerformed = true;
+            rebaseCount++;
+            onProgress?.('Rebased and force-pushed. Waiting for CI to rerun...');
+            await deps.sleep(pollIntervalMs);
+            continue;
+        }
+        // CI green + no conflicts — merge!
+        // If auto-merge is enabled, it may have already merged. Check first.
+        if (deps.isPRMerged(prNumber, cwd)) {
+            onProgress?.('PR was auto-merged');
+            return {
+                merged: true,
+                autoMergeEnabled,
+                pollCycles,
+                rebasePerformed,
+            };
+        }
+        onProgress?.(`Merging PR #${prNumber} (${method})...`);
+        const mergeResult = deps.mergePR(prNumber, { method, deleteBranch, admin, cwd });
+        if (mergeResult.success) {
+            return {
+                merged: true,
+                autoMergeEnabled,
+                pollCycles,
+                rebasePerformed,
+            };
+        }
+        // Merge failed — could be a race condition. Check if already merged.
+        if (deps.isPRMerged(prNumber, cwd)) {
+            onProgress?.('PR was merged by another process');
+            return {
+                merged: true,
+                autoMergeEnabled,
+                pollCycles,
+                rebasePerformed,
+            };
+        }
+        return {
+            merged: false,
+            autoMergeEnabled,
+            pollCycles,
+            rebasePerformed,
+            error: `Merge failed: ${mergeResult.error}`,
+            errorCode: 'MERGE_FAILED',
+        };
+    }
+    // Timeout — auto-merge may still complete later if enabled
+    const timeoutMinutes = Math.round(timeoutMs / 60_000);
+    return {
+        merged: false,
+        autoMergeEnabled,
+        pollCycles,
+        rebasePerformed,
+        error: autoMergeEnabled
+            ? `Timed out after ${timeoutMinutes} minutes. Native auto-merge is still enabled — PR will merge automatically when ready.`
+            : `Timed out after ${timeoutMinutes} minutes waiting for CI. Check manually.`,
+        errorCode: 'TIMEOUT',
+    };
+}
+//# sourceMappingURL=auto-merge.js.map

package/dist/lib/shipping/auto-merge.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"auto-merge.js","sourceRoot":"","sources":["../../../src/lib/shipping/auto-merge.ts"],"names":[],"mappings":"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"}

package/dist/lib/shipping/github.d.ts

@@ -0,0 +1,68 @@
+/**
+ * GitHub Git Provider & Auto-Merge Provider
+ *
+ * Implements the GitProvider interface for sibling rebase (PRLT-1143)
+ * and the AutoMergeProvider interface for auto-merge (PRLT-1144),
+ * both using the GitHub API via `gh` CLI.
+ */
+import type { PRInfo, MergeableState } from '../pr/index.js';
+import type { GitProvider, UpdateBranchResult, AutoMergeProvider, AutoMergeResult } from './types.js';
+/**
+ * GitHub implementation of GitProvider.
+ *
+ * Uses the `gh api` CLI for API-based operations where possible,
+ * falling back to local git operations when the API is unavailable.
+ */
+export declare class GitHubProvider implements GitProvider {
+    readonly name: "github";
+    listOpenPRs(cwd?: string): PRInfo[];
+    getMergeableState(prNumber: number, cwd?: string): MergeableState;
+    /**
+     * Update a PR branch using GitHub's update-branch API.
+     *
+     * Uses: PUT /repos/{owner}/{repo}/pulls/{pull_number}/update-branch
+     *
+     * This merges the base branch into the PR branch server-side,
+     * without requiring a local checkout or force-push.
+     *
+     * Falls back to local git rebase if the API call fails with a
+     * non-conflict error (e.g., permissions, network issues).
+     */
+    updatePRBranch(prNumber: number, cwd?: string): UpdateBranchResult;
+    /**
+     * Add a label to a GitHub PR.
+     */
+    addLabel(prNumber: number, label: string, cwd?: string): boolean;
+    /**
+     * Add a comment to a GitHub PR.
+     */
+    addComment(prNumber: number, body: string, cwd?: string): boolean;
+}
+/**
+ * GitHub implementation of AutoMergeProvider.
+ *
+ * Uses GitHub's native auto-merge feature when available, which
+ * automatically merges a PR once all required status checks pass.
+ */
+export declare class GitHubAutoMergeProvider implements AutoMergeProvider {
+    readonly name: "github";
+    /**
+     * Enable GitHub's native auto-merge on a PR.
+     *
+     * Uses `gh pr merge --auto` which sets the PR to auto-merge once
+     * all required status checks pass and branch protections are satisfied.
+     *
+     * Requires: auto-merge must be enabled in the repository settings.
+     */
+    enableAutoMerge(prNumber: number, method: 'merge' | 'squash' | 'rebase', cwd?: string): AutoMergeResult;
+    /**
+     * Disable GitHub's native auto-merge on a PR.
+     *
+     * Uses `gh pr merge --disable-auto` to cancel auto-merge.
+     */
+    disableAutoMerge(prNumber: number, cwd?: string): AutoMergeResult;
+    /**
+     * Check if a PR has been merged.
+     */
+    isPRMerged(prNumber: number, cwd?: string): boolean;
+}