@shepai/cli 1.123.0 → 1.124.0-pr394.98d0323

package/dist/packages/core/src/application/ports/output/repositories/feature-repository.interface.d.ts

@@ -57,6 +57,17 @@ export interface IFeatureRepository {
      * @returns The feature or null if not found
      */
     findBySlug(slug: string, repositoryPath: string): Promise<Feature | null>;
+    /**
+     * Find a feature by its branch name within a repository (excludes soft-deleted).
+     *
+     * Used for duplicate adoption detection — ensures a branch is not already
+     * tracked as a feature before adopting it.
+     *
+     * @param branch - The exact git branch name
+     * @param repositoryPath - The repository path to scope the search
+     * @returns The feature or null if not found
+     */
+    findByBranch(branch: string, repositoryPath: string): Promise<Feature | null>;
     /**
      * List features with optional filters.
      * Excludes soft-deleted features unless includeDeleted is true.

package/dist/packages/core/src/application/ports/output/repositories/feature-repository.interface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"feature-repository.interface.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/application/ports/output/repositories/feature-repository.interface.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AAErF;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,SAAS,CAAC,EAAE,aAAa,CAAC;IAC1B,2EAA2E;IAC3E,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED;;;;;;;;GAQG;AACH,MAAM,WAAW,kBAAkB;IACjC;;;;OAIG;IACH,MAAM,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAExC;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;IAE9C;;;;;;OAMG;IACH,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;IAExD;;;;;;OAMG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;IAE1E;;;;;;OAMG;IACH,IAAI,CAAC,OAAO,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;IAEvD;;;;OAIG;IACH,MAAM,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAExC;;;;;;;OAOG;IACH,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;IAErD;;;;OAIG;IACH,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAElC;;;;OAIG;IACH,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACvC"}
+{"version":3,"file":"feature-repository.interface.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/application/ports/output/repositories/feature-repository.interface.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AAErF;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,SAAS,CAAC,EAAE,aAAa,CAAC;IAC1B,2EAA2E;IAC3E,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED;;;;;;;;GAQG;AACH,MAAM,WAAW,kBAAkB;IACjC;;;;OAIG;IACH,MAAM,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAExC;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;IAE9C;;;;;;OAMG;IACH,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;IAExD;;;;;;OAMG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;IAE1E;;;;;;;;;OASG;IACH,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;IAE9E;;;;;;OAMG;IACH,IAAI,CAAC,OAAO,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;IAEvD;;;;OAIG;IACH,MAAM,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAExC;;;;;;;OAOG;IACH,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;IAErD;;;;OAIG;IACH,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAElC;;;;OAIG;IACH,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACvC"}

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

@@ -50,6 +50,21 @@ export interface IWorktreeService {
      * @throws WorktreeError with appropriate code
      */
     create(repoPath: string, branch: string, worktreePath: string, startPoint?: string): Promise<WorktreeInfo>;
+    /**
+     * Create a worktree for an already-existing branch (no -b flag).
+     *
+     * Unlike create(), this does not create a new branch. It attaches a worktree
+     * to a branch that already exists locally or as a remote tracking ref.
+     * For remote-only branches, pass "origin/<branch>" as the branch argument
+     * so that git automatically sets up local tracking.
+     *
+     * @param repoPath - Path to the git repository
+     * @param branch - Existing branch name or remote tracking ref (e.g., "origin/my-branch")
+     * @param worktreePath - Path for the new worktree directory
+     * @returns Information about the created worktree
+     * @throws WorktreeError with appropriate code
+     */
+    addExisting(repoPath: string, branch: string, worktreePath: string): Promise<WorktreeInfo>;
     /**
      * Remove an existing worktree.
      *
@@ -98,6 +113,16 @@ export interface IWorktreeService {
      * @returns Computed worktree path (e.g., /repo/.worktrees/branch-name)
      */
     getWorktreePath(repoPath: string, branch: string): string;
+    /**
+     * List all local and remote branch names in a repository.
+     *
+     * Returns unique branch names (without remote prefixes like "origin/").
+     * Excludes HEAD pointers and the current branch marker.
+     *
+     * @param repoPath - Path to the git repository
+     * @returns Array of branch name strings
+     */
+    listBranches(repoPath: string): Promise<string[]>;
     /**
      * Prune stale worktree entries whose directories no longer exist.
      *

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

@@ -1 +1 @@
-{"version":3,"file":"worktree-service.interface.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/application/ports/output/services/worktree-service.interface.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,8CAA8C;IAC9C,IAAI,EAAE,MAAM,CAAC;IACb,uBAAuB;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,4CAA4C;IAC5C,MAAM,EAAE,MAAM,CAAC;IACf,wCAAwC;IACxC,MAAM,EAAE,OAAO,CAAC;CACjB;AAED;;GAEG;AACH,oBAAY,iBAAiB;IAC3B,cAAc,mBAAmB;IACjC,aAAa,kBAAkB;IAC/B,SAAS,cAAc;IACvB,cAAc,mBAAmB;IACjC,SAAS,cAAc;CACxB;AAED;;GAEG;AACH,qBAAa,aAAc,SAAQ,KAAK;aAGpB,IAAI,EAAE,iBAAiB;aACvB,KAAK,CAAC,EAAE,KAAK;gBAF7B,OAAO,EAAE,MAAM,EACC,IAAI,EAAE,iBAAiB,EACvB,KAAK,CAAC,EAAE,KAAK,YAAA;CAKhC;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;;;;;;;;OASG;IACH,MAAM,CACJ,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,YAAY,CAAC,CAAC;IAEzB;;;;;;;OAOG;IACH,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE/E;;;;;OAKG;IACH,IAAI,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;IAEhD;;;;;;OAMG;IACH,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAE3D;;;;;;OAMG;IACH,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAEjE;;;;;;OAMG;IACH,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAEvE;;;;;;OAMG;IACH,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;IAE1D;;;;OAIG;IACH,KAAK,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEvC;;;;;;;OAOG;IACH,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACtD"}
+{"version":3,"file":"worktree-service.interface.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/application/ports/output/services/worktree-service.interface.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,8CAA8C;IAC9C,IAAI,EAAE,MAAM,CAAC;IACb,uBAAuB;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,4CAA4C;IAC5C,MAAM,EAAE,MAAM,CAAC;IACf,wCAAwC;IACxC,MAAM,EAAE,OAAO,CAAC;CACjB;AAED;;GAEG;AACH,oBAAY,iBAAiB;IAC3B,cAAc,mBAAmB;IACjC,aAAa,kBAAkB;IAC/B,SAAS,cAAc;IACvB,cAAc,mBAAmB;IACjC,SAAS,cAAc;CACxB;AAED;;GAEG;AACH,qBAAa,aAAc,SAAQ,KAAK;aAGpB,IAAI,EAAE,iBAAiB;aACvB,KAAK,CAAC,EAAE,KAAK;gBAF7B,OAAO,EAAE,MAAM,EACC,IAAI,EAAE,iBAAiB,EACvB,KAAK,CAAC,EAAE,KAAK,YAAA;CAKhC;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;;;;;;;;OASG;IACH,MAAM,CACJ,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,YAAY,CAAC,CAAC;IAEzB;;;;;;;;;;;;;OAaG;IACH,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;IAE3F;;;;;;;OAOG;IACH,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE/E;;;;;OAKG;IACH,IAAI,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;IAEhD;;;;;;OAMG;IACH,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAE3D;;;;;;OAMG;IACH,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAEjE;;;;;;OAMG;IACH,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAEvE;;;;;;OAMG;IACH,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;IAE1D;;;;;;;;OAQG;IACH,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAElD;;;;OAIG;IACH,KAAK,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEvC;;;;;;;OAOG;IACH,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACtD"}

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

@@ -0,0 +1,49 @@
+/**
+ * Adopt Branch Use Case
+ *
+ * Imports an existing git branch into Shep's feature tracking system.
+ * Creates a worktree (if needed), derives feature metadata from the branch name,
+ * and persists a Feature entity. Branches with an open PR get lifecycle=Review
+ * (shown as "REVIEW" in the UI); all others get lifecycle=Maintain (completed).
+ *
+ * This is a standalone use case — it does NOT extend or modify CreateFeatureUseCase.
+ * It needs only three dependencies: IFeatureRepository, IRepositoryRepository, and IWorktreeService.
+ */
+import type { Feature } from '../../../domain/generated/output.js';
+import type { IFeatureRepository } from '../../ports/output/repositories/feature-repository.interface.js';
+import type { IRepositoryRepository } from '../../ports/output/repositories/repository-repository.interface.js';
+import type { IWorktreeService } from '../../ports/output/services/worktree-service.interface.js';
+import type { IGitPrService } from '../../ports/output/services/git-pr-service.interface.js';
+export interface AdoptBranchInput {
+    branchName: string;
+    repositoryPath: string;
+}
+export interface AdoptBranchResult {
+    feature: Feature;
+}
+export declare class AdoptBranchUseCase {
+    private readonly featureRepo;
+    private readonly repositoryRepo;
+    private readonly worktreeService;
+    private readonly gitPrService;
+    constructor(featureRepo: IFeatureRepository, repositoryRepo: IRepositoryRepository, worktreeService: IWorktreeService, gitPrService: IGitPrService);
+    execute(input: AdoptBranchInput): Promise<AdoptBranchResult>;
+    /**
+     * Resolve the git ref to use for worktree creation.
+     * Returns the branch name for local branches, or "origin/<branch>" for remote-only.
+     * Throws if branch does not exist anywhere.
+     */
+    private resolveBranchRef;
+    /**
+     * Detect if the branch has an open PR (or one whose closure we cannot confirm).
+     * Returns PullRequest data if found, undefined otherwise.
+     * Gracefully returns undefined if gh CLI is unavailable or the repo has no remote.
+     */
+    private detectPrForBranch;
+    /**
+     * Find or create a Repository entity for the given path.
+     * Mirrors the pattern from CreateFeatureUseCase.
+     */
+    private resolveRepository;
+}
+//# sourceMappingURL=adopt-branch.use-case.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"adopt-branch.use-case.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/application/use-cases/features/adopt-branch.use-case.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAIH,OAAO,KAAK,EAAE,OAAO,EAAe,MAAM,qCAAqC,CAAC;AAEhF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iEAAiE,CAAC;AAC1G,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oEAAoE,CAAC;AAChH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2DAA2D,CAAC;AAClG,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yDAAyD,CAAC;AAG7F,MAAM,WAAW,gBAAgB;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,OAAO,CAAC;CAClB;AAKD,qBACa,kBAAkB;IAG3B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAE5B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAE/B,OAAO,CAAC,QAAQ,CAAC,eAAe;IAEhC,OAAO,CAAC,QAAQ,CAAC,YAAY;gBANZ,WAAW,EAAE,kBAAkB,EAE/B,cAAc,EAAE,qBAAqB,EAErC,eAAe,EAAE,gBAAgB,EAEjC,YAAY,EAAE,aAAa;IAGxC,OAAO,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAyFlE;;;;OAIG;YACW,gBAAgB;IAiB9B;;;;OAIG;YACW,iBAAiB;IA4B/B;;;OAGG;YACW,iBAAiB;CAuBhC"}

package/dist/packages/core/src/application/use-cases/features/adopt-branch.use-case.js

@@ -0,0 +1,188 @@
+/**
+ * Adopt Branch Use Case
+ *
+ * Imports an existing git branch into Shep's feature tracking system.
+ * Creates a worktree (if needed), derives feature metadata from the branch name,
+ * and persists a Feature entity. Branches with an open PR get lifecycle=Review
+ * (shown as "REVIEW" in the UI); all others get lifecycle=Maintain (completed).
+ *
+ * This is a standalone use case — it does NOT extend or modify CreateFeatureUseCase.
+ * It needs only three dependencies: IFeatureRepository, IRepositoryRepository, and IWorktreeService.
+ */
+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 { SdlcLifecycle, PrStatus } from '../../../domain/generated/output.js';
+import { deriveName, deriveSlug } from './branch-name-utils.js';
+/** Branches that must not be adopted as features. */
+const PROTECTED_BRANCHES = new Set(['main', 'master']);
+let AdoptBranchUseCase = class AdoptBranchUseCase {
+    featureRepo;
+    repositoryRepo;
+    worktreeService;
+    gitPrService;
+    constructor(featureRepo, repositoryRepo, worktreeService, gitPrService) {
+        this.featureRepo = featureRepo;
+        this.repositoryRepo = repositoryRepo;
+        this.worktreeService = worktreeService;
+        this.gitPrService = gitPrService;
+    }
+    async execute(input) {
+        const { branchName, repositoryPath } = input;
+        // --- Guard: reject main/master ---
+        if (PROTECTED_BRANCHES.has(branchName)) {
+            throw new Error(`Cannot adopt the "${branchName}" branch. The main branch should not be tracked as a feature.`);
+        }
+        // --- Guard: duplicate adoption ---
+        const existing = await this.featureRepo.findByBranch(branchName, repositoryPath);
+        if (existing) {
+            throw new Error(`Branch "${branchName}" is already tracked as feature "${existing.name}" (${existing.id}). ` +
+                'A branch can only be adopted once per repository.');
+        }
+        // --- Derive slug and check uniqueness ---
+        const slug = deriveSlug(branchName);
+        const slugCollision = await this.featureRepo.findBySlug(slug, repositoryPath);
+        if (slugCollision) {
+            throw new Error(`A feature with slug "${slug}" already exists in this repository (feature "${slugCollision.name}"). ` +
+                `Cannot adopt branch "${branchName}" because its derived slug collides.`);
+        }
+        // --- Validate branch existence (local or remote) ---
+        const branchRef = await this.resolveBranchRef(branchName, repositoryPath);
+        // --- Resolve or create repository entity ---
+        const repository = await this.resolveRepository(repositoryPath);
+        // --- Create or reuse worktree ---
+        const worktreePath = this.worktreeService.getWorktreePath(repositoryPath, slug);
+        const worktreeExists = await this.worktreeService.exists(repositoryPath, branchName);
+        if (!worktreeExists) {
+            await this.worktreeService.addExisting(repositoryPath, branchRef, worktreePath);
+        }
+        // --- Detect open PR for this branch ---
+        const prData = await this.detectPrForBranch(branchName, repositoryPath);
+        // --- Derive feature metadata ---
+        const name = deriveName(branchName);
+        const now = new Date();
+        const hasOpenPr = prData !== undefined;
+        // If the branch has an open (not yet merged) PR, place the feature in
+        // Review so the node shows "REVIEW" instead of "COMPLETED". Only truly
+        // finished branches (no PR, merged PR, or closed PR) get Maintain.
+        const lifecycle = prData?.status === PrStatus.Open ? SdlcLifecycle.Review : SdlcLifecycle.Maintain;
+        // --- Persist feature ---
+        const feature = {
+            id: randomUUID(),
+            name,
+            slug,
+            description: '',
+            userQuery: '',
+            repositoryPath,
+            branch: branchName,
+            lifecycle,
+            messages: [],
+            relatedArtifacts: [],
+            fast: false,
+            push: false,
+            openPr: hasOpenPr,
+            approvalGates: {
+                allowPrd: false,
+                allowPlan: false,
+                allowMerge: false,
+            },
+            worktreePath,
+            repositoryId: repository.id,
+            pr: prData,
+            createdAt: now,
+            updatedAt: now,
+        };
+        await this.featureRepo.create(feature);
+        return { feature };
+    }
+    /**
+     * Resolve the git ref to use for worktree creation.
+     * Returns the branch name for local branches, or "origin/<branch>" for remote-only.
+     * Throws if branch does not exist anywhere.
+     */
+    async resolveBranchRef(branchName, repositoryPath) {
+        const localExists = await this.worktreeService.branchExists(repositoryPath, branchName);
+        if (localExists) {
+            return branchName;
+        }
+        const remoteExists = await this.worktreeService.remoteBranchExists(repositoryPath, branchName);
+        if (remoteExists) {
+            return `origin/${branchName}`;
+        }
+        throw new Error(`Branch "${branchName}" does not exist locally or on the remote. ` +
+            'Check the branch name spelling and ensure you have fetched from the remote.');
+    }
+    /**
+     * Detect if the branch has an open PR (or one whose closure we cannot confirm).
+     * Returns PullRequest data if found, undefined otherwise.
+     * Gracefully returns undefined if gh CLI is unavailable or the repo has no remote.
+     */
+    async detectPrForBranch(branchName, repositoryPath) {
+        try {
+            const hasRemote = await this.gitPrService.hasRemote(repositoryPath);
+            if (!hasRemote)
+                return undefined;
+            const prStatuses = await this.gitPrService.listPrStatuses(repositoryPath);
+            const match = prStatuses.find((pr) => pr.headRefName === branchName);
+            if (!match)
+                return undefined;
+            // If the PR is definitively closed (not merged), skip it
+            if (match.state === PrStatus.Closed)
+                return undefined;
+            // Open or Merged — attach PR data
+            return {
+                url: match.url,
+                number: match.number,
+                status: match.state,
+                mergeable: match.mergeable,
+            };
+        }
+        catch {
+            // gh CLI not installed, auth failure, etc. — gracefully skip PR detection
+            return undefined;
+        }
+    }
+    /**
+     * Find or create a Repository entity for the given path.
+     * Mirrors the pattern from CreateFeatureUseCase.
+     */
+    async resolveRepository(repositoryPath) {
+        const normalizedPath = repositoryPath.replace(/\\/g, '/').replace(/\/+$/, '') || repositoryPath;
+        let repository = await this.repositoryRepo.findByPath(normalizedPath);
+        if (!repository) {
+            const now = new Date();
+            const repoName = normalizedPath.split('/').pop() ?? normalizedPath;
+            repository = await this.repositoryRepo.create({
+                id: randomUUID(),
+                name: repoName,
+                path: normalizedPath,
+                createdAt: now,
+                updatedAt: now,
+            });
+            if (!repository) {
+                throw new Error(`Failed to create or retrieve repository record for path: ${normalizedPath}`);
+            }
+        }
+        return repository;
+    }
+};
+AdoptBranchUseCase = __decorate([
+    injectable(),
+    __param(0, inject('IFeatureRepository')),
+    __param(1, inject('IRepositoryRepository')),
+    __param(2, inject('IWorktreeService')),
+    __param(3, inject('IGitPrService')),
+    __metadata("design:paramtypes", [Object, Object, Object, Object])
+], AdoptBranchUseCase);
+export { AdoptBranchUseCase };

package/dist/packages/core/src/application/use-cases/features/branch-name-utils.d.ts

@@ -0,0 +1,33 @@
+/**
+ * Pure utility functions for deriving feature metadata from git branch names.
+ *
+ * Used by the AdoptBranchUseCase to generate a human-readable feature name
+ * and a URL-safe slug from any git branch name.
+ */
+/**
+ * Derive a human-readable feature name from a git branch name.
+ *
+ * Strips known prefixes (feat/, fix/, etc.), replaces hyphens and underscores
+ * with spaces, and title-cases each word.
+ *
+ * @example deriveName('fix/login-bug')        → "Login Bug"
+ * @example deriveName('feat/user-auth')        → "User Auth"
+ * @example deriveName('my-cool-feature')       → "My Cool Feature"
+ * @example deriveName('feat/auth/login-bug')   → "Auth Login Bug"
+ * @example deriveName('release/v1.0.0')        → "V1.0.0"
+ */
+export declare function deriveName(branch: string): string;
+/**
+ * Derive a URL-safe slug from a git branch name.
+ *
+ * Lowercases the full branch name, converts slashes and special characters
+ * to hyphens, collapses consecutive hyphens, and trims leading/trailing hyphens.
+ *
+ * @example deriveSlug('fix/login-bug')        → "fix-login-bug"
+ * @example deriveSlug('feat/user-auth')        → "feat-user-auth"
+ * @example deriveSlug('my-cool-feature')       → "my-cool-feature"
+ * @example deriveSlug('release/v1.0.0')        → "release-v1-0-0"
+ * @example deriveSlug('feat/auth/login-bug')   → "feat-auth-login-bug"
+ */
+export declare function deriveSlug(branch: string): string;
+//# sourceMappingURL=branch-name-utils.d.ts.map

package/dist/packages/core/src/application/use-cases/features/branch-name-utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"branch-name-utils.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/application/use-cases/features/branch-name-utils.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAsBH;;;;;;;;;;;GAWG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAwBjD;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAMjD"}

