@shepai/cli 1.136.0-pr396.e077930 → 1.136.0-pr440.bb6800a

package/dist/packages/core/src/application/use-cases/features/rebase-feature-on-main.use-case.js

@@ -1,139 +0,0 @@
-/**
- * Rebase Feature on Main Use Case
- *
- * Rebases a feature branch onto the latest main branch with auto-sync
- * and agent-powered conflict resolution.
- *
- * Flow: resolve feature → create standalone agent run → record phase timing →
- * determine cwd (worktree or repo root) → sync main → rebase →
- * on conflict, delegate to ConflictResolutionService → complete timing.
- */
-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 { randomUUID } from 'node:crypto';
-import { GitPrError, GitPrErrorCode, } from '../../ports/output/services/git-pr-service.interface.js';
-import { AgentRunStatus, AgentType } from '../../../domain/generated/output.js';
-let RebaseFeatureOnMainUseCase = class RebaseFeatureOnMainUseCase {
-    featureRepo;
-    gitPrService;
-    worktreeService;
-    conflictResolutionService;
-    agentRunRepo;
-    phaseTimingRepo;
-    constructor(featureRepo, gitPrService, worktreeService, conflictResolutionService, agentRunRepo, phaseTimingRepo) {
-        this.featureRepo = featureRepo;
-        this.gitPrService = gitPrService;
-        this.worktreeService = worktreeService;
-        this.conflictResolutionService = conflictResolutionService;
-        this.agentRunRepo = agentRunRepo;
-        this.phaseTimingRepo = phaseTimingRepo;
-    }
-    async execute(featureId) {
-        // Resolve feature by exact ID or prefix
-        const feature = (await this.featureRepo.findById(featureId)) ??
-            (await this.featureRepo.findByIdPrefix(featureId));
-        if (!feature) {
-            throw new Error(`Feature not found: "${featureId}"`);
-        }
-        // Create standalone agent run + phase timing for activity timeline
-        const now = new Date().toISOString();
-        const agentRunId = randomUUID();
-        const phaseTimingId = randomUUID();
-        await this.agentRunRepo.create({
-            id: agentRunId,
-            agentType: AgentType.ClaudeCode,
-            agentName: 'rebase',
-            status: AgentRunStatus.running,
-            prompt: `Rebase ${feature.branch} on main`,
-            threadId: agentRunId,
-            startedAt: now,
-            featureId: feature.id,
-            repositoryPath: feature.repositoryPath,
-            createdAt: now,
-            updatedAt: now,
-        });
-        await this.phaseTimingRepo.save({
-            id: phaseTimingId,
-            agentRunId,
-            phase: 'rebase',
-            startedAt: now,
-            createdAt: now,
-            updatedAt: now,
-        });
-        const startMs = Date.now();
-        try {
-            // Determine working directory — worktree path if it exists, else repo root
-            const cwd = await this.resolveCwd(feature.repositoryPath, feature.branch);
-            const defaultBranch = await this.gitPrService.getDefaultBranch(feature.repositoryPath);
-            // Auto-sync main before rebasing (per spec decision)
-            await this.gitPrService.syncMain(cwd, defaultBranch);
-            // Attempt rebase
-            try {
-                await this.gitPrService.rebaseOnMain(cwd, feature.branch, defaultBranch);
-            }
-            catch (error) {
-                if (error instanceof GitPrError && error.code === GitPrErrorCode.REBASE_CONFLICT) {
-                    // Delegate to agent-powered conflict resolution
-                    await this.conflictResolutionService.resolve(cwd, feature.branch, defaultBranch);
-                    // Conflict resolution succeeded — complete timing as success
-                    await this.completeTiming(agentRunId, phaseTimingId, startMs, 'success');
-                    return;
-                }
-                throw error;
-            }
-            // Rebase succeeded without conflicts
-            await this.completeTiming(agentRunId, phaseTimingId, startMs, 'success');
-        }
-        catch (error) {
-            // Record failure in timing
-            const message = error instanceof Error ? error.message : String(error);
-            await this.completeTiming(agentRunId, phaseTimingId, startMs, 'error', message);
-            throw error;
-        }
-    }
-    async completeTiming(agentRunId, phaseTimingId, startMs, exitCode, errorMessage) {
-        const completedAt = new Date().toISOString();
-        const durationMs = Date.now() - startMs;
-        await this.phaseTimingRepo.update(phaseTimingId, {
-            completedAt,
-            durationMs: BigInt(durationMs),
-            exitCode,
-            ...(errorMessage && { errorMessage }),
-        });
-        await this.agentRunRepo.updateStatus(agentRunId, exitCode === 'success' ? AgentRunStatus.completed : AgentRunStatus.failed, { completedAt, ...(errorMessage && { error: errorMessage }) });
-    }
-    /**
-     * Resolve the correct working directory for the feature.
-     * Uses the worktree path if a worktree exists for this branch,
-     * otherwise falls back to the repository root.
-     */
-    async resolveCwd(repositoryPath, branch) {
-        const hasWorktree = await this.worktreeService.exists(repositoryPath, branch);
-        if (hasWorktree) {
-            return this.worktreeService.getWorktreePath(repositoryPath, branch);
-        }
-        return repositoryPath;
-    }
-};
-RebaseFeatureOnMainUseCase = __decorate([
-    injectable(),
-    __param(0, inject('IFeatureRepository')),
-    __param(1, inject('IGitPrService')),
-    __param(2, inject('IWorktreeService')),
-    __param(3, inject('ConflictResolutionService')),
-    __param(4, inject('IAgentRunRepository')),
-    __param(5, inject('IPhaseTimingRepository')),
-    __metadata("design:paramtypes", [Object, Object, Object, Function, Object, Object])
-], RebaseFeatureOnMainUseCase);
-export { RebaseFeatureOnMainUseCase };

