@aspruyt/xfg 4.0.0 → 4.0.1

package/dist/sync/index.d.ts

@@ -1,16 +1,3 @@
-export { FileWriter, shouldBeExecutable } from "./file-writer.js";
-export { ManifestManager } from "./manifest-manager.js";
-export { BranchManager } from "./branch-manager.js";
-export { AuthOptionsBuilder } from "./auth-options-builder.js";
-export { RepositorySession } from "./repository-session.js";
-export { CommitPushManager } from "./commit-push-manager.js";
-export { formatCommitMessage } from "./commit-message.js";
-export { FileSyncOrchestrator } from "./file-sync-orchestrator.js";
-export { PRMergeHandler } from "./pr-merge-handler.js";
-export { FileSyncStrategy } from "./file-sync-strategy.js";
-export { SyncWorkflow } from "./sync-workflow.js";
-export type { IFileWriter, FileWriteContext, FileWriterDeps, FileWriteAllResult, FileWriteResult, IManifestManager, OrphanProcessResult, OrphanDeleteOptions, OrphanDeleteDeps, IBranchManager, BranchSetupOptions, IAuthOptionsBuilder, AuthResult, IRepositorySession, SessionOptions, SessionContext, ICommitPushManager, CommitPushOptions, CommitPushResult, GitOpsFactory, IRepositoryProcessor, ProcessorOptions, ProcessorResult, FileChangeDetail, IFileSyncOrchestrator, FileSyncResult, IPRMergeHandler, PRHandlerOptions, WorkResult, IWorkStrategy, ISyncWorkflow, } from "./types.js";
+export type { DiffStats } from "./diff-utils.js";
+export type { GitOpsFactory, IAuthOptionsBuilder, IBranchManager, ICommitPushManager, IFileSyncOrchestrator, IPRMergeHandler, IRepositoryProcessor, IRepositorySession, ISyncWorkflow, IWorkStrategy, ProcessorResult, SessionContext, WorkResult, } from "./types.js";
 export { RepositoryProcessor } from "./repository-processor.js";
-export { createEmptyManifest, loadManifest, saveManifest, getManagedFiles, updateManifest, MANIFEST_FILENAME, type XfgManifest, type XfgManifestConfigEntry, } from "./manifest.js";
-export { getFileStatus, formatStatusBadge, formatDiffLine, generateDiff, createDiffStats, incrementDiffStats, type FileStatus, type DiffStats, } from "./diff-utils.js";
-export { interpolateXfgContent, type XfgTemplateContext, type XfgInterpolationOptions, } from "./xfg-template.js";

package/dist/sync/index.js

@@ -1,20 +1 @@
-export { FileWriter, shouldBeExecutable } from "./file-writer.js";
-export { ManifestManager } from "./manifest-manager.js";
-export { BranchManager } from "./branch-manager.js";
-export { AuthOptionsBuilder } from "./auth-options-builder.js";
-export { RepositorySession } from "./repository-session.js";
-export { CommitPushManager } from "./commit-push-manager.js";
-export { formatCommitMessage } from "./commit-message.js";
-export { FileSyncOrchestrator } from "./file-sync-orchestrator.js";
-export { PRMergeHandler } from "./pr-merge-handler.js";
-// Strategy pattern components
-export { FileSyncStrategy } from "./file-sync-strategy.js";
-export { SyncWorkflow } from "./sync-workflow.js";
-// Repository processor
 export { RepositoryProcessor } from "./repository-processor.js";
-// Manifest handling
-export { createEmptyManifest, loadManifest, saveManifest, getManagedFiles, updateManifest, MANIFEST_FILENAME, } from "./manifest.js";
-// Diff utilities
-export { getFileStatus, formatStatusBadge, formatDiffLine, generateDiff, createDiffStats, incrementDiffStats, } from "./diff-utils.js";
-// XFG templating
-export { interpolateXfgContent, } from "./xfg-template.js";

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

