@shepai/cli 1.136.1 → 1.137.0

package/apis/json-schema/FeatureFlags.yaml

@@ -22,6 +22,10 @@ properties:
     type: boolean
     default: false
     description: Enable adopt branch feature to import existing branches as tracked features
+  gitRebaseSync:
+    type: boolean
+    default: false
+    description: Enable git rebase-on-main and sync-main operations in the web UI
   reactFileManager:
     type: boolean
     default: false
@@ -32,5 +36,6 @@ required:
   - debug
   - githubImport
   - adoptBranch
+  - gitRebaseSync
   - reactFileManager
 description: Feature flag toggles for runtime feature control

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

@@ -9,15 +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",
-    PR_NOT_FOUND = "PR_NOT_FOUND"
+    NETWORK_ERROR = "NETWORK_ERROR",
+    PR_NOT_FOUND = "PR_NOT_FOUND",
+    REBASE_CONFLICT = "REBASE_CONFLICT",
+    SYNC_FAILED = "SYNC_FAILED"
 }
 /**
  * Typed error for git PR operations.
@@ -321,5 +323,89 @@ export interface IGitPrService {
      * @throws GitPrError with GH_NOT_FOUND or GIT_ERROR code on failure
      */
     getFailureLogs(cwd: string, runId: string, branch: string, logMaxChars?: number): Promise<string>;
+    /**
+     * Sync the remote-tracking ref for the base branch.
+     * If currently on the base branch, uses `git pull --ff-only`.
+     * If on a different branch (including worktrees), uses `git fetch origin <baseBranch>`
+     * which updates `origin/<baseBranch>` without touching the local branch ref.
+     * This avoids the "refusing to fetch into branch checked out at..." error
+     * when the local base branch is checked out in another worktree.
+     *
+     * @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
+     */
+    syncMain(cwd: string, baseBranch: string): Promise<void>;
+    /**
+     * Rebase the feature branch onto `origin/<baseBranch>`.
+     * Uses the remote-tracking ref (not the local branch) to avoid issues
+     * when the local base branch is checked out in another worktree.
+     * 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
+     * @param featureBranch - The feature branch to rebase
+     * @param baseBranch - The base branch name (rebase target will be origin/<baseBranch>)
+     * @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
+     */
+    rebaseOnMain(cwd: string, featureBranch: string, baseBranch: string): Promise<void>;
+    /**
+     * 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
+     * @returns Array of file paths with unresolved conflicts
+     * @throws GitPrError with GIT_ERROR code on failure
+     */
+    getConflictedFiles(cwd: string): Promise<string[]>;
+    /**
+     * Stage specific files in the working directory.
+     * Uses `git add` for the specified file paths.
+     *
+     * @param cwd - Working directory path
+     * @param files - Array of file paths to stage
+     * @throws GitPrError with GIT_ERROR code on failure
+     */
+    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>;
+    /**
+     * Abort an in-progress rebase, restoring the branch to its pre-rebase state.
+     * Runs `git rebase --abort`.
+     *
+     * @param cwd - Working directory path
+     * @throws GitPrError with GIT_ERROR code on failure
+     */
+    rebaseAbort(cwd: string): Promise<void>;
+    /**
+     * Get the sync status (ahead/behind counts) between a feature branch
+     * and a base branch's remote-tracking ref.
+     *
+     * Uses:
+     * - `git rev-list --count origin/<baseBranch>..<featureBranch>` → ahead
+     * - `git rev-list --count <featureBranch>..origin/<baseBranch>` → behind
+     *
+     * @param cwd - Working directory path
+     * @param featureBranch - The feature branch to check
+     * @param baseBranch - The base branch name (uses origin/<baseBranch>)
+     * @returns Object with ahead and behind commit counts
+     * @throws GitPrError with GIT_ERROR code on failure
+     */
+    getBranchSyncStatus(cwd: string, featureBranch: string, baseBranch: string): Promise<{
+        ahead: number;
+        behind: number;
+    }>;
 }
 //# 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,15 +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["SYNC_FAILED"] = "SYNC_FAILED";
 })(GitPrErrorCode || (GitPrErrorCode = {}));
 /**
  * Typed error for git PR operations.

package/dist/packages/core/src/application/use-cases/features/get-branch-sync-status.use-case.d.ts

@@ -0,0 +1,25 @@
+/**
+ * Get Branch Sync Status Use Case
+ *
+ * Returns how many commits a feature branch is ahead/behind the base branch.
+ *
+ * Flow: resolve feature → determine cwd (worktree or repo root) →
+ * sync remote tracking ref → get branch sync status.
+ */
+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';
+export interface BranchSyncStatusResult {
+    ahead: number;
+    behind: number;
+    baseBranch: string;
+}
+export declare class GetBranchSyncStatusUseCase {
+    private readonly featureRepo;
+    private readonly gitPrService;
+    private readonly worktreeService;
+    constructor(featureRepo: IFeatureRepository, gitPrService: IGitPrService, worktreeService: IWorktreeService);
+    execute(featureId: string): Promise<BranchSyncStatusResult>;
+    private resolveCwd;
+}
+//# sourceMappingURL=get-branch-sync-status.use-case.d.ts.map

package/dist/packages/core/src/application/use-cases/features/get-branch-sync-status.use-case.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-branch-sync-status.use-case.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/application/use-cases/features/get-branch-sync-status.use-case.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iEAAiE,CAAC;AAC1G,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yDAAyD,CAAC;AAC7F,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2DAA2D,CAAC;AAElG,MAAM,WAAW,sBAAsB;IACrC,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,qBACa,0BAA0B;IAGnC,OAAO,CAAC,QAAQ,CAAC,WAAW;IAE5B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAE7B,OAAO,CAAC,QAAQ,CAAC,eAAe;gBAJf,WAAW,EAAE,kBAAkB,EAE/B,YAAY,EAAE,aAAa,EAE3B,eAAe,EAAE,gBAAgB;IAG9C,OAAO,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,CAAC;YA0BnD,UAAU;CAOzB"}