package/dist/packages/core/src/application/use-cases/repositories/sync-repository-main.use-case.d.ts

@@ -1,16 +0,0 @@
-/**
- * Sync Repository Main Use Case
- *
- * Syncs a repository's local main branch with the remote.
- * Resolves the repository by ID, determines its path and default branch,
- * then delegates to IGitPrService.syncMain().
- */
-import type { IRepositoryRepository } from '../../ports/output/repositories/repository-repository.interface.js';
-import type { IGitPrService } from '../../ports/output/services/git-pr-service.interface.js';
-export declare class SyncRepositoryMainUseCase {
-    private readonly repositoryRepo;
-    private readonly gitPrService;
-    constructor(repositoryRepo: IRepositoryRepository, gitPrService: IGitPrService);
-    execute(repoId: string): Promise<void>;
-}
-//# sourceMappingURL=sync-repository-main.use-case.d.ts.map

package/dist/packages/core/src/application/use-cases/repositories/sync-repository-main.use-case.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"sync-repository-main.use-case.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/application/use-cases/repositories/sync-repository-main.use-case.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oEAAoE,CAAC;AAChH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yDAAyD,CAAC;AAE7F,qBACa,yBAAyB;IAGlC,OAAO,CAAC,QAAQ,CAAC,cAAc;IAE/B,OAAO,CAAC,QAAQ,CAAC,YAAY;gBAFZ,cAAc,EAAE,qBAAqB,EAErC,YAAY,EAAE,aAAa;IAGxC,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAS7C"}

package/dist/packages/core/src/application/use-cases/repositories/sync-repository-main.use-case.js

@@ -1,43 +0,0 @@
-/**
- * Sync Repository Main Use Case
- *
- * Syncs a repository's local main branch with the remote.
- * Resolves the repository by ID, determines its path and default branch,
- * then delegates to IGitPrService.syncMain().
- */
-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';
-let SyncRepositoryMainUseCase = class SyncRepositoryMainUseCase {
-    repositoryRepo;
-    gitPrService;
-    constructor(repositoryRepo, gitPrService) {
-        this.repositoryRepo = repositoryRepo;
-        this.gitPrService = gitPrService;
-    }
-    async execute(repoId) {
-        const repository = await this.repositoryRepo.findById(repoId);
-        if (!repository) {
-            throw new Error(`Repository not found: "${repoId}"`);
-        }
-        const defaultBranch = await this.gitPrService.getDefaultBranch(repository.path);
-        await this.gitPrService.syncMain(repository.path, defaultBranch);
-    }
-};
-SyncRepositoryMainUseCase = __decorate([
-    injectable(),
-    __param(0, inject('IRepositoryRepository')),
-    __param(1, inject('IGitPrService')),
-    __metadata("design:paramtypes", [Object, Object])
-], SyncRepositoryMainUseCase);
-export { SyncRepositoryMainUseCase };

