@proletariat/cli 0.3.94 → 0.3.96

package/dist/lib/shipping/github.js

@@ -0,0 +1,217 @@
+/**
+ * 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 { execSync, spawnSync } from 'node:child_process';
+import { listOpenPRs, getMergeableState, getGitHubRepo, rebasePRBranch, getPRByNumber, } from '../pr/index.js';
+// =============================================================================
+// GitHubProvider — Sibling Rebase (PRLT-1143)
+// =============================================================================
+/**
+ * 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 class GitHubProvider {
+    name = 'github';
+    listOpenPRs(cwd) {
+        return listOpenPRs(cwd);
+    }
+    getMergeableState(prNumber, cwd) {
+        return getMergeableState(prNumber, cwd);
+    }
+    /**
+     * 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, cwd) {
+        const repo = getGitHubRepo(cwd);
+        if (!repo) {
+            return {
+                success: false,
+                prNumber,
+                headBranch: '',
+                error: 'Could not determine GitHub repository from git remote',
+            };
+        }
+        // Get PR info for the head branch name
+        let headBranch = '';
+        let baseBranch = '';
+        try {
+            const prJson = execSync(`gh pr view ${prNumber} --json headRefName,baseRefName`, { cwd, encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] });
+            const prData = JSON.parse(prJson);
+            headBranch = prData.headRefName;
+            baseBranch = prData.baseRefName;
+        }
+        catch {
+            return {
+                success: false,
+                prNumber,
+                headBranch: '',
+                error: `Could not fetch PR #${prNumber} details`,
+            };
+        }
+        // Try API-based update-branch first
+        try {
+            execSync(`gh api repos/${repo}/pulls/${prNumber}/update-branch -X PUT -f expected_head_sha="$(gh pr view ${prNumber} --json headRefOid -q .headRefOid)"`, { cwd, encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] });
+            return {
+                success: true,
+                prNumber,
+                headBranch,
+            };
+        }
+        catch (apiError) {
+            const errorMsg = apiError instanceof Error ? apiError.message : String(apiError);
+            // Check if the error indicates merge conflicts
+            if (errorMsg.includes('merge conflict') || errorMsg.includes('Merge conflict')) {
+                return {
+                    success: false,
+                    prNumber,
+                    headBranch,
+                    error: 'Merge conflicts detected — manual resolution required',
+                    hasConflicts: true,
+                };
+            }
+            // API failed for non-conflict reason — fall back to local git rebase
+            const fallbackResult = rebasePRBranch(headBranch, baseBranch, cwd);
+            if (fallbackResult.success) {
+                return {
+                    success: true,
+                    prNumber,
+                    headBranch,
+                };
+            }
+            // Check if fallback failure was due to conflicts
+            const fallbackError = fallbackResult.error || '';
+            const isConflict = fallbackError.includes('CONFLICT') ||
+                fallbackError.includes('conflict') ||
+                fallbackError.includes('could not apply');
+            return {
+                success: false,
+                prNumber,
+                headBranch,
+                error: fallbackResult.error || 'Rebase failed',
+                hasConflicts: isConflict,
+            };
+        }
+    }
+    /**
+     * Add a label to a GitHub PR.
+     */
+    addLabel(prNumber, label, cwd) {
+        try {
+            execSync(`gh pr edit ${prNumber} --add-label "${label}"`, {
+                cwd,
+                stdio: ['pipe', 'pipe', 'pipe'],
+            });
+            return true;
+        }
+        catch {
+            return false;
+        }
+    }
+    /**
+     * Add a comment to a GitHub PR.
+     */
+    addComment(prNumber, body, cwd) {
+        try {
+            execSync(`gh pr comment ${prNumber} --body "${body.replace(/"/g, '\\"')}"`, {
+                cwd,
+                stdio: ['pipe', 'pipe', 'pipe'],
+            });
+            return true;
+        }
+        catch {
+            return false;
+        }
+    }
+}
+// =============================================================================
+// GitHubAutoMergeProvider — Auto-Merge (PRLT-1144)
+// =============================================================================
+/**
+ * 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 class GitHubAutoMergeProvider {
+    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, method, cwd) {
+        const args = ['pr', 'merge', String(prNumber), '--auto', `--${method}`];
+        const result = spawnSync('gh', args, {
+            cwd,
+            encoding: 'utf-8',
+            stdio: ['pipe', 'pipe', 'pipe'],
+        });
+        if (result.status !== 0) {
+            const stderr = result.stderr?.trim() || '';
+            // Check if auto-merge is already enabled
+            if (stderr.includes('already set to auto-merge') || stderr.includes('auto-merge is already enabled')) {
+                return {
+                    success: true,
+                    prNumber,
+                    alreadyEnabled: true,
+                };
+            }
+            return {
+                success: false,
+                prNumber,
+                error: stderr || 'Failed to enable auto-merge',
+            };
+        }
+        return { success: true, prNumber };
+    }
+    /**
+     * Disable GitHub's native auto-merge on a PR.
+     *
+     * Uses `gh pr merge --disable-auto` to cancel auto-merge.
+     */
+    disableAutoMerge(prNumber, cwd) {
+        const result = spawnSync('gh', ['pr', 'merge', String(prNumber), '--disable-auto'], {
+            cwd,
+            encoding: 'utf-8',
+            stdio: ['pipe', 'pipe', 'pipe'],
+        });
+        if (result.status !== 0) {
+            const stderr = result.stderr?.trim() || '';
+            // Not an error if auto-merge wasn't enabled
+            if (stderr.includes('not set to auto-merge') || stderr.includes('auto-merge is not enabled')) {
+                return { success: true, prNumber };
+            }
+            return {
+                success: false,
+                prNumber,
+                error: stderr || 'Failed to disable auto-merge',
+            };
+        }
+        return { success: true, prNumber };
+    }
+    /**
+     * Check if a PR has been merged.
+     */
+    isPRMerged(prNumber, cwd) {
+        const prInfo = getPRByNumber(prNumber, cwd);
+        return prInfo?.state === 'MERGED';
+    }
+}
+//# sourceMappingURL=github.js.map

