@shepai/cli 1.123.0-pr394.80f3f1f → 1.123.0-pr394.f86a739

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

@@ -3,7 +3,8 @@
  *
  * 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 with lifecycle=Maintain (agent inactive).
+ * 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.
@@ -12,6 +13,7 @@ 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;
@@ -23,7 +25,8 @@ export declare class AdoptBranchUseCase {
     private readonly featureRepo;
     private readonly repositoryRepo;
     private readonly worktreeService;
-    constructor(featureRepo: IFeatureRepository, repositoryRepo: IRepositoryRepository, worktreeService: IWorktreeService);
+    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.
@@ -31,6 +34,12 @@ export declare class AdoptBranchUseCase {
      * 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.

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

@@ -1 +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;;;;;;;;;GASG;AAIH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qCAAqC,CAAC;AAEnE,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;AAGlG,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;gBAJf,WAAW,EAAE,kBAAkB,EAE/B,cAAc,EAAE,qBAAqB,EAErC,eAAe,EAAE,gBAAgB;IAG9C,OAAO,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,iBAAiB,CAAC;IA6ElE;;;;OAIG;YACW,gBAAgB;IAiB9B;;;OAGG;YACW,iBAAiB;CAuBhC"}
+{"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

@@ -3,7 +3,8 @@
  *
  * 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 with lifecycle=Maintain (agent inactive).
+ * 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.
@@ -22,7 +23,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 };
 import { injectable, inject } from 'tsyringe';
 import { randomUUID } from 'node:crypto';
-import { SdlcLifecycle } from '../../../domain/generated/output.js';
+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']);
@@ -30,10 +31,12 @@ let AdoptBranchUseCase = class AdoptBranchUseCase {
     featureRepo;
     repositoryRepo;
     worktreeService;
-    constructor(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;
@@ -64,9 +67,16 @@ let AdoptBranchUseCase = class AdoptBranchUseCase {
         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(),
@@ -76,12 +86,12 @@ let AdoptBranchUseCase = class AdoptBranchUseCase {
             userQuery: '',
             repositoryPath,
             branch: branchName,
-            lifecycle: SdlcLifecycle.Maintain,
+            lifecycle,
             messages: [],
             relatedArtifacts: [],
             fast: false,
             push: false,
-            openPr: false,
+            openPr: hasOpenPr,
             approvalGates: {
                 allowPrd: false,
                 allowPlan: false,
@@ -89,6 +99,7 @@ let AdoptBranchUseCase = class AdoptBranchUseCase {
             },
             worktreePath,
             repositoryId: repository.id,
+            pr: prData,
             createdAt: now,
             updatedAt: now,
         };
@@ -112,6 +123,36 @@ let AdoptBranchUseCase = class AdoptBranchUseCase {
         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.
@@ -141,6 +182,7 @@ AdoptBranchUseCase = __decorate([
     __param(0, inject('IFeatureRepository')),
     __param(1, inject('IRepositoryRepository')),
     __param(2, inject('IWorktreeService')),
-    __metadata("design:paramtypes", [Object, Object, Object])
+    __param(3, inject('IGitPrService')),
+    __metadata("design:paramtypes", [Object, Object, Object, Object])
 ], AdoptBranchUseCase);
 export { AdoptBranchUseCase };

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

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

@@ -31,6 +31,9 @@ export function createAdoptCommand() {
             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();
         }

package/dist/src/presentation/web/components/common/feature-node/derive-feature-state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"derive-feature-state.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/feature-node/derive-feature-state.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAIL,qBAAqB,EACtB,MAAM,+BAA+B,CAAC;AACvC,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AAE3F;;;;;;;;;;GAUG;AACH,wBAAgB,eAAe,CAC7B,OAAO,EAAE,OAAO,EAChB,QAAQ,CAAC,EAAE,QAAQ,GAAG,IAAI,EAC1B,OAAO,CAAC,EAAE;IAAE,UAAU,CAAC,EAAE,OAAO,CAAA;CAAE,GACjC,gBAAgB,CAuDlB;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,CAYvD;AAED,oGAAoG;AACpG,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,qBAAqB,GAAG,gBAAgB,CAsBtF;AAED,wEAAwE;AACxE,eAAO,MAAM,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,qBAAqB,CAQlE,CAAC;AAeF;;;GAGG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,IAAI,GAAG,qBAAqB,CAQ7F;AAED,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,gBAAgB,GAAG,SAAS,CAAC;IACpC,SAAS,EAAE,qBAAqB,GAAG,SAAS,CAAC;IAC7C,SAAS,EAAE,qBAAqB,CAAC;IACjC,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,SAAS;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,qBAAqB,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,GAC7F,cAAc,EAAE,CAmBlB;AAED,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,MAAM,GAAG,SAAS,GAC5B,qBAAqB,GAAG,SAAS,CAGnC"}
+{"version":3,"file":"derive-feature-state.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/feature-node/derive-feature-state.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAIL,qBAAqB,EACtB,MAAM,+BAA+B,CAAC;AACvC,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AAE3F;;;;;;;;;;GAUG;AACH,wBAAgB,eAAe,CAC7B,OAAO,EAAE,OAAO,EAChB,QAAQ,CAAC,EAAE,QAAQ,GAAG,IAAI,EAC1B,OAAO,CAAC,EAAE;IAAE,UAAU,CAAC,EAAE,OAAO,CAAA;CAAE,GACjC,gBAAgB,CA4DlB;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,CAYvD;AAED,oGAAoG;AACpG,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,qBAAqB,GAAG,gBAAgB,CAsBtF;AAED,wEAAwE;AACxE,eAAO,MAAM,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,qBAAqB,CAQlE,CAAC;AAeF;;;GAGG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,IAAI,GAAG,qBAAqB,CAQ7F;AAED,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,gBAAgB,GAAG,SAAS,CAAC;IACpC,SAAS,EAAE,qBAAqB,GAAG,SAAS,CAAC;IAC7C,SAAS,EAAE,qBAAqB,CAAC;IACjC,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,SAAS;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,qBAAqB,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,GAC7F,cAAc,EAAE,CAmBlB;AAED,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,MAAM,GAAG,SAAS,GAC5B,qBAAqB,GAAG,SAAS,CAGnC"}

package/dist/src/presentation/web/components/common/feature-node/derive-feature-state.js

@@ -51,6 +51,10 @@ export function deriveNodeState(feature, agentRun, options) {
     if (feature.lifecycle === SdlcLifecycle.Maintain) {
         return 'done';
     }
+    // Adopted branch with an open PR — needs user review/merge action
+    if (feature.lifecycle === SdlcLifecycle.Review && !agentRun) {
+        return 'action-required';
+    }
     const tasks = feature.plan?.tasks;
     if (!tasks || tasks.length === 0) {
         return 'running';