@@ -4,6 +4,10 @@ import type { IManifestManager, OrphanProcessResult, OrphanDeleteOptions, Orphan
  * Handles manifest loading, saving, and orphan detection.
  */
 export declare class ManifestManager implements IManifestManager {
+    private readonly log?;
+    constructor(log?: {
+        debug(msg: string): void;
+    } | undefined);
     processOrphans(workDir: string, configId: string, filesWithDeleteOrphaned: Map<string, boolean | undefined>): OrphanProcessResult;
     deleteOrphans(filesToDelete: string[], options: OrphanDeleteOptions, deps: OrphanDeleteDeps): Promise<void>;
     saveUpdatedManifest(workDir: string, manifest: XfgManifest, existingManifest: XfgManifest | null, dryRun: boolean, fileChanges: Map<string, FileWriteResult>): void;

package/dist/sync/manifest-manager.js

@@ -5,8 +5,12 @@ import { loadManifest, saveManifest, updateManifest, MANIFEST_FILENAME, } from "
  * Handles manifest loading, saving, and orphan detection.
  */
 export class ManifestManager {
+    log;
+    constructor(log) {
+        this.log = log;
+    }
     processOrphans(workDir, configId, filesWithDeleteOrphaned) {
-        const existingManifest = loadManifest(workDir);
+        const existingManifest = loadManifest(workDir, this.log);
         const { manifest, filesToDelete } = updateManifest(existingManifest, configId, filesWithDeleteOrphaned);
         return { manifest, filesToDelete };
     }

package/dist/sync/manifest.d.ts

@@ -6,57 +6,26 @@ export interface XfgManifest {
     version: 4;
     configs: Record<string, XfgManifestConfigEntry>;
 }
-/**
- * Creates an empty manifest with the current version.
- */
 export declare function createEmptyManifest(): XfgManifest;
 /**
- * Loads the xfg manifest from a repository's working directory.
- * Returns null if the manifest file doesn't exist or is v1 format.
- *
- * V1 manifests are treated as non-existent because they lack the config ID
- * namespace required for multi-config support. The next run will create
- * a fresh v4 manifest.
- *
- * V2/V3 manifests are automatically migrated to V4 format.
- *
- * @param workDir - The repository working directory
- * @returns The manifest or null if not found or incompatible
+ * Loads and migrates manifest from workDir. V1 returns null (no config-ID namespace);
+ * V2/V3 are auto-migrated to V4.
  */
-export declare function loadManifest(workDir: string): XfgManifest | null;
+export declare function loadManifest(workDir: string, log?: {
+    debug(msg: string): void;
+}): XfgManifest | null;
 /**
  * Parses manifest content from a string (e.g., fetched from a remote API).
  * Handles V2→V3 migration, returns null for V1/unknown/invalid formats.
  */
-export declare function parseManifestContent(content: string): XfgManifest | null;
-/**
- * Saves the xfg manifest to a repository's working directory.
- *
- * @param workDir - The repository working directory
- * @param manifest - The manifest to save
- */
+export declare function parseManifestContent(content: string, log?: {
+    debug(msg: string): void;
+}): XfgManifest | null;
 export declare function saveManifest(workDir: string, manifest: XfgManifest): void;
-/**
- * Gets the list of managed files for a specific config from a manifest.
- * Returns an empty array if the manifest is null or the config isn't found.
- *
- * @param manifest - The manifest or null
- * @param configId - The config ID to get files for
- * @returns Array of managed file names for the given config
- */
 export declare function getManagedFiles(manifest: XfgManifest | null, configId: string): string[];
 /**
- * Updates the manifest with the current set of files that have deleteOrphaned enabled
- * for a specific config. Only modifies that config's files namespace - other configs are untouched.
- *
- * Files with deleteOrphaned: true are added to managedFiles.
- * Files with deleteOrphaned: false (explicit) are removed from managedFiles.
- * Files not in the config but in managedFiles for this configId are candidates for deletion.
- *
- * @param manifest - The existing manifest (or null for new repos)
- * @param configId - The config ID to update
- * @param filesWithDeleteOrphaned - Map of fileName to deleteOrphaned value (true/false/undefined)
- * @returns Updated manifest and list of files to delete
+ * Updates manifest tracking for a config. Files with deleteOrphaned: true are tracked;
+ * files previously tracked but no longer in config are returned as filesToDelete.
  */
 export declare function updateManifest(manifest: XfgManifest | null, configId: string, filesWithDeleteOrphaned: Map<string, boolean | undefined>): {
     manifest: XfgManifest;

package/dist/sync/manifest.js

@@ -1,18 +1,12 @@
 import { readFileSync, writeFileSync, existsSync } from "node:fs";
 import { join } from "node:path";
 export const MANIFEST_FILENAME = ".xfg.json";
-/**
- * Type guard to check if a manifest is v1 format.
- */
 function isV1Manifest(manifest) {
     return (typeof manifest === "object" &&
         manifest !== null &&
         manifest.version === 1 &&
         Array.isArray(manifest.managedFiles));
 }
-/**
- * Type guard to check if a manifest is v2 format.
- */
 function isV2Manifest(manifest) {
     return (typeof manifest === "object" &&
         manifest !== null &&
@@ -20,9 +14,6 @@ function isV2Manifest(manifest) {
         typeof manifest.configs === "object" &&
         manifest.configs !== null);
 }
-/**
- * Type guard to check if a manifest is v3 format.
- */
 function isV3Manifest(manifest) {
     return (typeof manifest === "object" &&
         manifest !== null &&
@@ -30,9 +21,6 @@ function isV3Manifest(manifest) {
         typeof manifest.configs === "object" &&
         manifest.configs !== null);
 }
-/**
- * Type guard to check if a manifest is v4 format.
- */
 function isV4Manifest(manifest) {
     return (typeof manifest === "object" &&
         manifest !== null &&
@@ -72,9 +60,6 @@ function migrateV3ToV4(v3) {
     }
     return { version: 4, configs: v4Configs };
 }
-/**
- * Creates an empty manifest with the current version.
- */
 export function createEmptyManifest() {
     return {
         version: 4,
@@ -82,19 +67,10 @@ export function createEmptyManifest() {
     };
 }
 /**
- * Loads the xfg manifest from a repository's working directory.
- * Returns null if the manifest file doesn't exist or is v1 format.
- *
- * V1 manifests are treated as non-existent because they lack the config ID
- * namespace required for multi-config support. The next run will create
- * a fresh v4 manifest.
- *
- * V2/V3 manifests are automatically migrated to V4 format.
- *
- * @param workDir - The repository working directory
- * @returns The manifest or null if not found or incompatible
+ * Loads and migrates manifest from workDir. V1 returns null (no config-ID namespace);
+ * V2/V3 are auto-migrated to V4.
  */
-export function loadManifest(workDir) {
+export function loadManifest(workDir, log) {
     const manifestPath = join(workDir, MANIFEST_FILENAME);
     if (!existsSync(manifestPath)) {
         return null;
@@ -121,7 +97,8 @@ export function loadManifest(workDir) {
         // Unknown format - treat as no manifest
         return null;
     }
-    catch {
+    catch (error) {
+        log?.debug(`Failed to load manifest from ${manifestPath}: ${error}`);
         return null;
     }
 }
@@ -129,7 +106,7 @@ export function loadManifest(workDir) {
  * Parses manifest content from a string (e.g., fetched from a remote API).
  * Handles V2→V3 migration, returns null for V1/unknown/invalid formats.
  */
-export function parseManifestContent(content) {
+export function parseManifestContent(content, log) {
     try {
         const parsed = JSON.parse(content);
         if (isV4Manifest(parsed)) {
@@ -143,29 +120,16 @@ export function parseManifestContent(content) {
         }
         return null;
     }
-    catch {
+    catch (error) {
+        log?.debug(`Failed to parse manifest content: ${error}`);
         return null;
     }
 }
-/**
- * Saves the xfg manifest to a repository's working directory.
- *
- * @param workDir - The repository working directory
- * @param manifest - The manifest to save
- */
 export function saveManifest(workDir, manifest) {
     const manifestPath = join(workDir, MANIFEST_FILENAME);
     const content = JSON.stringify(manifest, null, 2) + "\n";
     writeFileSync(manifestPath, content, "utf-8");
 }
-/**
- * Gets the list of managed files for a specific config from a manifest.
- * Returns an empty array if the manifest is null or the config isn't found.
- *
- * @param manifest - The manifest or null
- * @param configId - The config ID to get files for
- * @returns Array of managed file names for the given config
- */
 export function getManagedFiles(manifest, configId) {
     if (!manifest) {
         return [];
@@ -173,17 +137,8 @@ export function getManagedFiles(manifest, configId) {
     return [...(manifest.configs[configId]?.files ?? [])];
 }
 /**
- * Updates the manifest with the current set of files that have deleteOrphaned enabled
- * for a specific config. Only modifies that config's files namespace - other configs are untouched.
- *
- * Files with deleteOrphaned: true are added to managedFiles.
- * Files with deleteOrphaned: false (explicit) are removed from managedFiles.
- * Files not in the config but in managedFiles for this configId are candidates for deletion.
- *
- * @param manifest - The existing manifest (or null for new repos)
- * @param configId - The config ID to update
- * @param filesWithDeleteOrphaned - Map of fileName to deleteOrphaned value (true/false/undefined)
- * @returns Updated manifest and list of files to delete
+ * Updates manifest tracking for a config. Files with deleteOrphaned: true are tracked;
+ * files previously tracked but no longer in config are returned as filesToDelete.
  */
 export function updateManifest(manifest, configId, filesWithDeleteOrphaned) {
     // Get existing managed files for this config only
@@ -211,7 +166,7 @@ export function updateManifest(manifest, configId, filesWithDeleteOrphaned) {
         ...(manifest?.configs ?? {}),
     };
     // Update this config's managed files
-    const sortedManaged = Array.from(newManaged).sort();
+    const sortedManaged = Array.from(newManaged).sort((a, b) => a.localeCompare(b));
     if (sortedManaged.length > 0) {
         updatedConfigs[configId] = { files: sortedManaged };
     }

package/dist/sync/pr-merge-handler.d.ts

@@ -1,11 +1,7 @@
-import type { RepoConfig } from "../config/index.js";
-import type { RepoInfo } from "../shared/repo-detector.js";
 import type { ILogger } from "../shared/logger.js";
-import { type FileAction } from "../vcs/pr-creator.js";
-import type { DiffStats } from "./diff-utils.js";
-import type { ProcessorResult, PRHandlerOptions, IPRMergeHandler, FileChangeDetail } from "./types.js";
+import type { ProcessorResult, IPRMergeHandler, CreateAndMergeInput } from "./types.js";
 export declare class PRMergeHandler implements IPRMergeHandler {
     private readonly log;
     constructor(log: ILogger);
-    createAndMerge(repoInfo: RepoInfo, repoConfig: RepoConfig, options: PRHandlerOptions, changedFiles: FileAction[], repoName: string, diffStats?: DiffStats, fileChanges?: FileChangeDetail[]): Promise<ProcessorResult>;
+    createAndMerge(input: CreateAndMergeInput): Promise<ProcessorResult>;
 }

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

@@ -1,10 +1,11 @@
-import { createPR, mergePR, } from "../vcs/pr-creator.js";
+import { createPR, mergePR } from "../vcs/pr-creator.js";
 export class PRMergeHandler {
     log;
     constructor(log) {
         this.log = log;
     }
-    async createAndMerge(repoInfo, repoConfig, options, changedFiles, repoName, diffStats, fileChanges) {
+    async createAndMerge(input) {
+        const { repoInfo, repoConfig, options, changedFiles, repoName, diffStats, fileChanges, } = input;
         this.log.info("Creating pull request...");
         const prResult = await createPR({
             repoInfo,
@@ -18,6 +19,7 @@ export class PRMergeHandler {
             executor: options.executor,
             token: options.token,
             labels: repoConfig.prOptions?.labels,
+            log: this.log,
         });
         const mergeMode = repoConfig.prOptions?.merge ?? "auto";
         let mergeResult;
@@ -38,6 +40,7 @@ export class PRMergeHandler {
                 retries: options.retries,
                 executor: options.executor,
                 token: options.token,
+                log: this.log,
             });
             mergeResult = {
                 merged: result.merged ?? false,
@@ -45,7 +48,7 @@ export class PRMergeHandler {
                 message: result.message,
             };
             if (!result.success) {
-                this.log.info(`Warning: Merge operation failed - ${result.message}`);
+                this.log.warn(`Merge operation failed - ${result.message}`);
             }
             else {
                 this.log.info(result.message);

package/dist/sync/repository-processor.d.ts

@@ -1,14 +1,13 @@
 import type { RepoConfig } from "../config/index.js";
 import type { RepoInfo } from "../shared/repo-detector.js";
 import { ILogger } from "../shared/logger.js";
-import { type IFileWriter, type IManifestManager, type IBranchManager, type IAuthOptionsBuilder, type IRepositorySession, type ICommitPushManager, type IFileSyncOrchestrator, type IPRMergeHandler, type ISyncWorkflow, type IRepositoryProcessor, type GitOpsFactory, type ProcessorOptions, type ProcessorResult } from "./index.js";
+import type { IFileWriter, IManifestManager, IBranchManager, IAuthOptionsBuilder, IRepositorySession, ICommitPushManager, IFileSyncOrchestrator, IPRMergeHandler, ISyncWorkflow, IRepositoryProcessor, GitOpsFactory, ProcessorOptions, ProcessorResult } from "./types.js";
 /**
  * Thin facade that delegates to SyncWorkflow with FileSyncStrategy.
  */
 export declare class RepositoryProcessor implements IRepositoryProcessor {
     private readonly syncWorkflow;
     private readonly fileSyncOrchestrator;
-    private readonly log;
     constructor(gitOpsFactory?: GitOpsFactory, log?: ILogger, components?: {
         fileWriter?: IFileWriter;
         manifestManager?: IManifestManager;

package/dist/sync/repository-processor.js

@@ -1,28 +1,36 @@
 import { GitOps } from "../vcs/git-ops.js";
 import { AuthenticatedGitOps } from "../vcs/authenticated-git-ops.js";
+import { defaultExecutor } from "../shared/command-executor.js";
 import { logger } from "../shared/logger.js";
-import { hasGitHubAppCredentials } from "../vcs/index.js";
-import { GitHubAppTokenManager } from "../vcs/github-app-token-manager.js";
-import { FileWriter, ManifestManager, BranchManager, AuthOptionsBuilder, RepositorySession, CommitPushManager, FileSyncOrchestrator, PRMergeHandler, FileSyncStrategy, SyncWorkflow, } from "./index.js";
+import { createTokenManager } from "../vcs/index.js";
+import { FileWriter } from "./file-writer.js";
+import { ManifestManager } from "./manifest-manager.js";
+import { BranchManager } from "./branch-manager.js";
+import { AuthOptionsBuilder } from "./auth-options-builder.js";
+import { RepositorySession } from "./repository-session.js";
+import { CommitPushManager } from "./commit-push-manager.js";
+import { FileSyncOrchestrator } from "./file-sync-orchestrator.js";
+import { PRMergeHandler } from "./pr-merge-handler.js";
+import { FileSyncStrategy } from "./file-sync-strategy.js";
+import { SyncWorkflow } from "./sync-workflow.js";
 /**
  * Thin facade that delegates to SyncWorkflow with FileSyncStrategy.
  */
 export class RepositoryProcessor {
     syncWorkflow;
     fileSyncOrchestrator;
-    log;
     constructor(gitOpsFactory, log, components) {
-        const factory = gitOpsFactory ??
-            ((opts, auth) => new AuthenticatedGitOps(new GitOps(opts), auth));
         const logInstance = log ?? logger;
-        this.log = logInstance;
+        const factory = gitOpsFactory ??
+            ((opts, auth, retries) => {
+                const gitOps = new GitOps({ ...opts, log: logInstance });
+                return new AuthenticatedGitOps(gitOps, opts.executor ?? defaultExecutor, opts.workDir, retries ?? 3, auth, logInstance);
+            });
         // Initialize token manager for auth builder
-        const tokenManager = hasGitHubAppCredentials()
-            ? new GitHubAppTokenManager(process.env.XFG_GITHUB_APP_ID, process.env.XFG_GITHUB_APP_PRIVATE_KEY)
-            : null;
+        const tokenManager = createTokenManager();
         const fileWriter = components?.fileWriter ?? new FileWriter();
-        const manifestManager = components?.manifestManager ?? new ManifestManager();
-        const branchManager = components?.branchManager ?? new BranchManager();
+        const manifestManager = components?.manifestManager ?? new ManifestManager(logInstance);
+        const branchManager = components?.branchManager ?? new BranchManager(logInstance);
         const authOptionsBuilder = components?.authOptionsBuilder ??
             new AuthOptionsBuilder(tokenManager, logInstance);
         const repositorySession = components?.repositorySession ??

package/dist/sync/repository-session.js

@@ -1,3 +1,4 @@
+import { safeCleanup } from "../shared/type-guards.js";
 export class RepositorySession {
     gitOpsFactory;
     log;
@@ -7,28 +8,18 @@ export class RepositorySession {
     }
     async setup(repoInfo, options) {
         const { workDir, dryRun, retries, authOptions } = options;
-        // Create gitOps instance
-        const gitOps = this.gitOpsFactory({ workDir, dryRun, retries }, authOptions);
-        // Clean workspace
-        this.log.info("Cleaning workspace...");
+        const gitOps = this.gitOpsFactory({ workDir, dryRun }, authOptions, retries);
+        this.log.debug("Cleaning workspace...");
         gitOps.cleanWorkspace();
-        // Clone repository
-        this.log.info("Cloning repository...");
+        this.log.debug("Cloning repository...");
         await gitOps.clone(repoInfo.gitUrl);
-        // Detect default branch
         const { branch: baseBranch, method: detectionMethod } = await gitOps.getDefaultBranch();
         this.log.info(`Default branch: ${baseBranch} (detected via ${detectionMethod})`);
-        // Return context with cleanup function
         return {
             gitOps,
             baseBranch,
             cleanup: () => {
-                try {
-                    gitOps.cleanWorkspace();
-                }
-                catch {
-                    // Ignore cleanup errors - best effort
-                }
+                safeCleanup(() => gitOps.cleanWorkspace(), "workspace removal failed", this.log);
             },
         };
     }

package/dist/sync/sync-workflow.js

@@ -1,4 +1,5 @@
 import { getRepoDisplayName } from "../shared/repo-detector.js";
+import { safeCleanup } from "../shared/type-guards.js";
 import { defaultExecutor } from "../shared/command-executor.js";
 /**
  * Orchestrates the common sync workflow steps.
@@ -21,47 +22,37 @@ export class SyncWorkflow {
     }
     async execute(repoConfig, repoInfo, options, workStrategy) {
         const repoName = getRepoDisplayName(repoInfo);
-        const { branchName, workDir, dryRun } = options;
+        const { branchName, workDir } = options;
+        const dryRun = options.dryRun ?? false;
         const retries = options.retries ?? 3;
         const executor = options.executor ?? defaultExecutor;
-        // Step 1: Resolve auth
-        const authResult = await this.authOptionsBuilder.resolve(repoInfo, repoName);
-        if (authResult.skipResult) {
+        const authResult = await this.authOptionsBuilder.resolve(repoInfo, repoName, options.token);
+        if (!authResult.ok) {
             return authResult.skipResult;
         }
-        // Step 2: Determine merge mode
         const mergeMode = repoConfig.prOptions?.merge ?? "auto";
         const isDirectMode = mergeMode === "direct";
-        // Warn if mergeStrategy is set but ignored in direct mode
-        if (isDirectMode && repoConfig.prOptions?.mergeStrategy) {
-            this.log.info(`Warning: mergeStrategy '${repoConfig.prOptions.mergeStrategy}' is ignored in direct mode`);
-        }
         let session = null;
         try {
-            // Step 3: Setup session
             session = await this.repositorySession.setup(repoInfo, {
                 workDir,
-                dryRun: dryRun ?? false,
+                dryRun,
                 retries,
                 authOptions: authResult.authOptions,
             });
-            // Step 4: Setup branch
             await this.branchManager.setupBranch({
                 repoInfo,
                 branchName,
                 baseBranch: session.baseBranch,
                 workDir,
                 isDirectMode,
-                dryRun: dryRun ?? false,
+                dryRun,
                 retries,
                 token: authResult.token,
                 gitOps: session.gitOps,
-                log: this.log,
                 executor,
             });
-            // Step 5: Execute work strategy
             const workResult = await workStrategy.execute(repoConfig, repoInfo, session, options);
-            // Step 6: No changes - skip
             if (!workResult) {
                 return {
                     success: true,
@@ -70,7 +61,6 @@ export class SyncWorkflow {
                     skipped: true,
                 };
             }
-            // Step 7: Commit and push
             const pushBranch = isDirectMode ? session.baseBranch : branchName;
             const commitResult = await this.commitPushManager.commitAndPush({
                 repoInfo,
@@ -80,13 +70,12 @@ export class SyncWorkflow {
                 commitMessage: workResult.commitMessage,
                 pushBranch,
                 isDirectMode,
-                dryRun: dryRun ?? false,
+                dryRun,
                 retries,
                 token: authResult.token,
                 executor,
-            }, repoName);
-            // Step 8: Handle commit errors
-            if (!commitResult.success && commitResult.errorResult) {
+            });
+            if (!commitResult.success) {
                 return commitResult.errorResult;
             }
             if (commitResult.skipped) {
@@ -99,7 +88,6 @@ export class SyncWorkflow {
                     fileChanges: workResult.fileChangeDetails,
                 };
             }
-            // Step 9: Direct mode - done
             if (isDirectMode) {
                 this.log.info(`Changes pushed directly to ${session.baseBranch}`);
                 return {
@@ -110,24 +98,29 @@ export class SyncWorkflow {
                     fileChanges: workResult.fileChangeDetails,
                 };
             }
-            // Step 10: Create and merge PR
-            return await this.prMergeHandler.createAndMerge(repoInfo, repoConfig, {
-                branchName,
-                baseBranch: session.baseBranch,
-                workDir,
-                dryRun: dryRun ?? false,
-                retries,
-                prTemplate: options.prTemplate,
-                token: authResult.token,
-                executor,
-            }, workResult.changedFiles, repoName, workResult.diffStats, workResult.fileChangeDetails);
+            return await this.prMergeHandler.createAndMerge({
+                repoInfo,
+                repoConfig,
+                options: {
+                    branchName,
+                    baseBranch: session.baseBranch,
+                    workDir,
+                    dryRun,
+                    retries,
+                    prTemplate: options.prTemplate,
+                    token: authResult.token,
+                    executor,
+                },
+                changedFiles: workResult.changedFiles,
+                repoName,
+                diffStats: workResult.diffStats,
+                fileChanges: workResult.fileChangeDetails,
+            });
         }
         finally {
-            try {
-                session?.cleanup();
-            }
-            catch {
-                // Ignore cleanup errors - best effort
+            if (session) {
+                const s = session;
+                safeCleanup(() => s.cleanup(), "session teardown failed", this.log);
             }
         }
     }