@shepai/cli 1.175.1-pr537.fc6a92c → 1.176.0

package/dist/packages/core/src/infrastructure/services/git/branch-discovery.service.js

@@ -1,185 +0,0 @@
-/**
- * Branch Discovery Service
- *
- * Handles branch and remote discovery operations: checking remotes,
- * resolving default branches, sync status, and branch management.
- */
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-var __param = (this && this.__param) || function (paramIndex, decorator) {
-    return function (target, key) { decorator(target, key, paramIndex); }
-};
-import { injectable, inject } from 'tsyringe';
-import { GitPrError, GitPrErrorCode, } from '../../../application/ports/output/services/git-pr-service.interface.js';
-let BranchDiscoveryService = class BranchDiscoveryService {
-    execFile;
-    constructor(execFile) {
-        this.execFile = execFile;
-    }
-    async hasRemote(cwd) {
-        const { stdout } = await this.execFile('git', ['remote'], { cwd });
-        return stdout.trim().length > 0;
-    }
-    async getRemoteUrl(cwd) {
-        try {
-            const { stdout } = await this.execFile('git', ['remote', 'get-url', 'origin'], { cwd });
-            const raw = stdout.trim();
-            if (!raw)
-                return null;
-            // Convert SSH URLs to HTTPS: git@github.com:org/repo.git → https://github.com/org/repo
-            if (raw.startsWith('git@')) {
-                return raw.replace(/^git@([^:]+):/, 'https://$1/').replace(/\.git$/, '');
-            }
-            // Strip trailing .git from HTTPS URLs
-            return raw.replace(/\.git$/, '');
-        }
-        catch {
-            return null;
-        }
-    }
-    async getDefaultBranch(cwd) {
-        // 1. Try remote HEAD reference (most reliable when remote exists)
-        try {
-            const { stdout } = await this.execFile('git', ['symbolic-ref', 'refs/remotes/origin/HEAD'], {
-                cwd,
-            });
-            const ref = stdout.trim(); // e.g. "refs/remotes/origin/main"
-            if (ref)
-                return ref.replace('refs/remotes/origin/', '');
-        }
-        catch {
-            // No remote HEAD configured — continue to fallbacks
-        }
-        // 2. Check for common default branch names locally.
-        //    If both exist, pick the one with the most recent commit.
-        const candidates = [];
-        for (const name of ['main', 'master']) {
-            try {
-                const { stdout } = await this.execFile('git', ['rev-parse', '--verify', `refs/heads/${name}`], { cwd });
-                if (stdout.trim())
-                    candidates.push(name);
-            }
-            catch {
-                // Branch doesn't exist — try next
-            }
-        }
-        if (candidates.length === 1)
-            return candidates[0];
-        if (candidates.length > 1) {
-            // Pick the branch with the most recent commit
-            try {
-                const { stdout } = await this.execFile('git', [
-                    'for-each-ref',
-                    '--sort=-committerdate',
-                    '--format=%(refname:short)',
-                    ...candidates.map((c) => `refs/heads/${c}`),
-                ], { cwd });
-                const newest = stdout.trim().split('\n')[0];
-                if (newest)
-                    return newest;
-            }
-            catch {
-                // Fall through to first candidate
-            }
-            return candidates[0];
-        }
-        // 3. Check git config init.defaultBranch (user/system-level default)
-        try {
-            const { stdout } = await this.execFile('git', ['config', 'init.defaultBranch'], { cwd });
-            const configured = stdout.trim();
-            if (configured)
-                return configured;
-        }
-        catch {
-            // Not configured — continue
-        }
-        // 4. Fall back to current branch ONLY in the main worktree (not feature worktrees).
-        // In a feature worktree, symbolic-ref HEAD returns the feature branch, not the default.
-        try {
-            const gitDir = await this.execFile('git', ['rev-parse', '--git-dir'], { cwd });
-            const gitCommonDir = await this.execFile('git', ['rev-parse', '--git-common-dir'], { cwd });
-            const isMainWorktree = gitDir.stdout.trim() === gitCommonDir.stdout.trim();
-            if (isMainWorktree) {
-                const { stdout } = await this.execFile('git', ['symbolic-ref', '--short', 'HEAD'], { cwd });
-                const branch = stdout.trim();
-                if (branch)
-                    return branch;
-            }
-        }
-        catch {
-            // Detached HEAD or other error — continue
-        }
-        // 5. Ultimate fallback — throw instead of silently guessing
-        throw new Error(`Unable to determine default branch for repository at ${cwd}. ` +
-            `No remote HEAD, no main/master branch, and no init.defaultBranch configured.`);
-    }
-    async revParse(cwd, ref) {
-        const { stdout } = await this.execFile('git', ['rev-parse', ref], { cwd });
-        return stdout.trim();
-    }
-    async addRemote(cwd, remoteName, remoteUrl) {
-        try {
-            await this.execFile('git', ['remote', 'add', remoteName, remoteUrl], { cwd });
-        }
-        catch (error) {
-            throw this.parseGitError(error);
-        }
-    }
-    async deleteBranch(cwd, branch, deleteRemote) {
-        try {
-            await this.execFile('git', ['branch', '-d', branch], { cwd });
-            if (deleteRemote) {
-                await this.execFile('git', ['push', 'origin', '--delete', branch], { cwd });
-            }
-        }
-        catch (error) {
-            throw this.parseGitError(error);
-        }
-    }
-    async getBranchSyncStatus(cwd, featureBranch, baseBranch) {
-        try {
-            const remoteRef = `origin/${baseBranch}`;
-            const [aheadResult, behindResult] = await Promise.all([
-                this.execFile('git', ['rev-list', '--count', `${remoteRef}..${featureBranch}`], { cwd }),
-                this.execFile('git', ['rev-list', '--count', `${featureBranch}..${remoteRef}`], { cwd }),
-            ]);
-            return {
-                ahead: parseInt(aheadResult.stdout.trim(), 10) || 0,
-                behind: parseInt(behindResult.stdout.trim(), 10) || 0,
-            };
-        }
-        catch (error) {
-            throw this.parseGitError(error);
-        }
-    }
-    parseGitError(error) {
-        const message = error instanceof Error ? error.message : String(error);
-        const cause = error instanceof Error ? error : undefined;
-        if (message.includes('CONFLICT') && message.includes('rebase')) {
-            return new GitPrError(message, GitPrErrorCode.REBASE_CONFLICT, cause);
-        }
-        if (message.includes('non-fast-forward') || message.includes('diverged')) {
-            return new GitPrError(message, GitPrErrorCode.SYNC_FAILED, cause);
-        }
-        if (message.includes('rejected') || message.includes('conflict')) {
-            return new GitPrError(message, GitPrErrorCode.MERGE_CONFLICT, cause);
-        }
-        if (message.includes('Authentication') || message.includes('auth') || message.includes('403')) {
-            return new GitPrError(message, GitPrErrorCode.AUTH_FAILURE, cause);
-        }
-        return new GitPrError(message, GitPrErrorCode.GIT_ERROR, cause);
-    }
-};
-BranchDiscoveryService = __decorate([
-    injectable(),
-    __param(0, inject('ExecFunction')),
-    __metadata("design:paramtypes", [Function])
-], BranchDiscoveryService);
-export { BranchDiscoveryService };

