@shepai/cli 1.136.1 → 1.137.0-pr440.3cc2b78

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"}

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

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

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

@@ -45,5 +45,15 @@ export declare class GitPrService implements IGitPrService {
     private parseGhError;
     private parsePrNumberFromUrl;
     private parseDiffStat;
+    syncMain(cwd: string, baseBranch: string): Promise<void>;
+    rebaseOnMain(cwd: string, featureBranch: string, baseBranch: string): Promise<void>;
+    getConflictedFiles(cwd: string): Promise<string[]>;
+    stageFiles(cwd: string, files: string[]): Promise<void>;
+    rebaseContinue(cwd: string): Promise<void>;
+    rebaseAbort(cwd: string): Promise<void>;
+    getBranchSyncStatus(cwd: string, featureBranch: string, baseBranch: string): Promise<{
+        ahead: number;
+        behind: number;
+    }>;
 }
 //# sourceMappingURL=git-pr.service.d.ts.map

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

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

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/cli/commands/feat/archive.command.d.ts

@@ -0,0 +1,18 @@
+/**
+ * Feature Archive Command
+ *
+ * Archives a feature to hide it from the canvas without deleting it.
+ * Stores the current lifecycle state for restoration on unarchive.
+ *
+ * Usage: shep feat archive <id> [--force]
+ *
+ * @example
+ * $ shep feat archive feat-123
+ * $ shep feat archive feat-123 --force
+ */
+import { Command } from 'commander';
+/**
+ * Create the feat archive command
+ */
+export declare function createArchiveCommand(): Command;
+//# sourceMappingURL=archive.command.d.ts.map

package/dist/src/presentation/cli/commands/feat/archive.command.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"archive.command.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/cli/commands/feat/archive.command.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAWpC;;GAEG;AACH,wBAAgB,oBAAoB,IAAI,OAAO,CAkC9C"}

package/dist/src/presentation/cli/commands/feat/archive.command.js

@@ -0,0 +1,54 @@
+/**
+ * Feature Archive Command
+ *
+ * Archives a feature to hide it from the canvas without deleting it.
+ * Stores the current lifecycle state for restoration on unarchive.
+ *
+ * Usage: shep feat archive <id> [--force]
+ *
+ * @example
+ * $ shep feat archive feat-123
+ * $ shep feat archive feat-123 --force
+ */
+import { Command } from 'commander';
+import { container } from '../../../../../packages/core/src/infrastructure/di/container.js';
+import { ShowFeatureUseCase } from '../../../../../packages/core/src/application/use-cases/features/show-feature.use-case.js';
+import { ArchiveFeatureUseCase } from '../../../../../packages/core/src/application/use-cases/features/archive-feature.use-case.js';
+import { colors, messages } from '../../ui/index.js';
+import { confirm } from '@inquirer/prompts';
+/**
+ * Create the feat archive command
+ */
+export function createArchiveCommand() {
+    return new Command('archive')
+        .description('Archive a feature to hide it from the canvas')
+        .argument('<id>', 'Feature ID or prefix')
+        .option('-f, --force', 'Skip confirmation prompt')
+        .action(async (featureId, options) => {
+        try {
+            const showUseCase = container.resolve(ShowFeatureUseCase);
+            const feature = await showUseCase.execute(featureId);
+            if (!options.force) {
+                const confirmed = await confirm({
+                    message: `Archive feature "${feature.name}"?`,
+                    default: false,
+                });
+                if (!confirmed) {
+                    messages.info('Cancelled');
+                    return;
+                }
+            }
+            const archiveUseCase = container.resolve(ArchiveFeatureUseCase);
+            await archiveUseCase.execute(feature.id);
+            messages.newline();
+            messages.success('Feature archived');
+            console.log(`  ${colors.muted('Name:')} ${feature.name}`);
+            messages.newline();
+        }
+        catch (error) {
+            const err = error instanceof Error ? error : new Error(String(error));
+            messages.error('Failed to archive feature', err);
+            process.exitCode = 1;
+        }
+    });
+}

package/dist/src/presentation/cli/commands/feat/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/cli/commands/feat/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAapC;;GAEG;AACH,wBAAgB,iBAAiB,IAAI,OAAO,CAc3C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/cli/commands/feat/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAepC;;GAEG;AACH,wBAAgB,iBAAiB,IAAI,OAAO,CAgB3C"}

package/dist/src/presentation/cli/commands/feat/index.js

@@ -21,6 +21,8 @@ import { createApproveCommand } from './approve.command.js';
 import { createRejectCommand } from './reject.command.js';
 import { createLogsCommand } from './logs.command.js';
 import { createAdoptCommand } from './adopt.command.js';
+import { createArchiveCommand } from './archive.command.js';
+import { createUnarchiveCommand } from './unarchive.command.js';
 /**
  * Create the feat command group
  */
@@ -37,5 +39,7 @@ export function createFeatCommand() {
         .addCommand(createApproveCommand())
         .addCommand(createRejectCommand())
         .addCommand(createLogsCommand())
-        .addCommand(createAdoptCommand());
+        .addCommand(createAdoptCommand())
+        .addCommand(createArchiveCommand())
+        .addCommand(createUnarchiveCommand());
 }

package/dist/src/presentation/cli/commands/feat/ls.command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ls.command.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/cli/commands/feat/ls.command.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAGH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA6KpC,wBAAgB,eAAe,IAAI,OAAO,CAsGzC"}
+{"version":3,"file":"ls.command.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/cli/commands/feat/ls.command.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAGH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAkLpC,wBAAgB,eAAe,IAAI,OAAO,CAwGzC"}

package/dist/src/presentation/cli/commands/feat/ls.command.js

@@ -48,6 +48,9 @@ const STATUS_PRIORITY = {
  */
 function formatStatus(feature, run) {
     // Blocked features show "Waiting" — the parent relationship is conveyed by tree indentation
+    if (feature.lifecycle === 'Archived') {
+        return `${colors.muted(symbols.dotEmpty)} ${colors.muted('Archived')}`;
+    }
     if (feature.lifecycle === 'Deleting') {
         return `${colors.muted(symbols.spinner[0])} ${colors.muted('Deleting')}`;
     }
@@ -168,6 +171,7 @@ export function createLsCommand() {
         .description('List features')
         .option('-r, --repo <path>', 'Filter by repository path')
         .option('--include-deleted', 'Include soft-deleted features')
+        .option('--show-archived', 'Include archived features')
         .action(async (options) => {
         try {
             const useCase = container.resolve(ListFeaturesUseCase);
@@ -176,6 +180,7 @@ export function createLsCommand() {
             const filters = {
                 ...(options.repo && { repositoryPath: options.repo }),
                 ...(options.includeDeleted && { includeDeleted: true }),
+                ...(options.showArchived && { includeArchived: true }),
             };
             const features = await useCase.execute(Object.keys(filters).length > 0 ? filters : undefined);
             // Load agent runs and phase timings for all features in parallel