package/dist/lib/shipping/github.js.map

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

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

@@ -0,0 +1,13 @@
+/**
+ * Shipping Module — Public API
+ *
+ * Provider-agnostic shipping operations: sibling PR rebase,
+ * conflict labeling, git provider abstraction, and auto-merge orchestration.
+ */
+export type { GitProvider, GitProviderName, UpdateBranchResult, SiblingRebaseResult, RebaseSiblingOptions, } from './types.js';
+export { GitHubProvider } from './github.js';
+export { rebaseSiblingPRs, detectGitProvider } from './rebase.js';
+export type { AutoMergeResult, AutoMergeProvider, WhenGreenOptions, WhenGreenResult, } from './types.js';
+export { GitHubAutoMergeProvider } from './github.js';
+export { watchAndShip } from './auto-merge.js';
+export type { WatchAndShipDeps } from './auto-merge.js';

package/dist/lib/shipping/index.js

@@ -0,0 +1,11 @@
+/**
+ * Shipping Module — Public API
+ *
+ * Provider-agnostic shipping operations: sibling PR rebase,
+ * conflict labeling, git provider abstraction, and auto-merge orchestration.
+ */
+export { GitHubProvider } from './github.js';
+export { rebaseSiblingPRs, detectGitProvider } from './rebase.js';
+export { GitHubAutoMergeProvider } from './github.js';
+export { watchAndShip } from './auto-merge.js';
+//# sourceMappingURL=index.js.map

package/dist/lib/shipping/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/shipping/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAWH,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAUjE,OAAO,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAA;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA"}

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