package/dist/packages/core/src/application/use-cases/features/branch-name-utils.js

@@ -0,0 +1,77 @@
+/**
+ * Pure utility functions for deriving feature metadata from git branch names.
+ *
+ * Used by the AdoptBranchUseCase to generate a human-readable feature name
+ * and a URL-safe slug from any git branch name.
+ */
+/**
+ * Common branch name prefixes that are stripped when deriving a feature name.
+ * These are conventional prefixes from gitflow, conventional commits, etc.
+ */
+const KNOWN_PREFIXES = [
+    'feat/',
+    'fix/',
+    'chore/',
+    'refactor/',
+    'docs/',
+    'test/',
+    'ci/',
+    'build/',
+    'perf/',
+    'style/',
+    'revert/',
+    'hotfix/',
+    'release/',
+];
+/**
+ * Derive a human-readable feature name from a git branch name.
+ *
+ * Strips known prefixes (feat/, fix/, etc.), replaces hyphens and underscores
+ * with spaces, and title-cases each word.
+ *
+ * @example deriveName('fix/login-bug')        → "Login Bug"
+ * @example deriveName('feat/user-auth')        → "User Auth"
+ * @example deriveName('my-cool-feature')       → "My Cool Feature"
+ * @example deriveName('feat/auth/login-bug')   → "Auth Login Bug"
+ * @example deriveName('release/v1.0.0')        → "V1.0.0"
+ */
+export function deriveName(branch) {
+    let remaining = branch;
+    // Strip known prefix (only the first matching one)
+    for (const prefix of KNOWN_PREFIXES) {
+        if (remaining.startsWith(prefix)) {
+            remaining = remaining.slice(prefix.length);
+            break;
+        }
+    }
+    // Replace slashes, hyphens, and underscores with spaces
+    const words = remaining
+        .replace(/[/_-]+/g, ' ')
+        .trim()
+        .split(/\s+/)
+        .filter((w) => w.length > 0);
+    if (words.length === 0) {
+        return branch;
+    }
+    // Title-case each word
+    return words.map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join(' ');
+}
+/**
+ * Derive a URL-safe slug from a git branch name.
+ *
+ * Lowercases the full branch name, converts slashes and special characters
+ * to hyphens, collapses consecutive hyphens, and trims leading/trailing hyphens.
+ *
+ * @example deriveSlug('fix/login-bug')        → "fix-login-bug"
+ * @example deriveSlug('feat/user-auth')        → "feat-user-auth"
+ * @example deriveSlug('my-cool-feature')       → "my-cool-feature"
+ * @example deriveSlug('release/v1.0.0')        → "release-v1-0-0"
+ * @example deriveSlug('feat/auth/login-bug')   → "feat-auth-login-bug"
+ */
+export function deriveSlug(branch) {
+    return branch
+        .toLowerCase()
+        .replace(/[^a-z0-9-]/g, '-') // Replace non-alphanumeric chars (except hyphens) with hyphens
+        .replace(/-+/g, '-') // Collapse consecutive hyphens
+        .replace(/^-+|-+$/g, ''); // Trim leading/trailing hyphens
+}

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

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

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

