@shepai/cli 1.85.0 → 1.86.0

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

@@ -54,9 +54,10 @@ export interface IWorktreeService {
      * Remove an existing worktree.
      *
      * @param worktreePath - Path to the worktree to remove
+     * @param force - When true, passes --force to git worktree remove (handles dirty worktrees)
      * @throws WorktreeError if worktree not found or has uncommitted changes
      */
-    remove(worktreePath: string): Promise<void>;
+    remove(worktreePath: string, force?: boolean): Promise<void>;
     /**
      * List all worktrees in a repository.
      *

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;;;;;OAKG;IACH,MAAM,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE5C;;;;;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;;;;;;;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;;;;;;OAMG;IACH,MAAM,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE7D;;;;;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;;;;;;;OAOG;IACH,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACtD"}

package/dist/packages/core/src/application/use-cases/features/cleanup-feature-worktree.use-case.d.ts

@@ -0,0 +1,22 @@
+/**
+ * Cleanup Feature Worktree Use Case
+ *
+ * Orchestrates post-merge cleanup after a feature reaches SdlcLifecycle.Maintain:
+ * - Unlinks the git worktree (preserving directory contents on disk)
+ * - Deletes the local feature branch
+ * - Deletes the remote feature branch (if it still exists)
+ *
+ * All cleanup steps are non-fatal: errors are caught and logged as warnings
+ * so that a cleanup failure never surfaces as a feature run failure.
+ */
+import type { IFeatureRepository } from '../../ports/output/repositories/feature-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 declare class CleanupFeatureWorktreeUseCase {
+    private readonly featureRepo;
+    private readonly worktreeService;
+    private readonly gitPrService;
+    constructor(featureRepo: IFeatureRepository, worktreeService: IWorktreeService, gitPrService: IGitPrService);
+    execute(featureId: string): Promise<void>;
+}
+//# sourceMappingURL=cleanup-feature-worktree.use-case.d.ts.map

package/dist/packages/core/src/application/use-cases/features/cleanup-feature-worktree.use-case.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cleanup-feature-worktree.use-case.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/application/use-cases/features/cleanup-feature-worktree.use-case.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAGH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iEAAiE,CAAC;AAC1G,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2DAA2D,CAAC;AAClG,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yDAAyD,CAAC;AAE7F,qBACa,6BAA6B;IAER,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC9B,OAAO,CAAC,QAAQ,CAAC,eAAe;IACnC,OAAO,CAAC,QAAQ,CAAC,YAAY;gBAFP,WAAW,EAAE,kBAAkB,EACjC,eAAe,EAAE,gBAAgB,EACpC,YAAY,EAAE,aAAa;IAGjE,OAAO,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAqChD"}

package/dist/packages/core/src/application/use-cases/features/cleanup-feature-worktree.use-case.js

@@ -0,0 +1,76 @@
+/**
+ * Cleanup Feature Worktree Use Case
+ *
+ * Orchestrates post-merge cleanup after a feature reaches SdlcLifecycle.Maintain:
+ * - Unlinks the git worktree (preserving directory contents on disk)
+ * - Deletes the local feature branch
+ * - Deletes the remote feature branch (if it still exists)
+ *
+ * All cleanup steps are non-fatal: errors are caught and logged as warnings
+ * so that a cleanup failure never surfaces as a feature run failure.
+ */
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+import { injectable, inject } from 'tsyringe';
+let CleanupFeatureWorktreeUseCase = class CleanupFeatureWorktreeUseCase {
+    featureRepo;
+    worktreeService;
+    gitPrService;
+    constructor(featureRepo, worktreeService, gitPrService) {
+        this.featureRepo = featureRepo;
+        this.worktreeService = worktreeService;
+        this.gitPrService = gitPrService;
+    }
+    async execute(featureId) {
+        const feature = await this.featureRepo.findById(featureId);
+        if (!feature)
+            return;
+        // Step 1: Unlink the git worktree (directory contents are preserved on disk)
+        const worktreePath = feature.worktreePath ??
+            this.worktreeService.getWorktreePath(feature.repositoryPath, feature.branch);
+        try {
+            await this.worktreeService.remove(worktreePath, true);
+        }
+        catch (err) {
+            // eslint-disable-next-line no-console
+            console.warn('[CleanupFeatureWorktreeUseCase] worktree remove failed:', err);
+        }
+        // Step 2: Delete the local feature branch
+        try {
+            await this.gitPrService.deleteBranch(feature.repositoryPath, feature.branch);
+        }
+        catch (err) {
+            // eslint-disable-next-line no-console
+            console.warn('[CleanupFeatureWorktreeUseCase] local branch delete failed:', err);
+        }
+        // Step 3: Delete the remote feature branch if it still exists
+        try {
+            const remoteExists = await this.worktreeService.remoteBranchExists(feature.repositoryPath, feature.branch);
+            if (remoteExists) {
+                await this.gitPrService.deleteBranch(feature.repositoryPath, feature.branch, true);
+            }
+        }
+        catch (err) {
+            // eslint-disable-next-line no-console
+            console.warn('[CleanupFeatureWorktreeUseCase] remote branch delete failed:', err);
+        }
+    }
+};
+CleanupFeatureWorktreeUseCase = __decorate([
+    injectable(),
+    __param(0, inject('IFeatureRepository')),
+    __param(1, inject('IWorktreeService')),
+    __param(2, inject('IGitPrService')),
+    __metadata("design:paramtypes", [Object, Object, Object])
+], CleanupFeatureWorktreeUseCase);
+export { CleanupFeatureWorktreeUseCase };

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

