@shepai/cli 1.122.2-pr395.d35739a → 1.123.0-pr396.ac74a97

package/dist/packages/core/src/application/ports/output/services/git-pr-service.interface.d.ts

@@ -9,17 +9,17 @@ import type { PrStatus } from '../../../../domain/generated/output.js';
  * Error codes for git PR operations.
  */
 export declare enum GitPrErrorCode {
-    MERGE_CONFLICT = "MERGE_CONFLICT",
     AUTH_FAILURE = "AUTH_FAILURE",
-    GH_NOT_FOUND = "GH_NOT_FOUND",
-    NETWORK_ERROR = "NETWORK_ERROR",
-    CI_TIMEOUT = "CI_TIMEOUT",
     BRANCH_NOT_FOUND = "BRANCH_NOT_FOUND",
+    CI_TIMEOUT = "CI_TIMEOUT",
+    GH_NOT_FOUND = "GH_NOT_FOUND",
     GIT_ERROR = "GIT_ERROR",
+    MERGE_CONFLICT = "MERGE_CONFLICT",
     MERGE_FAILED = "MERGE_FAILED",
+    NETWORK_ERROR = "NETWORK_ERROR",
     PR_NOT_FOUND = "PR_NOT_FOUND",
     REBASE_CONFLICT = "REBASE_CONFLICT",
-    NOT_A_FORK = "NOT_A_FORK"
+    SYNC_FAILED = "SYNC_FAILED"
 }
 /**
  * Typed error for git PR operations.
@@ -321,56 +321,65 @@ export interface IGitPrService {
      */
     getFailureLogs(cwd: string, runId: string, branch: string, logMaxChars?: number): Promise<string>;
     /**
-     * Detect whether the current repository is a GitHub fork.
-     * Calls `gh repo view --json parent` once and returns both the boolean result and the
-     * parent clone URL so callers can pass it to ensureUpstreamRemote() without a second
-     * gh invocation (NFR-9).
+     * Fast-forward the local base branch to match its remote counterpart.
+     * If currently on the base branch, uses `git pull --ff-only`.
+     * If on a different branch, uses `git fetch origin <baseBranch>:<baseBranch>`.
      *
-     * @param cwd - Working directory path (inside the git repo)
-     * @returns Object with isFork boolean and optional upstreamUrl from parent
-     * @throws GitPrError with GIT_ERROR code on unexpected failures
+     * @param cwd - Working directory path
+     * @param baseBranch - The base branch to sync (e.g. "main")
+     * @throws GitPrError with SYNC_FAILED code if the branch has diverged and cannot fast-forward
+     * @throws GitPrError with GIT_ERROR code on other git failures
      */
-    isFork(cwd: string): Promise<{
-        isFork: boolean;
-        upstreamUrl?: string;
-    }>;
+    syncMain(cwd: string, baseBranch: string): Promise<void>;
     /**
-     * Ensure a remote named "upstream" exists in the repo.
-     * If it does not exist, adds it using the provided upstreamUrl.
-     * Idempotent: if the remote already exists, this is a no-op.
+     * Rebase the feature branch onto the latest base branch.
+     * Checks for dirty worktree before starting. Detects conflict state
+     * from git exit code and stderr — throws REBASE_CONFLICT if conflicts
+     * are encountered (caller is responsible for resolution or abort).
      *
-     * @param cwd - Working directory path (inside the git repo)
-     * @param upstreamUrl - Clone URL of the upstream (parent) repository
-     * @throws GitPrError with GIT_ERROR code on failure
+     * @param cwd - Working directory path
+     * @param featureBranch - The feature branch to rebase
+     * @param baseBranch - The base branch to rebase onto
+     * @throws GitPrError with GIT_ERROR code if the worktree is dirty
+     * @throws GitPrError with REBASE_CONFLICT code if conflicts are detected
+     * @throws GitPrError with BRANCH_NOT_FOUND code if a branch does not exist
      */
-    ensureUpstreamRemote(cwd: string, upstreamUrl: string): Promise<void>;
+    rebaseOnMain(cwd: string, featureBranch: string, baseBranch: string): Promise<void>;
     /**
-     * Fetch the latest refs from the upstream remote.
+     * Get the list of files with unresolved conflicts (unmerged paths).
+     * Uses `git diff --name-only --diff-filter=U` to identify conflicted files.
      *
-     * @param cwd - Working directory path (inside the git repo)
-     * @throws GitPrError with GIT_ERROR or NETWORK_ERROR code on failure
+     * @param cwd - Working directory path
+     * @returns Array of file paths with unresolved conflicts
+     * @throws GitPrError with GIT_ERROR code on failure
      */
