ai-sdlc 0.3.0 → 0.3.1-alpha.0-alpha.1

package/dist/agents/review.d.ts

@@ -43,6 +43,9 @@ export declare function deriveIndividualPassFailFromPerspectives(issues: ReviewI
 /**
  * Get source code changes from git diff
  *
+ * Compares current branch HEAD against the base branch (main/master) merge-base
+ * to detect all source code changes in the feature branch, not just the most recent commit.
+ *
  * Returns list of source files that have been modified (excludes tests and story files).
  * Uses spawnSync for security (prevents command injection).
  *
@@ -53,6 +56,8 @@ export declare function getSourceCodeChanges(workingDir: string): string[];
 /**
  * Get configuration file changes from git diff
  *
+ * Compares current branch HEAD against the base branch merge-base.
+ *
  * Detects changes to configuration files including:
  * - .claude/ directory (Agent SDK skills, CLAUDE.md)
  * - .github/ directory (workflows, actions, issue templates)
@@ -64,6 +69,21 @@ export declare function getSourceCodeChanges(workingDir: string): string[];
  * @returns Array of configuration file paths that have changed, or ['unknown'] if git fails
  */
 export declare function getConfigurationChanges(workingDir: string): string[];
+/**
+ * Get documentation file changes from git diff
+ *
+ * Compares current branch HEAD against the base branch merge-base.
+ *
+ * Detects changes to documentation files including:
+ * - Markdown files (.md) anywhere in the project (excluding story files)
+ * - docs/ directory (any file type)
+ *
+ * Uses spawnSync for security (prevents command injection).
+ *
+ * @param workingDir - Working directory to run git diff in
+ * @returns Array of documentation file paths that have changed, or ['unknown'] if git fails
+ */
+export declare function getDocumentationChanges(workingDir: string): string[];
 /**
  * Determine the effective content type for validation
  *
@@ -79,6 +99,8 @@ export declare function determineEffectiveContentType(story: Story): ContentType
 /**
  * Check if test files exist in git diff
  *
+ * Compares current branch HEAD against the base branch merge-base.
+ *
  * Returns true if any test files have been modified/added, false otherwise.
  * Uses spawnSync for security (prevents command injection).
  *
@@ -154,4 +176,63 @@ export interface CreatePROptions {
  * Create a pull request for the completed story
  */
 export declare function createPullRequest(storyPath: string, sdlcRoot: string, options?: CreatePROptions): Promise<AgentResult>;
+/**
+ * Status of a single CI check
+ */
+export interface CheckStatus {
+    name: string;
+    state: 'PENDING' | 'SUCCESS' | 'FAILURE' | 'ERROR' | 'SKIPPED';
+    conclusion: string | null;
+}
+/**
+ * Result of waiting for CI checks
+ */
+export interface WaitForChecksResult {
+    allPassed: boolean;
+    checks: CheckStatus[];
+    timedOut: boolean;
+    error?: string;
+}
+/**
+ * Options for waiting for CI checks
+ */
+export interface WaitForChecksOptions {
+    timeout?: number;
+    pollingInterval?: number;
+    requireAllChecksPassing?: boolean;
+}
+/**
+ * Wait for CI checks to complete on a pull request
+ *
+ * @param prUrl - URL or number of the pull request
+ * @param workingDir - Working directory for git commands
+ * @param options - Timeout and polling options
+ * @returns Result indicating whether all checks passed
+ */
+export declare function waitForChecks(prUrl: string, workingDir: string, options?: WaitForChecksOptions): Promise<WaitForChecksResult>;
+/**
+ * Result of merging a pull request
+ */
+export interface MergePullRequestResult {
+    success: boolean;
+    merged: boolean;
+    mergeSha?: string;
+    error?: string;
+}
+/**
+ * Options for merging a pull request
+ */
+export interface MergePullRequestOptions {
+    strategy?: 'squash' | 'merge' | 'rebase';
+    deleteBranchAfterMerge?: boolean;
+}
+/**
+ * Merge a pull request using the GitHub CLI
+ *
+ * @param prUrl - URL or number of the pull request
+ * @param workingDir - Working directory for git commands
+ * @param options - Merge strategy and cleanup options
+ * @returns Result indicating success/failure and merge SHA
+ */
+export declare function mergePullRequest(prUrl: string, workingDir: string, options?: MergePullRequestOptions): Promise<MergePullRequestResult>;
 //# sourceMappingURL=review.d.ts.map

package/dist/agents/review.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"review.d.ts","sourceRoot":"","sources":["../../src/agents/review.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,EAA8E,YAAY,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAqHzL;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,EAAE,CA0BlE;AAED;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,WAAW,EAAE,CAOrE;AAiBD;;GAEG;AACH,MAAM,MAAM,4BAA4B,GAAG,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,EAAE,MAAM,EAAE,UAAU,GAAG,SAAS,GAAG,QAAQ,GAAG,QAAQ,EAAE,OAAO,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;AAyZrJ;;;;;;;;;;;GAWG;AACH,wBAAgB,wCAAwC,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG;IAC/E,gBAAgB,EAAE,OAAO,CAAC;IAC1B,oBAAoB,EAAE,OAAO,CAAC;IAC9B,cAAc,EAAE,OAAO,CAAC;CACzB,CAsBA;AAsED;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,EAAE,CA2BjE;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,EAAE,CAqDpE;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,6BAA6B,CAAC,KAAK,EAAE,KAAK,GAAG,WAAW,CAavE;AAED;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CA2BxD;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,WAAW,EAAE,EAAE,aAAa,EAAE,MAAM,GAAG,MAAM,CA+F1F;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,iDAAiD;IACjD,sBAAsB,CAAC,EAAE,4BAA4B,CAAC;CACvD;AAED;;;;;GAKG;AACH,wBAAsB,cAAc,CAClC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,kBAAkB,GAC3B,OAAO,CAAC,YAAY,CAAC,CAievB;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,KAAK,CAAC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,CAkB/F;AAED;;;;GAIG;AACH,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAelE;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAiB7F;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM,CAsC9E;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,GAAE,MAAc,GAAG,MAAM,CAqC9E;AAgCD;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,+EAA+E;IAC/E,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED;;GAEG;AACH,wBAAsB,iBAAiB,CACrC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,eAAe,GACxB,OAAO,CAAC,WAAW,CAAC,CAqKtB"}
+{"version":3,"file":"review.d.ts","sourceRoot":"","sources":["../../src/agents/review.ts"],"names":[],"mappings":"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"}

package/dist/agents/review.js

@@ -3,7 +3,7 @@ import path from 'path';
 import fs from 'fs';
 import { z } from 'zod';
 import { ProcessManager } from '../core/process-manager.js';
-import { parseStory, updateStoryStatus, appendToSection, updateStoryField, isAtMaxRetries, appendReviewHistory, snapshotMaxRetries, getEffectiveMaxRetries, getEffectiveMaxImplementationRetries } from '../core/story.js';
+import { parseStory, updateStoryStatus, updateStoryField, isAtMaxRetries, appendReviewHistory, snapshotMaxRetries, getEffectiveMaxRetries, getEffectiveMaxImplementationRetries, writeSectionContent } from '../core/story.js';
 import { runAgentQuery } from '../core/client.js';
 import { getLogger } from '../core/logger.js';
 import { loadConfig, DEFAULT_TIMEOUTS } from '../core/config.js';
@@ -11,6 +11,7 @@ import { extractStructuredResponseSync } from '../core/llm-utils.js';
 import { ReviewDecision, ReviewSeverity } from '../types/index.js';
 import { sanitizeInput, truncateText } from '../cli/formatting.js';
 import { detectTestDuplicationPatterns } from './test-pattern-detector.js';
+import { getBaseBranch, getMergeBase } from '../core/git-utils.js';
 /**
  * Security: Validate Git branch name to prevent command injection
  * Only allows alphanumeric characters, hyphens, underscores, and forward slashes
@@ -591,9 +592,38 @@ function formatIssuesForDisplay(issues) {
     }
     return output;
 }
+/**
+ * Get the base commit reference for git diff comparisons
+ *
+ * Attempts to find the merge-base between the current branch and the base branch (main/master).
+ * Falls back to HEAD~1 if merge-base cannot be determined.
+ *
+ * This allows detecting source code changes across the entire feature branch,
+ * not just from the most recent commit.
+ *
+ * @param workingDir - Working directory to run git commands in
+ * @returns Commit reference to use for git diff comparison
+ */
+function getBaseCommitForDiff(workingDir) {
+    try {
+        const baseBranch = getBaseBranch(workingDir);
+        const mergeBase = getMergeBase(workingDir, baseBranch);
+        if (mergeBase) {
+            return mergeBase;
+        }
+    }
+    catch {
+        // If we can't determine base branch or merge-base, fall back to HEAD~1
+    }
+    // Fallback to HEAD~1 (original behavior)
+    return 'HEAD~1';
+}
 /**
  * Get source code changes from git diff
  *
+ * Compares current branch HEAD against the base branch (main/master) merge-base
+ * to detect all source code changes in the feature branch, not just the most recent commit.
+ *
  * Returns list of source files that have been modified (excludes tests and story files).
  * Uses spawnSync for security (prevents command injection).
  *
@@ -602,8 +632,9 @@ function formatIssuesForDisplay(issues) {
  */
 export function getSourceCodeChanges(workingDir) {
     try {
+        const baseCommit = getBaseCommitForDiff(workingDir);
         // Security: Use spawnSync with explicit args (not shell) to prevent injection
-        const result = spawnSync('git', ['diff', '--name-only', 'HEAD~1'], {
+        const result = spawnSync('git', ['diff', '--name-only', baseCommit], {
             cwd: workingDir,
             encoding: 'utf-8',
             stdio: ['ignore', 'pipe', 'pipe'],
@@ -629,6 +660,8 @@ export function getSourceCodeChanges(workingDir) {
 /**
  * Get configuration file changes from git diff
  *
+ * Compares current branch HEAD against the base branch merge-base.
+ *
  * Detects changes to configuration files including:
  * - .claude/ directory (Agent SDK skills, CLAUDE.md)
  * - .github/ directory (workflows, actions, issue templates)
@@ -641,8 +674,9 @@ export function getSourceCodeChanges(workingDir) {
  */
 export function getConfigurationChanges(workingDir) {
     try {
+        const baseCommit = getBaseCommitForDiff(workingDir);
         // Security: Use spawnSync with explicit args (not shell) to prevent injection
-        const result = spawnSync('git', ['diff', '--name-only', 'HEAD~1'], {
+        const result = spawnSync('git', ['diff', '--name-only', baseCommit], {
             cwd: workingDir,
             encoding: 'utf-8',
             stdio: ['ignore', 'pipe', 'pipe'],
@@ -691,6 +725,52 @@ export function getConfigurationChanges(workingDir) {
         return ['unknown'];
     }
 }
+/**
+ * Get documentation file changes from git diff
+ *
+ * Compares current branch HEAD against the base branch merge-base.
+ *
+ * Detects changes to documentation files including:
+ * - Markdown files (.md) anywhere in the project (excluding story files)
+ * - docs/ directory (any file type)
+ *
+ * Uses spawnSync for security (prevents command injection).
+ *
+ * @param workingDir - Working directory to run git diff in
+ * @returns Array of documentation file paths that have changed, or ['unknown'] if git fails
+ */
+export function getDocumentationChanges(workingDir) {
+    try {
+        const baseCommit = getBaseCommitForDiff(workingDir);
+        // Security: Use spawnSync with explicit args (not shell) to prevent injection
+        const result = spawnSync('git', ['diff', '--name-only', baseCommit], {
+            cwd: workingDir,
+            encoding: 'utf-8',
+            stdio: ['ignore', 'pipe', 'pipe'],
+        });
+        if (result.status !== 0) {
+            // Git command failed - fail open (assume changes exist)
+            return ['unknown'];
+        }
+        const output = result.stdout.toString();
+        return output
+            .split('\n')
+            .filter(f => f.trim())
+            .filter(f => {
+            // Markdown files (excluding story files in .ai-sdlc/stories/)
+            if (f.endsWith('.md') && !f.startsWith('.ai-sdlc/stories/'))
+                return true;
+            // Files in docs/ directory (any file type - images, diagrams, etc.)
+            if (f.startsWith('docs/'))
+                return true;
+            return false;
+        });
+    }
+    catch {
+        // If git diff fails, assume there are changes (fail open, not closed)
+        return ['unknown'];
+    }
+}
 /**
  * Determine the effective content type for validation
  *
@@ -717,6 +797,8 @@ export function determineEffectiveContentType(story) {
 /**
  * Check if test files exist in git diff
  *
+ * Compares current branch HEAD against the base branch merge-base.
+ *
  * Returns true if any test files have been modified/added, false otherwise.
  * Uses spawnSync for security (prevents command injection).
  *
@@ -725,8 +807,9 @@ export function determineEffectiveContentType(story) {
  */
 export function hasTestFiles(workingDir) {
     try {
+        const baseCommit = getBaseCommitForDiff(workingDir);
         // Security: Use spawnSync with explicit args (not shell) to prevent injection
-        const result = spawnSync('git', ['diff', '--name-only', 'HEAD~1'], {
+        const result = spawnSync('git', ['diff', '--name-only', baseCommit], {
             cwd: workingDir,
             encoding: 'utf-8',
             stdio: ['ignore', 'pipe', 'pipe'],
@@ -957,11 +1040,24 @@ export async function runReviewAgent(storyPath, sdlcRoot, options) {
                 });
             }
         }
-        // For 'documentation' type, skip all file change validation
-        if (contentType === 'documentation') {
-            logger.info('review', 'Documentation story - skipping file change validation', {
-                storyId: story.frontmatter.id,
-            });
+        // Check documentation changes for 'documentation' type
+        if (!validationFailed && contentType === 'documentation') {
+            const docChanges = getDocumentationChanges(workingDir);
+            if (docChanges.length === 0) {
+                validationFailed = true;
+                validationReason = 'Documentation story requires changes to markdown files (.md) or docs/ directory. No documentation changes detected.';
+                logger.warn('review', 'Documentation validation failed', {
+                    storyId: story.frontmatter.id,
+                    contentType,
+                    docChangesFound: docChanges.length,
+                });
+            }
+            else {
+                logger.info('review', 'Documentation changes detected', {
+                    storyId: story.frontmatter.id,
+                    fileCount: docChanges.length,
+                });
+            }
         }
         // Handle validation failure (if any)
         if (validationFailed) {
@@ -976,19 +1072,23 @@ export async function runReviewAgent(storyPath, sdlcRoot, options) {
                     contentType,
                 });
                 await updateStoryField(story, 'implementation_complete', false);
-                // Set restart reason (backward compatible message for default code stories)
+                // Set restart reason based on content type
                 const restartReason = contentType === 'configuration'
                     ? 'Configuration story requires changes to config files (.claude/, .github/, or root config files). No configuration changes detected.'
                     : contentType === 'mixed'
                         ? 'Mixed story requires both source AND configuration changes - no source code was modified.'
-                        : 'No source code changes detected. Implementation wrote documentation only.';
+                        : contentType === 'documentation'
+                            ? 'Documentation story requires changes to markdown files (.md) or docs/ directory. No documentation changes detected.'
+                            : 'No source code changes detected. Implementation wrote documentation only.';
                 await updateStoryField(story, 'last_restart_reason', restartReason);
                 // Create user-friendly recovery description
                 const recoveryDescription = contentType === 'configuration'
                     ? 'No configuration file modifications detected. Re-running implementation phase.'
                     : contentType === 'mixed'
                         ? 'No source code modifications detected. Re-running implementation phase.'
-                        : 'No source code modifications detected. Re-running implementation phase.';
+                        : contentType === 'documentation'
+                            ? 'No documentation file modifications detected. Re-running implementation phase.'
+                            : 'No source code modifications detected. Re-running implementation phase.';
                 return {
                     success: true,
                     story: parseStory(storyPath),
@@ -1036,33 +1136,43 @@ export async function runReviewAgent(storyPath, sdlcRoot, options) {
             storyId: story.frontmatter.id,
             contentType,
         });
-        // PRE-CHECK GATE: Check if test files exist
-        const testsExist = hasTestFiles(workingDir);
-        if (!testsExist) {
-            logger.warn('review', 'No test files detected in implementation changes', {
+        // PRE-CHECK GATE: Check if test files exist (only for code/mixed types)
+        // Documentation and configuration stories don't require test files
+        const requiresTests = contentType === 'code' || contentType === 'mixed';
+        if (requiresTests) {
+            const testsExist = hasTestFiles(workingDir);
+            if (!testsExist) {
+                logger.warn('review', 'No test files detected in implementation changes', {
+                    storyId: story.frontmatter.id,
+                });
+                return {
+                    success: true,
+                    story: parseStory(storyPath),
+                    changesMade: ['No test files found for implementation'],
+                    passed: false,
+                    decision: ReviewDecision.REJECTED,
+                    severity: ReviewSeverity.CRITICAL,
+                    reviewType: 'pre-check',
+                    issues: [{
+                            severity: 'blocker',
+                            category: 'testing',
+                            description: 'No tests found for this implementation. All implementations must include tests.',
+                            suggestedFix: 'Add test files (*.test.ts, *.spec.ts, or files in __tests__/ directory) that verify the implementation.',
+                        }],
+                    feedback: formatIssuesForDisplay([{
+                            severity: 'blocker',
+                            category: 'testing',
+                            description: 'No tests found for this implementation. All implementations must include tests.',
+                            suggestedFix: 'Add test files (*.test.ts, *.spec.ts, or files in __tests__/ directory) that verify the implementation.',
+                        }]),
+                };
+            }
+        }
+        else {
+            logger.info('review', 'Test file check skipped for non-code content type', {
                 storyId: story.frontmatter.id,
+                contentType,
             });
-            return {
-                success: true,
-                story: parseStory(storyPath),
-                changesMade: ['No test files found for implementation'],
-                passed: false,
-                decision: ReviewDecision.REJECTED,
-                severity: ReviewSeverity.CRITICAL,
-                reviewType: 'pre-check',
-                issues: [{
-                        severity: 'blocker',
-                        category: 'testing',
-                        description: 'No tests found for this implementation. All implementations must include tests.',
-                        suggestedFix: 'Add test files (*.test.ts, *.spec.ts, or files in __tests__/ directory) that verify the implementation.',
-                    }],
-                feedback: formatIssuesForDisplay([{
-                        severity: 'blocker',
-                        category: 'testing',
-                        description: 'No tests found for this implementation. All implementations must include tests.',
-                        suggestedFix: 'Add test files (*.test.ts, *.spec.ts, or files in __tests__/ directory) that verify the implementation.',
-                    }]),
-            };
         }
         // Run build and tests BEFORE reviews (async with progress)
         changesMade.push('Running build and test verification...');
@@ -1204,8 +1314,15 @@ ${passed ? '✅ **PASSED** - All reviews approved' : '❌ **FAILED** - Issues mu
 ---
 *Review completed: ${new Date().toISOString().split('T')[0]}*
 `;
-        // Append reviews to story
-        await appendToSection(story, 'Review Notes', reviewNotes);
+        // Determine if this is a retry (retry_count > 0)
+        const retryCount = story.frontmatter.retry_count || 0;
+        const isRetry = retryCount > 0;
+        // Write review notes to section file
+        await writeSectionContent(storyPath, 'review', reviewNotes, {
+            append: isRetry,
+            iteration: retryCount + 1,
+            isRework: isRetry,
+        });
         changesMade.push('Added unified collaborative review notes');
         // Determine decision
         const decision = passed ? ReviewDecision.APPROVED : ReviewDecision.REJECTED;
@@ -1576,4 +1693,253 @@ EOF
         };
     }
 }
+/**
+ * Wait for CI checks to complete on a pull request
+ *
+ * @param prUrl - URL or number of the pull request
+ * @param workingDir - Working directory for git commands
+ * @param options - Timeout and polling options
+ * @returns Result indicating whether all checks passed
+ */
+export async function waitForChecks(prUrl, workingDir, options) {
+    const timeout = options?.timeout ?? 600000; // 10 minutes
+    const pollingInterval = options?.pollingInterval ?? 10000; // 10 seconds
+    const requireAllChecksPassing = options?.requireAllChecksPassing ?? true;
+    // Security: Validate working directory
+    validateWorkingDirectory(workingDir);
+    // Extract PR number from URL if needed
+    const prMatch = prUrl.match(/\/pull\/(\d+)/);
+    const prIdentifier = prMatch ? prMatch[1] : prUrl;
+    // Security: Validate PR identifier (should be numeric or a valid URL)
+    if (!/^\d+$/.test(prIdentifier) && !prUrl.startsWith('https://')) {
+        return {
+            allPassed: false,
+            checks: [],
+            timedOut: false,
+            error: `Invalid PR identifier: ${prUrl}`,
+        };
+    }
+    const startTime = Date.now();
+    while (Date.now() - startTime < timeout) {
+        try {
+            // Use gh pr checks to get check status
+            const result = spawnSync('gh', ['pr', 'checks', prIdentifier, '--json', 'name,state,conclusion'], {
+                cwd: workingDir,
+                encoding: 'utf-8',
+                timeout: 30000, // 30 second timeout for the command
+            });
+            if (result.error) {
+                // gh CLI might not be available or authenticated
+                return {
+                    allPassed: false,
+                    checks: [],
+                    timedOut: false,
+                    error: `gh CLI error: ${result.error.message}`,
+                };
+            }
+            if (result.status !== 0) {
+                const stderr = result.stderr?.trim() || '';
+                // If no checks exist, that's OK
+                if (stderr.includes('no checks') || stderr.includes('No checks')) {
+                    return {
+                        allPassed: true,
+                        checks: [],
+                        timedOut: false,
+                    };
+                }
+                return {
+                    allPassed: false,
+                    checks: [],
+                    timedOut: false,
+                    error: `gh pr checks failed: ${stderr}`,
+                };
+            }
+            const checksOutput = result.stdout?.trim() || '[]';
+            let checks = [];
+            try {
+                checks = JSON.parse(checksOutput);
+            }
+            catch {
+                return {
+                    allPassed: false,
+                    checks: [],
+                    timedOut: false,
+                    error: `Failed to parse checks output: ${checksOutput.slice(0, 200)}`,
+                };
+            }
+            // If no checks, consider it passed
+            if (checks.length === 0) {
+                return {
+                    allPassed: true,
+                    checks: [],
+                    timedOut: false,
+                };
+            }
+            // Check if all checks are complete
+            const pendingChecks = checks.filter(c => c.state === 'PENDING' || c.state === null);
+            if (pendingChecks.length === 0) {
+                // All checks are complete
+                const failedChecks = checks.filter(c => c.state === 'FAILURE' || c.state === 'ERROR');
+                if (requireAllChecksPassing && failedChecks.length > 0) {
+                    return {
+                        allPassed: false,
+                        checks,
+                        timedOut: false,
+                        error: `${failedChecks.length} check(s) failed: ${failedChecks.map(c => c.name).join(', ')}`,
+                    };
+                }
+                return {
+                    allPassed: true,
+                    checks,
+                    timedOut: false,
+                };
+            }
+            // Still pending, wait and poll again
+            await new Promise(resolve => setTimeout(resolve, pollingInterval));
+        }
+        catch (error) {
+            return {
+                allPassed: false,
+                checks: [],
+                timedOut: false,
+                error: `Error checking PR status: ${error instanceof Error ? error.message : String(error)}`,
+            };
+        }
+    }
+    // Timed out waiting for checks
+    return {
+        allPassed: false,
+        checks: [],
+        timedOut: true,
+        error: `Timed out after ${timeout}ms waiting for CI checks to complete`,
+    };
+}
+/**
+ * Merge a pull request using the GitHub CLI
+ *
+ * @param prUrl - URL or number of the pull request
+ * @param workingDir - Working directory for git commands
+ * @param options - Merge strategy and cleanup options
+ * @returns Result indicating success/failure and merge SHA
+ */
+export async function mergePullRequest(prUrl, workingDir, options) {
+    const strategy = options?.strategy ?? 'squash';
+    const deleteBranchAfterMerge = options?.deleteBranchAfterMerge ?? true;
+    // Security: Validate working directory
+    validateWorkingDirectory(workingDir);
+    // Extract PR number from URL if needed
+    const prMatch = prUrl.match(/\/pull\/(\d+)/);
+    const prIdentifier = prMatch ? prMatch[1] : prUrl;
+    // Security: Validate PR identifier (should be numeric or a valid URL)
+    if (!/^\d+$/.test(prIdentifier) && !prUrl.startsWith('https://')) {
+        return {
+            success: false,
+            merged: false,
+            error: `Invalid PR identifier: ${prUrl}`,
+        };
+    }
+    // Security: Validate strategy
+    const validStrategies = ['squash', 'merge', 'rebase'];
+    if (!validStrategies.includes(strategy)) {
+        return {
+            success: false,
+            merged: false,
+            error: `Invalid merge strategy: ${strategy}`,
+        };
+    }
+    try {
+        // Build merge command arguments
+        const args = ['pr', 'merge', prIdentifier, `--${strategy}`];
+        if (deleteBranchAfterMerge) {
+            args.push('--delete-branch');
+        }
+        // Add auto flag to avoid interactive prompts
+        args.push('--auto');
+        const result = spawnSync('gh', args, {
+            cwd: workingDir,
+            encoding: 'utf-8',
+            timeout: 60000, // 60 second timeout
+        });
+        if (result.error) {
+            return {
+                success: false,
+                merged: false,
+                error: `gh CLI error: ${result.error.message}`,
+            };
+        }
+        if (result.status !== 0) {
+            const stderr = result.stderr?.trim() || '';
+            // Check for common error conditions
+            if (stderr.includes('already merged') || stderr.includes('Pull request #')) {
+                // Already merged is not an error
+                return {
+                    success: true,
+                    merged: true,
+                };
+            }
+            if (stderr.includes('conflict')) {
+                return {
+                    success: false,
+                    merged: false,
+                    error: `Merge conflict detected. Manual intervention required.`,
+                };
+            }
+            if (stderr.includes('review') || stderr.includes('approved')) {
+                return {
+                    success: false,
+                    merged: false,
+                    error: `PR requires review approval before merging.`,
+                };
+            }
+            if (stderr.includes('check') || stderr.includes('status')) {
+                return {
+                    success: false,
+                    merged: false,
+                    error: `CI checks must pass before merging.`,
+                };
+            }
+            return {
+                success: false,
+                merged: false,
+                error: `Merge failed: ${stderr}`,
+            };
+        }
+        // Try to extract merge SHA from output
+        const output = result.stdout?.trim() || '';
+        const shaMatch = output.match(/merged\s+(?:via|to|into)\s+(\w+)/i) || output.match(/([a-f0-9]{40})/);
+        const mergeSha = shaMatch ? shaMatch[1] : undefined;
+        // If merge was successful, try to get the actual merge SHA from the PR
+        let actualMergeSha = mergeSha;
+        if (!actualMergeSha) {
+            try {
+                const prInfoResult = spawnSync('gh', ['pr', 'view', prIdentifier, '--json', 'mergeCommit'], {
+                    cwd: workingDir,
+                    encoding: 'utf-8',
+                    timeout: 10000,
+                });
+                if (prInfoResult.status === 0 && prInfoResult.stdout) {
+                    const prInfo = JSON.parse(prInfoResult.stdout);
+                    if (prInfo.mergeCommit?.oid) {
+                        actualMergeSha = prInfo.mergeCommit.oid;
+                    }
+                }
+            }
+            catch {
+                // Ignore errors getting merge SHA - merge still succeeded
+            }
+        }
+        return {
+            success: true,
+            merged: true,
+            mergeSha: actualMergeSha,
+        };
+    }
+    catch (error) {
+        return {
+            success: false,
+            merged: false,
+            error: `Error merging PR: ${error instanceof Error ? error.message : String(error)}`,
+        };
+    }
+}
 //# sourceMappingURL=review.js.map