package/dist/packages/core/src/infrastructure/services/git/ci-status.service.d.ts

@@ -1,24 +0,0 @@
-/**
- * CI Status Service
- *
- * Handles CI-related operations: checking CI status, watching CI runs,
- * retrieving failure logs, and verifying merges.
- */
-import type { CiStatusResult } from '../../../application/ports/output/services/git-pr-service.interface.js';
-import type { ExecFunction } from './worktree.service.js';
-export declare class CiStatusService {
-    private readonly execFile;
-    constructor(execFile: ExecFunction);
-    getCiStatus(cwd: string, branch: string): Promise<CiStatusResult>;
-    watchCi(cwd: string, branch: string, timeoutMs?: number, intervalSeconds?: number): Promise<CiStatusResult>;
-    getFailureLogs(cwd: string, runId: string, _branch: string, logMaxChars?: number): Promise<string>;
-    verifyMerge(cwd: string, featureBranch: string, baseBranch: string, premergeBaseSha?: string): Promise<boolean>;
-    /**
-     * Resolve a branch name to a valid git ref, falling back to the remote
-     * tracking branch if the local ref has been deleted.
-     */
-    private resolveRef;
-    private truncateLog;
-    private parseGhError;
-}
-//# sourceMappingURL=ci-status.service.d.ts.map