-    fetchUpstream(cwd: string): Promise<void>;
+    getConflictedFiles(cwd: string): Promise<string[]>;
     /**
-     * Sync the local main branch to exactly match upstream/main using
-     * `git reset --hard upstream/main`. The upstream remote must already exist.
-     * Idempotent: if local main already matches upstream/main, this is a no-op.
+     * Stage specific files in the working directory.
+     * Uses `git add` for the specified file paths.
      *
-     * @param cwd - Working directory path (inside the git repo)
+     * @param cwd - Working directory path
+     * @param files - Array of file paths to stage
      * @throws GitPrError with GIT_ERROR code on failure
      */
-    syncForkMain(cwd: string): Promise<void>;
+    stageFiles(cwd: string, files: string[]): Promise<void>;
+    /**
+     * Continue an in-progress rebase after conflicts have been resolved.
+     * Runs `git rebase --continue`. May throw REBASE_CONFLICT if the next
+     * commit in the rebase also has conflicts.
+     *
+     * @param cwd - Working directory path
+     * @throws GitPrError with REBASE_CONFLICT code if new conflicts are detected
+     * @throws GitPrError with GIT_ERROR code on other git failures
+     */
+    rebaseContinue(cwd: string): Promise<void>;
     /**
-     * Rebase the specified branch onto the target branch (e.g., main).
-     * On conflict, automatically runs `git rebase --abort` to keep the worktree clean,
-     * then throws GitPrError with REBASE_CONFLICT listing the conflicting files.
+     * Abort an in-progress rebase, restoring the branch to its pre-rebase state.
+     * Runs `git rebase --abort`.
      *
-     * @param cwd - Working directory of the feature worktree
-     * @param branch - The branch to rebase (must be checked out in cwd)
-     * @param onto - The target branch to rebase onto (e.g., 'main')
-     * @throws GitPrError with REBASE_CONFLICT code (includes conflicting file list)
-     * @throws GitPrError with GIT_ERROR code on other failures
+     * @param cwd - Working directory path
+     * @throws GitPrError with GIT_ERROR code on failure
      */
-    rebase(cwd: string, branch: string, onto: string): Promise<void>;
+    rebaseAbort(cwd: string): Promise<void>;
 }
 //# sourceMappingURL=git-pr-service.interface.d.ts.map

package/dist/packages/core/src/application/ports/output/services/git-pr-service.interface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"git-pr-service.interface.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/application/ports/output/services/git-pr-service.interface.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"git-pr-service.interface.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/application/ports/output/services/git-pr-service.interface.ts"],"names":[],"mappings":"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"}

package/dist/packages/core/src/application/ports/output/services/git-pr-service.interface.js

@@ -9,17 +9,17 @@
  */
 export var GitPrErrorCode;
 (function (GitPrErrorCode) {
-    GitPrErrorCode["MERGE_CONFLICT"] = "MERGE_CONFLICT";
     GitPrErrorCode["AUTH_FAILURE"] = "AUTH_FAILURE";
-    GitPrErrorCode["GH_NOT_FOUND"] = "GH_NOT_FOUND";
-    GitPrErrorCode["NETWORK_ERROR"] = "NETWORK_ERROR";
-    GitPrErrorCode["CI_TIMEOUT"] = "CI_TIMEOUT";
     GitPrErrorCode["BRANCH_NOT_FOUND"] = "BRANCH_NOT_FOUND";
+    GitPrErrorCode["CI_TIMEOUT"] = "CI_TIMEOUT";
+    GitPrErrorCode["GH_NOT_FOUND"] = "GH_NOT_FOUND";
     GitPrErrorCode["GIT_ERROR"] = "GIT_ERROR";
+    GitPrErrorCode["MERGE_CONFLICT"] = "MERGE_CONFLICT";
     GitPrErrorCode["MERGE_FAILED"] = "MERGE_FAILED";
+    GitPrErrorCode["NETWORK_ERROR"] = "NETWORK_ERROR";
     GitPrErrorCode["PR_NOT_FOUND"] = "PR_NOT_FOUND";
     GitPrErrorCode["REBASE_CONFLICT"] = "REBASE_CONFLICT";
-    GitPrErrorCode["NOT_A_FORK"] = "NOT_A_FORK";
+    GitPrErrorCode["SYNC_FAILED"] = "SYNC_FAILED";
 })(GitPrErrorCode || (GitPrErrorCode = {}));
 /**
  * Typed error for git PR operations.

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

@@ -0,0 +1,28 @@
+/**
+ * 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 → determine cwd (worktree or repo root) →
+ * sync main → rebase → on conflict, delegate to ConflictResolutionService.
+ */
+import type { IFeatureRepository } from '../../ports/output/repositories/feature-repository.interface.js';
+import type { IGitPrService } from '../../ports/output/services/git-pr-service.interface.js';
+import type { IWorktreeService } from '../../ports/output/services/worktree-service.interface.js';
+import type { ConflictResolutionService } from '../../../infrastructure/services/agents/conflict-resolution/conflict-resolution.service.js';
+export declare class RebaseFeatureOnMainUseCase {
+    private readonly featureRepo;
+    private readonly gitPrService;
+    private readonly worktreeService;
+    private readonly conflictResolutionService;
+    constructor(featureRepo: IFeatureRepository, gitPrService: IGitPrService, worktreeService: IWorktreeService, conflictResolutionService: ConflictResolutionService);
+    execute(featureId: string): Promise<void>;
+    /**
+     * 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.
+     */
+    private resolveCwd;
+}
+//# sourceMappingURL=rebase-feature-on-main.use-case.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"rebase-feature-on-main.use-case.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/application/use-cases/features/rebase-feature-on-main.use-case.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAGH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iEAAiE,CAAC;AAC1G,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yDAAyD,CAAC;AAK7F,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2DAA2D,CAAC;AAClG,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,4FAA4F,CAAC;AAE5I,qBACa,0BAA0B;IAGnC,OAAO,CAAC,QAAQ,CAAC,WAAW;IAE5B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAE7B,OAAO,CAAC,QAAQ,CAAC,eAAe;IAEhC,OAAO,CAAC,QAAQ,CAAC,yBAAyB;gBANzB,WAAW,EAAE,kBAAkB,EAE/B,YAAY,EAAE,aAAa,EAE3B,eAAe,EAAE,gBAAgB,EAEjC,yBAAyB,EAAE,yBAAyB;IAGjE,OAAO,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA6B/C;;;;OAIG;YACW,UAAU;CAOzB"}

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