@@ -0,0 +1,35 @@
+/**
+ * Sibling PR Rebase — Provider-Agnostic
+ *
+ * After a PR merges, the base branch advances. Other open PRs may become
+ * stale or conflicting. This module rebases sibling PRs using the git
+ * provider's API (e.g., GitHub's update-branch endpoint), falling back
+ * to local git rebase when the API is unavailable.
+ *
+ * On conflict, optionally labels the PR and adds a comment so the
+ * author knows manual resolution is needed.
+ */
+import type { GitProvider, RebaseSiblingOptions, SiblingRebaseResult } from './types.js';
+/**
+ * Detect the git provider for the current repository.
+ *
+ * Currently supports GitHub. Returns null if the provider cannot be detected.
+ * GitLab support can be added here by checking the remote URL.
+ */
+export declare function detectGitProvider(cwd?: string): GitProvider | null;
+/**
+ * Rebase all open sibling PRs after a merge.
+ *
+ * This is the main entry point for post-merge sibling rebase.
+ * It uses the git provider's API to update branches, which is cleaner
+ * than local git rebase + force-push because:
+ * - No local checkout needed
+ * - Works in CI/CD without full git history
+ * - Uses the provider's merge infrastructure
+ * - Avoids force-push permission issues
+ *
+ * @param options - Configuration for the rebase operation
+ * @param provider - Git provider to use (auto-detected if not provided)
+ * @returns Results of the rebase operation for each PR
+ */
+export declare function rebaseSiblingPRs(options: RebaseSiblingOptions, provider?: GitProvider | null): SiblingRebaseResult;

package/dist/lib/shipping/rebase.js

@@ -0,0 +1,107 @@
+/**
+ * Sibling PR Rebase — Provider-Agnostic
+ *
+ * After a PR merges, the base branch advances. Other open PRs may become
+ * stale or conflicting. This module rebases sibling PRs using the git
+ * provider's API (e.g., GitHub's update-branch endpoint), falling back
+ * to local git rebase when the API is unavailable.
+ *
+ * On conflict, optionally labels the PR and adds a comment so the
+ * author knows manual resolution is needed.
+ */
+import { GitHubProvider } from './github.js';
+const CONFLICT_LABEL = 'rebase-conflict';
+const CONFLICT_COMMENT = 'This PR has merge conflicts with the base branch after a recent merge. ' +
+    'Please rebase or merge the base branch to resolve conflicts.';
+/**
+ * Detect the git provider for the current repository.
+ *
+ * Currently supports GitHub. Returns null if the provider cannot be detected.
+ * GitLab support can be added here by checking the remote URL.
+ */
+export function detectGitProvider(cwd) {
+    // For now, default to GitHub since it's the only implemented provider.
+    // When GitLab/Bitbucket providers are added, detect from the remote URL:
+    //   git remote get-url origin → github.com = GitHub, gitlab.com = GitLab, etc.
+    return new GitHubProvider();
+}
+/**
+ * Rebase all open sibling PRs after a merge.
+ *
+ * This is the main entry point for post-merge sibling rebase.
+ * It uses the git provider's API to update branches, which is cleaner
+ * than local git rebase + force-push because:
+ * - No local checkout needed
+ * - Works in CI/CD without full git history
+ * - Uses the provider's merge infrastructure
+ * - Avoids force-push permission issues
+ *
+ * @param options - Configuration for the rebase operation
+ * @param provider - Git provider to use (auto-detected if not provided)
+ * @returns Results of the rebase operation for each PR
+ */
+export function rebaseSiblingPRs(options, provider) {
+    const gitProvider = provider ?? detectGitProvider(options.cwd);
+    if (!gitProvider) {
+        return {
+            succeeded: [],
+            failed: [],
+            skipped: [],
+            totalChecked: 0,
+        };
+    }
+    const { excludePRNumber, cwd, onProgress, labelConflicts = true, commentOnConflicts = true, rebaseAll = false, } = options;
+    const openPRs = gitProvider.listOpenPRs(cwd);
+    const result = {
+        succeeded: [],
+        failed: [],
+        skipped: [],
+        totalChecked: 0,
+    };
+    for (const pr of openPRs) {
+        // Skip the PR that was just merged
+        if (pr.number === excludePRNumber)
+            continue;
+        result.totalChecked++;
+        // Check mergeable state unless rebaseAll is set
+        if (!rebaseAll) {
+            const state = gitProvider.getMergeableState(pr.number, cwd);
+            if (state === 'MERGEABLE') {
+                result.skipped.push({
+                    success: true,
+                    prNumber: pr.number,
+                    headBranch: pr.headBranch,
+                });
+                continue;
+            }
+            // Skip UNKNOWN state PRs — we can't determine if they need rebase
+            if (state === 'UNKNOWN') {
+                result.skipped.push({
+                    success: true,
+                    prNumber: pr.number,
+                    headBranch: pr.headBranch,
+                });
+                continue;
+            }
+        }
+        onProgress?.(`Updating PR #${pr.number} (${pr.headBranch})...`);
+        const updateResult = gitProvider.updatePRBranch(pr.number, cwd);
+        if (updateResult.success) {
+            result.succeeded.push(updateResult);
+        }
+        else {
+            result.failed.push(updateResult);
+            // Label and comment on conflict failures
+            if (updateResult.hasConflicts) {
+                if (labelConflicts) {
+                    gitProvider.addLabel(pr.number, CONFLICT_LABEL, cwd);
+                }
+                if (commentOnConflicts) {
+                    gitProvider.addComment(pr.number, CONFLICT_COMMENT, cwd);
+                }
+            }
+        }
+    }
+    return result;
+}
+//# sourceMappingURL=rebase.js.map