@@ -65,6 +65,7 @@ import { ShowFeatureUseCase } from '../../application/use-cases/features/show-fe
 import { DeleteFeatureUseCase } from '../../application/use-cases/features/delete-feature.use-case.js';
 import { ResumeFeatureUseCase } from '../../application/use-cases/features/resume-feature.use-case.js';
 import { StartFeatureUseCase } from '../../application/use-cases/features/start-feature.use-case.js';
+import { AdoptBranchUseCase } from '../../application/use-cases/features/adopt-branch.use-case.js';
 import { GetFeatureArtifactUseCase } from '../../application/use-cases/features/get-feature-artifact.use-case.js';
 import { GetResearchArtifactUseCase } from '../../application/use-cases/features/get-research-artifact.use-case.js';
 import { GetPlanArtifactUseCase } from '../../application/use-cases/features/get-plan-artifact.use-case.js';
@@ -278,6 +279,7 @@ export async function initializeContainer() {
     container.registerSingleton(DeleteFeatureUseCase);
     container.registerSingleton(ResumeFeatureUseCase);
     container.registerSingleton(StartFeatureUseCase);
+    container.registerSingleton(AdoptBranchUseCase);
     container.registerSingleton(GetFeatureArtifactUseCase);
     container.registerSingleton(GetResearchArtifactUseCase);
     container.registerSingleton(GetPlanArtifactUseCase);
@@ -328,6 +330,9 @@ export async function initializeContainer() {
     container.register('StartFeatureUseCase', {
         useFactory: (c) => c.resolve(StartFeatureUseCase),
     });
+    container.register('AdoptBranchUseCase', {
+        useFactory: (c) => c.resolve(AdoptBranchUseCase),
+    });
     container.register('ApproveAgentRunUseCase', {
         useFactory: (c) => c.resolve(ApproveAgentRunUseCase),
     });

package/dist/packages/core/src/infrastructure/repositories/sqlite-feature.repository.d.ts

@@ -19,6 +19,7 @@ export declare class SQLiteFeatureRepository implements IFeatureRepository {
     findById(id: string): Promise<Feature | null>;
     findByIdPrefix(prefix: string): Promise<Feature | null>;
     findBySlug(slug: string, repositoryPath: string): Promise<Feature | null>;
+    findByBranch(branch: string, repositoryPath: string): Promise<Feature | null>;
     list(filters?: FeatureListFilters): Promise<Feature[]>;
     findByParentId(parentId: string): Promise<Feature[]>;
     update(feature: Feature): Promise<void>;

package/dist/packages/core/src/infrastructure/repositories/sqlite-feature.repository.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sqlite-feature.repository.d.ts","sourceRoot":"","sources":["../../../../../../packages/core/src/infrastructure/repositories/sqlite-feature.repository.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAE3C,OAAO,KAAK,EACV,kBAAkB,EAClB,kBAAkB,EACnB,MAAM,6EAA6E,CAAC;AACrF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAC;AAOhE;;;GAGG;AACH,qBACa,uBAAwB,YAAW,kBAAkB;IACpD,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAF,EAAE,EAAE,QAAQ,CAAC,QAAQ;IAE5C,MAAM,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IA8BvC,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAW7C,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAcvD,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAazE,IAAI,CAAC,OAAO,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAyBtD,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAQpD,MAAM,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAyCvC,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKjC,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAK5C"}
+{"version":3,"file":"sqlite-feature.repository.d.ts","sourceRoot":"","sources":["../../../../../../packages/core/src/infrastructure/repositories/sqlite-feature.repository.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAE3C,OAAO,KAAK,EACV,kBAAkB,EAClB,kBAAkB,EACnB,MAAM,6EAA6E,CAAC;AACrF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAC;AAOhE;;;GAGG;AACH,qBACa,uBAAwB,YAAW,kBAAkB;IACpD,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAF,EAAE,EAAE,QAAQ,CAAC,QAAQ;IAE5C,MAAM,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IA8BvC,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAW7C,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAcvD,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAazE,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAa7E,IAAI,CAAC,OAAO,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAyBtD,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAQpD,MAAM,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAyCvC,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKjC,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAK5C"}

package/dist/packages/core/src/infrastructure/repositories/sqlite-feature.repository.js

@@ -78,6 +78,14 @@ let SQLiteFeatureRepository = class SQLiteFeatureRepository {
         }
         return fromDatabase(row);
     }
+    async findByBranch(branch, repositoryPath) {
+        const stmt = this.db.prepare("SELECT * FROM features WHERE branch = ? AND REPLACE(repository_path, '\\', '/') = ? AND deleted_at IS NULL");
+        const row = stmt.get(branch, repositoryPath.replace(/\\/g, '/'));
+        if (!row) {
+            return null;
+        }
+        return fromDatabase(row);
+    }
     async list(filters) {
         const conditions = [];
         const params = [];

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

@@ -18,12 +18,14 @@ export declare class WorktreeService implements IWorktreeService {
     private readonly execFile;
     constructor(execFile: ExecFunction);
     create(repoPath: string, branch: string, worktreePath: string, startPoint?: string): Promise<WorktreeInfo>;
+    addExisting(repoPath: string, branch: string, worktreePath: string): Promise<WorktreeInfo>;
     remove(repoPath: string, worktreePath: string, force?: boolean): Promise<void>;
     prune(repoPath: string): Promise<void>;
     list(repoPath: string): Promise<WorktreeInfo[]>;
     exists(repoPath: string, branch: string): Promise<boolean>;
     branchExists(repoPath: string, branch: string): Promise<boolean>;
     remoteBranchExists(repoPath: string, branch: string): Promise<boolean>;
+    listBranches(repoPath: string): Promise<string[]>;
     ensureGitRepository(repoPath: string): Promise<void>;
     getWorktreePath(repoPath: string, branch: string): string;
     private parseWorktreeOutput;

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

@@ -1 +1 @@
-{"version":3,"file":"worktree.service.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/infrastructure/services/git/worktree.service.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AASH,OAAO,KAAK,EACV,gBAAgB,EAChB,YAAY,EACb,MAAM,0EAA0E,CAAC;AAQlF;;;GAGG;AACH,MAAM,MAAM,YAAY,GAAG,CACzB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EAAE,EACd,OAAO,CAAC,EAAE,MAAM,KACb,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAEjD,qBACa,eAAgB,YAAW,gBAAgB;IAClB,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAAR,QAAQ,EAAE,YAAY;IAErE,MAAM,CACV,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,YAAY,CAAC;IAuBlB,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAW9E,KAAK,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQtC,IAAI,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAO/C,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAK1D,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAWhE,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAWtE,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAwC1D,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAQzD,OAAO,CAAC,mBAAmB;IA2B3B,OAAO,CAAC,aAAa;IAgCrB,OAAO,CAAC,kBAAkB;IAI1B,OAAO,CAAC,qBAAqB;CAsB9B"}
+{"version":3,"file":"worktree.service.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/infrastructure/services/git/worktree.service.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AASH,OAAO,KAAK,EACV,gBAAgB,EAChB,YAAY,EACb,MAAM,0EAA0E,CAAC;AAQlF;;;GAGG;AACH,MAAM,MAAM,YAAY,GAAG,CACzB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EAAE,EACd,OAAO,CAAC,EAAE,MAAM,KACb,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAEjD,qBACa,eAAgB,YAAW,gBAAgB;IAClB,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAAR,QAAQ,EAAE,YAAY;IAErE,MAAM,CACV,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,YAAY,CAAC;IAuBlB,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IAoB1F,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAW9E,KAAK,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQtC,IAAI,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAO/C,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAK1D,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAWhE,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAWtE,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAuBjD,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAwC1D,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAQzD,OAAO,CAAC,mBAAmB;IA2B3B,OAAO,CAAC,aAAa;IAgCrB,OAAO,CAAC,kBAAkB;IAI1B,OAAO,CAAC,qBAAqB;CAsB9B"}

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

@@ -50,6 +50,21 @@ let WorktreeService = class WorktreeService {
         }
         return created;
     }
+    async addExisting(repoPath, branch, worktreePath) {
+        try {
+            await this.execFile('git', ['worktree', 'add', worktreePath, branch], { cwd: repoPath });
+        }
+        catch (error) {
+            throw this.parseGitError(error);
+        }
+        const worktrees = await this.list(repoPath);
+        const created = worktrees.find((w) => w.branch === branch) ??
+            worktrees.find((w) => this.arePathsEquivalent(w.path, worktreePath));
+        if (!created) {
+            throw new WorktreeError('Worktree created but not found in list', WorktreeErrorCode.GIT_ERROR);
+        }
+        return created;
+    }
     async remove(repoPath, worktreePath, force) {
         try {
             const args = ['worktree', 'remove'];
@@ -102,6 +117,30 @@ let WorktreeService = class WorktreeService {
             return false;
         }
     }
+    async listBranches(repoPath) {
+        try {
+            const { stdout } = await this.execFile('git', ['branch', '-a', '--format=%(refname:short)'], {
+                cwd: repoPath,
+            });
+            const seen = new Set();
+            const branches = [];
+            for (const line of stdout.split('\n')) {
+                const trimmed = line.trim();
+                if (!trimmed || trimmed === 'origin/HEAD' || trimmed.startsWith('origin/HEAD ->'))
+                    continue;
+                // Strip "origin/" prefix for remote branches
+                const name = trimmed.startsWith('origin/') ? trimmed.slice('origin/'.length) : trimmed;
+                if (!seen.has(name)) {
+                    seen.add(name);
+                    branches.push(name);
+                }
+            }
+            return branches.sort();
+        }
+        catch {
+            return [];
+        }
+    }
     async ensureGitRepository(repoPath) {
         let isExistingRepo = false;
         try {

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

@@ -0,0 +1,14 @@
+/**
+ * Feature Adopt Command
+ *
+ * Adopts an existing git branch into Shep's feature tracking system.
+ * Creates a worktree (if needed), derives metadata from the branch name,
+ * and persists a Feature with lifecycle=Maintain (agent inactive).
+ *
+ * Usage:
+ *   shep feat adopt <branch>
+ *   shep feat adopt <branch> -r /path/to/repo
+ */
+import { Command } from 'commander';
+export declare function createAdoptCommand(): Command;
+//# sourceMappingURL=adopt.command.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"adopt.command.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/cli/commands/feat/adopt.command.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKpC,wBAAgB,kBAAkB,IAAI,OAAO,CAkC5C"}

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

@@ -0,0 +1,46 @@
+/**
+ * Feature Adopt Command
+ *
+ * Adopts an existing git branch into Shep's feature tracking system.
+ * Creates a worktree (if needed), derives metadata from the branch name,
+ * and persists a Feature with lifecycle=Maintain (agent inactive).
+ *
+ * Usage:
+ *   shep feat adopt <branch>
+ *   shep feat adopt <branch> -r /path/to/repo
+ */
+import { Command } from 'commander';
+import { container } from '../../../../../packages/core/src/infrastructure/di/container.js';
+import { AdoptBranchUseCase } from '../../../../../packages/core/src/application/use-cases/features/adopt-branch.use-case.js';
+import { colors, messages, spinner } from '../../ui/index.js';
+export function createAdoptCommand() {
+    return new Command('adopt')
+        .description('Adopt an existing branch as a tracked feature')
+        .argument('<branch>', 'Branch name to adopt')
+        .option('-r, --repo <path>', 'Repository path (defaults to cwd)')
+        .action(async (branch, options) => {
+        try {
+            const useCase = container.resolve(AdoptBranchUseCase);
+            const { feature } = await spinner('Adopting branch', () => useCase.execute({
+                branchName: branch,
+                repositoryPath: options.repo ?? process.cwd(),
+            }));
+            messages.newline();
+            messages.success('Branch adopted');
+            console.log(`  ${colors.muted('ID:')}        ${colors.accent(feature.id.slice(0, 8))}`);
+            console.log(`  ${colors.muted('Name:')}      ${feature.name}`);
+            console.log(`  ${colors.muted('Branch:')}    ${colors.accent(feature.branch)}`);
+            console.log(`  ${colors.muted('Status:')}    ${feature.lifecycle}`);
+            if (feature.pr) {
+                console.log(`  ${colors.muted('PR:')}        ${colors.accent(feature.pr.url)} (${feature.pr.status})`);
+            }
+            console.log(`  ${colors.muted('Worktree:')}  ${colors.accent(feature.worktreePath ?? '')}`);
+            messages.newline();
+        }
+        catch (error) {
+            const err = error instanceof Error ? error : new Error(String(error));
+            messages.error('Failed to adopt branch', err);
+            process.exitCode = 1;
+        }
+    });
+}