@aspruyt/xfg 4.0.2 → 4.0.4

package/dist/vcs/git-ops.js

@@ -1,8 +1,8 @@
-import { rmSync, existsSync, mkdirSync, writeFileSync, readFileSync, chmodSync, } from "node:fs";
+import { rmSync, existsSync, statSync, mkdirSync, writeFileSync, readFileSync, chmodSync, } from "node:fs";
 import { join, resolve, relative, isAbsolute, dirname } from "node:path";
 import { escapeShellArg } from "../shared/shell-utils.js";
-import { defaultExecutor, } from "../shared/command-executor.js";
 import { toErrorMessage } from "../shared/type-guards.js";
+import { ValidationError, SyncError } from "../shared/errors.js";
 export class GitOps {
     _workDir;
     dryRun;
@@ -11,7 +11,7 @@ export class GitOps {
     constructor(options) {
         this._workDir = options.workDir;
         this.dryRun = options.dryRun ?? false;
-        this._executor = options.executor ?? defaultExecutor;
+        this._executor = options.executor;
         this.log = options.log;
     }
     async exec(command, cwd) {
@@ -28,7 +28,7 @@ export class GitOps {
         const resolvedWorkDir = resolve(this._workDir);
         const relativePath = relative(resolvedWorkDir, resolvedPath);
         if (relativePath.startsWith("..") || isAbsolute(relativePath)) {
-            throw new Error(`Path traversal detected: ${fileName}`);
+            throw new ValidationError(`Path traversal detected: ${fileName}`);
         }
         return filePath;
     }
@@ -49,7 +49,7 @@ export class GitOps {
         }
         catch (error) {
             const message = toErrorMessage(error);
-            throw new Error(`Failed to create branch '${branchName}': ${message}`);
+            throw new SyncError(`Failed to create branch '${branchName}': ${message}`);
         }
     }
     writeFile(fileName, content) {
@@ -86,14 +86,18 @@ export class GitOps {
      */
     getFileContent(fileName) {
         const filePath = this.validatePath(fileName);
-        if (!existsSync(filePath)) {
-            return null;
-        }
         try {
+            if (!existsSync(filePath) || !statSync(filePath).isFile()) {
+                return null;
+            }
             return readFileSync(filePath, "utf-8");
         }
         catch (error) {
-            this.log?.debug(`Failed to read ${fileName}: ${toErrorMessage(error)}`);
+            const code = error.code;
+            if (code === "ENOENT" || code === "EACCES") {
+                return null;
+            }
+            this.log?.debug(`Unexpected error reading ${fileName}: ${error.message}`);
             return null;
         }
     }
@@ -136,20 +140,12 @@ export class GitOps {
             .filter((line) => line.length > 0)
             .map((line) => line.slice(3)); // Remove status prefix (e.g., " M ", "?? ", "A  ")
     }
-    /**
-     * Check if there are staged changes ready to commit.
-     * Uses `git diff --cached --quiet` which exits with 1 if there are staged changes.
-     */
+    async stageAll() {
+        await this.exec("git add -A", this._workDir);
+    }
     async hasStagedChanges() {
-        try {
-            await this.exec("git diff --cached --quiet", this._workDir);
-            return false; // Exit code 0 = no staged changes
-        }
-        catch (error) {
-            // Exit code 1 is expected when staged changes exist
-            this.log?.debug(`hasStagedChanges: ${toErrorMessage(error)}`);
-            return true;
-        }
+        const diff = await this.exec("git diff --cached --name-only", this._workDir);
+        return diff.length > 0;
     }
     /**
      * Check if a file exists on a specific branch.

package/dist/vcs/github-app-token-manager.js

@@ -1,7 +1,14 @@
 import { createSign } from "node:crypto";
 import { withRetry } from "../shared/retry-utils.js";
+import { SyncError } from "../shared/errors.js";
 /** Duration to cache tokens (45 minutes in milliseconds) */
 const TOKEN_CACHE_DURATION_MS = 45 * 60 * 1000;
+async function assertOkResponse(res, context) {
+    if (!res.ok) {
+        const body = await res.text().catch(() => "");
+        throw new SyncError(`${context}: ${res.status}${body ? ` - ${body}` : ""}`);
+    }
+}
 /**
  * Manages GitHub App authentication tokens for multiple organizations.
  * Handles JWT generation, installation discovery, and token caching.
@@ -59,10 +66,7 @@ export class GitHubAppTokenManager {
                     "X-GitHub-Api-Version": "2022-11-28",
                 },
             });
-            if (!res.ok) {
-                const body = await res.text().catch(() => "");
-                throw new Error(`GitHub API error: ${res.status}${body ? ` - ${body}` : ""}`);
-            }
+            await assertOkResponse(res, "GitHub App installations");
             return res;
         });
         const installations = (await response.json());
@@ -104,10 +108,7 @@ export class GitHubAppTokenManager {
                     "X-GitHub-Api-Version": "2022-11-28",
                 },
             });
-            if (!res.ok) {
-                const body = await res.text().catch(() => "");
-                throw new Error(`GitHub API error: ${res.status}${body ? ` - ${body}` : ""}`);
-            }
+            await assertOkResponse(res, "GitHub App access token");
             return res;
         });
         const tokenResponse = (await response.json());

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

@@ -3,17 +3,19 @@ import { join } from "node:path";
 import { escapeShellArg, escapeRegExp } from "../shared/shell-utils.js";
 import { assertGitHubRepo } from "../shared/repo-detector.js";
 import { BasePRStrategy } from "./pr-strategy.js";
-import { withRetry } from "../shared/retry-utils.js";
+import { withRetry, isPermanentError } from "../shared/retry-utils.js";
 import { sanitizeCredentials } from "../shared/sanitize-utils.js";
 import { toErrorMessage, safeCleanup } from "../shared/type-guards.js";
+import { NO_OP_DEBUG_LOG } from "../shared/logger.js";
 import { getStderr } from "../shared/command-executor.js";
 import { buildTokenEnv, getHostnameFlag } from "../shared/gh-api-utils.js";
+import { SyncError } from "../shared/errors.js";
 /**
  * Get the repo flag value for gh CLI commands.
  * Returns HOST/OWNER/REPO for GHE, OWNER/REPO for github.com.
  */
 function getRepoFlag(repoInfo) {
-    if (repoInfo.host && repoInfo.host !== "github.com") {
+    if (repoInfo.host !== "github.com") {
         return `${repoInfo.host}/${repoInfo.owner}/${repoInfo.repo}`;
     }
     return `${repoInfo.owner}/${repoInfo.repo}`;
@@ -33,10 +35,13 @@ export class GitHubPRStrategy extends BasePRStrategy {
         const tokenEnv = buildTokenEnv(token);
         const command = `gh pr list --repo ${escapeShellArg(repoFlag)} --head ${escapeShellArg(branchName)} --json url --jq '.[0].url'`;
         try {
-            const existingPR = await withRetry(() => this.executor.exec(command, workDir, { env: tokenEnv }), { retries });
+            const existingPR = await withRetry(() => this.executor.exec(command, workDir, { env: tokenEnv }), { retries, log: this.log });
             return existingPR || null;
         }
         catch (error) {
+            if (isPermanentError(error)) {
+                throw error;
+            }
             const stderr = getStderr(error);
             if (stderr && !stderr.includes("no pull requests match")) {
                 this.log?.debug(`GitHub PR check failed - ${sanitizeCredentials(stderr).trim()}`);
@@ -69,7 +74,7 @@ export class GitHubPRStrategy extends BasePRStrategy {
         const tokenEnv = buildTokenEnv(token);
         const command = `gh pr close ${escapeShellArg(prNumber)} --repo ${escapeShellArg(repoFlag)} --delete-branch`;
         try {
-            await withRetry(() => this.executor.exec(command, workDir, { env: tokenEnv }), { retries });
+            await withRetry(() => this.executor.exec(command, workDir, { env: tokenEnv }), { retries, log: this.log });
             return true;
         }
         catch (error) {
@@ -92,13 +97,13 @@ export class GitHubPRStrategy extends BasePRStrategy {
             }
         }
         try {
-            const result = await withRetry(() => this.executor.exec(command, workDir, { env: tokenEnv }), { retries });
+            const result = await withRetry(() => this.executor.exec(command, workDir, { env: tokenEnv }), { retries, log: this.log });
             // Extract URL from output - use strict regex for valid PR URLs only
             const host = repoInfo.host;
             const urlRegex = buildPRUrlRegex(host);
             const urlMatch = result.match(urlRegex);
             if (!urlMatch) {
-                throw new Error(`Could not parse PR URL from output: ${result}`);
+                throw new SyncError(`Could not parse PR URL from output: ${result}`);
             }
             return {
                 url: urlMatch[0],
@@ -110,7 +115,7 @@ export class GitHubPRStrategy extends BasePRStrategy {
             safeCleanup(() => {
                 if (existsSync(bodyFile))
                     unlinkSync(bodyFile);
-            }, `failed to remove ${bodyFile}`, this.log ?? { debug() { } });
+            }, `failed to remove ${bodyFile}`, this.log ?? NO_OP_DEBUG_LOG);
         }
     }
     /**
@@ -122,7 +127,7 @@ export class GitHubPRStrategy extends BasePRStrategy {
         const tokenEnv = buildTokenEnv(token);
         const command = `gh api ${hostnamePart}repos/${escapeShellArg(repoInfo.owner)}/${escapeShellArg(repoInfo.repo)} --jq '.allow_auto_merge // false'`;
         try {
-            const result = await withRetry(() => this.executor.exec(command, workDir, { env: tokenEnv }), { retries });
+            const result = await withRetry(() => this.executor.exec(command, workDir, { env: tokenEnv }), { retries, log: this.log });
             return result.trim() === "true";
         }
         catch (error) {
@@ -147,7 +152,6 @@ export class GitHubPRStrategy extends BasePRStrategy {
     }
     async merge(options) {
         const { prUrl, repoInfo, config, workDir, retries = 3, token } = options;
-        // Manual mode: do nothing
         if (config.mode === "manual") {
             return {
                 success: true,
@@ -182,7 +186,7 @@ export class GitHubPRStrategy extends BasePRStrategy {
             }, "Failed to enable auto-merge");
         }
         if (config.mode === "force") {
-            // Force merge using admin privileges
+            this.log?.warn(`Force-merging PR ${prUrl} using admin privileges (bypasses branch protection)`);
             const forceCommand = `gh pr merge ${escapeShellArg(prUrl)} --admin ${strategyFlag} ${deleteBranchFlag}`.trim();
             return this.executeMergeCommand(() => this.executor.exec(forceCommand, workDir, { env: tokenEnv }), retries, {
                 success: true,
@@ -190,9 +194,12 @@ export class GitHubPRStrategy extends BasePRStrategy {
                 merged: true,
             }, "Failed to force merge");
         }
+        // "direct" mode doesn't create PRs, so merge() should not be called for it.
+        // This is a defensive fallback for type safety.
+        const _exhaustive = config.mode;
         return {
             success: false,
-            message: `Unknown merge mode: ${config.mode}`,
+            message: `Merge not applicable for mode: ${_exhaustive}`,
             merged: false,
         };
     }

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

@@ -4,7 +4,7 @@ import type { IPRStrategyLogger } from "./pr-strategy.js";
 import type { PRStrategyOptions, CloseExistingPROptions, MergeOptions, MergeResult } from "./types.js";
 import { ICommandExecutor } from "../shared/command-executor.js";
 export declare class GitLabPRStrategy extends BasePRStrategy {
-    constructor(executor?: ICommandExecutor, log?: IPRStrategyLogger);
+    constructor(executor: ICommandExecutor, log?: IPRStrategyLogger);
     /**
      * Build the repo flag for glab commands.
      * Format: namespace/repo (supports nested groups)

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

@@ -3,11 +3,13 @@ import { join } from "node:path";
 import { escapeShellArg } from "../shared/shell-utils.js";
 import { assertGitLabRepo } from "../shared/repo-detector.js";
 import { BasePRStrategy } from "./pr-strategy.js";
-import { withRetry } from "../shared/retry-utils.js";
+import { withRetry, isPermanentError } 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";
+import { NO_OP_DEBUG_LOG } from "../shared/logger.js";
+import { SyncError } from "../shared/errors.js";
 export class GitLabPRStrategy extends BasePRStrategy {
     constructor(executor, log) {
         super(executor, log);
@@ -70,7 +72,7 @@ export class GitLabPRStrategy extends BasePRStrategy {
         // Note: glab mr list returns open MRs by default (use -c for closed, -M for merged)
         const command = `glab mr list --source-branch ${escapeShellArg(branchName)} -R ${escapeShellArg(repoFlag)} -F json`;
         try {
-            const result = await withRetry(() => this.executor.exec(command, workDir), { retries });
+            const result = await withRetry(() => this.executor.exec(command, workDir), { retries, log: this.log });
             if (!result || result.trim() === "" || result.trim() === "[]") {
                 return null;
             }
@@ -81,6 +83,9 @@ export class GitLabPRStrategy extends BasePRStrategy {
             return null;
         }
         catch (error) {
+            if (isPermanentError(error)) {
+                throw error;
+            }
             const stderr = getStderr(error);
             if (stderr && !stderr.includes("no merge requests")) {
                 this.log?.debug(`GitLab MR check failed - ${sanitizeCredentials(stderr).trim()}`);
@@ -114,6 +119,7 @@ export class GitLabPRStrategy extends BasePRStrategy {
         try {
             await withRetry(() => this.executor.exec(closeCommand, workDir), {
                 retries,
+                log: this.log,
             });
         }
         catch (error) {
@@ -125,6 +131,7 @@ export class GitLabPRStrategy extends BasePRStrategy {
         try {
             await withRetry(() => this.executor.exec(deleteBranchCommand, workDir), {
                 retries,
+                log: this.log,
             });
         }
         catch (error) {
@@ -143,7 +150,7 @@ export class GitLabPRStrategy extends BasePRStrategy {
         // glab mr create with description from file
         const command = `glab mr create --source-branch ${escapeShellArg(branchName)} --target-branch ${escapeShellArg(baseBranch)} --title ${escapeShellArg(title)} --description "$(cat ${escapeShellArg(descFile)})" --yes -R ${escapeShellArg(repoFlag)}`;
         try {
-            const result = await withRetry(() => this.executor.exec(command, workDir), { retries });
+            const result = await withRetry(() => this.executor.exec(command, workDir), { retries, log: this.log });
             // Extract MR URL from output
             // glab typically outputs the URL directly
             const urlMatch = result.match(/https:\/\/[^\s]+\/-\/merge_requests\/\d+/);
@@ -163,18 +170,17 @@ export class GitLabPRStrategy extends BasePRStrategy {
                     message: "MR created successfully",
                 };
             }
-            throw new Error(`Could not parse MR URL from output: ${result}`);
+            throw new SyncError(`Could not parse MR URL from output: ${result}`);
         }
         finally {
             safeCleanup(() => {
                 if (existsSync(descFile))
                     unlinkSync(descFile);
-            }, `failed to remove ${descFile}`, this.log ?? { debug() { } });
+            }, `failed to remove ${descFile}`, this.log ?? NO_OP_DEBUG_LOG);
         }
     }
     async merge(options) {
         const { prUrl, config, workDir, retries = 3 } = options;
-        // Manual mode: do nothing
         if (config.mode === "manual") {
             return {
                 success: true,
@@ -221,9 +227,10 @@ export class GitLabPRStrategy extends BasePRStrategy {
                 merged: true,
             }, "Failed to force merge");
         }
+        const _exhaustive = config.mode;
         return {
             success: false,
-            message: `Unknown merge mode: ${config.mode}`,
+            message: `Merge not applicable for mode: ${_exhaustive}`,
             merged: false,
         };
     }

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

@@ -37,7 +37,7 @@ export declare class GraphQLCommitStrategy implements ICommitStrategy {
      */
     private static readonly GRAPHQL_PERMANENT_ERROR_PATTERNS;
     private executor;
-    constructor(executor?: ICommandExecutor);
+    constructor(executor: ICommandExecutor);
     /**
      * Create a commit with the given file changes using GitHub's GraphQL API.
      * Uses the createCommitOnBranch mutation for verified commits.
@@ -86,12 +86,6 @@ export declare class GraphQLCommitStrategy implements ICommitStrategy {
      * Returns repositoryId (always) and refId (null if branch doesn't exist).
      */
     private queryRemoteRef;
-    /**
-     * Create a branch ref on the remote via GraphQL createRef mutation.
-     */
     private createRemoteRef;
-    /**
-     * Delete a branch ref on the remote via GraphQL deleteRef mutation.
-     */
     private deleteRemoteRef;
 }

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

@@ -1,9 +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, 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";
+import { parseApiJson, buildTokenEnv } from "../shared/gh-api-utils.js";
+import { ValidationError, GraphQLApiError } from "../shared/errors.js";
 /**
  * Maximum payload size for GitHub GraphQL API (50MB).
  * Base64 encoding adds ~33% overhead, so raw content should be checked.
@@ -27,7 +27,7 @@ export const SAFE_BRANCH_NAME_PATTERN = /^[a-zA-Z0-9][-a-zA-Z0-9_./]*$/;
  */
 export function validateSafeBranchName(branchName) {
     if (!SAFE_BRANCH_NAME_PATTERN.test(branchName)) {
-        throw new Error(`Invalid branch name for GraphQL commit strategy: "${branchName}". ` +
+        throw new ValidationError(`Invalid branch name for GraphQL commit strategy: "${branchName}". ` +
             `Branch names must start with alphanumeric and contain only ` +
             `alphanumeric characters, hyphens, underscores, dots, and forward slashes.`);
     }
@@ -62,7 +62,7 @@ export class GraphQLCommitStrategy {
     ];
     executor;
     constructor(executor) {
-        this.executor = executor ?? defaultExecutor;
+        this.executor = executor;
     }
     /**
      * Create a commit with the given file changes using GitHub's GraphQL API.
@@ -74,10 +74,9 @@ export class GraphQLCommitStrategy {
     async commit(options) {
         const { repoInfo, branchName, message, fileChanges, workDir, retries = 3, token, } = options;
         if (!isGitHubRepo(repoInfo)) {
-            throw new Error(`GraphQL commit strategy requires GitHub repositories. Got: ${repoInfo.type}`);
+            throw new ValidationError(`GraphQL commit strategy requires GitHub repositories. Got: ${repoInfo.type}`);
         }
         validateSafeBranchName(branchName);
-        const githubInfo = repoInfo;
         const additions = fileChanges.filter((fc) => fc.content !== null);
         const deletions = fileChanges.filter((fc) => fc.content === null);
         // Base64 encoding adds ~33% overhead to raw content size
@@ -86,13 +85,13 @@ export class GraphQLCommitStrategy {
             return sum + base64Size;
         }, 0);
         if (totalSize > MAX_PAYLOAD_SIZE) {
-            throw new Error(`GraphQL payload exceeds 50 MB limit (${Math.round(totalSize / (1024 * 1024))} MB). ` +
+            throw new ValidationError(`GraphQL payload exceeds 50 MB limit (${Math.round(totalSize / (1024 * 1024))} MB). ` +
                 `Consider using smaller files or the git commit strategy.`);
         }
         const gitOps = options.gitOps;
         // 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);
+        await this.ensureBranchExistsOnRemote(branchName, workDir, options.force, repoInfo, token);
         // Outer retry loop for expectedHeadOid mismatch — each iteration re-fetches
         // the remote HEAD so the next mutation uses a fresh OID.
         let lastError = null;
@@ -107,7 +106,7 @@ 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);
-                const result = await this.executeGraphQLMutation(githubInfo, branchName, message, headSha.trim(), additions, deletions, workDir, token);
+                const result = await this.executeGraphQLMutation(repoInfo, branchName, message, headSha.trim(), additions, deletions, workDir, token);
                 return result;
             }
             catch (error) {
@@ -119,7 +118,7 @@ export class GraphQLCommitStrategy {
                 throw lastError;
             }
         }
-        throw lastError ?? new Error("Unexpected error in GraphQL commit");
+        throw (lastError ?? new GraphQLApiError("Unexpected error in GraphQL commit"));
     }
     /**
      * Execute the createCommitOnBranch GraphQL mutation.
@@ -161,7 +160,7 @@ export class GraphQLCommitStrategy {
         const hostnameArg = repoInfo.host !== "github.com"
             ? `--hostname ${escapeShellArg(repoInfo.host)}`
             : "";
-        const tokenEnv = token ? { GH_TOKEN: token } : undefined;
+        const tokenEnv = buildTokenEnv(token);
         const command = `echo ${escapeShellArg(requestBody)} | gh api graphql ${hostnameArg} --input -`;
         let response;
         try {
@@ -177,14 +176,11 @@ export class GraphQLCommitStrategy {
         }
         const parsed = parseApiJson(response, "GraphQL createCommitOnBranch response");
         if (parsed.errors) {
-            const errors = parsed.errors;
-            throw new Error(`GraphQL error: ${errors.map((e) => e.message).join(", ")}`);
+            throw new GraphQLApiError(parsed.errors.map((e) => e.message).join(", "));
         }
-        const data = parsed.data;
-        const commit = data?.createCommitOnBranch?.commit;
-        const oid = commit?.oid;
+        const oid = parsed.data?.createCommitOnBranch?.commit?.oid;
         if (!oid) {
-            throw new Error("GraphQL response missing commit OID");
+            throw new GraphQLApiError("Response missing commit OID");
         }
         return {
             sha: oid,
@@ -206,7 +202,7 @@ export class GraphQLCommitStrategy {
      */
     async ensureBranchExistsOnRemote(branchName, workDir, force, repoInfo, token) {
         if (!repoInfo) {
-            throw new Error("repoInfo is required for GraphQL ref operations");
+            throw new GraphQLApiError("repoInfo is required for ref operations");
         }
         const { repositoryId, refId } = await this.queryRemoteRef(repoInfo, branchName, workDir, token);
         if (refId && force) {
@@ -258,7 +254,7 @@ export class GraphQLCommitStrategy {
         if (cleanMessage.length > 2000) {
             cleanMessage = cleanMessage.substring(0, 2000) + "... (truncated)";
         }
-        return new Error(`GraphQL commit failed for ${repo}: ${cleanMessage}`);
+        return new GraphQLApiError(`Commit failed for ${repo}: ${cleanMessage}`);
     }
     /**
      * Check if an error is due to expectedHeadOid mismatch (optimistic locking failure).
@@ -278,7 +274,7 @@ export class GraphQLCommitStrategy {
         const hostnameArg = repoInfo.host !== "github.com"
             ? `--hostname ${escapeShellArg(repoInfo.host)}`
             : "";
-        const tokenEnv = token ? { GH_TOKEN: token } : undefined;
+        const tokenEnv = buildTokenEnv(token);
         const command = `echo ${escapeShellArg(requestBody)} | gh api graphql ${hostnameArg} --input -`;
         let response;
         try {
@@ -291,7 +287,7 @@ export class GraphQLCommitStrategy {
         }
         const parsed = parseApiJson(response, "GraphQL API response");
         if (parsed.errors) {
-            throw new Error(`GraphQL error: ${parsed.errors.map((e) => e.message).join(", ")}`);
+            throw new GraphQLApiError(parsed.errors.map((e) => e.message).join(", "));
         }
         return parsed;
     }
@@ -301,24 +297,20 @@ export class GraphQLCommitStrategy {
      */
     async queryRemoteRef(repoInfo, branchName, workDir, token) {
         const query = `{ repository(owner: ${JSON.stringify(repoInfo.owner)}, name: ${JSON.stringify(repoInfo.repo)}) { id ref(qualifiedName: ${JSON.stringify(`refs/heads/${branchName}`)}) { id } } }`;
-        const parsed = await this.executeGraphQLRefOp(query, repoInfo, workDir, token);
-        const repo = parsed.data?.repository;
-        const repositoryId = repo?.id;
+        const repoResponse = await this.executeGraphQLRefOp(query, repoInfo, workDir, token);
+        const repositoryId = repoResponse.data?.repository?.id;
         if (!repositoryId) {
-            throw new Error(`GraphQL response missing repository ID for ${repoInfo.owner}/${repoInfo.repo}`);
+            throw new GraphQLApiError(`Response missing repository ID for ${repoInfo.owner}/${repoInfo.repo}`);
         }
-        return { repositoryId, refId: repo?.ref?.id ?? null };
+        return {
+            repositoryId,
+            refId: repoResponse.data?.repository?.ref?.id ?? null,
+        };
     }
-    /**
-     * Create a branch ref on the remote via GraphQL createRef mutation.
-     */
     async createRemoteRef(repositoryId, branchName, oid, workDir, repoInfo, token) {
         const mutation = `mutation { createRef(input: { repositoryId: ${JSON.stringify(repositoryId)}, name: ${JSON.stringify(`refs/heads/${branchName}`)}, oid: ${JSON.stringify(oid)} }) { clientMutationId } }`;
         await this.executeGraphQLRefOp(mutation, repoInfo, workDir, token);
     }
-    /**
-     * Delete a branch ref on the remote via GraphQL deleteRef mutation.
-     */
     async deleteRemoteRef(refId, workDir, repoInfo, token) {
         const mutation = `mutation { deleteRef(input: { refId: ${JSON.stringify(refId)} }) { clientMutationId } }`;
         await this.executeGraphQLRefOp(mutation, repoInfo, workDir, token);

package/dist/vcs/index.d.ts

@@ -1,3 +1,4 @@
-export type { PRMergeConfig, FileChange } from "./types.js";
+export type { PRMergeConfig, FileChange, FileAction, IGitOps, ILocalGitOps, INetworkGitOps, IPRStrategy, GitAuthOptions, PRResult, PRStrategyOptions, MergeOptions, MergeResult, CloseExistingPROptions, CommitOptions, CommitResult, ICommitStrategy, } from "./types.js";
+export type { GitOpsOptions } from "./git-ops.js";
 export { getCommitStrategy, createTokenManager, } from "./commit-strategy-selector.js";
 export { getPRStrategy } from "./pr-strategy-factory.js";

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

@@ -1,11 +1,8 @@
 import { RepoInfo } from "../shared/repo-detector.js";
 import type { IPRStrategyLogger } from "./pr-strategy.js";
-import type { MergeResult, PRMergeConfig, PRResult } from "./types.js";
+import type { FileAction, MergeResult, PRMergeConfig, PRResult } from "./types.js";
 import { ICommandExecutor } from "../shared/command-executor.js";
-export interface FileAction {
-    fileName: string;
-    action: "create" | "update" | "skip" | "delete";
-}
+export type { FileAction };
 interface PROptions {
     repoInfo: RepoInfo;
     branchName: string;
@@ -17,8 +14,8 @@ interface PROptions {
     retries?: number;
     /** Custom PR body template */
     prTemplate?: string;
-    /** Optional command executor for shell commands (for testing) */
-    executor?: ICommandExecutor;
+    /** Command executor for shell commands */
+    executor: ICommandExecutor;
     /** GitHub App installation token for authentication */
     token?: string;
     /** Labels to apply to the created PR */
@@ -50,8 +47,8 @@ interface MergePROptions {
     workDir: string;
     dryRun?: boolean;
     retries?: number;
-    /** Optional command executor for shell commands (for testing) */
-    executor?: ICommandExecutor;
+    /** Command executor for shell commands */
+    executor: ICommandExecutor;
     /** GitHub App installation token for authentication */
     token?: string;
     /** Optional logger for PR strategy debug/warn/info messages */

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

@@ -2,4 +2,4 @@ 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;
+export declare function getPRStrategy(repoInfo: RepoInfo, executor: ICommandExecutor, log?: IPRStrategyLogger): IPRStrategy;

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

@@ -1,4 +1,5 @@
 import { isGitHubRepo, isAzureDevOpsRepo, isGitLabRepo, } from "../shared/repo-detector.js";
+import { SyncError } from "../shared/errors.js";
 import { GitHubPRStrategy } from "./github-pr-strategy.js";
 import { AzurePRStrategy } from "./azure-pr-strategy.js";
 import { GitLabPRStrategy } from "./gitlab-pr-strategy.js";
@@ -13,5 +14,5 @@ export function getPRStrategy(repoInfo, executor, log) {
         return new GitLabPRStrategy(executor, log);
     }
     const _exhaustive = repoInfo;
-    throw new Error(`Unknown repository type: ${JSON.stringify(_exhaustive)}`);
+    throw new SyncError(`Unknown repository type: ${JSON.stringify(_exhaustive)}`);
 }

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

@@ -10,7 +10,7 @@ export declare abstract class BasePRStrategy implements IPRStrategy {
     protected bodyFilePath: string;
     protected executor: ICommandExecutor;
     protected log?: IPRStrategyLogger;
-    constructor(executor?: ICommandExecutor, log?: IPRStrategyLogger);
+    constructor(executor: ICommandExecutor, log?: IPRStrategyLogger);
     abstract checkExistingPR(options: CloseExistingPROptions): Promise<string | null>;
     abstract closeExistingPR(options: CloseExistingPROptions): Promise<boolean>;
     abstract create(options: PRStrategyOptions): Promise<PRResult>;

package/dist/vcs/pr-strategy.js

@@ -1,12 +1,11 @@
 import { toErrorMessage } from "../shared/type-guards.js";
 import { withRetry } from "../shared/retry-utils.js";
-import { defaultExecutor, } from "../shared/command-executor.js";
 export class BasePRStrategy {
     bodyFilePath = ".pr-body.md";
     executor;
     log;
     constructor(executor, log) {
-        this.executor = executor ?? defaultExecutor;
+        this.executor = executor;
         this.log = log;
     }
     /**
@@ -15,7 +14,7 @@ export class BasePRStrategy {
      */
     async executeMergeCommand(execFn, retries, successResult, errorPrefix) {
         try {
-            await withRetry(execFn, { retries });
+            await withRetry(execFn, { retries, log: this.log });
             return successResult;
         }
         catch (error) {