package/dist/packages/core/src/infrastructure/persistence/sqlite/migrations/042-add-feature-flag-git-rebase-sync.d.ts

@@ -1,11 +0,0 @@
-/**
- * Migration 042: Add feature_flag_git_rebase_sync column to settings table.
- *
- * Adds a boolean (INTEGER 0/1) column for the git rebase-sync feature flag.
- * Defaults to 0 (disabled).
- */
-import type { MigrationParams } from 'umzug';
-import type Database from 'better-sqlite3';
-export declare function up({ context: db }: MigrationParams<Database.Database>): Promise<void>;
-export declare function down({ context: db }: MigrationParams<Database.Database>): Promise<void>;
-//# sourceMappingURL=042-add-feature-flag-git-rebase-sync.d.ts.map

package/dist/packages/core/src/infrastructure/persistence/sqlite/migrations/042-add-feature-flag-git-rebase-sync.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"042-add-feature-flag-git-rebase-sync.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/infrastructure/persistence/sqlite/migrations/042-add-feature-flag-git-rebase-sync.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,OAAO,CAAC;AAC7C,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAE3C,wBAAsB,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,eAAe,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAS3F;AAED,wBAAsB,IAAI,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,eAAe,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAG7F"}

package/dist/packages/core/src/infrastructure/persistence/sqlite/migrations/042-add-feature-flag-git-rebase-sync.js

@@ -1,17 +0,0 @@
-/**
- * Migration 042: Add feature_flag_git_rebase_sync column to settings table.
- *
- * Adds a boolean (INTEGER 0/1) column for the git rebase-sync feature flag.
- * Defaults to 0 (disabled).
- */
-export async function up({ context: db }) {
-    const columns = db.pragma('table_info(settings)');
-    const existing = new Set(columns.map((c) => c.name));
-    if (!existing.has('feature_flag_git_rebase_sync')) {
-        db.exec('ALTER TABLE settings ADD COLUMN feature_flag_git_rebase_sync INTEGER NOT NULL DEFAULT 0');
-    }
-}
-export async function down({ context: db }) {
-    // SQLite does not support DROP COLUMN before 3.35.0; column remains but is unused after rollback.
-    void db;
-}

package/dist/packages/core/src/infrastructure/services/agents/conflict-resolution/conflict-resolution.prompt.d.ts

@@ -1,35 +0,0 @@
-/**
- * Conflict Resolution Prompt Builder
- *
- * Builds prompts for the AI agent to resolve git rebase conflicts.
- * Follows the merge-prompts.ts pattern of pure functions returning
- * markdown strings.
- */
-export interface ConflictedFile {
-    /** Relative file path from repo root */
-    path: string;
-    /** Full file contents including conflict markers */
-    content: string;
-}
-export interface ConflictResolutionPromptParams {
-    /** Files with conflict markers */
-    conflictedFiles: ConflictedFile[];
-    /** The feature branch being rebased */
-    featureBranch: string;
-    /** The base branch being rebased onto */
-    baseBranch: string;
-    /** 1-based attempt number */
-    attemptNumber: number;
-    /** Maximum allowed attempts */
-    maxAttempts: number;
-    /** Feedback from previous failed attempt (remaining markers info) */
-    previousFeedback?: string;
-}
-/**
- * Build a prompt for the conflict resolution agent.
- *
- * The agent receives conflicted file contents and instructions to resolve
- * all conflict markers by editing files in the working directory.
- */
-export declare function buildConflictResolutionPrompt(params: ConflictResolutionPromptParams): string;
-//# sourceMappingURL=conflict-resolution.prompt.d.ts.map