package/dist/packages/core/src/application/use-cases/features/get-branch-sync-status.use-case.js

@@ -0,0 +1,62 @@
+/**
+ * Get Branch Sync Status Use Case
+ *
+ * Returns how many commits a feature branch is ahead/behind the base branch.
+ *
+ * Flow: resolve feature → determine cwd (worktree or repo root) →
+ * sync remote tracking ref → get branch sync status.
+ */
+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 GetBranchSyncStatusUseCase = class GetBranchSyncStatusUseCase {
+    featureRepo;
+    gitPrService;
+    worktreeService;
+    constructor(featureRepo, gitPrService, worktreeService) {
+        this.featureRepo = featureRepo;
+        this.gitPrService = gitPrService;
+        this.worktreeService = worktreeService;
+    }
+    async execute(featureId) {
+        const feature = (await this.featureRepo.findById(featureId)) ??
+            (await this.featureRepo.findByIdPrefix(featureId));
+        if (!feature) {
+            throw new Error(`Feature not found: "${featureId}"`);
+        }
+        if (!feature.branch) {
+            throw new Error(`Feature "${featureId}" has no branch`);
+        }
+        const cwd = await this.resolveCwd(feature.repositoryPath, feature.branch);
+        const baseBranch = await this.gitPrService.getDefaultBranch(feature.repositoryPath);
+        // Sync the remote tracking ref so ahead/behind counts are current
+        await this.gitPrService.syncMain(cwd, baseBranch);
+        const { ahead, behind } = await this.gitPrService.getBranchSyncStatus(cwd, feature.branch, baseBranch);
+        return { ahead, behind, baseBranch };
+    }
+    async resolveCwd(repositoryPath, branch) {
+        const hasWorktree = await this.worktreeService.exists(repositoryPath, branch);
+        if (hasWorktree) {
+            return this.worktreeService.getWorktreePath(repositoryPath, branch);
+        }
+        return repositoryPath;
+    }
+};
+GetBranchSyncStatusUseCase = __decorate([
+    injectable(),
+    __param(0, inject('IFeatureRepository')),
+    __param(1, inject('IGitPrService')),
+    __param(2, inject('IWorktreeService')),
+    __metadata("design:paramtypes", [Object, Object, Object])
+], GetBranchSyncStatusUseCase);
+export { GetBranchSyncStatusUseCase };

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

@@ -0,0 +1,34 @@
+/**
+ * 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.
+ */
+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 { IAgentRunRepository } from '../../ports/output/agents/agent-run-repository.interface.js';
+import type { IPhaseTimingRepository } from '../../ports/output/agents/phase-timing-repository.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;
+    private readonly agentRunRepo;
+    private readonly phaseTimingRepo;
+    constructor(featureRepo: IFeatureRepository, gitPrService: IGitPrService, worktreeService: IWorktreeService, conflictResolutionService: ConflictResolutionService, agentRunRepo: IAgentRunRepository, phaseTimingRepo: IPhaseTimingRepository);
+    execute(featureId: string): Promise<void>;
+    private completeTiming;
+    /**
+     * 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;;;;;;;;;GASG;AAIH,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,mBAAmB,EAAE,MAAM,6DAA6D,CAAC;AACvG,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,gEAAgE,CAAC;AAE7G,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;IAE1C,OAAO,CAAC,QAAQ,CAAC,YAAY;IAE7B,OAAO,CAAC,QAAQ,CAAC,eAAe;gBAVf,WAAW,EAAE,kBAAkB,EAE/B,YAAY,EAAE,aAAa,EAE3B,eAAe,EAAE,gBAAgB,EAEjC,yBAAyB,EAAE,yBAAyB,EAEpD,YAAY,EAAE,mBAAmB,EAEjC,eAAe,EAAE,sBAAsB;IAGpD,OAAO,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAuEjC,cAAc;IAwB5B;;;;OAIG;YACW,UAAU;CAOzB"}

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

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

@@ -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/repositories/sync-repository-main.use-case.js

@@ -0,0 +1,43 @@
+/**
+ * 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/domain/factories/settings-defaults.factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"settings-defaults.factory.d.ts","sourceRoot":"","sources":["../../../../../../packages/core/src/domain/factories/settings-defaults.factory.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAK,EACV,QAAQ,EAUT,MAAM,qBAAqB,CAAC;AA6C7B;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,qBAAqB,IAAI,QAAQ,CAmFhD"}
+{"version":3,"file":"settings-defaults.factory.d.ts","sourceRoot":"","sources":["../../../../../../packages/core/src/domain/factories/settings-defaults.factory.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAK,EACV,QAAQ,EAUT,MAAM,qBAAqB,CAAC;AA6C7B;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,qBAAqB,IAAI,QAAQ,CAoFhD"}

package/dist/packages/core/src/domain/factories/settings-defaults.factory.js

@@ -125,6 +125,7 @@ export function createDefaultSettings() {
         debug: false,
         githubImport: false,
         adoptBranch: false,
+        gitRebaseSync: false,
         reactFileManager: false,
     };
     return {

package/dist/packages/core/src/domain/generated/output.d.ts

@@ -550,6 +550,10 @@ export type FeatureFlags = {
      * Enable adopt branch feature to import existing branches as tracked features
      */
     adoptBranch: boolean;
+    /**
+     * Enable git rebase-on-main and sync-main operations in the web UI
+     */
+    gitRebaseSync: boolean;
     /**
      * Use the built-in React file manager instead of the native OS folder picker
      */