@@ -0,0 +1,81 @@
+/**
+ * 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 → determine cwd (worktree or repo root) →
+ * sync main → rebase → on conflict, delegate to ConflictResolutionService.
+ */
+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 '../../ports/output/services/git-pr-service.interface.js';
+let RebaseFeatureOnMainUseCase = class RebaseFeatureOnMainUseCase {
+    featureRepo;
+    gitPrService;
+    worktreeService;
+    conflictResolutionService;
+    constructor(featureRepo, gitPrService, worktreeService, conflictResolutionService) {
+        this.featureRepo = featureRepo;
+        this.gitPrService = gitPrService;
+        this.worktreeService = worktreeService;
+        this.conflictResolutionService = conflictResolutionService;
+    }
+    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}"`);
+        }
+        // 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);
+                return;
+            }
+            throw error;
+        }
+    }
+    /**
+     * 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')),
+    __metadata("design:paramtypes", [Object, Object, Object, Function])
+], RebaseFeatureOnMainUseCase);
+export { RebaseFeatureOnMainUseCase };

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

@@ -0,0 +1,16 @@
+/**
+ * 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

@@ -0,0 +1 @@
+{"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/{sync-fork-main.use-case.js → repositories/sync-repository-main.use-case.js}

@@ -1,8 +1,9 @@
 /**
- * Sync Fork Main Use Case
+ * Sync Repository Main Use Case
  *
- * Syncs the local main branch with upstream/main for fork repositories.
- * For non-fork repos, returns a no-op result with an informational reason.
+ * 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;
@@ -17,24 +18,26 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
 import { injectable, inject } from 'tsyringe';
-let SyncForkMainUseCase = class SyncForkMainUseCase {
+let SyncRepositoryMainUseCase = class SyncRepositoryMainUseCase {
+    repositoryRepo;
     gitPrService;
-    constructor(gitPrService) {
+    constructor(repositoryRepo, gitPrService) {
+        this.repositoryRepo = repositoryRepo;
         this.gitPrService = gitPrService;
     }
-    async execute(cwd) {
-        const { isFork, upstreamUrl } = await this.gitPrService.isFork(cwd);
-        if (!isFork) {
-            return { synced: false, reason: 'not-a-fork' };
+    async execute(repoId) {
+        const repository = await this.repositoryRepo.findById(repoId);
+        if (!repository) {
+            throw new Error(`Repository not found: "${repoId}"`);
         }
-        await this.gitPrService.ensureUpstreamRemote(cwd, upstreamUrl);
-        await this.gitPrService.syncForkMain(cwd);
-        return { synced: true, upstreamUrl };
+        const defaultBranch = await this.gitPrService.getDefaultBranch(repository.path);
+        await this.gitPrService.syncMain(repository.path, defaultBranch);
     }
 };
-SyncForkMainUseCase = __decorate([
+SyncRepositoryMainUseCase = __decorate([
     injectable(),
-    __param(0, inject('IGitPrService')),
-    __metadata("design:paramtypes", [Object])
-], SyncForkMainUseCase);
-export { SyncForkMainUseCase };
+    __param(0, inject('IRepositoryRepository')),
+    __param(1, inject('IGitPrService')),
+    __metadata("design:paramtypes", [Object, Object])
+], SyncRepositoryMainUseCase);
+export { SyncRepositoryMainUseCase };

package/dist/packages/core/src/infrastructure/di/container.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"container.d.ts","sourceRoot":"","sources":["../../../../../../packages/core/src/infrastructure/di/container.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,kBAAkB,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAsHrC;;;;;;GAMG;AACH,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,OAAO,SAAS,CAAC,CAyUrE;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,IAAI,OAAO,CAEhD;AAED;;;GAGG;AACH,OAAO,EAAE,SAAS,EAAE,CAAC"}
+{"version":3,"file":"container.d.ts","sourceRoot":"","sources":["../../../../../../packages/core/src/infrastructure/di/container.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,kBAAkB,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAuHrC;;;;;;GAMG;AACH,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,OAAO,SAAS,CAAC,CA6UrE;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,IAAI,OAAO,CAEhD;AAED;;;GAGG;AACH,OAAO,EAAE,SAAS,EAAE,CAAC"}

package/dist/packages/core/src/infrastructure/di/container.js

@@ -80,8 +80,9 @@ import { CheckAndUnblockFeaturesUseCase } from '../../application/use-cases/feat
 import { UpdateFeatureLifecycleUseCase } from '../../application/use-cases/features/update/update-feature-lifecycle.use-case.js';
 import { CleanupFeatureWorktreeUseCase } from '../../application/use-cases/features/cleanup-feature-worktree.use-case.js';
 import { UpgradeCliUseCase } from '../../application/use-cases/upgrade/upgrade-cli.use-case.js';
-import { SyncForkMainUseCase } from '../../application/use-cases/sync-fork-main.use-case.js';
-import { RebaseFeatureUseCase } from '../../application/use-cases/features/rebase-feature.use-case.js';
+import { SyncRepositoryMainUseCase } from '../../application/use-cases/repositories/sync-repository-main.use-case.js';
+import { RebaseFeatureOnMainUseCase } from '../../application/use-cases/features/rebase-feature-on-main.use-case.js';
+import { ConflictResolutionService } from '../services/agents/conflict-resolution/conflict-resolution.service.js';
 // Session listing
 import { ClaudeCodeSessionRepository } from '../services/agents/sessions/claude-code-session.repository.js';
 import { StubSessionRepository } from '../services/agents/sessions/stub-session.repository.js';
@@ -297,8 +298,12 @@ export async function initializeContainer() {
     container.registerSingleton(UpdateFeatureLifecycleUseCase);
     container.registerSingleton(CleanupFeatureWorktreeUseCase);
     container.registerSingleton(UpgradeCliUseCase);
-    container.registerSingleton(SyncForkMainUseCase);
-    container.registerSingleton(RebaseFeatureUseCase);
+    container.registerSingleton(ConflictResolutionService);
+    container.register('ConflictResolutionService', {
+        useFactory: (c) => c.resolve(ConflictResolutionService),
+    });
+    container.registerSingleton(SyncRepositoryMainUseCase);
+    container.registerSingleton(RebaseFeatureOnMainUseCase);
     // Session repositories (per-AgentType string tokens)
     container.register(`IAgentSessionRepository:${AgentType.ClaudeCode}`, {
         useFactory: () => new ClaudeCodeSessionRepository(),
@@ -389,11 +394,11 @@ export async function initializeContainer() {
     container.register('UpgradeCliUseCase', {
         useFactory: (c) => c.resolve(UpgradeCliUseCase),
     });
-    container.register('SyncForkMainUseCase', {
-        useFactory: (c) => c.resolve(SyncForkMainUseCase),
+    container.register('SyncRepositoryMainUseCase', {
+        useFactory: (c) => c.resolve(SyncRepositoryMainUseCase),
     });
-    container.register('RebaseFeatureUseCase', {
-        useFactory: (c) => c.resolve(RebaseFeatureUseCase),
+    container.register('RebaseFeatureOnMainUseCase', {
+        useFactory: (c) => c.resolve(RebaseFeatureOnMainUseCase),
     });
     _initialized = true;
     return container;

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

@@ -0,0 +1,35 @@
+/**
+ * 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

@@ -0,0 +1 @@
+{"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

@@ -0,0 +1,66 @@
+/**
+ * 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

@@ -0,0 +1,42 @@
+/**
+ * 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

@@ -0,0 +1 @@
+{"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"}