@@ -18,13 +18,18 @@ import type { IFeatureRepository } from '../../ports/output/repositories/feature
 import type { IWorktreeService } from '../../ports/output/services/worktree-service.interface.js';
 import type { IFeatureAgentProcessService } from '../../ports/output/agents/feature-agent-process.interface.js';
 import type { IAgentRunRepository } from '../../ports/output/agents/agent-run-repository.interface.js';
+import type { CleanupFeatureWorktreeUseCase } from './cleanup-feature-worktree.use-case.js';
+export interface DeleteFeatureOptions {
+    cleanup?: boolean;
+}
 export declare class DeleteFeatureUseCase {
     private readonly featureRepo;
     private readonly worktreeService;
     private readonly processService;
     private readonly runRepo;
-    constructor(featureRepo: IFeatureRepository, worktreeService: IWorktreeService, processService: IFeatureAgentProcessService, runRepo: IAgentRunRepository);
-    execute(featureId: string): Promise<Feature>;
+    private readonly cleanupUseCase;
+    constructor(featureRepo: IFeatureRepository, worktreeService: IWorktreeService, processService: IFeatureAgentProcessService, runRepo: IAgentRunRepository, cleanupUseCase: Pick<CleanupFeatureWorktreeUseCase, 'execute'>);
+    execute(featureId: string, options?: DeleteFeatureOptions): Promise<Feature>;
     private cascadeDeleteChildren;
     private deleteSingleFeature;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"delete-feature.use-case.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/application/use-cases/features/delete-feature.use-case.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qCAAqC,CAAC;AAEnE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iEAAiE,CAAC;AAC1G,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2DAA2D,CAAC;AAClG,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,8DAA8D,CAAC;AAChH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6DAA6D,CAAC;AAEvG,qBACa,oBAAoB;IAEC,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC9B,OAAO,CAAC,QAAQ,CAAC,eAAe;IAE5D,OAAO,CAAC,QAAQ,CAAC,cAAc;IACA,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAJR,WAAW,EAAE,kBAAkB,EACjC,eAAe,EAAE,gBAAgB,EAE7D,cAAc,EAAE,2BAA2B,EACZ,OAAO,EAAE,mBAAmB;IAGxE,OAAO,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;YAkBpC,qBAAqB;YASrB,mBAAmB;CA8BlC"}
+{"version":3,"file":"delete-feature.use-case.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/application/use-cases/features/delete-feature.use-case.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qCAAqC,CAAC;AAEnE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iEAAiE,CAAC;AAC1G,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2DAA2D,CAAC;AAClG,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,8DAA8D,CAAC;AAChH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6DAA6D,CAAC;AACvG,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,wCAAwC,CAAC;AAE5F,MAAM,WAAW,oBAAoB;IACnC,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,qBACa,oBAAoB;IAEC,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC9B,OAAO,CAAC,QAAQ,CAAC,eAAe;IAE5D,OAAO,CAAC,QAAQ,CAAC,cAAc;IACA,OAAO,CAAC,QAAQ,CAAC,OAAO;IAEvD,OAAO,CAAC,QAAQ,CAAC,cAAc;gBANgB,WAAW,EAAE,kBAAkB,EACjC,eAAe,EAAE,gBAAgB,EAE7D,cAAc,EAAE,2BAA2B,EACZ,OAAO,EAAE,mBAAmB,EAE3D,cAAc,EAAE,IAAI,CAAC,6BAA6B,EAAE,SAAS,CAAC;IAG3E,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,oBAAoB,GAAG,OAAO,CAAC,OAAO,CAAC;YAkBpE,qBAAqB;YAYrB,mBAAmB;CA0ClC"}

package/dist/packages/core/src/application/use-cases/features/delete-feature.use-case.js