package/dist/lib/shipping/rebase.js.map

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

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

@@ -0,0 +1,181 @@
+/**
+ * Shipping Types — Git Provider Interface & Auto-Merge
+ *
+ * Provider-agnostic interface for git hosting operations needed by the
+ * shipping/rebase pipeline and auto-merge orchestration. Implementations
+ * exist for GitHub (via gh CLI) and can be added for GitLab, Bitbucket, etc.
+ */
+import type { PRInfo, MergeableState } from '../pr/index.js';
+/**
+ * Supported git hosting provider names.
+ */
+export type GitProviderName = 'github' | 'gitlab';
+/**
+ * Result of attempting to update (rebase) a PR branch via the provider API.
+ */
+export interface UpdateBranchResult {
+    success: boolean;
+    /** PR number that was updated */
+    prNumber: number;
+    /** Head branch name */
+    headBranch: string;
+    /** Error message if the update failed */
+    error?: string;
+    /** Whether the failure was due to merge conflicts */
+    hasConflicts?: boolean;
+}
+/**
+ * Result of the full sibling rebase operation across all PRs.
+ */
+export interface SiblingRebaseResult {
+    /** PRs that were successfully rebased */
+    succeeded: UpdateBranchResult[];
+    /** PRs that failed to rebase (conflicts or other errors) */
+    failed: UpdateBranchResult[];
+    /** PRs that were skipped (already up to date) */
+    skipped: UpdateBranchResult[];
+    /** Total open PRs checked */
+    totalChecked: number;
+}
+/**
+ * Options for the rebaseSiblingPRs operation.
+ */
+export interface RebaseSiblingOptions {
+    /** PR number to exclude (the one that was just merged) */
+    excludePRNumber: number | null;
+    /** Working directory for git operations */
+    cwd?: string;
+    /** Callback for progress messages */
+    onProgress?: (msg: string) => void;
+    /** Whether to add a 'rebase-conflict' label on conflict failures */
+    labelConflicts?: boolean;
+    /** Whether to add a comment on conflict failures */
+    commentOnConflicts?: boolean;
+    /** Whether to attempt all PRs or just conflicting ones */
+    rebaseAll?: boolean;
+}
+/**
+ * Provider-agnostic interface for git hosting operations.
+ *
+ * Each provider (GitHub, GitLab, etc.) implements this interface to enable
+ * API-based branch updates instead of local git rebase + force-push.
+ *
+ * API-based updates are preferred because:
+ * - They don't require a local checkout
+ * - They work in CI/CD environments without full git history
+ * - They use the hosting provider's merge infrastructure
+ * - They avoid force-push permission issues
+ */
+export interface GitProvider {
+    /** Which provider this is */
+    readonly name: GitProviderName;
+    /**
+     * List all open PRs/MRs in the repository.
+     */
+    listOpenPRs(cwd?: string): PRInfo[];
+    /**
+     * Get the mergeable state of a PR/MR.
+     */
+    getMergeableState(prNumber: number, cwd?: string): MergeableState;
+    /**
+     * Update a PR branch to include the latest changes from its base branch.
+     *
+     * GitHub: PUT /repos/{owner}/{repo}/pulls/{pull_number}/update-branch
+     * GitLab: PUT /projects/{id}/merge_requests/{merge_request_iid}/rebase
+     *
+     * This is the API-based alternative to local git rebase + force-push.
+     * Falls back to local git rebase if the API call fails.
+     */
+    updatePRBranch(prNumber: number, cwd?: string): UpdateBranchResult;
+    /**
+     * Add a label to a PR/MR.
+     */
+    addLabel(prNumber: number, label: string, cwd?: string): boolean;
+    /**
+     * Add a comment to a PR/MR.
+     */
+    addComment(prNumber: number, body: string, cwd?: string): boolean;
+}
+/**
+ * Result of enabling or disabling auto-merge on a PR.
+ */
+export interface AutoMergeResult {
+    success: boolean;
+    prNumber: number;
+    error?: string;
+    /** Whether auto-merge was already enabled when we tried to enable it */
+    alreadyEnabled?: boolean;
+}
+/**
+ * Configuration for the when-green watch loop.
+ */
+export interface WhenGreenOptions {
+    /** PR number to watch */
+    prNumber: number;
+    /** Merge method (squash, merge, rebase) */
+    method: 'merge' | 'squash' | 'rebase';
+    /** Delete branch after merging */
+    deleteBranch: boolean;
+    /** Use admin privileges to bypass branch protections */
+    admin: boolean;
+    /** Fail on conflicts instead of auto-rebasing */
+    noRebase: boolean;
+    /** Working directory for git operations */
+    cwd?: string;
+    /** Head branch name */
+    headBranch: string;
+    /** Base branch name */
+    baseBranch: string;
+    /** Callback for progress messages */
+    onProgress?: (msg: string) => void;
+    /** Callback for warning messages */
+    onWarning?: (msg: string) => void;
+    /** Maximum time to wait in milliseconds (default: 60 minutes) */
+    timeoutMs?: number;
+    /** Poll interval in milliseconds (default: 30 seconds) */
+    pollIntervalMs?: number;
+}
+/**
+ * Result of the when-green watch loop.
+ */
+export interface WhenGreenResult {
+    /** Whether the PR was successfully merged */
+    merged: boolean;
+    /** Whether native auto-merge was enabled as a safety net */
+    autoMergeEnabled: boolean;
+    /** Number of poll cycles completed */
+    pollCycles: number;
+    /** Whether a rebase was performed during the watch */
+    rebasePerformed: boolean;
+    /** Error message if the operation failed */
+    error?: string;
+    /** Error code for JSON output */
+    errorCode?: string;
+}
+/**
+ * Provider-agnostic interface for auto-merge operations.
+ *
+ * Each provider (GitHub, GitLab, etc.) implements these methods to enable
+ * native auto-merge functionality.
+ */
+export interface AutoMergeProvider {
+    /** Which provider this is */
+    readonly name: 'github' | 'gitlab';
+    /**
+     * Enable native auto-merge on a PR.
+     *
+     * GitHub: `gh pr merge --auto --squash`
+     * GitLab: merge when pipeline succeeds API
+     */
+    enableAutoMerge(prNumber: number, method: 'merge' | 'squash' | 'rebase', cwd?: string): AutoMergeResult;
+    /**
+     * Disable native auto-merge on a PR.
+     *
+     * GitHub: `gh pr merge --disable-auto`
+     */
+    disableAutoMerge(prNumber: number, cwd?: string): AutoMergeResult;
+    /**
+     * Check if a PR has been merged (by auto-merge or manually).
+     */
+    isPRMerged(prNumber: number, cwd?: string): boolean;
+}

package/dist/lib/shipping/types.js

@@ -0,0 +1,9 @@
+/**
+ * Shipping Types — Git Provider Interface & Auto-Merge
+ *
+ * Provider-agnostic interface for git hosting operations needed by the
+ * shipping/rebase pipeline and auto-merge orchestration. Implementations
+ * exist for GitHub (via gh CLI) and can be added for GitLab, Bitbucket, etc.
+ */
+export {};
+//# sourceMappingURL=types.js.map

package/dist/lib/shipping/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/lib/shipping/types.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG"}

package/dist/lib/sync/daemon-process.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Daemon Process
+ *
+ * This is the background process spawned by `prlt sync start`.
+ * It runs a sync cycle and merge queue cycle on a configurable interval.
+ *
+ * Args: [hqPath, intervalSeconds]
+ */
+export {};