package/dist/packages/core/src/infrastructure/services/git/ci-status.service.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ci-status.service.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/infrastructure/services/git/ci-status.service.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wEAAwE,CAAC;AAK7G,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAE1D,qBACa,eAAe;IACU,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAAR,QAAQ,EAAE,YAAY;IAErE,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAsBjE,OAAO,CACX,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,EACd,SAAS,CAAC,EAAE,MAAM,EAClB,eAAe,CAAC,EAAE,MAAM,GACvB,OAAO,CAAC,cAAc,CAAC;IAiEpB,cAAc,CAClB,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,WAAW,SAAS,GACnB,OAAO,CAAC,MAAM,CAAC;IAWZ,WAAW,CACf,GAAG,EAAE,MAAM,EACX,aAAa,EAAE,MAAM,EACrB,UAAU,EAAE,MAAM,EAClB,eAAe,CAAC,EAAE,MAAM,GACvB,OAAO,CAAC,OAAO,CAAC;IA6CnB;;;OAGG;YACW,UAAU;IAmBxB,OAAO,CAAC,WAAW;IAQnB,OAAO,CAAC,YAAY;CAcrB"}

package/dist/packages/core/src/infrastructure/services/git/ci-status.service.js

@@ -1,202 +0,0 @@
-/**
- * CI Status Service
- *
- * Handles CI-related operations: checking CI status, watching CI runs,
- * retrieving failure logs, and verifying merges.
- */
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-var __param = (this && this.__param) || function (paramIndex, decorator) {
-    return function (target, key) { decorator(target, key, paramIndex); }
-};
-import { injectable, inject } from 'tsyringe';
-import { GitPrError, GitPrErrorCode, } from '../../../application/ports/output/services/git-pr-service.interface.js';
-let CiStatusService = class CiStatusService {
-    execFile;
-    constructor(execFile) {
-        this.execFile = execFile;
-    }
-    async getCiStatus(cwd, branch) {
-        try {
-            const { stdout } = await this.execFile('gh', ['run', 'list', '--branch', branch, '--json', 'conclusion,url', '--limit', '1'], { cwd });
-            const runs = JSON.parse(stdout);
-            if (runs.length === 0 || !runs[0].conclusion) {
-                return { status: 'pending', runUrl: runs[0]?.url };
-            }
-            return {
-                status: runs[0].conclusion === 'success' ? 'success' : 'failure',
-                runUrl: runs[0].url,
-            };
-        }
-        catch (error) {
-            throw this.parseGhError(error);
-        }
-    }
-    async watchCi(cwd, branch, timeoutMs, intervalSeconds) {
-        // Resolve the latest run for the branch BEFORE the try/catch so the
-        // runUrl is available in both success and failure return paths.
-        let runUrl;
-        try {
-            // gh run watch requires a run ID — it does not support --branch.
-            // First, resolve the latest run ID for the branch via gh run list.
-            const { stdout: listOut } = await this.execFile('gh', ['run', 'list', '--branch', branch, '--json', 'databaseId,url', '--limit', '1'], { cwd });
-            const runs = JSON.parse(listOut);
-            if (runs.length === 0 || !runs[0].databaseId) {
-                return { status: 'pending' };
-            }
-            const runId = String(runs[0].databaseId);
-            runUrl = runs[0].url;
-            const interval = intervalSeconds ?? 30;
-            const args = [
-                'run',
-                'watch',
-                runId,
-                '--exit-status',
-                '--compact',
-                '--interval',
-                String(interval),
-            ];
-            const { stdout } = await this.execFile('gh', args, {
-                cwd,
-                ...(timeoutMs ? { timeout: timeoutMs } : {}),
-            });
-            // gh run watch --exit-status exits 0 when the run succeeds.
-            // If we reach here (no exception), CI passed — no need for fragile stdout parsing.
-            return {
-                status: 'success',
-                runUrl,
-                logExcerpt: stdout.trim(),
-            };
-        }
-        catch (error) {
-            const message = error instanceof Error ? error.message : String(error);
-            const cause = error instanceof Error ? error : undefined;
-            if (message.includes('timed out') || message.includes('timeout')) {
-                throw new GitPrError(message, GitPrErrorCode.CI_TIMEOUT, cause);
-            }
-            // gh run watch --exit-status exits non-zero when the run fails.
-            // Node.js execFile produces errors with a numeric `code` (exit code) and
-            // stdout/stderr from the process. The error.message is typically
-            // "Command failed: gh run watch <id> --exit-status\n" — detect this by
-            // checking for a numeric exit code or the "Command failed" prefix.
-            const exitCode = error?.code;
-            const hasNumericExitCode = typeof exitCode === 'number';
-            const isCommandFailure = message.includes('Command failed') || message.includes('exit code');
-            if (hasNumericExitCode || isCommandFailure) {
-                // Build a useful log excerpt from stdout/stderr if available
-                const errObj = error;
-                const parts = [errObj.stdout, errObj.stderr, message].filter(Boolean);
-                return { status: 'failure', runUrl, logExcerpt: parts.join('\n').trim() };
-            }
-            throw new GitPrError(message, GitPrErrorCode.GIT_ERROR, cause);
-        }
-    }
-    async getFailureLogs(cwd, runId, _branch, logMaxChars = 50_000) {
-        try {
-            const { stdout } = await this.execFile('gh', ['run', 'view', runId, '--log-failed'], {
-                cwd,
-            });
-            return this.truncateLog(stdout, logMaxChars, runId);
-        }
-        catch (error) {
-            throw this.parseGhError(error);
-        }
-    }
-    async verifyMerge(cwd, featureBranch, baseBranch, premergeBaseSha) {
-        // Resolve the feature branch ref — the local branch may have been deleted
-        // after a squash merge (git branch -d succeeds when pushed to remote).
-        // Fall back to the remote tracking branch if the local ref is gone.
-        const resolvedRef = await this.resolveRef(cwd, featureBranch);
-        if (!resolvedRef)
-            return false;
-        // First try: true merge (feature branch is ancestor of base)
-        try {
-            await this.execFile('git', ['merge-base', '--is-ancestor', resolvedRef, baseBranch], {
-                cwd,
-            });
-            return true;
-        }
-        catch {
-            // Not a true merge — check for squash merge by comparing tree content.
-            // After a squash merge, all changes from the feature branch are on the base
-            // branch, so `git diff featureBranch baseBranch` should produce no output.
-        }
-        try {
-            await this.execFile('git', ['diff', '--quiet', resolvedRef, baseBranch], { cwd });
-            // --quiet exits 0 when there's no diff → squash merge verified
-            return true;
-        }
-        catch {
-            // Exit code 1 = diff exists (not merged), other errors also mean unverified.
-            // Fall through to premergeBaseSha check if available.
-        }
-        // Third fallback: if the caller recorded the base branch HEAD before the merge
-        // agent ran, check whether it advanced. This handles agents that legitimately
-        // modify the tree during squash merge (e.g. adding .gitignore, removing
-        // node_modules). If baseBranch HEAD moved forward, the agent committed something.
-        if (premergeBaseSha) {
-            try {
-                const { stdout } = await this.execFile('git', ['rev-parse', baseBranch], { cwd });
-                const currentSha = stdout.trim();
-                return currentSha !== premergeBaseSha;
-            }
-            catch {
-                return false;
-            }
-        }
-        return false;
-    }
-    /**
-     * Resolve a branch name to a valid git ref, falling back to the remote
-     * tracking branch if the local ref has been deleted.
-     */
-    async resolveRef(cwd, branch) {
-        // Try local ref first
-        try {
-            await this.execFile('git', ['rev-parse', '--verify', branch], { cwd });
-            return branch;
-        }
-        catch {
-            // Local ref doesn't exist
-        }
-        // Try remote tracking branch
-        const remoteRef = `origin/${branch}`;
-        try {
-            await this.execFile('git', ['rev-parse', '--verify', remoteRef], { cwd });
-            return remoteRef;
-        }
-        catch {
-            return null;
-        }
-    }
-    truncateLog(output, maxChars, runId) {
-        if (output.length <= maxChars)
-            return output;
-        return `${output.slice(0, maxChars)}\n[Log truncated at ${maxChars} chars — full log available via gh run view ${runId}]`;
-    }
-    parseGhError(error) {
-        const message = error instanceof Error ? error.message : String(error);
-        const cause = error instanceof Error ? error : undefined;
-        const errnoCode = error?.code;
-        if (errnoCode === 'ENOENT' || message.includes('ENOENT')) {
-            return new GitPrError(message, GitPrErrorCode.GH_NOT_FOUND, cause);
-        }
-        if (message.includes('Authentication') || message.includes('auth') || message.includes('403')) {
-            return new GitPrError(message, GitPrErrorCode.AUTH_FAILURE, cause);
-        }
-        return new GitPrError(message, GitPrErrorCode.GIT_ERROR, cause);
-    }
-};
-CiStatusService = __decorate([
-    injectable(),
-    __param(0, inject('ExecFunction')),
-    __metadata("design:paramtypes", [Function])
-], CiStatusService);
-export { CiStatusService };

