@shepai/cli 1.135.3 → 1.136.0-pr396.e077930

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

@@ -617,6 +617,14 @@ let GitPrService = class GitPrService {
     parseGitError(error) {
         const message = error instanceof Error ? error.message : String(error);
         const cause = error instanceof Error ? error : undefined;
+        // Rebase-specific: detect "CONFLICT" during rebase operations
+        if (message.includes('CONFLICT') && message.includes('rebase')) {
+            return new GitPrError(message, GitPrErrorCode.REBASE_CONFLICT, cause);
+        }
+        // Sync-specific: non-fast-forward or diverged branch
+        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);
         }
@@ -657,6 +665,148 @@ let GitPrService = class GitPrService {
             commitCount,
         };
     }
+    // --- Rebase & Sync operations ---
+    async syncMain(cwd, baseBranch) {
+        try {
+            // Detect current branch
+            const { stdout } = await this.execFile('git', ['rev-parse', '--abbrev-ref', 'HEAD'], { cwd });
+            const currentBranch = stdout.trim();
+            if (currentBranch === baseBranch) {
+                // On the base branch — use git pull --ff-only
+                await this.execFile('git', ['pull', '--ff-only', 'origin', baseBranch], { cwd });
+            }
+            else {
+                // On a different branch — fetch the remote ref only (updates origin/<baseBranch>).
+                // We intentionally do NOT update the local <baseBranch> ref because it may be
+                // checked out in another worktree, which causes git to refuse the update with:
+                //   "fatal: refusing to fetch into branch 'refs/heads/main' checked out at ..."
+                await this.execFile('git', ['fetch', 'origin', baseBranch], { cwd });
+            }
+        }
+        catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            const cause = error instanceof Error ? error : undefined;
+            if (message.includes('non-fast-forward') ||
+                message.includes('Not possible to fast-forward') ||
+                message.includes('diverged')) {
+                throw new GitPrError(`Cannot fast-forward '${baseBranch}': local branch has diverged from remote. ` +
+                    `Resolve the divergence manually with 'git checkout ${baseBranch} && git reset --hard origin/${baseBranch}' ` +
+                    `if you want to discard local changes on ${baseBranch}.`, GitPrErrorCode.SYNC_FAILED, cause);
+            }
+            throw new GitPrError(`Failed to sync '${baseBranch}' with remote: ${message}`, GitPrErrorCode.GIT_ERROR, cause);
+        }
+    }
+    async rebaseOnMain(cwd, featureBranch, baseBranch) {
+        // Check for dirty worktree before starting
+        const dirty = await this.hasUncommittedChanges(cwd);
+        if (dirty) {
+            throw new GitPrError(`Cannot rebase: working directory has uncommitted changes. ` +
+                `Please commit or stash your changes before rebasing.`, GitPrErrorCode.GIT_ERROR);
+        }
+        // Checkout the feature branch
+        try {
+            await this.execFile('git', ['checkout', featureBranch], { cwd });
+        }
+        catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            const cause = error instanceof Error ? error : undefined;
+            if (message.includes('did not match') ||
+                message.includes('not a commit') ||
+                message.includes('pathspec')) {
+                throw new GitPrError(`Branch '${featureBranch}' not found.`, GitPrErrorCode.BRANCH_NOT_FOUND, cause);
+            }
+            throw new GitPrError(`Failed to checkout '${featureBranch}': ${message}`, GitPrErrorCode.GIT_ERROR, cause);
+        }
+        // Rebase onto origin/<baseBranch> (the remote-tracking ref).
+        // We use origin/<baseBranch> rather than the local <baseBranch> because:
+        // 1. syncMain fetches origin/<baseBranch> — it's always up-to-date
+        // 2. The local <baseBranch> may be checked out in another worktree and stale
+        const rebaseTarget = `origin/${baseBranch}`;
+        try {
+            await this.execFile('git', ['rebase', rebaseTarget], { cwd });
+        }
+        catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            const cause = error instanceof Error ? error : undefined;
+            // Detect rebase conflict from git stderr/exit code
+            if (message.includes('CONFLICT') || message.includes('could not apply')) {
+                // Get the list of conflicted files to include in the error message
+                let conflictedFiles = [];
+                try {
+                    conflictedFiles = await this.getConflictedFiles(cwd);
+                }
+                catch {
+                    // Failed to get conflicted files — still report the conflict
+                }
+                const fileList = conflictedFiles.length > 0 ? ` Conflicted files: ${conflictedFiles.join(', ')}` : '';
+                throw new GitPrError(`Rebase of '${featureBranch}' onto '${baseBranch}' encountered conflicts.${fileList}`, GitPrErrorCode.REBASE_CONFLICT, cause);
+            }
+            throw new GitPrError(`Rebase of '${featureBranch}' onto '${baseBranch}' failed: ${message}`, GitPrErrorCode.GIT_ERROR, cause);
+        }
+    }
+    async getConflictedFiles(cwd) {
+        try {
+            const { stdout } = await this.execFile('git', ['diff', '--name-only', '--diff-filter=U'], {
+                cwd,
+            });
+            return stdout
+                .trim()
+                .split('\n')
+                .filter((f) => f.length > 0)
+                .map((f) => f.replace(/\\/g, '/'));
+        }
+        catch (error) {
+            throw this.parseGitError(error);
+        }
+    }
+    async stageFiles(cwd, files) {
+        try {
+            await this.execFile('git', ['add', ...files], { cwd });
+        }
+        catch (error) {
+            throw this.parseGitError(error);
+        }
+    }
+    async rebaseContinue(cwd) {
+        try {
+            await this.execFile('git', ['rebase', '--continue'], {
+                cwd,
+                env: { ...process.env, GIT_EDITOR: 'true' },
+            });
+        }
+        catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            const cause = error instanceof Error ? error : undefined;
+            if (message.includes('CONFLICT') || message.includes('could not apply')) {
+                throw new GitPrError(`Rebase continue encountered new conflicts: ${message}`, GitPrErrorCode.REBASE_CONFLICT, cause);
+            }
+            throw this.parseGitError(error);
+        }
+    }
+    async rebaseAbort(cwd) {
+        try {
+            await this.execFile('git', ['rebase', '--abort'], { 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);
+        }
+    }
 };
 GitPrService = __decorate([
     injectable(),

package/dist/src/presentation/web/app/(dashboard)/get-graph-data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-graph-data.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/app/(dashboard)/get-graph-data.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAE5E,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAI1C,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AAwFD,MAAM,MAAM,aAAa,GACrB;IAAE,MAAM,EAAE,SAAS,CAAA;CAAE,GACrB;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,IAAI,EAAE,WAAW,CAAA;CAAE,GACtC;IAAE,MAAM,EAAE,YAAY,CAAA;CAAE,CAAC;AA6B7B,wBAAsB,YAAY,IAAI,OAAO,CAAC;IAAE,KAAK,EAAE,cAAc,EAAE,CAAC;IAAC,KAAK,EAAE,IAAI,EAAE,CAAA;CAAE,CAAC,CA6DxF"}
+{"version":3,"file":"get-graph-data.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/app/(dashboard)/get-graph-data.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAE5E,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAI1C,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AAiFD,MAAM,MAAM,aAAa,GACrB;IAAE,MAAM,EAAE,SAAS,CAAA;CAAE,GACrB;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,IAAI,EAAE,WAAW,CAAA;CAAE,GACtC;IAAE,MAAM,EAAE,YAAY,CAAA;CAAE,CAAC;AA6B7B,wBAAsB,YAAY,IAAI,OAAO,CAAC;IAAE,KAAK,EAAE,cAAc,EAAE,CAAC;IAAC,KAAK,EAAE,IAAI,EAAE,CAAA;CAAE,CAAC,CA6DxF"}

package/dist/src/presentation/web/app/(dashboard)/get-graph-data.js

@@ -31,13 +31,7 @@ async function refreshRepoGitInfo(repo) {
             gitInfoCache.set(repo.path, { kind: 'not-a-repo', checkedAt: Date.now() });
             return;
         }
-        const cached = gitInfoCache.get(repo.path);
-        if (cached?.kind === 'repo' && cached.sha === headSha) {
-            // HEAD unchanged — just bump checkedAt
-            cached.checkedAt = Date.now();
-            return;
-        }
-        // HEAD changed — fetch branch + subject & author in parallel
+        // Fetch branch + subject & author in parallel
         const [currentBranch, logLine] = await Promise.all([
             gitCommand(repo.path, ['symbolic-ref', '--short', 'HEAD']),
             gitCommand(repo.path, ['log', '-1', `--format=%s${FIELD_SEP}%an`]),
@@ -45,7 +39,8 @@ async function refreshRepoGitInfo(repo) {
         if (!currentBranch)
             return;
         const [commitMessage, committer] = (logLine ?? '').split(FIELD_SEP);
-        // Behind count
+        // Behind count — always compute, even when on the default branch,
+        // because local main can be behind origin/main.
         let behindCount = null;
         const defaultBranchRef = await gitCommand(repo.path, [
             'symbolic-ref',
@@ -53,7 +48,8 @@ async function refreshRepoGitInfo(repo) {
             'refs/remotes/origin/HEAD',
         ]);
         const defaultBranch = defaultBranchRef?.replace('origin/', '') ?? null;
-        if (defaultBranch && currentBranch !== defaultBranch) {
+        if (defaultBranch) {
+            // Compare current branch (or default branch itself) against origin
             const behind = await gitCommand(repo.path, [
                 'rev-list',
                 '--count',
@@ -63,9 +59,6 @@ async function refreshRepoGitInfo(repo) {
             if (isNaN(behindCount))
                 behindCount = null;
         }
-        else {
-            behindCount = 0;
-        }
         gitInfoCache.set(repo.path, {
             kind: 'repo',
             sha: headSha,

package/dist/src/presentation/web/app/actions/check-agent-auth.d.ts

@@ -8,6 +8,8 @@ export interface AgentAuthStatus {
     label: string;
     /** CLI binary name (e.g. "claude", "gemini") */
     binaryName: string | null;
+    /** Shell command to install the tool (e.g. "npm install -g @anthropic-ai/claude-code") */
+    installCommand: string | null;
     /** Instructions to authenticate if not authenticated */
     authCommand: string | null;
 }

package/dist/src/presentation/web/app/actions/check-agent-auth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"check-agent-auth.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/app/actions/check-agent-auth.ts"],"names":[],"mappings":"AAWA,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,+CAA+C;IAC/C,SAAS,EAAE,OAAO,CAAC;IACnB,8CAA8C;IAC9C,aAAa,EAAE,OAAO,CAAC;IACvB,yCAAyC;IACzC,KAAK,EAAE,MAAM,CAAC;IACd,gDAAgD;IAChD,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,wDAAwD;IACxD,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AA6FD;;;GAGG;AACH,wBAAsB,cAAc,IAAI,OAAO,CAAC,eAAe,CAAC,CAiF/D"}
+{"version":3,"file":"check-agent-auth.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/app/actions/check-agent-auth.ts"],"names":[],"mappings":"AAWA,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,+CAA+C;IAC/C,SAAS,EAAE,OAAO,CAAC;IACnB,8CAA8C;IAC9C,aAAa,EAAE,OAAO,CAAC;IACvB,yCAAyC;IACzC,KAAK,EAAE,MAAM,CAAC;IACd,gDAAgD;IAChD,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,0FAA0F;IAC1F,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,wDAAwD;IACxD,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AA6FD;;;GAGG;AACH,wBAAsB,cAAc,IAAI,OAAO,CAAC,eAAe,CAAC,CAwF/D"}

package/dist/src/presentation/web/app/actions/check-agent-auth.js

@@ -114,6 +114,7 @@ export async function checkAgentAuth() {
             authenticated: false,
             label: 'Unknown',
             binaryName: null,
+            installCommand: null,
             authCommand: null,
         };
     }
@@ -128,16 +129,19 @@ export async function checkAgentAuth() {
             authenticated: true,
             label,
             binaryName: null,
+            installCommand: null,
             authCommand: null,
         };
     }
-    // Check if tool is installed
+    // Check if tool is installed (also grab install command from metadata)
     let installed = false;
+    let installCommand = null;
     try {
         const useCase = resolve('ListToolsUseCase');
         const tools = await useCase.execute();
         const tool = tools.find((t) => t.id === toolId);
         installed = tool?.status.status === 'available';
+        installCommand = tool?.installCommand ?? null;
     }
     catch {
         installed = false;
@@ -149,6 +153,7 @@ export async function checkAgentAuth() {
             authenticated: false,
             label,
             binaryName,
+            installCommand,
             authCommand: binaryName ? `Install ${label} first` : null,
         };
     }
@@ -161,6 +166,7 @@ export async function checkAgentAuth() {
             authenticated: false,
             label,
             binaryName,
+            installCommand,
             authCommand: binaryName,
         };
     }
@@ -175,6 +181,7 @@ export async function checkAgentAuth() {
         authenticated,
         label,
         binaryName,
+        installCommand,
         authCommand: authenticated ? null : binaryName,
     };
 }

package/dist/src/presentation/web/app/actions/check-tool-status.d.ts

@@ -0,0 +1,14 @@
+export interface ToolStatusEntry {
+    installed: boolean;
+    version: string | null;
+    /** Platform-specific install command from tool JSON metadata */
+    installCommand: string | null;
+    /** Documentation/website URL */
+    installUrl: string | null;
+}
+export interface ToolStatusResult {
+    git: ToolStatusEntry;
+    gh: ToolStatusEntry;
+}
+export declare function checkToolStatus(): Promise<ToolStatusResult>;
+//# sourceMappingURL=check-tool-status.d.ts.map

package/dist/src/presentation/web/app/actions/check-tool-status.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"check-tool-status.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/app/actions/check-tool-status.ts"],"names":[],"mappings":"AAOA,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,gEAAgE;IAChE,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,gCAAgC;IAChC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B;AAED,MAAM,WAAW,gBAAgB;IAC/B,GAAG,EAAE,eAAe,CAAC;IACrB,EAAE,EAAE,eAAe,CAAC;CACrB;AAwBD,wBAAsB,eAAe,IAAI,OAAO,CAAC,gBAAgB,CAAC,CA8BjE"}

package/dist/src/presentation/web/app/actions/check-tool-status.js

@@ -0,0 +1,53 @@
+'use server';
+import { execFile } from 'node:child_process';
+import { IS_WINDOWS } from '../../../../../packages/core/src/infrastructure/platform.js';
+import { resolve } from '../../lib/server-container.js';
+function getVersion(command, args) {
+    return new Promise((resolve) => {
+        try {
+            const opts = IS_WINDOWS ? { timeout: 5000, windowsHide: true } : { timeout: 5000 };
+            execFile(command, args, opts, (error, stdout) => {
+                if (error) {
+                    resolve({ installed: false, version: null });
+                    return;
+                }
+                // Extract version number from output like "git version 2.43.0" or "gh version 2.40.1"
+                const match = stdout.match(/(\d+\.\d+(?:\.\d+)?)/);
+                resolve({ installed: true, version: match?.[1] ?? null });
+            });
+        }
+        catch {
+            resolve({ installed: false, version: null });
+        }
+    });
+}
+export async function checkToolStatus() {
+    // Run version checks and tool metadata lookup in parallel
+    const [gitVersion, ghVersion, tools] = await Promise.all([
+        getVersion('git', ['--version']),
+        getVersion('gh', ['--version']),
+        (async () => {
+            try {
+                const useCase = resolve('ListToolsUseCase');
+                return await useCase.execute();
+            }
+            catch {
+                return [];
+            }
+        })(),
+    ]);
+    const gitTool = tools.find((t) => t.id === 'git');
+    const ghTool = tools.find((t) => t.id === 'gh');
+    return {
+        git: {
+            ...gitVersion,
+            installCommand: gitTool?.installCommand ?? null,
+            installUrl: gitTool?.website ?? 'https://git-scm.com',
+        },
+        gh: {
+            ...ghVersion,
+            installCommand: ghTool?.installCommand ?? null,
+            installUrl: ghTool?.website ?? 'https://cli.github.com',
+        },
+    };
+}

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

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

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

@@ -0,0 +1,22 @@
+'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

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

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

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

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

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

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

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

package/dist/src/presentation/web/app/build-graph-nodes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build-graph-nodes.d.ts","sourceRoot":"","sources":["../../../../../src/presentation/web/app/build-graph-nodes.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,sCAAsC,CAAC;AAS1F,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAC5E,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAU1C,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,OAAO,CAAC;IACjB,GAAG,EAAE,QAAQ,GAAG,IAAI,CAAC;CACtB;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,sBAAsB;IACrC,uEAAuE;IACvE,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,6EAA6E;IAC7E,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,qEAAqE;IACrE,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,0FAA0F;IAC1F,WAAW,CAAC,EAAE,GAAG,CACf,MAAM,EACN;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CACzF,CAAC;IACF,0DAA0D;IAC1D,aAAa,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,GAAG,YAAY,CAAC,CAAC;CACjE;AAED,wBAAgB,eAAe,CAC7B,YAAY,EAAE,UAAU,EAAE,EAC1B,gBAAgB,EAAE,cAAc,EAAE,EAClC,OAAO,CAAC,EAAE,sBAAsB,GAC/B;IAAE,KAAK,EAAE,cAAc,EAAE,CAAC;IAAC,KAAK,EAAE,IAAI,EAAE,CAAA;CAAE,CAoG5C"}
+{"version":3,"file":"build-graph-nodes.d.ts","sourceRoot":"","sources":["../../../../../src/presentation/web/app/build-graph-nodes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,sCAAsC,CAAC;AAS1F,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAC5E,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAG1C,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,OAAO,CAAC;IACjB,GAAG,EAAE,QAAQ,GAAG,IAAI,CAAC;CACtB;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,sBAAsB;IACrC,uEAAuE;IACvE,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,6EAA6E;IAC7E,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,qEAAqE;IACrE,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,0FAA0F;IAC1F,WAAW,CAAC,EAAE,GAAG,CACf,MAAM,EACN;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CACzF,CAAC;IACF,0DAA0D;IAC1D,aAAa,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,GAAG,YAAY,CAAC,CAAC;CACjE;AAED,wBAAgB,eAAe,CAC7B,YAAY,EAAE,UAAU,EAAE,EAC1B,gBAAgB,EAAE,cAAc,EAAE,EAClC,OAAO,CAAC,EAAE,sBAAsB,GAC/B;IAAE,KAAK,EAAE,cAAc,EAAE,CAAC;IAAC,KAAK,EAAE,IAAI,EAAE,CAAA;CAAE,CAoG5C"}

package/dist/src/presentation/web/app/build-graph-nodes.js

@@ -1,15 +1,7 @@
-import { createHash } from 'node:crypto';
-import path from 'node:path';
 import { AgentRunStatus } from '../../../../packages/core/src/domain/generated/output.js';
 import { deriveNodeState, deriveProgress, deriveLifecycle, } from '../components/common/feature-node/derive-feature-state.js';
 import { isProcessAlive } from '../../../../packages/core/src/infrastructure/services/process/is-process-alive.js';
-import { getShepHomeDir } from '../../../../packages/core/src/infrastructure/services/filesystem/shep-directory.service.js';
-/** Compute the worktree path for a feature, matching WorktreeService.getWorktreePath() */
-function computeWorktreePath(repoPath, branch) {
-    const repoHash = createHash('sha256').update(repoPath).digest('hex').slice(0, 16);
-    const slug = branch.replace(/\//g, '-');
-    return path.join(getShepHomeDir(), 'repos', repoHash, 'wt', slug).replace(/\\/g, '/');
-}
+import { computeWorktreePath } from '../../../../packages/core/src/infrastructure/services/ide-launchers/compute-worktree-path.js';
 export function buildGraphNodes(repositories, featuresWithRuns, options) {
     // Normalize path separators so Windows backslash paths match forward-slash paths
     const normalizePath = (p) => p.replace(/\\/g, '/');

package/dist/src/presentation/web/components/common/control-center-drawer/feature-drawer-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"feature-drawer-client.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/control-center-drawer/feature-drawer-client.tsx"],"names":[],"mappings":"AAuCA,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAI/D,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,UAAU,CAAC;IACjB,8FAA8F;IAC9F,MAAM,CAAC,EAAE,aAAa,CAAC;CACxB;AAED,wBAAgB,mBAAmB,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,EAAE,wBAAwB,2CAimB1F"}
+{"version":3,"file":"feature-drawer-client.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/control-center-drawer/feature-drawer-client.tsx"],"names":[],"mappings":"AAuCA,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAK/D,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,UAAU,CAAC;IACjB,8FAA8F;IAC9F,MAAM,CAAC,EAAE,aAAa,CAAC;CACxB;AAED,wBAAgB,mBAAmB,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,EAAE,wBAAwB,2CAgoB1F"}

package/dist/src/presentation/web/components/common/control-center-drawer/feature-drawer-client.js

@@ -30,6 +30,7 @@ import { resolveSseEventUpdates } from '../../common/feature-node/derive-feature
 import { deriveInitialTab } from './drawer-view.js';
 import { useArtifactFetch } from './use-artifact-fetch.js';
 import { useDrawerSync } from './use-drawer-sync.js';
+import { useBranchSyncStatus } from '../../../hooks/use-branch-sync-status.js';
 export function FeatureDrawerClient({ view: initialView, urlTab }) {
     const featureFlags = useFeatureFlags();
     const router = useRouter();
@@ -320,6 +321,7 @@ export function FeatureDrawerClient({ view: initialView, urlTab }) {
     // ── Hooks (always called unconditionally per Rules of Hooks) ──────────
     const featureActionsInput = featureNode?.repositoryPath && featureNode?.branch
         ? {
+            featureId: featureNode.featureId,
             repositoryPath: featureNode.repositoryPath,
             branch: featureNode.branch,
             worktreePath: featureNode.worktreePath,
@@ -327,6 +329,19 @@ export function FeatureDrawerClient({ view: initialView, urlTab }) {
         }
         : null;
     const featureActions = useFeatureActions(featureActionsInput);
+    // Branch sync status — only when the feature flag is on and the feature has a branch
+    const syncFeatureId = featureFlags.gitRebaseSync && featureNode?.branch ? featureNode.featureId : null;
+    const { data: syncData, loading: syncLoading, error: syncError, refresh: refreshSync, } = useBranchSyncStatus(syncFeatureId);
+    // Auto-refresh sync status after a successful rebase
+    const prevRebaseLoadingRef = useRef(featureActions.rebaseLoading);
+    useEffect(() => {
+        if (prevRebaseLoadingRef.current &&
+            !featureActions.rebaseLoading &&
+            !featureActions.rebaseError) {
+            refreshSync();
+        }
+        prevRebaseLoadingRef.current = featureActions.rebaseLoading;
+    }, [featureActions.rebaseLoading, featureActions.rebaseError, refreshSync]);
     const featureDeployTarget = featureNode?.repositoryPath && featureNode.branch
         ? {
             targetId: featureNode.featureId,
@@ -364,7 +379,7 @@ export function FeatureDrawerClient({ view: initialView, urlTab }) {
             ...(featureNode.state === 'error' && { onRetry: handleRetry }),
             ...(featureNode.state === 'pending' && { onStart: handleStart }),
         };
-        body = (_jsx(FeatureDrawerTabs, { featureNode: enrichedNode, featureId: featureNode.featureId, initialTab: view.initialTab, urlTab: urlTab, sseEvents: events, prdData: prdData, prdSelections: prdSelections, onPrdSelect: (qId, oId) => setPrdSelections((prev) => ({ ...prev, [qId]: oId })), onPrdApprove: handlePrdApprove, onPrdReject: handlePrdReject, isPrdLoading: isLoadingPrd, techData: techData, onTechApprove: handleTechApprove, onTechReject: handleTechReject, isTechLoading: isLoadingTech, productData: isLoadingTechProduct ? null : techProductData, mergeData: mergeData, onMergeApprove: handleMergeApprove, onMergeReject: handleMergeReject, isMergeLoading: isLoadingMerge, isRejecting: isRejecting, chatInput: chatInput, onChatInputChange: setChatInput }));
+        body = (_jsx(FeatureDrawerTabs, { featureNode: enrichedNode, featureId: featureNode.featureId, initialTab: view.initialTab, urlTab: urlTab, sseEvents: events, prdData: prdData, prdSelections: prdSelections, onPrdSelect: (qId, oId) => setPrdSelections((prev) => ({ ...prev, [qId]: oId })), onPrdApprove: handlePrdApprove, onPrdReject: handlePrdReject, isPrdLoading: isLoadingPrd, techData: techData, onTechApprove: handleTechApprove, onTechReject: handleTechReject, isTechLoading: isLoadingTech, productData: isLoadingTechProduct ? null : techProductData, mergeData: mergeData, onMergeApprove: handleMergeApprove, onMergeReject: handleMergeReject, isMergeLoading: isLoadingMerge, syncStatus: featureFlags.gitRebaseSync ? syncData : undefined, syncLoading: syncLoading, syncError: syncError, onRefreshSync: featureFlags.gitRebaseSync ? refreshSync : undefined, onRebaseOnMain: featureFlags.gitRebaseSync ? featureActions.rebaseOnMain : undefined, rebaseLoading: featureActions.rebaseLoading, rebaseError: featureActions.rebaseError, isRejecting: isRejecting, chatInput: chatInput, onChatInputChange: setChatInput }));
     }
     return (_jsx(BaseDrawer, { open: isOpen, onClose: attemptClose, size: "md", modal: false, header: header, "data-testid": view.type === 'feature' ? 'feature-drawer' : 'repository-drawer', children: body }));
 }

package/dist/src/presentation/web/components/common/control-center-drawer/repository-drawer-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"repository-drawer-client.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/control-center-drawer/repository-drawer-client.tsx"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AAE9E,MAAM,WAAW,2BAA2B;IAC1C,IAAI,EAAE,kBAAkB,CAAC;CAC1B;AAED,wBAAgB,sBAAsB,CAAC,EAAE,IAAI,EAAE,EAAE,2BAA2B,2CAmF3E"}
+{"version":3,"file":"repository-drawer-client.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/control-center-drawer/repository-drawer-client.tsx"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AAE9E,MAAM,WAAW,2BAA2B;IAC1C,IAAI,EAAE,kBAAkB,CAAC;CAC1B;AAED,wBAAgB,sBAAsB,CAAC,EAAE,IAAI,EAAE,EAAE,2BAA2B,2CA2G3E"}

package/dist/src/presentation/web/components/common/control-center-drawer/repository-drawer-client.js

@@ -1,8 +1,8 @@
 'use client';
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { useCallback } from 'react';
 import { useRouter, usePathname } from 'next/navigation';
-import { Code2, Terminal, FolderOpen } from 'lucide-react';
+import { Code2, Terminal, FolderOpen, RefreshCw } from 'lucide-react';
 import { BaseDrawer } from '../../common/base-drawer/index.js';
 import { ActionButton } from '../../common/action-button/index.js';
 import { DrawerTitle, DrawerDescription } from '../../ui/drawer.js';
@@ -14,7 +14,7 @@ export function RepositoryDrawerClient({ data }) {
     const router = useRouter();
     const pathname = usePathname();
     const isOpen = pathname.startsWith('/repository/');
-    const repoActions = useRepositoryActions(data.repositoryPath ? { repositoryPath: data.repositoryPath } : null);
+    const repoActions = useRepositoryActions(data.repositoryPath ? { repositoryId: data.id, repositoryPath: data.repositoryPath } : null);
     const onClose = useCallback(() => {
         router.push('/');
     }, [router]);
@@ -26,5 +26,5 @@ export function RepositoryDrawerClient({ data }) {
         }
         : undefined;
     const header = (_jsxs("div", { "data-testid": "repository-drawer-header", children: [_jsx(DrawerTitle, { children: data.name }), data.repositoryPath ? (_jsx(DrawerDescription, { className: "truncate font-mono text-xs", children: data.repositoryPath })) : null] }));
-    return (_jsx(BaseDrawer, { open: isOpen, onClose: onClose, size: "md", modal: false, header: header, deployTarget: featureFlags.envDeploy ? repoDeployTarget : undefined, "data-testid": "repository-drawer", children: data.repositoryPath ? (_jsxs("div", { className: "flex-1 overflow-y-auto", children: [_jsx(Separator, {}), _jsxs("div", { className: "flex flex-col gap-3 p-4", children: [_jsx("div", { className: "text-muted-foreground text-xs font-semibold tracking-wider", children: "OPEN WITH" }), _jsxs("div", { className: "flex flex-col gap-2", children: [_jsx(ActionButton, { label: "Open in IDE", onClick: repoActions.openInIde, loading: repoActions.ideLoading, error: !!repoActions.ideError, icon: Code2, variant: "outline", size: "sm" }), _jsx(ActionButton, { label: "Open in Shell", onClick: repoActions.openInShell, loading: repoActions.shellLoading, error: !!repoActions.shellError, icon: Terminal, variant: "outline", size: "sm" }), _jsx(ActionButton, { label: "Open Folder", onClick: repoActions.openFolder, loading: repoActions.folderLoading, error: !!repoActions.folderError, icon: FolderOpen, variant: "outline", size: "sm" })] })] })] })) : null }));
+    return (_jsx(BaseDrawer, { open: isOpen, onClose: onClose, size: "md", modal: false, header: header, deployTarget: featureFlags.envDeploy ? repoDeployTarget : undefined, "data-testid": "repository-drawer", children: data.repositoryPath ? (_jsxs("div", { className: "flex-1 overflow-y-auto", children: [_jsx(Separator, {}), _jsxs("div", { className: "flex flex-col gap-3 p-4", children: [_jsx("div", { className: "text-muted-foreground text-xs font-semibold tracking-wider", children: "OPEN WITH" }), _jsxs("div", { className: "flex flex-col gap-2", children: [_jsx(ActionButton, { label: "Open in IDE", onClick: repoActions.openInIde, loading: repoActions.ideLoading, error: !!repoActions.ideError, icon: Code2, variant: "outline", size: "sm" }), _jsx(ActionButton, { label: "Open in Shell", onClick: repoActions.openInShell, loading: repoActions.shellLoading, error: !!repoActions.shellError, icon: Terminal, variant: "outline", size: "sm" }), _jsx(ActionButton, { label: "Open Folder", onClick: repoActions.openFolder, loading: repoActions.folderLoading, error: !!repoActions.folderError, icon: FolderOpen, variant: "outline", size: "sm" })] })] }), data.id && featureFlags.gitRebaseSync ? (_jsxs(_Fragment, { children: [_jsx(Separator, {}), _jsxs("div", { className: "flex flex-col gap-3 p-4", children: [_jsx("div", { className: "text-muted-foreground text-xs font-semibold tracking-wider", children: "GIT OPERATIONS" }), _jsxs("div", { className: "flex flex-col gap-2", children: [_jsx(ActionButton, { label: "Sync Main", onClick: repoActions.syncMain, loading: repoActions.syncLoading, error: !!repoActions.syncError, icon: RefreshCw, variant: "outline", size: "sm" }), repoActions.syncError ? (_jsx("p", { className: "text-destructive text-xs", children: repoActions.syncError })) : null] })] })] })) : null] })) : null }));
 }

package/dist/src/presentation/web/components/common/feature-drawer/use-feature-actions.d.ts

@@ -1,4 +1,5 @@
 export interface FeatureActionsInput {
+    featureId: string;
     repositoryPath: string;
     branch: string;
     worktreePath?: string;
@@ -8,12 +9,15 @@ export interface FeatureActionsState {
     openInIde: () => Promise<void>;
     openInShell: () => Promise<void>;
     openSpecsFolder: () => Promise<void>;
+    rebaseOnMain: () => Promise<void>;
     ideLoading: boolean;
     shellLoading: boolean;
     specsLoading: boolean;
+    rebaseLoading: boolean;
     ideError: string | null;
     shellError: string | null;
     specsError: string | null;
+    rebaseError: string | null;
 }
 export declare function useFeatureActions(input: FeatureActionsInput | null): FeatureActionsState;
 //# sourceMappingURL=use-feature-actions.d.ts.map

package/dist/src/presentation/web/components/common/feature-drawer/use-feature-actions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-feature-actions.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/feature-drawer/use-feature-actions.ts"],"names":[],"mappings":"AAOA,MAAM,WAAW,mBAAmB;IAClC,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,mBAAmB;IAClC,SAAS,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/B,WAAW,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,eAAe,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACrC,UAAU,EAAE,OAAO,CAAC;IACpB,YAAY,EAAE,OAAO,CAAC;IACtB,YAAY,EAAE,OAAO,CAAC;IACtB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B;AAID,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,mBAAmB,GAAG,IAAI,GAAG,mBAAmB,CA8GxF"}
+{"version":3,"file":"use-feature-actions.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/feature-drawer/use-feature-actions.ts"],"names":[],"mappings":"AAQA,MAAM,WAAW,mBAAmB;IAClC,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,mBAAmB;IAClC,SAAS,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/B,WAAW,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,eAAe,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACrC,YAAY,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAClC,UAAU,EAAE,OAAO,CAAC;IACpB,YAAY,EAAE,OAAO,CAAC;IACtB,YAAY,EAAE,OAAO,CAAC;IACtB,aAAa,EAAE,OAAO,CAAC;IACvB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AAID,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,mBAAmB,GAAG,IAAI,GAAG,mBAAmB,CA6IxF"}