@aspruyt/xfg 4.0.0 → 4.0.2

package/dist/sync/types.d.ts

@@ -1,28 +1,18 @@
 import type { FileContent, RepoConfig } from "../config/types.js";
 import type { RepoInfo } from "../shared/repo-detector.js";
-import type { IAuthenticatedGitOps, GitAuthOptions } from "../vcs/authenticated-git-ops.js";
+import type { ILocalGitOps, IGitOps, GitAuthOptions } from "../vcs/authenticated-git-ops.js";
 import type { GitOpsOptions } from "../vcs/git-ops.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/pr-creator.js";
-/**
- * Factory function type for creating IAuthenticatedGitOps instances.
- * Allows dependency injection for testing.
- */
-export type GitOpsFactory = (options: GitOpsOptions, auth?: GitAuthOptions) => IAuthenticatedGitOps;
-/**
- * Result of processing a single file
- */
+export type GitOpsFactory = (options: GitOpsOptions, auth?: GitAuthOptions, retries?: number) => IGitOps;
 export interface FileWriteResult {
     fileName: string;
     content: string | null;
     action: "create" | "update" | "delete" | "skip";
 }
-/**
- * Context for file writing operations
- */
 export interface FileWriteContext {
     repoInfo: RepoInfo;
     baseBranch: string;
@@ -30,72 +20,38 @@ export interface FileWriteContext {
     dryRun: boolean;
     noDelete: boolean;
     configId: string;
+    /** True when using GraphQL commit strategy (GitHub App) which cannot set file modes */
+    isGraphQLCommitMode?: boolean;
 }
-/**
- * Dependencies for FileWriter
- */
 export interface FileWriterDeps {
-    gitOps: IAuthenticatedGitOps;
+    gitOps: ILocalGitOps;
     log: ILogger;
 }
-/**
- * Result of writing all files
- */
 export interface FileWriteAllResult {
     fileChanges: Map<string, FileWriteResult>;
     diffStats: DiffStats;
 }
-/**
- * Interface for file writing operations
- */
 export interface IFileWriter {
-    /**
-     * Write all files from config to repository
-     */
     writeFiles(files: FileContent[], ctx: FileWriteContext, deps: FileWriterDeps): Promise<FileWriteAllResult>;
 }
-/**
- * Result of processing orphans
- */
 export interface OrphanProcessResult {
     manifest: XfgManifest;
     filesToDelete: string[];
 }
-/**
- * Options for orphan deletion
- */
 export interface OrphanDeleteOptions {
     dryRun: boolean;
     noDelete: boolean;
 }
-/**
- * Dependencies for orphan deletion
- */
 export interface OrphanDeleteDeps {
-    gitOps: IAuthenticatedGitOps;
+    gitOps: ILocalGitOps;
     log: ILogger;
     fileChanges: Map<string, FileWriteResult>;
 }
-/**
- * Interface for manifest management operations
- */
 export interface IManifestManager {
-    /**
-     * Process manifest to find orphaned files
-     */
     processOrphans(workDir: string, configId: string, filesWithDeleteOrphaned: Map<string, boolean | undefined>): OrphanProcessResult;
-    /**
-     * Delete orphaned files
-     */
     deleteOrphans(filesToDelete: string[], options: OrphanDeleteOptions, deps: OrphanDeleteDeps): Promise<void>;
-    /**
-     * Save updated manifest
-     */
     saveUpdatedManifest(workDir: string, manifest: XfgManifest, existingManifest: XfgManifest | null, dryRun: boolean, fileChanges: Map<string, FileWriteResult>): void;
 }
-/**
- * Options for branch setup
- */
 export interface BranchSetupOptions {
     repoInfo: RepoInfo;
     branchName: string;
@@ -105,81 +61,40 @@ export interface BranchSetupOptions {
     dryRun: boolean;
     retries: number;
     token?: string;
-    gitOps: IAuthenticatedGitOps;
-    log: ILogger;
+    gitOps: IGitOps;
     executor: ICommandExecutor;
 }
-/**
- * Interface for branch management operations
- */
 export interface IBranchManager {
-    /**
-     * Setup branch for sync (close existing PR, create fresh branch)
-     */
     setupBranch(options: BranchSetupOptions): Promise<void>;
 }
-/**
- * Result of resolving authentication for a repository
- */
-export interface AuthResult {
-    /** Installation token or PAT */
+export type AuthResult = {
+    ok: true;
     token?: string;
-    /** Auth options for git operations */
     authOptions?: GitAuthOptions;
-    /** If set, caller should return this result (e.g., no installation found) */
-    skipResult?: {
-        success: boolean;
-        repoName: string;
-        message: string;
-        skipped?: boolean;
-    };
-}
-/**
- * Interface for building authentication options
- */
+} | {
+    ok: false;
+    skipResult: ProcessorResult;
+};
 export interface IAuthOptionsBuilder {
-    /**
-     * Resolve authentication for a repository.
-     * Returns token and auth options, or a skip result if repo should be skipped.
-     */
-    resolve(repoInfo: RepoInfo, repoName: string): Promise<AuthResult>;
+    resolve(repoInfo: RepoInfo, repoName: string, preResolvedToken?: string): Promise<AuthResult>;
 }
-/**
- * Options for setting up a repository session
- */
 export interface SessionOptions {
     workDir: string;
     dryRun: boolean;
     retries: number;
     authOptions?: GitAuthOptions;
 }
-/**
- * Context returned from session setup
- */
 export interface SessionContext {
-    /** Authenticated git operations */
-    gitOps: IAuthenticatedGitOps;
-    /** Default branch name */
+    gitOps: IGitOps;
     baseBranch: string;
-    /** Cleanup function - call in finally block */
     cleanup: () => void;
 }
-/**
- * Interface for managing repository workspace lifecycle
- */
 export interface IRepositorySession {
-    /**
-     * Setup repository workspace: clean, clone, detect default branch.
-     * Returns context with gitOps and cleanup function.
-     */
     setup(repoInfo: RepoInfo, options: SessionOptions): Promise<SessionContext>;
 }
-/**
- * Options for commit and push operations
- */
 export interface CommitPushOptions {
     repoInfo: RepoInfo;
-    gitOps: IAuthenticatedGitOps;
+    gitOps: IGitOps;
     workDir: string;
     fileChanges: Map<string, FileWriteResult>;
     commitMessage: string;
@@ -190,34 +105,19 @@ export interface CommitPushOptions {
     token?: string;
     executor: ICommandExecutor;
 }
-/**
- * Result of commit and push operation
- */
-export interface CommitPushResult {
-    /** Whether commit/push succeeded */
-    success: boolean;
-    /** If failed, contains error result to return */
-    errorResult?: {
-        success: boolean;
-        repoName: string;
-        message: string;
-    };
-    /** If success but no changes, indicates skip */
-    skipped?: boolean;
-}
-/**
- * Interface for commit and push operations
- */
+export type CommitPushResult = {
+    success: true;
+    skipped?: false;
+} | {
+    success: true;
+    skipped: true;
+} | {
+    success: false;
+    errorResult: ProcessorResult;
+};
 export interface ICommitPushManager {
-    /**
-     * Stage, commit, and push changes.
-     * Handles dry-run mode and branch protection errors.
-     */
-    commitAndPush(options: CommitPushOptions, repoName: string): Promise<CommitPushResult>;
+    commitAndPush(options: CommitPushOptions): Promise<CommitPushResult>;
 }
-/**
- * Options for repository processing
- */
 export interface ProcessorOptions {
     branchName: string;
     workDir: string;
@@ -227,17 +127,15 @@ export interface ProcessorOptions {
     executor?: ICommandExecutor;
     prTemplate?: string;
     noDelete?: boolean;
+    /** Pre-resolved GitHub token — avoids duplicate resolution in AuthOptionsBuilder */
+    token?: string;
+    /** True when using GraphQL commit strategy (GitHub App) which cannot set file modes */
+    isGraphQLCommitMode?: boolean;
 }
-/**
- * Detail of a single file change for reporting
- */
 export interface FileChangeDetail {
     path: string;
     action: "create" | "update" | "delete";
 }
-/**
- * Result of repository processing
- */
 export interface ProcessorResult {
     success: boolean;
     repoName: string;
@@ -252,33 +150,18 @@ export interface ProcessorResult {
     diffStats?: DiffStats;
     fileChanges?: FileChangeDetail[];
 }
-/**
- * Interface for repository processing operations
- */
 export interface IRepositoryProcessor {
     process(repoConfig: RepoConfig, repoInfo: RepoInfo, options: ProcessorOptions): Promise<ProcessorResult>;
 }
-/**
- * Result of file synchronization
- */
 export interface FileSyncResult {
     fileChanges: Map<string, FileWriteResult>;
     diffStats: DiffStats;
     changedFiles: FileAction[];
     hasChanges: boolean;
 }
-/**
- * Interface for file synchronization orchestration
- */
 export interface IFileSyncOrchestrator {
-    /**
-     * Write files, handle orphans, update manifest, return change summary.
-     */
     sync(repoConfig: RepoConfig, repoInfo: RepoInfo, session: SessionContext, options: ProcessorOptions): Promise<FileSyncResult>;
 }
-/**
- * Options for PR creation and merge
- */
 export interface PRHandlerOptions {
     branchName: string;
     baseBranch: string;
@@ -289,48 +172,30 @@ export interface PRHandlerOptions {
     token?: string;
     executor: ICommandExecutor;
 }
-/**
- * Interface for PR creation and merge handling
- */
+export interface CreateAndMergeInput {
+    repoInfo: RepoInfo;
+    repoConfig: RepoConfig;
+    options: PRHandlerOptions;
+    changedFiles: FileAction[];
+    repoName: string;
+    diffStats?: DiffStats;
+    fileChanges?: FileChangeDetail[];
+}
 export interface IPRMergeHandler {
-    /**
-     * Create PR and optionally merge based on repo config.
-     * Returns ProcessorResult with PR URL and merge status.
-     */
-    createAndMerge(repoInfo: RepoInfo, repoConfig: RepoConfig, options: PRHandlerOptions, changedFiles: FileAction[], repoName: string, diffStats?: DiffStats, fileChanges?: FileChangeDetail[]): Promise<ProcessorResult>;
+    createAndMerge(input: CreateAndMergeInput): Promise<ProcessorResult>;
 }
-/**
- * Result of executing work within a sync workflow
- */
 export interface WorkResult {
-    /** File changes to commit */
     fileChanges: Map<string, FileWriteResult>;
-    /** Changed files for PR body */
     changedFiles: FileAction[];
-    /** Diff statistics for reporting */
     diffStats?: DiffStats;
-    /** Human-readable commit message */
     commitMessage: string;
-    /** File change details for result reporting */
     fileChangeDetails: FileChangeDetail[];
 }
-/**
- * Strategy for executing work within the sync workflow.
- * Implementations define what changes to make (files vs manifest).
- */
+/** Defines what changes to make within the sync workflow. Return null if no changes. */
 export interface IWorkStrategy {
-    /**
-     * Execute work and return changes to commit.
-     * Return null if no changes detected (workflow will skip).
-     */
     execute(repoConfig: RepoConfig, repoInfo: RepoInfo, session: SessionContext, options: ProcessorOptions): Promise<WorkResult | null>;
 }
-/**
- * Orchestrates the common sync workflow steps.
- */
+/** Orchestrates: auth → session → branch → work → commit → PR */
 export interface ISyncWorkflow {
-    /**
-     * Execute workflow: auth → session → branch → work → commit → PR
-     */
     execute(repoConfig: RepoConfig, repoInfo: RepoInfo, options: ProcessorOptions, workStrategy: IWorkStrategy): Promise<ProcessorResult>;
 }

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

@@ -1,40 +1,28 @@
-import { GitOps } from "./git-ops.js";
+import type { ICommandExecutor } from "../shared/command-executor.js";
+import type { GitAuthOptions, ILocalGitOps, IGitOps } from "./types.js";
+export type { GitAuthOptions, ILocalGitOps, INetworkGitOps, IGitOps, } from "./types.js";
 /**
- * Options for authenticated git operations.
- */
-export interface GitAuthOptions {
-    /** Access token for authentication */
-    token: string;
-    /** Git host (e.g., "github.com", "github.mycompany.com") */
-    host: string;
-    /** Repository owner */
-    owner: string;
-    /** Repository name */
-    repo: string;
-}
-/**
- * Interface for authenticated git operations.
- * Enables proper mocking in tests without relying on class inheritance.
+ * 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 interface IAuthenticatedGitOps {
-    clone(gitUrl: string): Promise<void>;
-    fetch(options?: {
-        prune?: boolean;
-    }): Promise<void>;
-    push(branchName: string, options?: {
-        force?: boolean;
-    }): Promise<void>;
-    getDefaultBranch(): Promise<{
-        branch: string;
-        method: string;
-    }>;
-    lsRemote(branchName: string, options?: {
-        skipRetry?: boolean;
-    }): Promise<string>;
-    pushRefspec(refspec: string, options?: {
-        delete?: boolean;
-    }): Promise<void>;
-    fetchBranch(branchName: string): Promise<void>;
+export declare class AuthenticatedGitOps implements IGitOps {
+    private readonly localOps;
+    private readonly executor;
+    private readonly workDir;
+    private readonly retries;
+    private readonly auth?;
+    private readonly log?;
+    constructor(localOps: ILocalGitOps, executor: ICommandExecutor, workDir: string, retries: number, auth?: GitAuthOptions | undefined, log?: {
+        debug(msg: string): void;
+    } | undefined);
+    private execWithRetry;
+    /**
+     * Build the authenticated remote URL.
+     */
+    private getAuthenticatedUrl;
     cleanWorkspace(): void;
     createBranch(branchName: string): Promise<void>;
     writeFile(fileName: string, content: string): void;
@@ -48,28 +36,10 @@ export interface IAuthenticatedGitOps {
     fileExists(fileName: string): boolean;
     deleteFile(fileName: string): void;
     commit(message: string): Promise<boolean>;
-}
-/**
- * Wrapper around GitOps that adds authentication to network operations.
- *
- * When auth options are provided, network operations (clone, fetch, push,
- * getDefaultBranch) use `-c url.insteadOf` to override credentials per-command.
- * This allows different tokens for different repos without global git config.
- *
- * Local operations (commit, writeFile, etc.) pass through unchanged.
- */
-export declare class AuthenticatedGitOps implements IAuthenticatedGitOps {
-    private gitOps;
-    private auth?;
-    private executor;
-    private workDir;
-    private retries;
-    constructor(gitOps: GitOps, auth?: GitAuthOptions);
-    private execWithRetry;
-    /**
-     * Build the authenticated remote URL.
-     */
-    private getAuthenticatedUrl;
+    getDefaultBranchLocal(): Promise<{
+        branch: string;
+        method: string;
+    }>;
     clone(gitUrl: string): Promise<void>;
     fetch(options?: {
         prune?: boolean;
@@ -103,17 +73,4 @@ export declare class AuthenticatedGitOps implements IAuthenticatedGitOps {
      * Used by GraphQLCommitStrategy to update local refs.
      */
     fetchBranch(branchName: string): Promise<void>;
-    cleanWorkspace(): void;
-    createBranch(branchName: string): Promise<void>;
-    writeFile(fileName: string, content: string): void;
-    setExecutable(fileName: string): Promise<void>;
-    getFileContent(fileName: string): string | null;
-    wouldChange(fileName: string, content: string): boolean;
-    hasChanges(): Promise<boolean>;
-    getChangedFiles(): Promise<string[]>;
-    hasStagedChanges(): Promise<boolean>;
-    fileExistsOnBranch(fileName: string, branch: string): Promise<boolean>;
-    fileExists(fileName: string): boolean;
-    deleteFile(fileName: string): void;
-    commit(message: string): Promise<boolean>;
 }