package/dist/packages/core/src/infrastructure/services/git/diff-analyzer.service.d.ts

@@ -1,19 +0,0 @@
-/**
- * Diff Analyzer Service
- *
- * Handles diff analysis operations: computing diff summaries between branches
- * and parsing unified diffs into structured per-file data.
- */
-import type { DiffSummary, FileDiff } from '../../../application/ports/output/services/git-pr-service.interface.js';
-import type { ExecFunction } from './worktree.service.js';
-export declare class DiffAnalyzerService {
-    private readonly execFile;
-    constructor(execFile: ExecFunction);
-    getPrDiffSummary(cwd: string, baseBranch: string): Promise<DiffSummary>;
-    getFileDiffs(cwd: string, baseBranch: string): Promise<FileDiff[]>;
-    parseUnifiedDiff(rawDiff: string): FileDiff[];
-    private parseFileDiff;
-    private parseGitError;
-    parseDiffStat(diffStat: string, logOutput: string): DiffSummary;
-}
-//# sourceMappingURL=diff-analyzer.service.d.ts.map

package/dist/packages/core/src/infrastructure/services/git/diff-analyzer.service.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"diff-analyzer.service.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/infrastructure/services/git/diff-analyzer.service.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAGV,WAAW,EACX,QAAQ,EACT,MAAM,wEAAwE,CAAC;AAKhF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAE1D,qBACa,mBAAmB;IACM,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAAR,QAAQ,EAAE,YAAY;IAErE,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAevE,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;IAaxE,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,QAAQ,EAAE;IAe7C,OAAO,CAAC,aAAa;IAmFrB,OAAO,CAAC,aAAa;IAoBrB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,WAAW;CAiBhE"}

