@aspruyt/xfg 4.0.0 → 4.0.2

package/dist/vcs/gitlab-pr-strategy.js

@@ -1,14 +1,16 @@
 import { existsSync, writeFileSync, unlinkSync } from "node:fs";
 import { join } from "node:path";
 import { escapeShellArg } from "../shared/shell-utils.js";
-import { isGitLabRepo } from "../shared/repo-detector.js";
-import { BasePRStrategy, } from "./pr-strategy.js";
-import { logger } from "../shared/logger.js";
-import { withRetry, isPermanentError } from "../shared/retry-utils.js";
+import { assertGitLabRepo } from "../shared/repo-detector.js";
+import { BasePRStrategy } from "./pr-strategy.js";
+import { withRetry } from "../shared/retry-utils.js";
+import { getStderr } from "../shared/command-executor.js";
+import { parseApiJson } from "../shared/gh-api-utils.js";
 import { sanitizeCredentials } from "../shared/sanitize-utils.js";
+import { toErrorMessage, safeCleanup } from "../shared/type-guards.js";
 export class GitLabPRStrategy extends BasePRStrategy {
-    constructor(executor) {
-        super(executor);
+    constructor(executor, log) {
+        super(executor, log);
         this.bodyFilePath = ".mr-description.md";
     }
     /**
@@ -62,9 +64,7 @@ export class GitLabPRStrategy extends BasePRStrategy {
     }
     async checkExistingPR(options) {
         const { repoInfo, branchName, workDir, retries = 3 } = options;
-        if (!isGitLabRepo(repoInfo)) {
-            throw new Error("Expected GitLab repository");
-        }
+        assertGitLabRepo(repoInfo, "GitLab PR strategy");
         const repoFlag = this.getRepoFlag(repoInfo);
         // Use glab mr list with JSON output for reliable parsing
         // Note: glab mr list returns open MRs by default (use -c for closed, -M for merged)
@@ -74,33 +74,23 @@ export class GitLabPRStrategy extends BasePRStrategy {
             if (!result || result.trim() === "" || result.trim() === "[]") {
                 return null;
             }
-            // Parse JSON to get MR IID
-            const mrs = JSON.parse(result);
+            const mrs = parseApiJson(result, "glab mr list");
             if (Array.isArray(mrs) && mrs.length > 0 && mrs[0].iid) {
                 return this.buildMRUrl(repoInfo, String(mrs[0].iid));
             }
             return null;
         }
         catch (error) {
-            if (error instanceof Error) {
-                // Throw on permanent errors (auth failures, etc.)
-                if (isPermanentError(error)) {
-                    throw error;
-                }
-                // Log unexpected errors for debugging
-                const stderr = error.stderr ?? "";
-                if (stderr && !stderr.includes("no merge requests")) {
-                    logger.info(`Debug: GitLab MR check failed - ${sanitizeCredentials(stderr).trim()}`);
-                }
+            const stderr = getStderr(error);
+            if (stderr && !stderr.includes("no merge requests")) {
+                this.log?.debug(`GitLab MR check failed - ${sanitizeCredentials(stderr).trim()}`);
             }
             return null;
         }
     }
     async closeExistingPR(options) {
         const { repoInfo, branchName, baseBranch, workDir, retries = 3 } = options;
-        if (!isGitLabRepo(repoInfo)) {
-            throw new Error("Expected GitLab repository");
-        }
+        assertGitLabRepo(repoInfo, "GitLab PR strategy");
         // First check if there's an existing MR
         const existingUrl = await this.checkExistingPR({
             repoInfo,
@@ -108,8 +98,6 @@ export class GitLabPRStrategy extends BasePRStrategy {
             baseBranch,
             workDir,
             retries,
-            title: "", // Not used for check
-            body: "", // Not used for check
         });
         if (!existingUrl) {
             return false;
@@ -117,7 +105,8 @@ export class GitLabPRStrategy extends BasePRStrategy {
         // Extract MR IID from URL
         const mrInfo = this.parseMRUrl(existingUrl);
         if (!mrInfo) {
-            throw new Error(`Could not extract MR IID from URL: ${existingUrl}`);
+            this.log?.warn(`Could not extract MR IID from URL: ${existingUrl}`);
+            return false;
         }
         const repoFlag = this.getRepoFlag(repoInfo);
         // Close the MR
@@ -128,11 +117,10 @@ export class GitLabPRStrategy extends BasePRStrategy {
             });
         }
         catch (error) {
-            const message = error instanceof Error ? error.message : String(error);
-            logger.info(`Warning: Failed to close existing MR !${mrInfo.mrIid}: ${message}`);
+            const message = toErrorMessage(error);
+            this.log?.warn(`Failed to close existing MR !${mrInfo.mrIid}: ${message}`);
             return false;
         }
-        // Delete the source branch via git
         const deleteBranchCommand = `git push origin --delete ${escapeShellArg(branchName)}`;
         try {
             await withRetry(() => this.executor.exec(deleteBranchCommand, workDir), {
@@ -141,18 +129,15 @@ export class GitLabPRStrategy extends BasePRStrategy {
         }
         catch (error) {
             // Branch deletion failure is not critical
-            const message = error instanceof Error ? error.message : String(error);
-            logger.info(`Warning: Failed to delete branch ${branchName}: ${message}`);
+            const message = toErrorMessage(error);
+            this.log?.warn(`Failed to delete branch ${branchName}: ${message}`);
         }
         return true;
     }
     async create(options) {
         const { repoInfo, title, body, branchName, baseBranch, workDir, retries = 3, } = options;
-        if (!isGitLabRepo(repoInfo)) {
-            throw new Error("Expected GitLab repository");
-        }
+        assertGitLabRepo(repoInfo, "GitLab PR strategy");
         const repoFlag = this.getRepoFlag(repoInfo);
-        // Write description to temp file to avoid shell escaping issues
         const descFile = join(workDir, this.bodyFilePath);
         writeFileSync(descFile, body, "utf-8");
         // glab mr create with description from file
@@ -181,15 +166,10 @@ export class GitLabPRStrategy extends BasePRStrategy {
             throw new Error(`Could not parse MR URL from output: ${result}`);
         }
         finally {
-            // Clean up temp file - log warning on failure instead of throwing
-            try {
-                if (existsSync(descFile)) {
+            safeCleanup(() => {
+                if (existsSync(descFile))
                     unlinkSync(descFile);
-                }
-            }
-            catch (cleanupError) {
-                logger.info(`Warning: Failed to clean up temp file ${descFile}: ${cleanupError instanceof Error ? cleanupError.message : String(cleanupError)}`);
-            }
+            }, `failed to remove ${descFile}`, this.log ?? { debug() { } });
         }
     }
     async merge(options) {
@@ -218,56 +198,28 @@ export class GitLabPRStrategy extends BasePRStrategy {
             : "";
         if (config.mode === "auto") {
             // Enable auto-merge when pipeline succeeds
-            // glab mr merge <id> --when-pipeline-succeeds [--squash] [--remove-source-branch]
-            const flagParts = [
+            const autoFlagParts = [
                 "--when-pipeline-succeeds",
                 strategyFlag,
                 deleteBranchFlag,
             ].filter(Boolean);
-            const command = `glab mr merge ${escapeShellArg(mrInfo.mrIid)} ${flagParts.join(" ")} -R ${escapeShellArg(repoFlag)} -y`;
-            try {
-                await withRetry(() => this.executor.exec(command.trim(), workDir), {
-                    retries,
-                });
-                return {
-                    success: true,
-                    message: "Auto-merge enabled. MR will merge when pipeline succeeds.",
-                    merged: false,
-                    autoMergeEnabled: true,
-                };
-            }
-            catch (error) {
-                const message = error instanceof Error ? error.message : String(error);
-                return {
-                    success: false,
-                    message: `Failed to enable auto-merge: ${message}`,
-                    merged: false,
-                };
-            }
+            const autoCommand = `glab mr merge ${escapeShellArg(mrInfo.mrIid)} ${autoFlagParts.join(" ")} -R ${escapeShellArg(repoFlag)} -y`;
+            return this.executeMergeCommand(() => this.executor.exec(autoCommand.trim(), workDir), retries, {
+                success: true,
+                message: "Auto-merge enabled. MR will merge when pipeline succeeds.",
+                merged: false,
+                autoMergeEnabled: true,
+            }, "Failed to enable auto-merge");
         }
         if (config.mode === "force") {
             // Force merge immediately
-            // glab mr merge <id> --yes [--squash] [--remove-source-branch]
-            const flagParts = [strategyFlag, deleteBranchFlag].filter(Boolean);
-            const command = `glab mr merge ${escapeShellArg(mrInfo.mrIid)} ${flagParts.join(" ")} -R ${escapeShellArg(repoFlag)} -y`;
-            try {
-                await withRetry(() => this.executor.exec(command.trim(), workDir), {
-                    retries,
-                });
-                return {
-                    success: true,
-                    message: "MR merged successfully.",
-                    merged: true,
-                };
-            }
-            catch (error) {
-                const message = error instanceof Error ? error.message : String(error);
-                return {
-                    success: false,
-                    message: `Failed to force merge: ${message}`,
-                    merged: false,
-                };
-            }
+            const forceFlagParts = [strategyFlag, deleteBranchFlag].filter(Boolean);
+            const forceCommand = `glab mr merge ${escapeShellArg(mrInfo.mrIid)} ${forceFlagParts.join(" ")} -R ${escapeShellArg(repoFlag)} -y`;
+            return this.executeMergeCommand(() => this.executor.exec(forceCommand.trim(), workDir), retries, {
+                success: true,
+                message: "MR merged successfully.",
+                merged: true,
+            }, "Failed to force merge");
         }
         return {
             success: false,

package/dist/vcs/graphql-commit-strategy.d.ts

@@ -21,7 +21,7 @@ export declare const SAFE_BRANCH_NAME_PATTERN: RegExp;
  * Validates that a branch name is safe for use in shell commands.
  * Throws an error if the branch name contains potentially dangerous characters.
  */
-export declare function validateBranchName(branchName: string): void;
+export declare function validateSafeBranchName(branchName: string): void;
 /**
  * GraphQL-based commit strategy using GitHub's createCommitOnBranch mutation.
  * Used with GitHub App authentication. Commits via this strategy ARE verified
@@ -32,9 +32,8 @@ export declare function validateBranchName(branchName: string): void;
 export declare class GraphQLCommitStrategy implements ICommitStrategy {
     /**
      * GraphQL permanent error patterns for ref operations.
-     * Differs from DEFAULT_PERMANENT_ERROR_PATTERNS which has
-     * git-CLI-specific patterns (/remote\s*rejected/i) that don't
-     * apply to GraphQL responses.
+     * Extends CORE_PERMANENT_ERROR_PATTERNS with GraphQL-specific patterns
+     * (omits git-CLI patterns like /remote\s*rejected/i).
      */
     private static readonly GRAPHQL_PERMANENT_ERROR_PATTERNS;
     private executor;

package/dist/vcs/graphql-commit-strategy.js

@@ -1,7 +1,9 @@
 import { defaultExecutor, } from "../shared/command-executor.js";
 import { isGitHubRepo } from "../shared/repo-detector.js";
 import { escapeShellArg } from "../shared/shell-utils.js";
-import { withRetry, DEFAULT_PERMANENT_ERROR_PATTERNS, } from "../shared/retry-utils.js";
+import { withRetry, CORE_PERMANENT_ERROR_PATTERNS, DEFAULT_PERMANENT_ERROR_PATTERNS, } from "../shared/retry-utils.js";
+import { toErrorMessage } from "../shared/type-guards.js";
+import { parseApiJson } from "../shared/gh-api-utils.js";
 /**
  * Maximum payload size for GitHub GraphQL API (50MB).
  * Base64 encoding adds ~33% overhead, so raw content should be checked.
@@ -23,7 +25,7 @@ export const SAFE_BRANCH_NAME_PATTERN = /^[a-zA-Z0-9][-a-zA-Z0-9_./]*$/;
  * Validates that a branch name is safe for use in shell commands.
  * Throws an error if the branch name contains potentially dangerous characters.
  */
-export function validateBranchName(branchName) {
+export function validateSafeBranchName(branchName) {
     if (!SAFE_BRANCH_NAME_PATTERN.test(branchName)) {
         throw new Error(`Invalid branch name for GraphQL commit strategy: "${branchName}". ` +
             `Branch names must start with alphanumeric and contain only ` +
@@ -50,20 +52,11 @@ const OID_MISMATCH_PATTERNS = [
 export class GraphQLCommitStrategy {
     /**
      * GraphQL permanent error patterns for ref operations.
-     * Differs from DEFAULT_PERMANENT_ERROR_PATTERNS which has
-     * git-CLI-specific patterns (/remote\s*rejected/i) that don't
-     * apply to GraphQL responses.
+     * Extends CORE_PERMANENT_ERROR_PATTERNS with GraphQL-specific patterns
+     * (omits git-CLI patterns like /remote\s*rejected/i).
      */
     static GRAPHQL_PERMANENT_ERROR_PATTERNS = [
-        /not\s*found/i,
-        /unauthorized/i,
-        /permission\s*denied/i,
-        /not\s*accessible\s*by\s*integration/i,
-        /bad\s*credentials/i,
-        /invalid\s*(token|credentials)/i,
-        /401\b/,
-        /403\b/,
-        /does\s*not\s*exist/i,
+        ...CORE_PERMANENT_ERROR_PATTERNS,
         /could\s*not\s*resolve/i,
         /already\s*exists/i,
     ];
@@ -80,17 +73,14 @@ export class GraphQLCommitStrategy {
      */
     async commit(options) {
         const { repoInfo, branchName, message, fileChanges, workDir, retries = 3, token, } = options;
-        // Validate this is a GitHub repo
         if (!isGitHubRepo(repoInfo)) {
             throw new Error(`GraphQL commit strategy requires GitHub repositories. Got: ${repoInfo.type}`);
         }
-        // Validate branch name is safe for shell commands
-        validateBranchName(branchName);
+        validateSafeBranchName(branchName);
         const githubInfo = repoInfo;
-        // Separate additions from deletions
         const additions = fileChanges.filter((fc) => fc.content !== null);
         const deletions = fileChanges.filter((fc) => fc.content === null);
-        // Calculate payload size (base64 adds ~33% overhead)
+        // Base64 encoding adds ~33% overhead to raw content size
         const totalSize = additions.reduce((sum, fc) => {
             const base64Size = Math.ceil((fc.content.length * 4) / 3);
             return sum + base64Size;
@@ -99,18 +89,15 @@ export class GraphQLCommitStrategy {
             throw new Error(`GraphQL payload exceeds 50 MB limit (${Math.round(totalSize / (1024 * 1024))} MB). ` +
                 `Consider using smaller files or the git commit strategy.`);
         }
-        // Get gitOps for authenticated network operations
         const gitOps = options.gitOps;
-        // Ensure the branch exists on remote and is up-to-date with local HEAD
-        // createCommitOnBranch requires the branch to already exist
-        // For PR branches (force=true), we force-update to ensure fresh start from main
+        // createCommitOnBranch requires the branch to already exist on remote.
+        // For PR branches (force=true), force-update ensures a fresh start from main.
         await this.ensureBranchExistsOnRemote(branchName, workDir, options.force, githubInfo, token);
-        // Retry loop for expectedHeadOid mismatch
+        // Outer retry loop for expectedHeadOid mismatch — each iteration re-fetches
+        // the remote HEAD so the next mutation uses a fresh OID.
         let lastError = null;
         for (let attempt = 0; attempt <= retries; attempt++) {
             try {
-                // Fetch from remote to ensure we have the latest HEAD
-                // This is critical for expectedHeadOid to match
                 const safeBranch = escapeShellArg(branchName);
                 if (gitOps) {
                     await gitOps.fetchBranch(branchName);
@@ -120,22 +107,18 @@ export class GraphQLCommitStrategy {
                 }
                 // Get the remote HEAD SHA for this branch (not local HEAD)
                 const headSha = await this.executor.exec(`git rev-parse origin/${safeBranch}`, workDir);
-                // Build and execute the GraphQL mutation
                 const result = await this.executeGraphQLMutation(githubInfo, branchName, message, headSha.trim(), additions, deletions, workDir, token);
                 return result;
             }
             catch (error) {
-                lastError = error instanceof Error ? error : new Error(String(error));
-                // Check if this is an expectedHeadOid mismatch error (retryable)
+                lastError =
+                    error instanceof Error ? error : new Error(toErrorMessage(error));
                 if (this.isHeadOidMismatchError(lastError) && attempt < retries) {
-                    // Retry - the next iteration will fetch and get fresh HEAD SHA
                     continue;
                 }
-                // For other errors, throw immediately
                 throw lastError;
             }
         }
-        // Should not reach here, but just in case
         throw lastError ?? new Error("Unexpected error in GraphQL commit");
     }
     /**
@@ -143,19 +126,14 @@ export class GraphQLCommitStrategy {
      */
     async executeGraphQLMutation(repoInfo, branchName, message, expectedHeadOid, additions, deletions, workDir, token) {
         const repositoryNameWithOwner = `${repoInfo.owner}/${repoInfo.repo}`;
-        // Build file additions with base64 encoding
         const fileAdditions = additions.map((fc) => ({
             path: fc.path,
             contents: Buffer.from(fc.content).toString("base64"),
         }));
-        // Build file deletions (path only)
         const fileDeletions = deletions.map((fc) => ({
             path: fc.path,
         }));
-        // Build the mutation (minified to avoid shell escaping issues with newlines)
         const mutation = "mutation CreateCommit($input: CreateCommitOnBranchInput!) { createCommitOnBranch(input: $input) { commit { oid } } }";
-        // Build the input variables
-        // Note: GitHub API doesn't accept empty arrays, so only include fields when non-empty
         const fileChanges = {};
         if (fileAdditions.length > 0) {
             fileChanges.additions = fileAdditions;
@@ -176,25 +154,18 @@ export class GraphQLCommitStrategy {
                 fileChanges,
             },
         };
-        // Build the GraphQL request body
         const requestBody = JSON.stringify({
             query: mutation,
             variables,
         });
-        // Build the gh api graphql command
-        // Use --input - to pass the JSON body via stdin (more reliable for complex nested JSON)
-        // Use --hostname for GitHub Enterprise
         const hostnameArg = repoInfo.host !== "github.com"
             ? `--hostname ${escapeShellArg(repoInfo.host)}`
             : "";
-        // Use token parameter for authentication when provided
-        // This ensures the GitHub App is used as the commit author, not github-actions[bot]
-        // GH_TOKEN env var must be set for the gh command (after the pipe), not echo
-        const tokenPrefix = token ? `GH_TOKEN=${token} ` : "";
-        const command = `echo ${escapeShellArg(requestBody)} | ${tokenPrefix}gh api graphql ${hostnameArg} --input -`;
+        const tokenEnv = token ? { GH_TOKEN: token } : undefined;
+        const command = `echo ${escapeShellArg(requestBody)} | gh api graphql ${hostnameArg} --input -`;
         let response;
         try {
-            response = await withRetry(() => this.executor.exec(command, workDir), {
+            response = await withRetry(() => this.executor.exec(command, workDir, { env: tokenEnv }), {
                 permanentErrorPatterns: [
                     ...DEFAULT_PERMANENT_ERROR_PATTERNS,
                     ...OID_MISMATCH_PATTERNS,
@@ -204,12 +175,14 @@ export class GraphQLCommitStrategy {
         catch (error) {
             throw this.sanitizeCommandError(error, repositoryNameWithOwner);
         }
-        // Parse the response
-        const parsed = JSON.parse(response);
+        const parsed = parseApiJson(response, "GraphQL createCommitOnBranch response");
         if (parsed.errors) {
-            throw new Error(`GraphQL error: ${parsed.errors.map((e) => e.message).join(", ")}`);
+            const errors = parsed.errors;
+            throw new Error(`GraphQL error: ${errors.map((e) => e.message).join(", ")}`);
         }
-        const oid = parsed.data?.createCommitOnBranch?.commit?.oid;
+        const data = parsed.data;
+        const commit = data?.createCommitOnBranch?.commit;
+        const oid = commit?.oid;
         if (!oid) {
             throw new Error("GraphQL response missing commit OID");
         }
@@ -252,7 +225,7 @@ export class GraphQLCommitStrategy {
                 await this.createRemoteRef(repositoryId, branchName, sha, workDir, repoInfo, token);
             }
             catch (error) {
-                const msg = error instanceof Error ? error.message : String(error);
+                const msg = toErrorMessage(error);
                 if (/already exists/i.test(msg)) {
                     // Branch was created between our query and create — that's fine
                     return;
@@ -260,7 +233,6 @@ export class GraphQLCommitStrategy {
                 throw error;
             }
         }
-        // refId exists + !force: no-op (branch already exists)
     }
     /**
      * Sanitize command execution errors to remove the GraphQL payload.
@@ -269,7 +241,7 @@ export class GraphQLCommitStrategy {
      * of base64-encoded file contents). This extracts just the meaningful stderr.
      */
     sanitizeCommandError(error, repo) {
-        const originalMessage = error instanceof Error ? error.message : String(error);
+        const originalMessage = toErrorMessage(error);
         let cleanMessage;
         if (originalMessage.startsWith("Command failed:")) {
             // Extract stderr: everything after the first newline
@@ -294,11 +266,7 @@ export class GraphQLCommitStrategy {
      */
     isHeadOidMismatchError(error) {
         const message = error.message.toLowerCase();
-        return (message.includes("expected branch to point to") ||
-            message.includes("expectedheadoid") ||
-            message.includes("head oid") ||
-            // GitHub may return this generic error for OID mismatches
-            message.includes("was provided invalid value"));
+        return OID_MISMATCH_PATTERNS.some((pattern) => pattern.test(message));
     }
     /**
      * Execute a GraphQL query or mutation for ref operations.
@@ -310,18 +278,18 @@ export class GraphQLCommitStrategy {
         const hostnameArg = repoInfo.host !== "github.com"
             ? `--hostname ${escapeShellArg(repoInfo.host)}`
             : "";
-        const tokenPrefix = token ? `GH_TOKEN=${token} ` : "";
-        const command = `echo ${escapeShellArg(requestBody)} | ${tokenPrefix}gh api graphql ${hostnameArg} --input -`;
+        const tokenEnv = token ? { GH_TOKEN: token } : undefined;
+        const command = `echo ${escapeShellArg(requestBody)} | gh api graphql ${hostnameArg} --input -`;
         let response;
         try {
-            response = await withRetry(() => this.executor.exec(command, workDir), {
+            response = await withRetry(() => this.executor.exec(command, workDir, { env: tokenEnv }), {
                 permanentErrorPatterns: GraphQLCommitStrategy.GRAPHQL_PERMANENT_ERROR_PATTERNS,
             });
         }
         catch (error) {
             throw this.sanitizeCommandError(error, `${repoInfo.owner}/${repoInfo.repo}`);
         }
-        const parsed = JSON.parse(response);
+        const parsed = parseApiJson(response, "GraphQL API response");
         if (parsed.errors) {
             throw new Error(`GraphQL error: ${parsed.errors.map((e) => e.message).join(", ")}`);
         }

package/dist/vcs/index.d.ts

@@ -1,16 +1,3 @@
-export type { PRMergeConfig, MergeResult, PRStrategyOptions, MergeOptions, CloseExistingPROptions, IPRStrategy, FileChange, CommitOptions, CommitResult, ICommitStrategy, } from "./types.js";
-export { GitOps, sanitizeBranchName, validateBranchName, type IGitOps, type GitOpsOptions, } from "./git-ops.js";
-export { AuthenticatedGitOps, type IAuthenticatedGitOps, type GitAuthOptions, } from "./authenticated-git-ops.js";
-export { GitHubAppTokenManager } from "./github-app-token-manager.js";
-export { createPR, mergePR, formatPRBody, formatPRTitle, escapeShellArg, type PROptions, type PRResult, type FileAction, type MergePROptions, } from "./pr-creator.js";
-export { BasePRStrategy, PRWorkflowExecutor } from "./pr-strategy.js";
-export { GitHubPRStrategy } from "./github-pr-strategy.js";
-export { AzurePRStrategy } from "./azure-pr-strategy.js";
-export { GitLabPRStrategy } from "./gitlab-pr-strategy.js";
-export { GitCommitStrategy } from "./git-commit-strategy.js";
-export { GraphQLCommitStrategy, MAX_PAYLOAD_SIZE, } from "./graphql-commit-strategy.js";
-export { getCommitStrategy, hasGitHubAppCredentials, } from "./commit-strategy-selector.js";
-import { RepoInfo } from "../shared/repo-detector.js";
-import type { IPRStrategy } from "./types.js";
-import { ICommandExecutor } from "../shared/command-executor.js";
-export declare function getPRStrategy(repoInfo: RepoInfo, executor?: ICommandExecutor): IPRStrategy;
+export type { PRMergeConfig, FileChange } from "./types.js";
+export { getCommitStrategy, createTokenManager, } from "./commit-strategy-selector.js";
+export { getPRStrategy } from "./pr-strategy-factory.js";

package/dist/vcs/index.js

@@ -1,35 +1,4 @@
-// Core git operations
-export { GitOps, sanitizeBranchName, validateBranchName, } from "./git-ops.js";
-// Authenticated git operations (with per-command auth)
-export { AuthenticatedGitOps, } from "./authenticated-git-ops.js";
-// GitHub App token management
-export { GitHubAppTokenManager } from "./github-app-token-manager.js";
-// PR creation utilities
-export { createPR, mergePR, formatPRBody, formatPRTitle, escapeShellArg, } from "./pr-creator.js";
-// PR strategies
-export { BasePRStrategy, PRWorkflowExecutor } from "./pr-strategy.js";
-export { GitHubPRStrategy } from "./github-pr-strategy.js";
-export { AzurePRStrategy } from "./azure-pr-strategy.js";
-export { GitLabPRStrategy } from "./gitlab-pr-strategy.js";
 // Commit strategies
-export { GitCommitStrategy } from "./git-commit-strategy.js";
-export { GraphQLCommitStrategy, MAX_PAYLOAD_SIZE, } from "./graphql-commit-strategy.js";
-export { getCommitStrategy, hasGitHubAppCredentials, } from "./commit-strategy-selector.js";
+export { getCommitStrategy, createTokenManager, } from "./commit-strategy-selector.js";
 // PR strategy factory
-import { isGitHubRepo, isAzureDevOpsRepo, isGitLabRepo, } from "../shared/repo-detector.js";
-import { GitHubPRStrategy } from "./github-pr-strategy.js";
-import { AzurePRStrategy } from "./azure-pr-strategy.js";
-import { GitLabPRStrategy } from "./gitlab-pr-strategy.js";
-export function getPRStrategy(repoInfo, executor) {
-    if (isGitHubRepo(repoInfo)) {
-        return new GitHubPRStrategy(executor);
-    }
-    if (isAzureDevOpsRepo(repoInfo)) {
-        return new AzurePRStrategy(executor);
-    }
-    if (isGitLabRepo(repoInfo)) {
-        return new GitLabPRStrategy(executor);
-    }
-    const _exhaustive = repoInfo;
-    throw new Error(`Unknown repository type: ${JSON.stringify(_exhaustive)}`);
-}
+export { getPRStrategy } from "./pr-strategy-factory.js";

package/dist/vcs/pr-creator.d.ts

@@ -1,12 +1,12 @@
 import { RepoInfo } from "../shared/repo-detector.js";
-import type { MergeResult, PRMergeConfig } from "./types.js";
+import type { IPRStrategyLogger } from "./pr-strategy.js";
+import type { MergeResult, PRMergeConfig, PRResult } from "./types.js";
 import { ICommandExecutor } from "../shared/command-executor.js";
-export { escapeShellArg } from "../shared/shell-utils.js";
 export interface FileAction {
     fileName: string;
     action: "create" | "update" | "skip" | "delete";
 }
-export interface PROptions {
+interface PROptions {
     repoInfo: RepoInfo;
     branchName: string;
     baseBranch: string;
@@ -23,12 +23,10 @@ export interface PROptions {
     token?: string;
     /** Labels to apply to the created PR */
     labels?: string[];
+    /** Optional logger for PR strategy debug/warn/info messages */
+    log?: IPRStrategyLogger;
 }
-export interface PRResult {
-    url?: string;
-    success: boolean;
-    message: string;
-}
+export type { PRResult } from "./types.js";
 /**
  * Format PR body using template with ${xfg:...} variables.
  *
@@ -45,7 +43,7 @@ export declare function formatPRBody(files: FileAction[], repoInfo: RepoInfo, cu
  */
 export declare function formatPRTitle(files: FileAction[]): string;
 export declare function createPR(options: PROptions): Promise<PRResult>;
-export interface MergePROptions {
+interface MergePROptions {
     repoInfo: RepoInfo;
     prUrl: string;
     mergeConfig: PRMergeConfig;
@@ -56,5 +54,7 @@ export interface MergePROptions {
     executor?: ICommandExecutor;
     /** GitHub App installation token for authentication */
     token?: string;
+    /** Optional logger for PR strategy debug/warn/info messages */
+    log?: IPRStrategyLogger;
 }
 export declare function mergePR(options: MergePROptions): Promise<MergeResult>;

package/dist/vcs/pr-creator.js

@@ -1,10 +1,9 @@
 import { readFileSync, existsSync } from "node:fs";
 import { join, dirname } from "node:path";
 import { fileURLToPath } from "node:url";
-import { getPRStrategy } from "./index.js";
-import { interpolateXfgContent } from "../sync/xfg-template.js";
-// Re-export for backwards compatibility and testing
-export { escapeShellArg } from "../shared/shell-utils.js";
+import { getPRStrategy } from "./pr-strategy-factory.js";
+import { PRWorkflowExecutor } from "./pr-strategy.js";
+import { interpolateXfgContent } from "../shared/xfg-template.js";
 function loadDefaultTemplate() {
     // Try to find PR.md in the project root
     const __filename = fileURLToPath(import.meta.url);
@@ -97,7 +96,7 @@ export function formatPRTitle(files) {
     return `chore: sync ${changedFiles.length} config files`;
 }
 export async function createPR(options) {
-    const { repoInfo, branchName, baseBranch, files, workDir, dryRun, retries, prTemplate, executor, token, labels, } = options;
+    const { repoInfo, branchName, baseBranch, files, workDir, dryRun, retries, prTemplate, executor, token, labels, log, } = options;
     const title = formatPRTitle(files);
     const body = formatPRBody(files, repoInfo, prTemplate);
     if (dryRun) {
@@ -106,9 +105,10 @@ export async function createPR(options) {
             message: `[DRY RUN] Would create PR: "${title}"`,
         };
     }
-    // Get the appropriate strategy and execute
-    const strategy = getPRStrategy(repoInfo, executor);
-    return strategy.execute({
+    // Get the appropriate strategy and execute via workflow executor
+    const strategy = getPRStrategy(repoInfo, executor, log);
+    const workflow = new PRWorkflowExecutor(strategy);
+    return workflow.execute({
         repoInfo,
         title,
         body,
@@ -121,7 +121,7 @@ export async function createPR(options) {
     });
 }
 export async function mergePR(options) {
-    const { repoInfo, prUrl, mergeConfig, workDir, dryRun, retries, executor, token, } = options;
+    const { repoInfo, prUrl, mergeConfig, workDir, dryRun, retries, executor, token, log, } = options;
     if (dryRun) {
         const modeText = mergeConfig.mode === "force"
             ? "force merge"
@@ -135,9 +135,10 @@ export async function mergePR(options) {
         };
     }
     // Get the appropriate strategy and execute merge
-    const strategy = getPRStrategy(repoInfo, executor);
+    const strategy = getPRStrategy(repoInfo, executor, log);
     return strategy.merge({
         prUrl,
+        repoInfo,
         config: mergeConfig,
         workDir,
         retries,

package/dist/vcs/pr-strategy-factory.d.ts

@@ -0,0 +1,5 @@
+import { RepoInfo } from "../shared/repo-detector.js";
+import type { IPRStrategy } from "./types.js";
+import { ICommandExecutor } from "../shared/command-executor.js";
+import type { IPRStrategyLogger } from "./pr-strategy.js";
+export declare function getPRStrategy(repoInfo: RepoInfo, executor?: ICommandExecutor, log?: IPRStrategyLogger): IPRStrategy;