package/dist/packages/core/src/infrastructure/services/agents/conflict-resolution/conflict-resolution.prompt.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"conflict-resolution.prompt.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/infrastructure/services/agents/conflict-resolution/conflict-resolution.prompt.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,MAAM,WAAW,cAAc;IAC7B,wCAAwC;IACxC,IAAI,EAAE,MAAM,CAAC;IACb,oDAAoD;IACpD,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,8BAA8B;IAC7C,kCAAkC;IAClC,eAAe,EAAE,cAAc,EAAE,CAAC;IAClC,uCAAuC;IACvC,aAAa,EAAE,MAAM,CAAC;IACtB,yCAAyC;IACzC,UAAU,EAAE,MAAM,CAAC;IACnB,6BAA6B;IAC7B,aAAa,EAAE,MAAM,CAAC;IACtB,+BAA+B;IAC/B,WAAW,EAAE,MAAM,CAAC;IACpB,qEAAqE;IACrE,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED;;;;;GAKG;AACH,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,8BAA8B,GAAG,MAAM,CAgE5F"}

package/dist/packages/core/src/infrastructure/services/agents/conflict-resolution/conflict-resolution.prompt.js

@@ -1,66 +0,0 @@
-/**
- * Conflict Resolution Prompt Builder
- *
- * Builds prompts for the AI agent to resolve git rebase conflicts.
- * Follows the merge-prompts.ts pattern of pure functions returning
- * markdown strings.
- */
-/**
- * Build a prompt for the conflict resolution agent.
- *
- * The agent receives conflicted file contents and instructions to resolve
- * all conflict markers by editing files in the working directory.
- */
-export function buildConflictResolutionPrompt(params) {
-    const { conflictedFiles, featureBranch, baseBranch, attemptNumber, maxAttempts, previousFeedback, } = params;
-    const fileSection = conflictedFiles
-        .map((f) => `### \`${f.path}\`
-
-\`\`\`
-${f.content}
-\`\`\``)
-        .join('\n\n');
-    const feedbackSection = previousFeedback
-        ? `
-## Previous Attempt Feedback
-
-Your previous resolution attempt (${attemptNumber - 1}/${maxAttempts}) was incomplete:
-
-${previousFeedback}
-
-You MUST resolve all remaining conflict markers in this attempt.
-`
-        : '';
-    return `You are resolving git rebase conflicts (attempt ${attemptNumber}/${maxAttempts}).
-
-## Branch Context
-
-- Feature branch: \`${featureBranch}\`
-- Base branch: \`${baseBranch}\`
-- The feature branch is being rebased onto the latest \`${baseBranch}\`.
-${feedbackSection}
-## Conflicted Files
-
-The following files contain conflict markers that must be resolved:
-
-${fileSection}
-
-## Instructions
-
-1. Read each conflicted file listed above
-2. Resolve ALL conflict markers (\`<<<<<<<\`, \`=======\`, \`>>>>>>>\`) by editing the files
-3. For each conflict, determine the correct resolution by understanding the intent of both sides:
-   - The \`<<<<<<< HEAD\` section contains changes from \`${baseBranch}\` (theirs during rebase)
-   - The \`>>>>>>> ...\` section contains changes from \`${featureBranch}\` (ours during rebase)
-4. Produce a merged result that preserves the intent of both sides where possible
-5. If the changes conflict logically (not just textually), prefer the feature branch changes but ensure compatibility with the base branch
-
-## Constraints
-
-- Edit ONLY the conflicted files listed above — do NOT modify any other files
-- Remove ALL conflict markers (\`<<<<<<<\`, \`=======\`, \`>>>>>>>\`) from every conflicted file
-- Do NOT add new files or delete files
-- Do NOT run git commands — only edit files to resolve conflicts
-- Do NOT run tests, builds, or linters — only resolve the conflict markers
-- Every conflicted file must have zero remaining conflict markers when you are done`;
-}

package/dist/packages/core/src/infrastructure/services/agents/conflict-resolution/conflict-resolution.service.d.ts