package/dist/packages/core/src/infrastructure/services/git/diff-analyzer.service.js

@@ -1,173 +0,0 @@
-/**
- * Diff Analyzer Service
- *
- * Handles diff analysis operations: computing diff summaries between branches
- * and parsing unified diffs into structured per-file data.
- */
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-var __param = (this && this.__param) || function (paramIndex, decorator) {
-    return function (target, key) { decorator(target, key, paramIndex); }
-};
-import { injectable, inject } from 'tsyringe';
-import { GitPrError, GitPrErrorCode, } from '../../../application/ports/output/services/git-pr-service.interface.js';
-let DiffAnalyzerService = class DiffAnalyzerService {
-    execFile;
-    constructor(execFile) {
-        this.execFile = execFile;
-    }
-    async getPrDiffSummary(cwd, baseBranch) {
-        const { stdout: diffStat } = await this.execFile('git', ['diff', '--stat', `${baseBranch}...HEAD`], { cwd });
-        const { stdout: logOutput } = await this.execFile('git', ['log', '--oneline', `${baseBranch}...HEAD`], { cwd });
-        return this.parseDiffStat(diffStat, logOutput);
-    }
-    async getFileDiffs(cwd, baseBranch) {
-        try {
-            const { stdout } = await this.execFile('git', ['diff', '--unified=3', `${baseBranch}...HEAD`], { cwd });
-            return this.parseUnifiedDiff(stdout);
-        }
-        catch (error) {
-            throw this.parseGitError(error);
-        }
-    }
-    parseUnifiedDiff(rawDiff) {
-        if (!rawDiff.trim())
-            return [];
-        const files = [];
-        // Split on "diff --git" boundaries (keeping the delimiter)
-        const fileSections = rawDiff.split(/^(?=diff --git )/m).filter((s) => s.trim());
-        for (const section of fileSections) {
-            const file = this.parseFileDiff(section);
-            if (file)
-                files.push(file);
-        }
-        return files;
-    }
-    parseFileDiff(section) {
-        const lines = section.split('\n');
-        if (lines.length === 0)
-            return null;
-        // Parse header: "diff --git a/path b/path"
-        const headerMatch = lines[0].match(/^diff --git a\/(.+?) b\/(.+)$/);
-        if (!headerMatch)
-            return null;
-        const oldPath = headerMatch[1];
-        const newPath = headerMatch[2];
-        // Determine status from diff header lines
-        let status = 'modified';
-        const isNew = lines.some((l) => l.startsWith('new file mode'));
-        const isDeleted = lines.some((l) => l.startsWith('deleted file mode'));
-        const isRenamed = lines.some((l) => l.startsWith('rename from'));
-        if (isNew)
-            status = 'added';
-        else if (isDeleted)
-            status = 'deleted';
-        else if (isRenamed)
-            status = 'renamed';
-        // Parse hunks
-        const hunks = [];
-        let currentHunk = null;
-        let oldLineNum = 0;
-        let newLineNum = 0;
-        let additions = 0;
-        let deletions = 0;
-        for (const line of lines) {
-            const hunkHeaderMatch = line.match(/^@@\s+-(\d+)(?:,\d+)?\s+\+(\d+)(?:,\d+)?\s+@@(.*)$/);
-            if (hunkHeaderMatch) {
-                currentHunk = { header: line, lines: [] };
-                hunks.push(currentHunk);
-                oldLineNum = parseInt(hunkHeaderMatch[1], 10);
-                newLineNum = parseInt(hunkHeaderMatch[2], 10);
-                continue;
-            }
-            if (!currentHunk)
-                continue;
-            if (line.startsWith('+')) {
-                const diffLine = {
-                    type: 'added',
-                    content: line.slice(1),
-                    newNumber: newLineNum,
-                };
-                currentHunk.lines.push(diffLine);
-                newLineNum++;
-                additions++;
-            }
-            else if (line.startsWith('-')) {
-                const diffLine = {
-                    type: 'removed',
-                    content: line.slice(1),
-                    oldNumber: oldLineNum,
-                };
-                currentHunk.lines.push(diffLine);
-                oldLineNum++;
-                deletions++;
-            }
-            else if (line.startsWith(' ')) {
-                const diffLine = {
-                    type: 'context',
-                    content: line.slice(1),
-                    oldNumber: oldLineNum,
-                    newNumber: newLineNum,
-                };
-                currentHunk.lines.push(diffLine);
-                oldLineNum++;
-                newLineNum++;
-            }
-            // Skip lines like ""
-        }
-        return {
-            path: newPath,
-            oldPath: isRenamed || oldPath !== newPath ? oldPath : undefined,
-            additions,
-            deletions,
-            status,
-            hunks,
-        };
-    }
-    parseGitError(error) {
-        const message = error instanceof Error ? error.message : String(error);
-        const cause = error instanceof Error ? error : undefined;
-        if (message.includes('CONFLICT') && message.includes('rebase')) {
-            return new GitPrError(message, GitPrErrorCode.REBASE_CONFLICT, cause);
-        }
-        if (message.includes('non-fast-forward') || message.includes('diverged')) {
-            return new GitPrError(message, GitPrErrorCode.SYNC_FAILED, cause);
-        }
-        if (message.includes('rejected') || message.includes('conflict')) {
-            return new GitPrError(message, GitPrErrorCode.MERGE_CONFLICT, cause);
-        }
-        if (message.includes('Authentication') || message.includes('auth') || message.includes('403')) {
-            return new GitPrError(message, GitPrErrorCode.AUTH_FAILURE, cause);
-        }
-        return new GitPrError(message, GitPrErrorCode.GIT_ERROR, cause);
-    }
-    parseDiffStat(diffStat, logOutput) {
-        const summaryLine = diffStat.trim().split('\n').pop() ?? '';
-        const filesMatch = summaryLine.match(/(\d+)\s+files?\s+changed/);
-        const addMatch = summaryLine.match(/(\d+)\s+insertions?\(\+\)/);
-        const delMatch = summaryLine.match(/(\d+)\s+deletions?\(-\)/);
-        const commitCount = logOutput
-            .trim()
-            .split('\n')
-            .filter((l) => l.trim()).length;
-        return {
-            filesChanged: filesMatch ? parseInt(filesMatch[1], 10) : 0,
-            additions: addMatch ? parseInt(addMatch[1], 10) : 0,
-            deletions: delMatch ? parseInt(delMatch[1], 10) : 0,
-            commitCount,
-        };
-    }
-};
-DiffAnalyzerService = __decorate([
-    injectable(),
-    __param(0, inject('ExecFunction')),
-    __metadata("design:paramtypes", [Function])
-], DiffAnalyzerService);
-export { DiffAnalyzerService };

