@aspruyt/xfg 4.0.4 → 5.0.0

package/dist/shared/xfg-template.js

@@ -86,26 +86,6 @@ function buildXfgConfig(ctx, options) {
         restoreEscaped: (content) => `\${xfg:${content}}`,
     };
 }
-/**
- * Interpolate xfg template variables in content.
- *
- * Supports these syntaxes:
- * - ${xfg:repo.name} - Repository name
- * - ${xfg:repo.owner} - Repository owner
- * - ${xfg:repo.fullName} - Full repository name (owner/repo)
- * - ${xfg:repo.url} - Git URL
- * - ${xfg:repo.platform} - Platform type (github, azure-devops, gitlab)
- * - ${xfg:repo.host} - Host domain
- * - ${xfg:file.name} - Current file name
- * - ${xfg:date} - Current date (YYYY-MM-DD)
- * - ${xfg:customVar} - Custom variable from vars config
- * - $${xfg:var} - Escape: outputs literal ${xfg:var}
- *
- * @param content - The content to process (object, string, or string[])
- * @param ctx - Template context with repo info and custom vars
- * @param options - Interpolation options (default: strict mode)
- * @returns Content with interpolated values
- */
 export function interpolateXfgContent(content, ctx, options = DEFAULT_OPTIONS) {
     const config = buildXfgConfig(ctx, options);
     if (typeof content === "string") {

package/dist/sync/auth-options-builder.js

@@ -19,7 +19,13 @@ export class AuthOptionsBuilder {
             return { ok: true, token, authOptions };
         }
         // Otherwise resolve via token manager / env fallback
-        const resolved = await resolveGitHubToken(repoInfo, this.tokenManager, repoName, this.log, this.envToken);
+        const resolved = await resolveGitHubToken({
+            repoInfo,
+            tokenManager: this.tokenManager,
+            context: repoName,
+            log: this.log,
+            envToken: this.envToken,
+        });
         if (resolved.skipped) {
             return {
                 ok: false,

package/dist/sync/branch-manager.d.ts

@@ -1,4 +1,4 @@
-import type { IPRStrategy } from "../vcs/types.js";
+import type { IPRStrategy } from "../vcs/index.js";
 import type { RepoInfo } from "../shared/repo-detector.js";
 import type { ICommandExecutor } from "../shared/command-executor.js";
 import type { IBranchManager, BranchSetupOptions } from "./types.js";

package/dist/sync/commit-message.d.ts

@@ -1,4 +1,4 @@
-import type { FileAction } from "../vcs/types.js";
+import type { FileAction } from "../vcs/index.js";
 /**
  * Format a commit message based on the files being changed.
  *

package/dist/sync/commit-push-manager.d.ts

@@ -1,4 +1,4 @@
-import type { ICommitStrategy } from "../vcs/types.js";
+import type { ICommitStrategy } from "../vcs/index.js";
 import type { RepoInfo } from "../shared/repo-detector.js";
 import type { ICommandExecutor } from "../shared/command-executor.js";
 import type { CommitPushOptions, CommitPushResult, ICommitPushManager } from "./types.js";

package/dist/sync/commit-push-manager.js

@@ -46,7 +46,7 @@ export class CommitPushManager {
             return this.handleCommitError(error, isDirectMode, pushBranch, repoInfo);
         }
     }
-    handleCommitError(error, isDirectMode, baseBranch, repoInfo) {
+    handleCommitError(error, isDirectMode, pushBranch, repoInfo) {
         const repoName = getRepoDisplayName(repoInfo);
         const message = toErrorMessage(error);
         if (isDirectMode &&
@@ -58,7 +58,7 @@ export class CommitPushManager {
                 errorResult: {
                     success: false,
                     repoName,
-                    message: `Push to '${baseBranch}' was rejected (likely branch protection). ` +
+                    message: `Push to '${pushBranch}' was rejected (likely branch protection). ` +
                         `To use 'direct' mode, the target branch must allow direct pushes. ` +
                         `Use 'merge: force' to create a PR and merge with admin privileges.`,
                 },

package/dist/sync/diff-utils.d.ts

@@ -6,11 +6,24 @@ export declare function getFileStatus(exists: boolean, changed: boolean): FileSt
  * Format a single diff line with appropriate color.
  */
 export declare function formatDiffLine(line: string): string;
+/**
+ * Check if a file is a structured data file (JSON, JSON5, YAML, YML).
+ */
+export declare function isStructuredDataFile(fileName: string): boolean;
+/**
+ * Compute a unified diff between old and new content.
+ * Returns raw diff lines (no ANSI formatting).
+ *
+ * - oldContent === null → new file (all additions)
+ * - newContent === null → deleted file (all removals)
+ * - both null → empty array
+ */
+export declare function computeUnifiedDiff(oldContent: string | null, newContent: string | null, contextLines?: number): string[];
 /**
  * Generate a unified diff between old and new content.
- * Returns an array of formatted diff lines.
+ * Returns an array of formatted (chalk-colored) diff lines.
  */
-export declare function generateDiff(oldContent: string | null, newContent: string, _fileName: string, contextLines?: number): string[];
+export declare function generateDiff(oldContent: string | null, newContent: string, contextLines?: number): string[];
 export interface DiffStats {
     newCount: number;
     modifiedCount: number;

package/dist/sync/diff-utils.js

@@ -18,34 +18,70 @@ export function formatDiffLine(line) {
     return line;
 }
 /**
- * Generate a unified diff between old and new content.
- * Returns an array of formatted diff lines.
+ * Check if a file is a structured data file (JSON, JSON5, YAML, YML).
  */
-export function generateDiff(oldContent, newContent, _fileName, contextLines = 3) {
-    const oldLines = oldContent ? oldContent.split("\n") : [];
-    const newLines = newContent.split("\n");
-    // For new files, show all lines as additions
+export function isStructuredDataFile(fileName) {
+    return /\.(json|json5|ya?ml)$/i.test(fileName);
+}
+/**
+ * Compute a unified diff between old and new content.
+ * Returns raw diff lines (no ANSI formatting).
+ *
+ * - oldContent === null → new file (all additions)
+ * - newContent === null → deleted file (all removals)
+ * - both null → empty array
+ */
+export function computeUnifiedDiff(oldContent, newContent, contextLines = 3) {
+    if (oldContent === null && newContent === null) {
+        return [];
+    }
+    // New file: all additions
     if (oldContent === null) {
-        const result = [];
-        for (const line of newLines) {
-            result.push(formatDiffLine(`+${line}`));
+        const newLines = newContent.split("\n");
+        // Filter trailing empty string from split
+        const lines = newLines[newLines.length - 1] === "" ? newLines.slice(0, -1) : newLines;
+        if (lines.length === 0)
+            return [];
+        const result = [`@@ -0,0 +1,${lines.length} @@`];
+        for (const line of lines) {
+            result.push(`+${line}`);
+        }
+        return result;
+    }
+    // Deleted file: all removals
+    if (newContent === null) {
+        const oldLines = oldContent.split("\n");
+        const lines = oldLines[oldLines.length - 1] === "" ? oldLines.slice(0, -1) : oldLines;
+        if (lines.length === 0)
+            return [];
+        const result = [`@@ -1,${lines.length} +0,0 @@`];
+        for (const line of lines) {
+            result.push(`-${line}`);
         }
         return result;
     }
-    // Simple LCS-based diff algorithm
+    // Modified file: LCS diff
+    const oldLines = oldContent.split("\n");
+    const newLines = newContent.split("\n");
     const hunks = computeDiffHunks(oldLines, newLines, contextLines);
-    if (hunks.length === 0) {
+    if (hunks.length === 0)
         return [];
-    }
     const result = [];
     for (const hunk of hunks) {
-        result.push(formatDiffLine(`@@ -${hunk.oldStart},${hunk.oldCount} +${hunk.newStart},${hunk.newCount} @@`));
+        result.push(`@@ -${hunk.oldStart},${hunk.oldCount} +${hunk.newStart},${hunk.newCount} @@`);
         for (const line of hunk.lines) {
-            result.push(formatDiffLine(line));
+            result.push(line);
         }
     }
     return result;
 }
+/**
+ * Generate a unified diff between old and new content.
+ * Returns an array of formatted (chalk-colored) diff lines.
+ */
+export function generateDiff(oldContent, newContent, contextLines = 3) {
+    return computeUnifiedDiff(oldContent, newContent, contextLines).map(formatDiffLine);
+}
 /**
  * Compute diff hunks using a simple line-by-line comparison.
  * This is a simplified diff that shows changed regions with context.

package/dist/sync/file-sync-orchestrator.js

@@ -1,5 +1,4 @@
 import { incrementDiffStats } from "./diff-utils.js";
-import { loadManifest } from "./manifest.js";
 export class FileSyncOrchestrator {
     fileWriter;
     manifestManager;
@@ -22,10 +21,9 @@ export class FileSyncOrchestrator {
             configId,
             hasAppCredentials: options.hasAppCredentials,
         }, { gitOps: session.gitOps, log: this.log });
-        const existingManifest = loadManifest(workDir, this.log);
         const filesWithDeleteOrphaned = new Map(repoConfig.files.map((f) => [f.fileName, f.deleteOrphaned]));
-        const { manifest: newManifest, filesToDelete } = this.manifestManager.processOrphans(workDir, configId, filesWithDeleteOrphaned);
-        await this.manifestManager.deleteOrphans(filesToDelete, { dryRun: dryRun, noDelete: noDelete }, { gitOps: session.gitOps, log: this.log, fileChanges });
+        const { manifest: newManifest, existingManifest, filesToDelete, } = this.manifestManager.processOrphans(workDir, configId, filesWithDeleteOrphaned);
+        this.manifestManager.deleteOrphans(filesToDelete, { dryRun: dryRun, noDelete: noDelete }, { gitOps: session.gitOps, log: this.log, fileChanges });
         // Save manifest (may add to fileChanges)
         this.manifestManager.saveUpdatedManifest(workDir, newManifest, existingManifest, dryRun, fileChanges);
         // Count stats for entries added after writeFiles (orphan deletes + manifest).

package/dist/sync/file-sync-strategy.js

@@ -15,10 +15,17 @@ export class FileSyncStrategy {
         }
         const fileChangeDetails = changedFiles
             .filter((f) => f.action !== "skip")
-            .map((f) => ({
-            path: f.fileName,
-            action: f.action,
-        }));
+            .map((f) => {
+            const detail = {
+                path: f.fileName,
+                action: f.action,
+            };
+            const writeResult = fileChanges.get(f.fileName);
+            if (writeResult?.diffLines) {
+                detail.diffLines = writeResult.diffLines;
+            }
+            return detail;
+        });
         return {
             fileChanges,
             changedFiles,

package/dist/sync/file-writer.js

@@ -2,7 +2,7 @@ import { existsSync } from "node:fs";
 import { join } from "node:path";
 import { convertContentToString } from "../config/formatter.js";
 import { interpolateXfgContent } from "../shared/xfg-template.js";
-import { getFileStatus, generateDiff, createDiffStats, incrementDiffStats, } from "./diff-utils.js";
+import { getFileStatus, generateDiff, createDiffStats, incrementDiffStats, computeUnifiedDiff, isStructuredDataFile, } from "./diff-utils.js";
 /**
  * Determines if a file should be marked as executable.
  * .sh files are auto-executable unless explicit executable: false is set.
@@ -65,16 +65,21 @@ export class FileWriter {
             const existingContent = gitOps.getFileContent(file.fileName);
             const changed = gitOps.wouldChange(file.fileName, fileContent);
             if (changed) {
-                fileChanges.set(file.fileName, {
+                const writeResult = {
                     fileName: file.fileName,
                     content: fileContent,
                     action,
-                });
+                };
+                // Compute raw diff lines for structured data files (all modes)
+                if (isStructuredDataFile(file.fileName)) {
+                    writeResult.diffLines = computeUnifiedDiff(existingContent, fileContent);
+                }
+                fileChanges.set(file.fileName, writeResult);
             }
             if (dryRun) {
                 const status = getFileStatus(existingContent !== null, changed);
                 incrementDiffStats(diffStats, status);
-                const diffLines = generateDiff(existingContent, fileContent, file.fileName);
+                const diffLines = generateDiff(existingContent, fileContent);
                 log.fileDiff(file.fileName, status, diffLines);
             }
             else if (changed) {

package/dist/sync/index.d.ts

@@ -1,3 +1,4 @@
 export type { DiffStats } from "./diff-utils.js";
-export type { GitOpsFactory, IAuthOptionsBuilder, IBranchManager, ICommitPushManager, IFileSyncOrchestrator, IPRMergeHandler, IRepositoryProcessor, IRepositorySession, IWorkStrategy, ProcessorResult, SessionContext, WorkResult, } from "./types.js";
+export { computeUnifiedDiff, isStructuredDataFile, formatDiffLine, } from "./diff-utils.js";
+export type { FileChangeDetail, GitOpsFactory, IAuthOptionsBuilder, IBranchManager, ICommitPushManager, IFileSyncOrchestrator, IPRMergeHandler, IRepositoryProcessor, IRepositorySession, IWorkStrategy, ProcessorResult, SessionContext, WorkResult, } from "./types.js";
 export { RepositoryProcessor } from "./repository-processor.js";

package/dist/sync/index.js

@@ -1 +1,2 @@
+export { computeUnifiedDiff, isStructuredDataFile, formatDiffLine, } from "./diff-utils.js";
 export { RepositoryProcessor } from "./repository-processor.js";

package/dist/sync/manifest-manager.d.ts

@@ -10,6 +10,6 @@ export declare class ManifestManager implements IManifestManager {
         warn(msg: string): void;
     } | undefined);
     processOrphans(workDir: string, configId: string, filesWithDeleteOrphaned: Map<string, boolean | undefined>): OrphanProcessResult;
-    deleteOrphans(filesToDelete: string[], options: OrphanDeleteOptions, deps: OrphanDeleteDeps): Promise<void>;
+    deleteOrphans(filesToDelete: string[], options: OrphanDeleteOptions, deps: OrphanDeleteDeps): void;
     saveUpdatedManifest(workDir: string, manifest: XfgManifest, existingManifest: XfgManifest | null, dryRun: boolean, fileChanges: Map<string, FileWriteResult>): void;
 }

package/dist/sync/manifest-manager.js

@@ -1,6 +1,7 @@
 import { existsSync } from "node:fs";
 import { join } from "node:path";
 import { loadManifest, saveManifest, updateManifest, MANIFEST_FILENAME, } from "./manifest.js";
+import { computeUnifiedDiff, isStructuredDataFile } from "./diff-utils.js";
 /**
  * Handles manifest loading, saving, and orphan detection.
  */
@@ -12,9 +13,9 @@ export class ManifestManager {
     processOrphans(workDir, configId, filesWithDeleteOrphaned) {
         const existingManifest = loadManifest(workDir, this.log);
         const { manifest, filesToDelete } = updateManifest(existingManifest, configId, filesWithDeleteOrphaned);
-        return { manifest, filesToDelete };
+        return { manifest, existingManifest, filesToDelete };
     }
-    async deleteOrphans(filesToDelete, options, deps) {
+    deleteOrphans(filesToDelete, options, deps) {
         const { dryRun, noDelete } = options;
         const { gitOps, log, fileChanges } = deps;
         if (filesToDelete.length === 0) {
@@ -29,11 +30,18 @@ export class ManifestManager {
             if (!gitOps.fileExists(fileName)) {
                 continue;
             }
-            fileChanges.set(fileName, {
+            const writeResult = {
                 fileName,
                 content: null,
                 action: "delete",
-            });
+            };
+            if (isStructuredDataFile(fileName)) {
+                const existingContent = gitOps.getFileContent(fileName);
+                if (existingContent !== null) {
+                    writeResult.diffLines = computeUnifiedDiff(existingContent, null);
+                }
+            }
+            fileChanges.set(fileName, writeResult);
             if (dryRun) {
                 log.fileDiff(fileName, "DELETED", []);
             }
@@ -56,11 +64,17 @@ export class ManifestManager {
         }
         const manifestExisted = existsSync(join(workDir, MANIFEST_FILENAME));
         const manifestContent = JSON.stringify(manifest, null, 2) + "\n";
-        fileChanges.set(MANIFEST_FILENAME, {
+        const writeResult = {
             fileName: MANIFEST_FILENAME,
             content: manifestContent,
             action: manifestExisted ? "update" : "create",
-        });
+        };
+        // Compute diff for the manifest (it's a JSON file)
+        const oldManifestContent = existingManifest
+            ? JSON.stringify(existingManifest, null, 2) + "\n"
+            : null;
+        writeResult.diffLines = computeUnifiedDiff(oldManifestContent, manifestContent);
+        fileChanges.set(MANIFEST_FILENAME, writeResult);
         if (!dryRun) {
             saveManifest(workDir, manifest);
         }

package/dist/sync/pr-merge-handler.js

@@ -1,4 +1,4 @@
-import { createPR, mergePR } from "../vcs/pr-creator.js";
+import { createPR, mergePR, getPRStrategy, } from "../vcs/index.js";
 export class PRMergeHandler {
     log;
     constructor(log) {
@@ -7,6 +7,9 @@ export class PRMergeHandler {
     async createAndMerge(input) {
         const { repoInfo, repoConfig, options, changedFiles, repoName, diffStats, fileChanges, } = input;
         this.log.info("Creating pull request...");
+        const strategy = options.dryRun
+            ? undefined
+            : getPRStrategy(repoInfo, options.executor, this.log);
         const prResult = await createPR({
             repoInfo,
             branchName: options.branchName,
@@ -20,6 +23,7 @@ export class PRMergeHandler {
             token: options.token,
             labels: repoConfig.prOptions?.labels,
             log: this.log,
+            strategy,
         });
         const mergeMode = repoConfig.prOptions?.merge ?? "auto";
         let mergeResult;
@@ -41,6 +45,7 @@ export class PRMergeHandler {
                 executor: options.executor,
                 token: options.token,
                 log: this.log,
+                strategy,
             });
             mergeResult = {
                 merged: result.merged ?? false,

package/dist/sync/repository-processor.js

@@ -20,7 +20,14 @@ export class RepositoryProcessor {
         const factory = gitOpsFactory ??
             ((opts, auth, retries) => {
                 const gitOps = new GitOps({ ...opts, log: log });
-                return new AuthenticatedGitOps(gitOps, opts.executor, opts.workDir, retries ?? 3, auth, log);
+                return new AuthenticatedGitOps({
+                    localOps: gitOps,
+                    executor: opts.executor,
+                    workDir: opts.workDir,
+                    retries: retries ?? 3,
+                    auth,
+                    log,
+                });
             });
         const tokenManager = components?.tokenManager ?? null;
         const fileWriter = components?.fileWriter ?? new FileWriter();

package/dist/sync/types.d.ts

@@ -1,17 +1,16 @@
 import type { FileContent, RepoConfig } from "../config/types.js";
 import type { RepoInfo } from "../shared/repo-detector.js";
-import type { ILocalGitOps, IGitOps, GitAuthOptions } from "../vcs/types.js";
-import type { GitOpsOptions } from "../vcs/git-ops.js";
+import type { ILocalGitOps, IGitOps, GitAuthOptions, GitOpsOptions, FileAction } from "../vcs/index.js";
 import type { DiffStats } from "./diff-utils.js";
 import type { ILogger } from "../shared/logger.js";
 import type { XfgManifest } from "./manifest.js";
 import type { ICommandExecutor } from "../shared/command-executor.js";
-import type { FileAction } from "../vcs/types.js";
 export type GitOpsFactory = (options: GitOpsOptions, auth?: GitAuthOptions, retries?: number) => IGitOps;
 export interface FileWriteResult {
     fileName: string;
     content: string | null;
     action: "create" | "update" | "delete" | "skip";
+    diffLines?: string[];
 }
 export interface FileWriteContext {
     repoInfo: RepoInfo;
@@ -36,6 +35,7 @@ export interface IFileWriter {
 }
 export interface OrphanProcessResult {
     manifest: XfgManifest;
+    existingManifest: XfgManifest | null;
     filesToDelete: string[];
 }
 export interface OrphanDeleteOptions {
@@ -49,7 +49,7 @@ export interface OrphanDeleteDeps {
 }
 export interface IManifestManager {
     processOrphans(workDir: string, configId: string, filesWithDeleteOrphaned: Map<string, boolean | undefined>): OrphanProcessResult;
-    deleteOrphans(filesToDelete: string[], options: OrphanDeleteOptions, deps: OrphanDeleteDeps): Promise<void>;
+    deleteOrphans(filesToDelete: string[], options: OrphanDeleteOptions, deps: OrphanDeleteDeps): void;
     saveUpdatedManifest(workDir: string, manifest: XfgManifest, existingManifest: XfgManifest | null, dryRun: boolean, fileChanges: Map<string, FileWriteResult>): void;
 }
 /** Common runtime context shared across workflow step options bags. */
@@ -135,6 +135,7 @@ export interface ProcessorOptions {
 export interface FileChangeDetail {
     path: string;
     action: "create" | "update" | "delete";
+    diffLines?: string[];
 }
 export interface ProcessorResult {
     success: boolean;

package/dist/vcs/authenticated-git-ops.d.ts

@@ -8,6 +8,14 @@ import type { GitAuthOptions, ILocalGitOps, IGitOps } from "./types.js";
  * the remote origin. Subsequent operations (fetch, push, getDefaultBranch)
  * reuse that authenticated remote URL — no extra auth setup per operation.
  */
+export interface AuthenticatedGitOpsOptions {
+    localOps: ILocalGitOps;
+    executor: ICommandExecutor;
+    workDir: string;
+    retries: number;
+    auth?: GitAuthOptions;
+    log?: DebugLog;
+}
 export declare class AuthenticatedGitOps implements IGitOps {
     private readonly localOps;
     private readonly executor;
@@ -15,7 +23,7 @@ export declare class AuthenticatedGitOps implements IGitOps {
     private readonly retries;
     private readonly auth?;
     private readonly log?;
-    constructor(localOps: ILocalGitOps, executor: ICommandExecutor, workDir: string, retries: number, auth?: GitAuthOptions | undefined, log?: DebugLog | undefined);
+    constructor(options: AuthenticatedGitOpsOptions);
     private execWithRetry;
     /**
      * Build the authenticated remote URL.

package/dist/vcs/authenticated-git-ops.js

@@ -2,13 +2,6 @@ import { escapeShellArg } from "../shared/shell-utils.js";
 import { withRetry } from "../shared/retry-utils.js";
 import { toErrorMessage } from "../shared/type-guards.js";
 import { SyncError } from "../shared/errors.js";
-/**
- * Adds authentication to network git operations and delegates local ops.
- *
- * When auth options are provided, clone uses an embedded token URL which sets
- * the remote origin. Subsequent operations (fetch, push, getDefaultBranch)
- * reuse that authenticated remote URL — no extra auth setup per operation.
- */
 export class AuthenticatedGitOps {
     localOps;
     executor;
@@ -16,13 +9,13 @@ export class AuthenticatedGitOps {
     retries;
     auth;
     log;
-    constructor(localOps, executor, workDir, retries, auth, log) {
-        this.localOps = localOps;
-        this.executor = executor;
-        this.workDir = workDir;
-        this.retries = retries;
-        this.auth = auth;
-        this.log = log;
+    constructor(options) {
+        this.localOps = options.localOps;
+        this.executor = options.executor;
+        this.workDir = options.workDir;
+        this.retries = options.retries;
+        this.auth = options.auth;
+        this.log = options.log;
     }
     async execWithRetry(command) {
         return withRetry(() => this.executor.exec(command, this.workDir), {

package/dist/vcs/git-ops.js

@@ -33,10 +33,15 @@ export class GitOps {
         return filePath;
     }
     cleanWorkspace() {
-        if (existsSync(this._workDir)) {
-            rmSync(this._workDir, { recursive: true, force: true });
+        try {
+            if (existsSync(this._workDir)) {
+                rmSync(this._workDir, { recursive: true, force: true });
+            }
+            mkdirSync(this._workDir, { recursive: true });
+        }
+        catch (error) {
+            throw new SyncError(`Failed to clean workspace '${this._workDir}': ${toErrorMessage(error)}`);
         }
-        mkdirSync(this._workDir, { recursive: true });
     }
     /**
      * Create a new branch from the current HEAD.
@@ -57,11 +62,14 @@ export class GitOps {
             return;
         }
         const filePath = this.validatePath(fileName);
-        // Create parent directories if they don't exist
-        mkdirSync(dirname(filePath), { recursive: true });
-        // Normalize trailing newline - ensure exactly one
-        const normalized = content.endsWith("\n") ? content : content + "\n";
-        writeFileSync(filePath, normalized, "utf-8");
+        try {
+            mkdirSync(dirname(filePath), { recursive: true });
+            const normalized = content.endsWith("\n") ? content : content + "\n";
+            writeFileSync(filePath, normalized, "utf-8");
+        }
+        catch (error) {
+            throw new SyncError(`Failed to write file '${fileName}': ${toErrorMessage(error)}`);
+        }
     }
     /**
      * Marks a file as executable both on the filesystem and in git's index.
@@ -74,8 +82,12 @@ export class GitOps {
             return;
         }
         const filePath = this.validatePath(fileName);
-        // Set filesystem permissions (755 = rwxr-xr-x)
-        chmodSync(filePath, 0o755);
+        try {
+            chmodSync(filePath, 0o755);
+        }
+        catch (error) {
+            throw new SyncError(`Failed to set executable permissions on '${fileName}': ${toErrorMessage(error)}`);
+        }
         // Also update git's index so the executable bit is committed
         const relativePath = relative(this._workDir, filePath);
         await this.exec(`git update-index --add --chmod=+x ${escapeShellArg(relativePath)}`, this._workDir);
@@ -97,7 +109,7 @@ export class GitOps {
             if (code === "ENOENT" || code === "EACCES") {
                 return null;
             }
-            this.log?.debug(`Unexpected error reading ${fileName}: ${error.message}`);
+            this.log?.debug(`Unexpected error reading ${fileName}: ${toErrorMessage(error)}`);
             return null;
         }
     }
@@ -180,7 +192,12 @@ export class GitOps {
         if (!existsSync(filePath)) {
             return;
         }
-        rmSync(filePath);
+        try {
+            rmSync(filePath);
+        }
+        catch (error) {
+            throw new SyncError(`Failed to delete file '${fileName}': ${toErrorMessage(error)}`);
+        }
     }
     /**
      * Stage all changes and commit with the given message.

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

@@ -87,7 +87,12 @@ export class GitHubPRStrategy extends BasePRStrategy {
         const { repoInfo, title, body, branchName, baseBranch, workDir, retries = 3, token, labels, } = options;
         assertGitHubRepo(repoInfo, "GitHub PR strategy");
         const bodyFile = join(workDir, this.bodyFilePath);
-        writeFileSync(bodyFile, body, "utf-8");
+        try {
+            writeFileSync(bodyFile, body, "utf-8");
+        }
+        catch (err) {
+            throw new SyncError(`Failed to write PR description to ${bodyFile}: ${toErrorMessage(err)}`);
+        }
         const tokenEnv = buildTokenEnv(token);
         let command = `gh pr create --title ${escapeShellArg(title)} --body-file ${escapeShellArg(bodyFile)} --base ${escapeShellArg(baseBranch)} --head ${escapeShellArg(branchName)}`;
         // Append label flags

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

@@ -5,7 +5,7 @@ import { assertGitLabRepo } from "../shared/repo-detector.js";
 import { BasePRStrategy } from "./pr-strategy.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 { parseApiJson } from "../shared/json-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";
@@ -146,7 +146,12 @@ export class GitLabPRStrategy extends BasePRStrategy {
         assertGitLabRepo(repoInfo, "GitLab PR strategy");
         const repoFlag = this.getRepoFlag(repoInfo);
         const descFile = join(workDir, this.bodyFilePath);
-        writeFileSync(descFile, body, "utf-8");
+        try {
+            writeFileSync(descFile, body, "utf-8");
+        }
+        catch (err) {
+            throw new SyncError(`Failed to write PR description to ${descFile}: ${toErrorMessage(err)}`);
+        }
         // 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 {

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

@@ -2,7 +2,8 @@ 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, buildTokenEnv } from "../shared/gh-api-utils.js";
+import { parseApiJson } from "../shared/json-utils.js";
+import { buildTokenEnv } from "../shared/gh-api-utils.js";
 import { ValidationError, GraphQLApiError } from "../shared/errors.js";
 /**
  * Maximum payload size for GitHub GraphQL API (50MB).

package/dist/vcs/index.d.ts

@@ -2,3 +2,4 @@ export type { PRMergeConfig, FileChange, FileAction, IGitOps, ILocalGitOps, INet
 export type { GitOpsOptions } from "./git-ops.js";
 export { getCommitStrategy, createTokenManager, } from "./commit-strategy-selector.js";
 export { getPRStrategy } from "./pr-strategy-factory.js";
+export { createPR, mergePR } from "./pr-creator.js";

package/dist/vcs/index.js

@@ -2,3 +2,5 @@
 export { getCommitStrategy, createTokenManager, } from "./commit-strategy-selector.js";
 // PR strategy factory
 export { getPRStrategy } from "./pr-strategy-factory.js";
+// PR creation and merge
+export { createPR, mergePR } from "./pr-creator.js";