@@ -1,42 +0,0 @@
-/**
- * Conflict Resolution Service
- *
- * Orchestrates agent-powered conflict resolution during git rebase.
- * Follows the CI watch/fix loop pattern: detect conflict → invoke agent →
- * validate resolution → stage files → continue rebase, with retry logic.
- */
-import type { IAgentExecutorProvider } from '../../../../application/ports/output/agents/agent-executor-provider.interface.js';
-import type { IGitPrService } from '../../../../application/ports/output/services/git-pr-service.interface.js';
-export declare class ConflictResolutionService {
-    private readonly agentProvider;
-    private readonly gitPrService;
-    constructor(agentProvider: IAgentExecutorProvider, gitPrService: IGitPrService);
-    /**
-     * Resolve all conflicts during a rebase operation.
-     *
-     * Handles multi-commit rebases where each commit may introduce conflicts.
-     * For each conflicted commit: reads conflicted files, invokes agent to
-     * resolve, validates no remaining markers, stages resolved files, and
-     * continues the rebase. Retries up to MAX_RETRIES_PER_COMMIT times.
-     *
-     * If retries are exhausted, aborts the rebase and throws REBASE_CONFLICT.
-     *
-     * @param cwd - Working directory (repo root or worktree path)
-     * @param featureBranch - Feature branch being rebased
-     * @param baseBranch - Base branch being rebased onto
-     */
-    resolve(cwd: string, featureBranch: string, baseBranch: string): Promise<void>;
-    /**
-     * Read the contents of conflicted files from the working directory.
-     */
-    private readConflictedFileContents;
-    /**
-     * Validate that no conflict markers remain in the previously-conflicted files.
-     */
-    private validateResolution;
-    /**
-     * Build feedback about remaining conflict markers for retry attempts.
-     */
-    private buildFeedbackFromRemainingMarkers;
-}
-//# sourceMappingURL=conflict-resolution.service.d.ts.map

package/dist/packages/core/src/infrastructure/services/agents/conflict-resolution/conflict-resolution.service.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"conflict-resolution.service.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/infrastructure/services/agents/conflict-resolution/conflict-resolution.service.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAKH,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,wEAAwE,CAAC;AACrH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iEAAiE,CAAC;AAerG,qBACa,yBAAyB;IAGlC,OAAO,CAAC,QAAQ,CAAC,aAAa;IAE9B,OAAO,CAAC,QAAQ,CAAC,YAAY;gBAFZ,aAAa,EAAE,sBAAsB,EAErC,YAAY,EAAE,aAAa;IAG9C;;;;;;;;;;;;;OAaG;IACG,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkEpF;;OAEG;IACH,OAAO,CAAC,0BAA0B;IAWlC;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAgB1B;;OAEG;IACH,OAAO,CAAC,iCAAiC;CAyB1C"}

package/dist/packages/core/src/infrastructure/services/agents/conflict-resolution/conflict-resolution.service.js