@@ -32,13 +32,15 @@ let DeleteFeatureUseCase = class DeleteFeatureUseCase {
     worktreeService;
     processService;
     runRepo;
-    constructor(featureRepo, worktreeService, processService, runRepo) {
+    cleanupUseCase;
+    constructor(featureRepo, worktreeService, processService, runRepo, cleanupUseCase) {
         this.featureRepo = featureRepo;
         this.worktreeService = worktreeService;
         this.processService = processService;
         this.runRepo = runRepo;
+        this.cleanupUseCase = cleanupUseCase;
     }
-    async execute(featureId) {
+    async execute(featureId, options) {
         // 1. Find feature (exact or prefix match)
         const feature = (await this.featureRepo.findById(featureId)) ??
             (await this.featureRepo.findByIdPrefix(featureId));
@@ -46,20 +48,20 @@ let DeleteFeatureUseCase = class DeleteFeatureUseCase {
             throw new Error(`Feature not found: "${featureId}"`);
         }
         // 2. Cascade delete all sub-features (depth-first)
-        await this.cascadeDeleteChildren(feature.id);
+        await this.cascadeDeleteChildren(feature.id, options);
         // 3. Delete the feature itself
-        await this.deleteSingleFeature(feature);
+        await this.deleteSingleFeature(feature, options);
         return feature;
     }
-    async cascadeDeleteChildren(parentId) {
+    async cascadeDeleteChildren(parentId, options) {
         const children = await this.featureRepo.findByParentId(parentId);
         for (const child of children) {
             // Recurse into grandchildren first (depth-first)
-            await this.cascadeDeleteChildren(child.id);
-            await this.deleteSingleFeature(child);
+            await this.cascadeDeleteChildren(child.id, options);
+            await this.deleteSingleFeature(child, options);
         }
     }
-    async deleteSingleFeature(feature) {
+    async deleteSingleFeature(feature, options) {
         // Cancel running/pending agent run if present
         if (feature.agentRunId) {
             const run = await this.runRepo.findById(feature.agentRunId);
@@ -75,13 +77,24 @@ let DeleteFeatureUseCase = class DeleteFeatureUseCase {
                 await this.runRepo.updateStatus(run.id, AgentRunStatus.cancelled);
             }
         }
-        // Remove worktree (ignore errors if already removed)
-        const worktreePath = this.worktreeService.getWorktreePath(feature.repositoryPath, feature.branch);
-        try {
-            await this.worktreeService.remove(worktreePath);
+        // 4. Cleanup: either full cleanup (worktree + branches) or just worktree removal
+        const cleanup = options?.cleanup !== false;
+        if (cleanup) {
+            try {
+                await this.cleanupUseCase.execute(feature.id);
+            }
+            catch {
+                // Cleanup is best-effort — don't block deletion
+            }
         }
-        catch {
-            // Worktree might already be removed - that's fine
+        else {
+            const worktreePath = this.worktreeService.getWorktreePath(feature.repositoryPath, feature.branch);
+            try {
+                await this.worktreeService.remove(worktreePath);
+            }
+            catch {
+                // Worktree might already be removed - that's fine
+            }
         }
         // Delete feature record
         await this.featureRepo.delete(feature.id);
@@ -93,6 +106,7 @@ DeleteFeatureUseCase = __decorate([
     __param(1, inject('IWorktreeService')),
     __param(2, inject('IFeatureAgentProcessService')),
     __param(3, inject('IAgentRunRepository')),
-    __metadata("design:paramtypes", [Object, Object, Object, Object])
+    __param(4, inject('CleanupFeatureWorktreeUseCase')),
+    __metadata("design:paramtypes", [Object, Object, Object, Object, Object])
 ], DeleteFeatureUseCase);
 export { DeleteFeatureUseCase };

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;AAkHrC;;;;;;GAMG;AACH,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,OAAO,SAAS,CAAC,CAiRrE;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;AAmHrC;;;;;;GAMG;AACH,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,OAAO,SAAS,CAAC,CAqRrE;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

@@ -77,6 +77,7 @@ import { ListRepositoriesUseCase } from '../../application/use-cases/repositorie
 import { DeleteRepositoryUseCase } from '../../application/use-cases/repositories/delete-repository.use-case.js';
 import { CheckAndUnblockFeaturesUseCase } from '../../application/use-cases/features/check-and-unblock-features.use-case.js';
 import { UpdateFeatureLifecycleUseCase } from '../../application/use-cases/features/update/update-feature-lifecycle.use-case.js';
+import { CleanupFeatureWorktreeUseCase } from '../../application/use-cases/features/cleanup-feature-worktree.use-case.js';
 // Session listing
 import { ClaudeCodeSessionRepository } from '../services/agents/sessions/claude-code-session.repository.js';
 import { StubSessionRepository } from '../services/agents/sessions/stub-session.repository.js';
@@ -259,6 +260,7 @@ export async function initializeContainer() {
     // because the latter injects the former via class token.
     container.registerSingleton(CheckAndUnblockFeaturesUseCase);
     container.registerSingleton(UpdateFeatureLifecycleUseCase);
+    container.registerSingleton(CleanupFeatureWorktreeUseCase);
     // Session repositories (per-AgentType string tokens)
     container.register(`IAgentSessionRepository:${AgentType.ClaudeCode}`, {
         useFactory: () => new ClaudeCodeSessionRepository(),
@@ -334,6 +336,9 @@ export async function initializeContainer() {
     container.register('UpdateSettingsUseCase', {
         useFactory: (c) => c.resolve(UpdateSettingsUseCase),
     });
+    container.register('CleanupFeatureWorktreeUseCase', {
+        useFactory: (c) => c.resolve(CleanupFeatureWorktreeUseCase),
+    });
     _initialized = true;
     return container;
 }

package/dist/packages/core/src/infrastructure/services/agents/feature-agent/feature-agent-worker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"feature-agent-worker.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/feature-agent-worker.ts"],"names":[],"mappings":";AACA;;;;;;;;GAQG;AAEH,OAAO,kBAAkB,CAAC;AAe1B,OAAO,EAAkB,KAAK,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAU9E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAElE,MAAM,WAAW,UAAU;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,UAAU,CAiE1D;AAgCD;;;GAGG;AACH,wBAAsB,SAAS,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAkP/D"}
+{"version":3,"file":"feature-agent-worker.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/feature-agent-worker.ts"],"names":[],"mappings":";AACA;;;;;;;;GAQG;AAEH,OAAO,kBAAkB,CAAC;AAe1B,OAAO,EAAkB,KAAK,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAW9E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAElE,MAAM,WAAW,UAAU;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,UAAU,CAiE1D;AAgCD;;;GAGG;AACH,wBAAsB,SAAS,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAoP/D"}

package/dist/packages/core/src/infrastructure/services/agents/feature-agent/feature-agent-worker.js

@@ -24,6 +24,7 @@ import { setPhaseTimingContext, recordLifecycleEvent } from './phase-timing-cont
 import { setLifecycleContext } from './lifecycle-context.js';
 import { setLogPrefix, getLogPrefix } from './log-context.js';
 import { UpdateFeatureLifecycleUseCase } from '../../../../application/use-cases/features/update/update-feature-lifecycle.use-case.js';
+import { CleanupFeatureWorktreeUseCase } from '../../../../application/use-cases/features/cleanup-feature-worktree.use-case.js';
 /**
  * Parse CLI arguments into a WorkerArgs object.
  * Throws if any required argument is missing.
@@ -167,6 +168,7 @@ export async function runWorker(args) {
     // Resolve merge node dependencies
     const gitPrService = container.resolve('IGitPrService');
     const featureRepository = container.resolve('IFeatureRepository');
+    const cleanupFeatureWorktreeUseCase = container.resolve(CleanupFeatureWorktreeUseCase);
     const graphDeps = {
         executor,
         mergeNodeDeps: {
@@ -176,6 +178,7 @@ export async function runWorker(args) {
             verifyMerge: (cwd, featureBranch, baseBranch) => gitPrService.verifyMerge(cwd, featureBranch, baseBranch),
             featureRepository,
             gitPrService,
+            cleanupFeatureWorktreeUseCase,
         },
     };
     // Use threadId for checkpoint path so resume runs share the same checkpoint DB.

package/dist/packages/core/src/infrastructure/services/agents/feature-agent/nodes/merge/merge.node.d.ts

@@ -16,6 +16,7 @@ import type { IAgentExecutor } from '../../../../../../application/ports/output/
 import type { FeatureAgentState } from '../../state.js';
 import type { IFeatureRepository } from '../../../../../../application/ports/output/repositories/feature-repository.interface.js';
 import type { DiffSummary, IGitPrService } from '../../../../../../application/ports/output/services/git-pr-service.interface.js';
+import type { CleanupFeatureWorktreeUseCase } from '../../../../../../application/use-cases/features/cleanup-feature-worktree.use-case.js';
 export interface MergeNodeDeps {
     executor: IAgentExecutor;
     getDiffSummary: (cwd: string, baseBranch: string) => Promise<DiffSummary>;
@@ -28,6 +29,7 @@ export interface MergeNodeDeps {
      */
     verifyMerge: (cwd: string, featureBranch: string, baseBranch: string) => Promise<boolean>;
     gitPrService: IGitPrService;
+    cleanupFeatureWorktreeUseCase: Pick<CleanupFeatureWorktreeUseCase, 'execute'>;
 }
 /**
  * Factory that creates the merge node function.

package/dist/packages/core/src/infrastructure/services/agents/feature-agent/nodes/merge/merge.node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"merge.node.d.ts","sourceRoot":"","sources":["../../../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/nodes/merge/merge.node.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+DAA+D,CAAC;AACpG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yEAAyE,CAAC;AAClH,OAAO,KAAK,EACV,WAAW,EACX,aAAa,EACd,MAAM,iEAAiE,CAAC;AAmBzE,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,cAAc,CAAC;IACzB,cAAc,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,WAAW,CAAC,CAAC;IAC1E,SAAS,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC7C,gBAAgB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACnD,iBAAiB,EAAE,IAAI,CAAC,kBAAkB,EAAE,UAAU,GAAG,QAAQ,CAAC,CAAC;IACnE;;;OAGG;IACH,WAAW,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC1F,YAAY,EAAE,aAAa,CAAC;CAC7B;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,aAAa,IAGnC,OAAO,iBAAiB,KAAG,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAsQ7E"}
+{"version":3,"file":"merge.node.d.ts","sourceRoot":"","sources":["../../../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/nodes/merge/merge.node.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+DAA+D,CAAC;AACpG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yEAAyE,CAAC;AAClH,OAAO,KAAK,EACV,WAAW,EACX,aAAa,EACd,MAAM,iEAAiE,CAAC;AAkBzE,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,uEAAuE,CAAC;AAE3H,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,cAAc,CAAC;IACzB,cAAc,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,WAAW,CAAC,CAAC;IAC1E,SAAS,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC7C,gBAAgB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACnD,iBAAiB,EAAE,IAAI,CAAC,kBAAkB,EAAE,UAAU,GAAG,QAAQ,CAAC,CAAC;IACnE;;;OAGG;IACH,WAAW,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC1F,YAAY,EAAE,aAAa,CAAC;IAC5B,6BAA6B,EAAE,IAAI,CAAC,6BAA6B,EAAE,SAAS,CAAC,CAAC;CAC/E;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,aAAa,IAGnC,OAAO,iBAAiB,KAAG,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CA0Q7E"}

package/dist/packages/core/src/infrastructure/services/agents/feature-agent/nodes/merge/merge.node.js

@@ -231,6 +231,9 @@ export function createMergeNode(deps) {
                     updatedAt: new Date(),
                 });
                 messages.push(`[merge] Feature lifecycle → ${newLifecycle}`);
+                if (merged) {
+                    await deps.cleanupFeatureWorktreeUseCase.execute(feature.id);
+                }
             }
             const elapsed = ((Date.now() - startTime) / 1000).toFixed(1);
             await recordPhaseEnd(mergeTimingId, Date.now() - startTime);

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

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

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;AAOlF;;;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;IAqBlB,MAAM,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ3C,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;IAmC1D,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAMzD,OAAO,CAAC,mBAAmB;IA2B3B,OAAO,CAAC,aAAa;IAgCrB,OAAO,CAAC,kBAAkB;IAI1B,OAAO,CAAC,qBAAqB;CAU9B"}
+{"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;AAOlF;;;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;IAqBlB,MAAM,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAW5D,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;IAmC1D,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAMzD,OAAO,CAAC,mBAAmB;IA2B3B,OAAO,CAAC,aAAa;IAgCrB,OAAO,CAAC,kBAAkB;IAI1B,OAAO,CAAC,qBAAqB;CAU9B"}

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

@@ -48,9 +48,13 @@ let WorktreeService = class WorktreeService {
         }
         return created;
     }
-    async remove(worktreePath) {
+    async remove(worktreePath, force) {
         try {
-            await this.execFile('git', ['worktree', 'remove', worktreePath], {});
+            const args = ['worktree', 'remove'];
+            if (force)
+                args.push('--force');
+            args.push(worktreePath);
+            await this.execFile('git', args, {});
         }
         catch (error) {
             throw this.parseGitError(error);

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

@@ -2,12 +2,14 @@
  * Feature Delete Command
  *
  * Deletes a feature, its worktree, and cancels any running agent.
+ * Optionally cleans up worktree and branches (local + remote).
  *
- * Usage: shep feat del <id> [--force]
+ * Usage: shep feat del <id> [--force] [--no-cleanup]
  *
  * @example
  * $ shep feat del feat-123
  * $ shep feat del feat-123 --force
+ * $ shep feat del feat-123 --force --no-cleanup
  */
 import { Command } from 'commander';
 /**

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

@@ -1 +1 @@
-{"version":3,"file":"del.command.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/cli/commands/feat/del.command.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAWpC;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,OAAO,CAoC1C"}
+{"version":3,"file":"del.command.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/cli/commands/feat/del.command.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAYpC;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,OAAO,CAmD1C"}

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

@@ -2,12 +2,14 @@
  * Feature Delete Command
  *
  * Deletes a feature, its worktree, and cancels any running agent.
+ * Optionally cleans up worktree and branches (local + remote).
  *
- * Usage: shep feat del <id> [--force]
+ * Usage: shep feat del <id> [--force] [--no-cleanup]
  *
  * @example
  * $ shep feat del feat-123
  * $ shep feat del feat-123 --force
+ * $ shep feat del feat-123 --force --no-cleanup
  */
 import { Command } from 'commander';
 import { container } from '../../../../../packages/core/src/infrastructure/di/container.js';
@@ -23,6 +25,7 @@ export function createDelCommand() {
         .description('Delete a feature')
         .argument('<id>', 'Feature ID or prefix')
         .option('-f, --force', 'Skip confirmation prompt')
+        .option('--no-cleanup', 'Skip worktree and branch cleanup')
         .action(async (featureId, options) => {
         try {
             // First show what we're about to delete
@@ -38,12 +41,26 @@ export function createDelCommand() {
                     return;
                 }
             }
+            // Determine cleanup preference
+            let cleanup = true;
+            if (options.cleanup === false) {
+                cleanup = false;
+            }
+            else if (!options.force) {
+                cleanup = await confirm({
+                    message: 'Also clean up worktree and branches?',
+                    default: true,
+                });
+            }
             const deleteUseCase = container.resolve(DeleteFeatureUseCase);
-            await deleteUseCase.execute(feature.id);
+            await deleteUseCase.execute(feature.id, { cleanup });
             messages.newline();
             messages.success('Feature deleted');
             console.log(`  ${colors.muted('Name:')}   ${feature.name}`);
             console.log(`  ${colors.muted('Branch:')} ${feature.branch}`);
+            if (cleanup) {
+                console.log(`  ${colors.muted('Cleanup:')} worktree, local branch, remote branch`);
+            }
             messages.newline();
         }
         catch (error) {

package/dist/src/presentation/web/app/actions/delete-feature.d.ts

@@ -1,5 +1,5 @@
 import type { Feature } from '../../../../../packages/core/src/domain/generated/output.js';
-export declare function deleteFeature(featureId: string): Promise<{
+export declare function deleteFeature(featureId: string, cleanup?: boolean): Promise<{
     feature?: Feature;
     error?: string;
 }>;

package/dist/src/presentation/web/app/actions/delete-feature.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"delete-feature.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/app/actions/delete-feature.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sCAAsC,CAAC;AAEpE,wBAAsB,aAAa,CACjC,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC;IAAE,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAahD"}
+{"version":3,"file":"delete-feature.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/app/actions/delete-feature.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sCAAsC,CAAC;AAEpE,wBAAsB,aAAa,CACjC,SAAS,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC;IAAE,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAgBhD"}

package/dist/src/presentation/web/app/actions/delete-feature.js

@@ -1,12 +1,14 @@
 'use server';
 import { resolve } from '../../lib/server-container.js';
-export async function deleteFeature(featureId) {
+export async function deleteFeature(featureId, cleanup) {
     if (!featureId?.trim()) {
         return { error: 'id is required' };
     }
     try {
         const deleteFeatureUseCase = resolve('DeleteFeatureUseCase');
-        const feature = await deleteFeatureUseCase.execute(featureId);
+        const feature = cleanup !== undefined
+            ? await deleteFeatureUseCase.execute(featureId, { cleanup })
+            : await deleteFeatureUseCase.execute(featureId);
         return { feature };
     }
     catch (error) {

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":"AA+CA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAGhD,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,UAAU,CAAC;CAClB;AAED,wBAAgB,mBAAmB,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,wBAAwB,2CAkjBlF"}
+{"version":3,"file":"feature-drawer-client.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/control-center-drawer/feature-drawer-client.tsx"],"names":[],"mappings":"AAqCA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAGhD,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,UAAU,CAAC;CAClB;AAED,wBAAgB,mBAAmB,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,wBAAwB,2CA6hBlF"}

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

@@ -20,7 +20,7 @@ import { DeploymentStatusBadge } from '../../common/deployment-status-badge/inde
 import { DrawerTitle, DrawerDescription } from '../../ui/drawer.js';
 import { Button } from '../../ui/button.js';
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '../../ui/tooltip.js';
-import { AlertDialog, AlertDialogAction, AlertDialogCancel, AlertDialogContent, AlertDialogDescription, AlertDialogFooter, AlertDialogHeader, AlertDialogTitle, AlertDialogTrigger, } from '../../ui/alert-dialog.js';
+import { DeleteFeatureDialog } from '../../common/delete-feature-dialog/index.js';
 import { ActionButton } from '../../common/action-button/index.js';
 import { OpenActionMenu } from '../../common/open-action-menu/index.js';
 import { FeatureDrawerTabs } from '../../common/feature-drawer-tabs/index.js';
@@ -111,6 +111,7 @@ export function FeatureDrawerClient({ view: initialView }) {
     const [mergeData, setMergeData] = useState(null);
     // ── Delete state ───────────────────────────────────────────────────────
     const [isDeleting, setIsDeleting] = useState(false);
+    const [deleteDialogOpen, setDeleteDialogOpen] = useState(false);
     // ── Shared reject state ────────────────────────────────────────────────
     const [isRejecting, setIsRejecting] = useState(false);
     const isRejectingRef = useRef(false);
@@ -261,10 +262,10 @@ export function FeatureDrawerClient({ view: initialView }) {
     }, [view, featureNode, prdData, prdSelections, onClose]);
     const handleTechApprove = useCallback(() => handleSimpleApprove('Plan'), [handleSimpleApprove]);
     const handleMergeApprove = useCallback(() => handleSimpleApprove('Merge'), [handleSimpleApprove]);
-    const handleDelete = useCallback(async (featureId) => {
+    const handleDelete = useCallback(async (featureId, cleanup) => {
         setIsDeleting(true);
         try {
-            const result = await deleteFeature(featureId);
+            const result = await deleteFeature(featureId, cleanup);
             if (result.error) {
                 toast.error(result.error);
                 return;
@@ -317,7 +318,7 @@ export function FeatureDrawerClient({ view: initialView }) {
         const repoName = featureNode.repositoryName ??
             featureNode.repositoryPath.split('/').filter(Boolean).at(-1) ??
             '';
-        header = (_jsxs(_Fragment, { children: [_jsxs("div", { "data-testid": "feature-drawer-header", children: [_jsx(DrawerTitle, { children: featureNode.name }), repoName ? (_jsxs("div", { className: "flex items-center gap-1.5 pt-0.5", children: [_jsx(Code2, { className: "text-muted-foreground size-3.5 shrink-0" }), featureNode.remoteUrl ? (_jsxs("a", { href: featureNode.remoteUrl, target: "_blank", rel: "noopener noreferrer", className: "text-muted-foreground hover:text-foreground inline-flex items-center gap-1 text-xs transition-colors", "data-testid": "feature-drawer-repo-link", children: [repoName, _jsx(ExternalLink, { className: "size-3" })] })) : (_jsx("span", { className: "text-muted-foreground text-xs", children: repoName }))] })) : null, _jsx(DrawerDescription, { className: "sr-only", children: featureNode.name })] }), featureActionsInput ? (_jsxs("div", { className: "flex items-center gap-2 pt-2", "data-testid": "feature-drawer-actions", children: [_jsx(OpenActionMenu, { actions: featureActions, repositoryPath: featureActionsInput.repositoryPath, showSpecs: !!featureActionsInput.specPath }), featureFlags.envDeploy && featureDeployTarget ? (_jsxs(_Fragment, { children: [_jsx(TooltipProvider, { children: _jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsx("span", { children: _jsx(ActionButton, { label: isFeatureDeployActive ? 'Stop Dev Server' : 'Start Dev Server', onClick: isFeatureDeployActive ? deployAction.stop : deployAction.deploy, loading: deployAction.deployLoading || deployAction.stopLoading, error: !!deployAction.deployError, icon: isFeatureDeployActive ? Square : Play, iconOnly: true, variant: "outline", size: "icon-sm" }) }) }), _jsx(TooltipContent, { children: isFeatureDeployActive ? 'Stop Dev Server' : 'Start Dev Server' })] }) }), isFeatureDeployActive ? (_jsx(DeploymentStatusBadge, { status: deployAction.status, url: deployAction.url, targetId: featureDeployTarget?.targetId })) : null] })) : null, _jsxs("div", { className: "ml-auto flex items-center gap-1.5", children: [_jsx("code", { className: "bg-muted text-muted-foreground rounded px-1.5 py-0.5 font-mono text-xs", children: shortId }), _jsx("button", { type: "button", onClick: handleCopyId, className: "text-muted-foreground hover:text-foreground inline-flex items-center rounded p-0.5 transition-colors", "aria-label": "Copy feature ID", "data-testid": "feature-drawer-copy-id", children: idCopied ? (_jsx(Check, { className: "size-3.5 text-green-600" })) : (_jsx(Copy, { className: "size-3.5" })) })] }), featureNode.featureId ? (_jsxs(AlertDialog, { children: [_jsx(AlertDialogTrigger, { asChild: true, children: _jsx(Button, { variant: "ghost", size: "icon-sm", "aria-label": "Delete feature", disabled: isDeleting, className: "text-muted-foreground hover:text-destructive", "data-testid": "feature-drawer-delete", children: isDeleting ? (_jsx(Loader2, { className: "size-4 animate-spin" })) : (_jsx(Trash2, { className: "size-4" })) }) }), _jsxs(AlertDialogContent, { children: [_jsxs(AlertDialogHeader, { children: [_jsx(AlertDialogTitle, { children: "Delete feature?" }), _jsxs(AlertDialogDescription, { children: ["This will permanently delete ", _jsx("strong", { children: featureNode.name }), " (", featureNode.featureId, "). This action cannot be undone.", featureNode.state === 'running' ? (_jsx(_Fragment, { children: " This feature has a running agent that will be stopped." })) : null] })] }), _jsxs(AlertDialogFooter, { children: [_jsx(AlertDialogCancel, { disabled: isDeleting, children: "Cancel" }), _jsx(AlertDialogAction, { variant: "destructive", disabled: isDeleting, onClick: () => handleDelete(featureNode.featureId), children: isDeleting ? (_jsxs(_Fragment, { children: [_jsx(Loader2, { className: "mr-2 h-4 w-4 animate-spin" }), "Deleting\u2026"] })) : ('Delete') })] })] })] })) : null] })) : null] }));
+        header = (_jsxs(_Fragment, { children: [_jsxs("div", { "data-testid": "feature-drawer-header", children: [_jsx(DrawerTitle, { children: featureNode.name }), repoName ? (_jsxs("div", { className: "flex items-center gap-1.5 pt-0.5", children: [_jsx(Code2, { className: "text-muted-foreground size-3.5 shrink-0" }), featureNode.remoteUrl ? (_jsxs("a", { href: featureNode.remoteUrl, target: "_blank", rel: "noopener noreferrer", className: "text-muted-foreground hover:text-foreground inline-flex items-center gap-1 text-xs transition-colors", "data-testid": "feature-drawer-repo-link", children: [repoName, _jsx(ExternalLink, { className: "size-3" })] })) : (_jsx("span", { className: "text-muted-foreground text-xs", children: repoName }))] })) : null, _jsx(DrawerDescription, { className: "sr-only", children: featureNode.name })] }), featureActionsInput ? (_jsxs("div", { className: "flex items-center gap-2 pt-2", "data-testid": "feature-drawer-actions", children: [_jsx(OpenActionMenu, { actions: featureActions, repositoryPath: featureActionsInput.repositoryPath, showSpecs: !!featureActionsInput.specPath }), featureFlags.envDeploy && featureDeployTarget ? (_jsxs(_Fragment, { children: [_jsx(TooltipProvider, { children: _jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsx("span", { children: _jsx(ActionButton, { label: isFeatureDeployActive ? 'Stop Dev Server' : 'Start Dev Server', onClick: isFeatureDeployActive ? deployAction.stop : deployAction.deploy, loading: deployAction.deployLoading || deployAction.stopLoading, error: !!deployAction.deployError, icon: isFeatureDeployActive ? Square : Play, iconOnly: true, variant: "outline", size: "icon-sm" }) }) }), _jsx(TooltipContent, { children: isFeatureDeployActive ? 'Stop Dev Server' : 'Start Dev Server' })] }) }), isFeatureDeployActive ? (_jsx(DeploymentStatusBadge, { status: deployAction.status, url: deployAction.url, targetId: featureDeployTarget?.targetId })) : null] })) : null, _jsxs("div", { className: "ml-auto flex items-center gap-1.5", children: [_jsx("code", { className: "bg-muted text-muted-foreground rounded px-1.5 py-0.5 font-mono text-xs", children: shortId }), _jsx("button", { type: "button", onClick: handleCopyId, className: "text-muted-foreground hover:text-foreground inline-flex items-center rounded p-0.5 transition-colors", "aria-label": "Copy feature ID", "data-testid": "feature-drawer-copy-id", children: idCopied ? (_jsx(Check, { className: "size-3.5 text-green-600" })) : (_jsx(Copy, { className: "size-3.5" })) })] }), featureNode.featureId ? (_jsxs(_Fragment, { children: [_jsx(Button, { variant: "ghost", size: "icon-sm", "aria-label": "Delete feature", disabled: isDeleting, className: "text-muted-foreground hover:text-destructive", "data-testid": "feature-drawer-delete", onClick: () => setDeleteDialogOpen(true), children: isDeleting ? (_jsx(Loader2, { className: "size-4 animate-spin" })) : (_jsx(Trash2, { className: "size-4" })) }), _jsx(DeleteFeatureDialog, { open: deleteDialogOpen, onOpenChange: setDeleteDialogOpen, onConfirm: (cleanup) => handleDelete(featureNode.featureId, cleanup), isDeleting: isDeleting, featureName: featureNode.name, featureId: featureNode.featureId })] })) : null] })) : null] }));
     }
     // ── Body ──────────────────────────────────────────────────────────────
     let body = null;

package/dist/src/presentation/web/components/common/delete-feature-dialog/delete-feature-dialog-config.d.ts

@@ -0,0 +1,9 @@
+export interface DeleteFeatureDialogProps {
+    open: boolean;
+    onOpenChange: (open: boolean) => void;
+    onConfirm: (cleanup: boolean) => void;
+    isDeleting: boolean;
+    featureName: string;
+    featureId: string;
+}
+//# sourceMappingURL=delete-feature-dialog-config.d.ts.map

package/dist/src/presentation/web/components/common/delete-feature-dialog/delete-feature-dialog-config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"delete-feature-dialog-config.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/delete-feature-dialog/delete-feature-dialog-config.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,OAAO,CAAC;IACd,YAAY,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAC;IACtC,SAAS,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;IACtC,UAAU,EAAE,OAAO,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;CACnB"}

package/dist/src/presentation/web/components/common/delete-feature-dialog/delete-feature-dialog-config.js

@@ -0,0 +1 @@
+export {};

package/dist/src/presentation/web/components/common/delete-feature-dialog/delete-feature-dialog.d.ts

@@ -0,0 +1,3 @@
+import type { DeleteFeatureDialogProps } from './delete-feature-dialog-config.js';
+export declare function DeleteFeatureDialog({ open, onOpenChange, onConfirm, isDeleting, featureName, featureId, }: DeleteFeatureDialogProps): import("react/jsx-runtime").JSX.Element;
+//# sourceMappingURL=delete-feature-dialog.d.ts.map

package/dist/src/presentation/web/components/common/delete-feature-dialog/delete-feature-dialog.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"delete-feature-dialog.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/delete-feature-dialog/delete-feature-dialog.tsx"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAE/E,wBAAgB,mBAAmB,CAAC,EAClC,IAAI,EACJ,YAAY,EACZ,SAAS,EACT,UAAU,EACV,WAAW,EACX,SAAS,GACV,EAAE,wBAAwB,2CAqD1B"}

package/dist/src/presentation/web/components/common/delete-feature-dialog/delete-feature-dialog.js

@@ -0,0 +1,16 @@
+'use client';
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { useEffect, useState } from 'react';
+import { Loader2 } from 'lucide-react';
+import { AlertDialog, AlertDialogAction, AlertDialogCancel, AlertDialogContent, AlertDialogDescription, AlertDialogFooter, AlertDialogHeader, AlertDialogTitle, } from '../../ui/alert-dialog.js';
+import { Checkbox } from '../../ui/checkbox.js';
+import { Label } from '../../ui/label.js';
+export function DeleteFeatureDialog({ open, onOpenChange, onConfirm, isDeleting, featureName, featureId, }) {
+    const [cleanup, setCleanup] = useState(true);
+    useEffect(() => {
+        if (open) {
+            setCleanup(true);
+        }
+    }, [open]);
+    return (_jsx(AlertDialog, { open: open, onOpenChange: onOpenChange, children: _jsxs(AlertDialogContent, { children: [_jsxs(AlertDialogHeader, { children: [_jsx(AlertDialogTitle, { children: "Delete feature?" }), _jsxs(AlertDialogDescription, { children: ["This will permanently delete ", _jsx("strong", { children: featureName }), " (", featureId, "). This action cannot be undone."] })] }), _jsxs("div", { className: "flex items-center gap-2", children: [_jsx(Checkbox, { id: "cleanup-checkbox", checked: cleanup, onCheckedChange: (checked) => setCleanup(checked === true), disabled: isDeleting, "aria-label": "Clean up worktree and branches" }), _jsx(Label, { htmlFor: "cleanup-checkbox", className: "cursor-pointer text-sm", children: "Clean up worktree and branches" })] }), _jsxs(AlertDialogFooter, { children: [_jsx(AlertDialogCancel, { disabled: isDeleting, onClick: () => onOpenChange(false), children: "Cancel" }), _jsx(AlertDialogAction, { variant: "destructive", disabled: isDeleting, onClick: () => onConfirm(cleanup), children: isDeleting ? (_jsxs(_Fragment, { children: [_jsx(Loader2, { className: "mr-2 h-4 w-4 animate-spin" }), "Deleting\u2026"] })) : ('Delete') })] })] }) }));
+}

package/dist/src/presentation/web/components/common/delete-feature-dialog/delete-feature-dialog.stories.d.ts

@@ -0,0 +1,8 @@
+import type { Meta, StoryObj } from '@storybook/react';
+import { DeleteFeatureDialog } from './delete-feature-dialog.js';
+declare const meta: Meta<typeof DeleteFeatureDialog>;
+export default meta;
+type Story = StoryObj<typeof DeleteFeatureDialog>;
+export declare const Default: Story;
+export declare const Deleting: Story;
+//# sourceMappingURL=delete-feature-dialog.stories.d.ts.map

package/dist/src/presentation/web/components/common/delete-feature-dialog/delete-feature-dialog.stories.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"delete-feature-dialog.stories.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/delete-feature-dialog/delete-feature-dialog.stories.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAE9D,QAAA,MAAM,IAAI,EAAE,IAAI,CAAC,OAAO,mBAAmB,CAe1C,CAAC;AAEF,eAAe,IAAI,CAAC;AACpB,KAAK,KAAK,GAAG,QAAQ,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAElD,eAAO,MAAM,OAAO,EAAE,KAAU,CAAC;AAEjC,eAAO,MAAM,QAAQ,EAAE,KAItB,CAAC"}