package/dist/packages/core/src/infrastructure/services/git/merge-strategy.service.d.ts

@@ -1,30 +0,0 @@
-/**
- * Merge Strategy Service
- *
- * Handles merge operations, conflict resolution, rebase, sync,
- * commit/push, and stash operations.
- */
-import type { MergeStrategy } from '../../../application/ports/output/services/git-pr-service.interface.js';
-import type { ExecFunction } from './worktree.service.js';
-export declare class MergeStrategyService {
-    private readonly execFile;
-    constructor(execFile: ExecFunction);
-    hasUncommittedChanges(cwd: string): Promise<boolean>;
-    commitAll(cwd: string, message: string): Promise<string>;
-    push(cwd: string, branch: string, setUpstream?: boolean): Promise<void>;
-    mergePr(cwd: string, prNumber: number, strategy?: MergeStrategy): Promise<void>;
-    private getPrHeadBranch;
-    localMergeSquash(cwd: string, featureBranch: string, baseBranch: string, commitMessage: string, hasRemote?: boolean): Promise<void>;
-    mergeBranch(cwd: string, sourceBranch: string, targetBranch: string): Promise<void>;
-    syncMain(cwd: string, baseBranch: string): Promise<void>;
-    rebaseOnMain(cwd: string, featureBranch: string, baseBranch: string): Promise<void>;
-    getConflictedFiles(cwd: string): Promise<string[]>;
-    stageFiles(cwd: string, files: string[]): Promise<void>;
-    rebaseContinue(cwd: string): Promise<void>;
-    rebaseAbort(cwd: string): Promise<void>;
-    stash(cwd: string, message?: string): Promise<boolean>;
-    stashPop(cwd: string): Promise<void>;
-    stashDrop(cwd: string): Promise<void>;
-    private parseGitError;
-}
-//# sourceMappingURL=merge-strategy.service.d.ts.map

package/dist/packages/core/src/infrastructure/services/git/merge-strategy.service.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"merge-strategy.service.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/infrastructure/services/git/merge-strategy.service.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAMH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wEAAwE,CAAC;AAK5G,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAE1D,qBACa,oBAAoB;IACK,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAAR,QAAQ,EAAE,YAAY;IAErE,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAKpD,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAWxD,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAYvE,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,GAAE,aAAwB,GAAG,OAAO,CAAC,IAAI,CAAC;YA6BjF,eAAe;IASvB,gBAAgB,CACpB,GAAG,EAAE,MAAM,EACX,aAAa,EAAE,MAAM,EACrB,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,MAAM,EACrB,SAAS,UAAQ,GAChB,OAAO,CAAC,IAAI,CAAC;IA4EV,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAUnF,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA0CxD,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAyEnF,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAelD,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAQvD,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAqB1C,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQvC,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IActD,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQpC,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ3C,OAAO,CAAC,aAAa;CAmBtB"}