@@ -1,169 +0,0 @@
-/**
- * Conflict Resolution Service
- *
- * Orchestrates agent-powered conflict resolution during git rebase.
- * Follows the CI watch/fix loop pattern: detect conflict → invoke agent →
- * validate resolution → stage files → continue rebase, with retry logic.
- */
-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 { readFileSync } from 'node:fs';
-import { join } from 'node:path';
-import { GitPrError, GitPrErrorCode, } from '../../../../application/ports/output/services/git-pr-service.interface.js';
-import { buildConflictResolutionPrompt, } from './conflict-resolution.prompt.js';
-const MAX_RETRIES_PER_COMMIT = 3;
-/** Conflict markers that indicate unresolved conflicts */
-const CONFLICT_MARKERS = ['<<<<<<<', '=======', '>>>>>>>'];
-let ConflictResolutionService = class ConflictResolutionService {
-    agentProvider;
-    gitPrService;
-    constructor(agentProvider, gitPrService) {
-        this.agentProvider = agentProvider;
-        this.gitPrService = gitPrService;
-    }
-    /**
-     * Resolve all conflicts during a rebase operation.
-     *
-     * Handles multi-commit rebases where each commit may introduce conflicts.
-     * For each conflicted commit: reads conflicted files, invokes agent to
-     * resolve, validates no remaining markers, stages resolved files, and
-     * continues the rebase. Retries up to MAX_RETRIES_PER_COMMIT times.
-     *
-     * If retries are exhausted, aborts the rebase and throws REBASE_CONFLICT.
-     *
-     * @param cwd - Working directory (repo root or worktree path)
-     * @param featureBranch - Feature branch being rebased
-     * @param baseBranch - Base branch being rebased onto
-     */
-    async resolve(cwd, featureBranch, baseBranch) {
-        const executor = await this.agentProvider.getExecutor();
-        // Outer loop: handle multi-commit rebases where rebaseContinue
-        // may reveal conflicts on the next commit
-        while (true) {
-            const conflictedFiles = await this.gitPrService.getConflictedFiles(cwd);
-            if (conflictedFiles.length === 0) {
-                return; // No conflicts — rebase is complete
-            }
-            // Inner loop: retry agent resolution for the current commit's conflicts
-            let resolved = false;
-            for (let attempt = 1; attempt <= MAX_RETRIES_PER_COMMIT; attempt++) {
-                const fileContents = this.readConflictedFileContents(cwd, conflictedFiles);
-                const previousFeedback = attempt > 1 ? this.buildFeedbackFromRemainingMarkers(cwd, conflictedFiles) : undefined;
-                const prompt = buildConflictResolutionPrompt({
-                    conflictedFiles: fileContents,
-                    featureBranch,
-                    baseBranch,
-                    attemptNumber: attempt,
-                    maxAttempts: MAX_RETRIES_PER_COMMIT,
-                    previousFeedback,
-                });
-                await executor.execute(prompt, { cwd });
-                // Validate: check no conflict markers remain
-                if (this.validateResolution(cwd, conflictedFiles)) {
-                    resolved = true;
-                    break;
-                }
-            }
-            if (!resolved) {
-                // Exhausted retries — abort and report
-                await this.gitPrService.rebaseAbort(cwd);
-                const remaining = conflictedFiles.join(', ');
-                throw new GitPrError(`Failed to resolve conflicts after ${MAX_RETRIES_PER_COMMIT} attempts. ` +
-                    `Unresolved files: ${remaining}. The rebase has been aborted.`, GitPrErrorCode.REBASE_CONFLICT);
-            }
-            // Resolution succeeded — stage files and continue rebase
-            await this.gitPrService.stageFiles(cwd, conflictedFiles);
-            try {
-                await this.gitPrService.rebaseContinue(cwd);
-                // rebaseContinue succeeded — check if there are more conflicts
-                // from subsequent commits (loop continues)
-                return; // No more conflicts
-            }
-            catch (error) {
-                if (error instanceof GitPrError && error.code === GitPrErrorCode.REBASE_CONFLICT) {
-                    // Next commit has conflicts — loop back to resolve them
-                    continue;
-                }
-                throw error; // Unexpected error
-            }
-        }
-    }
-    /**
-     * Read the contents of conflicted files from the working directory.
-     */
-    readConflictedFileContents(cwd, filePaths) {
-        return filePaths.map((filePath) => {
-            try {
-                const content = readFileSync(join(cwd, filePath), 'utf-8');
-                return { path: filePath, content };
-            }
-            catch {
-                return { path: filePath, content: '(unable to read file)' };
-            }
-        });
-    }
-    /**
-     * Validate that no conflict markers remain in the previously-conflicted files.
-     */
-    validateResolution(cwd, filePaths) {
-        for (const filePath of filePaths) {
-            try {
-                const content = readFileSync(join(cwd, filePath), 'utf-8');
-                for (const marker of CONFLICT_MARKERS) {
-                    if (content.includes(marker)) {
-                        return false;
-                    }
-                }
-            }
-            catch {
-                return false;
-            }
-        }
-        return true;
-    }
-    /**
-     * Build feedback about remaining conflict markers for retry attempts.
-     */
-    buildFeedbackFromRemainingMarkers(cwd, filePaths) {
-        const remaining = [];
-        for (const filePath of filePaths) {
-            try {
-                const content = readFileSync(join(cwd, filePath), 'utf-8');
-                const lines = content.split('\n');
-                const markerLines = [];
-                lines.forEach((line, index) => {
-                    if (CONFLICT_MARKERS.some((marker) => line.includes(marker))) {
-                        markerLines.push(index + 1);
-                    }
-                });
-                if (markerLines.length > 0) {
-                    remaining.push(`- \`${filePath}\`: conflict markers remain on lines ${markerLines.join(', ')}`);
-                }
-            }
-            catch {
-                remaining.push(`- \`${filePath}\`: unable to read file`);
-            }
-        }
-        return remaining.length > 0
-            ? remaining.join('\n')
-            : 'No specific markers found, but validation failed.';
-    }
-};
-ConflictResolutionService = __decorate([
-    injectable(),
-    __param(0, inject('IAgentExecutorProvider')),
-    __param(1, inject('IGitPrService')),
-    __metadata("design:paramtypes", [Object, Object])
-], ConflictResolutionService);
-export { ConflictResolutionService };

package/dist/src/presentation/web/app/actions/get-branch-sync-status.d.ts

@@ -1,11 +0,0 @@
-export declare function getBranchSyncStatus(featureId: string): Promise<{
-    success: boolean;
-    data?: {
-        ahead: number;
-        behind: number;
-        baseBranch: string;
-        checkedAt: string;
-    };
-    error?: string;
-}>;
-//# sourceMappingURL=get-branch-sync-status.d.ts.map

package/dist/src/presentation/web/app/actions/get-branch-sync-status.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"get-branch-sync-status.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/app/actions/get-branch-sync-status.ts"],"names":[],"mappings":"AAKA,wBAAsB,mBAAmB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC;IACpE,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IAChF,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC,CAmBD"}

package/dist/src/presentation/web/app/actions/get-branch-sync-status.js

@@ -1,22 +0,0 @@
-'use server';
-import { resolve } from '../../lib/server-container.js';
-export async function getBranchSyncStatus(featureId) {
-    if (!featureId?.trim()) {
-        return { success: false, error: 'Feature id is required' };
-    }
-    try {
-        const useCase = resolve('GetBranchSyncStatusUseCase');
-        const result = await useCase.execute(featureId);
-        return {
-            success: true,
-            data: {
-                ...result,
-                checkedAt: new Date().toISOString(),
-            },
-        };
-    }
-    catch (error) {
-        const message = error instanceof Error ? error.message : 'Failed to get branch sync status';
-        return { success: false, error: message };
-    }
-}

package/dist/src/presentation/web/app/actions/rebase-feature.d.ts

@@ -1,5 +0,0 @@
-export declare function rebaseFeature(featureId: string): Promise<{
-    success: boolean;
-    error?: string;
-}>;
-//# sourceMappingURL=rebase-feature.d.ts.map

package/dist/src/presentation/web/app/actions/rebase-feature.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"rebase-feature.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/app/actions/rebase-feature.ts"],"names":[],"mappings":"AAKA,wBAAsB,aAAa,CACjC,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAa/C"}

package/dist/src/presentation/web/app/actions/rebase-feature.js

@@ -1,16 +0,0 @@
-'use server';
-import { resolve } from '../../lib/server-container.js';
-export async function rebaseFeature(featureId) {
-    if (!featureId?.trim()) {
-        return { success: false, error: 'Feature id is required' };
-    }
-    try {
-        const useCase = resolve('RebaseFeatureOnMainUseCase');
-        await useCase.execute(featureId);
-        return { success: true };
-    }
-    catch (error) {
-        const message = error instanceof Error ? error.message : 'Failed to rebase feature';
-        return { success: false, error: message };
-    }
-}

package/dist/src/presentation/web/app/actions/sync-repository.d.ts

@@ -1,5 +0,0 @@
-export declare function syncRepository(repositoryId: string): Promise<{
-    success: boolean;
-    error?: string;
-}>;
-//# sourceMappingURL=sync-repository.d.ts.map

package/dist/src/presentation/web/app/actions/sync-repository.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"sync-repository.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/app/actions/sync-repository.ts"],"names":[],"mappings":"AAKA,wBAAsB,cAAc,CAClC,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAa/C"}