@shepai/cli 1.47.0 → 1.49.0

package/apis/json-schema/ApprovalGateDefaults.yaml

@@ -0,0 +1,26 @@
+$schema: https://json-schema.org/draft/2020-12/schema
+$id: ApprovalGateDefaults.yaml
+type: object
+properties:
+  allowPrd:
+    type: boolean
+    default: false
+    description: "Auto-approve requirements phase (default: false)"
+  allowPlan:
+    type: boolean
+    default: false
+    description: "Auto-approve planning phase (default: false)"
+  allowMerge:
+    type: boolean
+    default: false
+    description: "Auto-approve merge phase (default: false)"
+  pushOnImplementationComplete:
+    type: boolean
+    default: false
+    description: "Push branch to remote on implementation complete (default: false)"
+required:
+  - allowPrd
+  - allowPlan
+  - allowMerge
+  - pushOnImplementationComplete
+description: Default approval gate settings for new features

package/apis/json-schema/Feature.yaml

@@ -42,6 +42,9 @@ properties:
   specPath:
     type: string
     description: Absolute path to the feature spec directory inside the worktree
+  repositoryId:
+    $ref: UUID.yaml
+    description: ID of the Repository entity this feature belongs to
   push:
     type: boolean
     default: false

package/apis/json-schema/Repository.yaml

@@ -0,0 +1,16 @@
+$schema: https://json-schema.org/draft/2020-12/schema
+$id: Repository.yaml
+type: object
+properties:
+  name:
+    type: string
+    description: Human-readable name for the repository (typically the directory name)
+  path:
+    type: string
+    description: Absolute file system path to the repository root (unique)
+required:
+  - name
+  - path
+allOf:
+  - $ref: SoftDeletableEntity.yaml
+description: A code repository tracked by the Shep platform

package/apis/json-schema/Settings.yaml

@@ -23,6 +23,10 @@ properties:
   workflow:
     $ref: WorkflowConfig.yaml
     description: Global workflow configuration defaults
+  onboardingComplete:
+    type: boolean
+    default: false
+    description: "Whether first-run onboarding has been completed (default: false)"
 required:
   - models
   - user
@@ -31,6 +35,7 @@ required:
   - agent
   - notifications
   - workflow
+  - onboardingComplete
 allOf:
   - $ref: BaseEntity.yaml
 description: Global Shep platform settings (singleton)

package/apis/json-schema/WorkflowConfig.yaml

@@ -6,26 +6,10 @@ properties:
     type: boolean
     default: false
     description: "Create PR on implementation complete (default: false)"
-  pushOnImplementationComplete:
-    type: boolean
-    default: false
-    description: "Push branch on implementation complete (default: false)"
-  allowPrd:
-    type: boolean
-    default: false
-    description: "Auto-approve requirements phase (default: false)"
-  allowPlan:
-    type: boolean
-    default: false
-    description: "Auto-approve planning phase (default: false)"
-  autoMergeOnImplementationComplete:
-    type: boolean
-    default: false
-    description: "Auto-merge on implementation complete (default: false)"
+  approvalGateDefaults:
+    $ref: ApprovalGateDefaults.yaml
+    description: Default approval gate preferences for new features
 required:
   - openPrOnImplementationComplete
-  - pushOnImplementationComplete
-  - allowPrd
-  - allowPlan
-  - autoMergeOnImplementationComplete
+  - approvalGateDefaults
 description: Global workflow configuration defaults

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

@@ -71,6 +71,23 @@ export type MergeStrategy = 'squash' | 'merge' | 'rebase';
  * Service interface for git PR and merge operations.
  */
 export interface IGitPrService {
+    /**
+     * Check if the repository has any configured git remotes.
+     *
+     * @param cwd - Working directory path
+     * @returns True if at least one remote is configured
+     */
+    hasRemote(cwd: string): Promise<boolean>;
+    /**
+     * Detect the repository's default branch with robust fallback chain:
+     * 1. Remote HEAD (git symbolic-ref refs/remotes/origin/HEAD)
+     * 2. Local branches named main or master (in that order)
+     * 3. Current branch (git symbolic-ref HEAD)
+     *
+     * @param cwd - Working directory path
+     * @returns The default branch name (e.g. "main", "master", "develop")
+     */
+    getDefaultBranch(cwd: string): Promise<string>;
     /**
      * Check if the working directory has uncommitted changes.
      *

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

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

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

@@ -45,10 +45,11 @@ export interface IWorktreeService {
      * @param repoPath - Path to the git repository
      * @param branch - Branch name to create
      * @param worktreePath - Path for the new worktree directory
+     * @param startPoint - Optional commit/branch to start from (defaults to HEAD)
      * @returns Information about the created worktree
      * @throws WorktreeError with appropriate code
      */
-    create(repoPath: string, branch: string, worktreePath: string): Promise<WorktreeInfo>;
+    create(repoPath: string, branch: string, worktreePath: string, startPoint?: string): Promise<WorktreeInfo>;
     /**
      * Remove an existing worktree.
      *
@@ -87,5 +88,14 @@ export interface IWorktreeService {
      * @returns Computed worktree path (e.g., /repo/.worktrees/branch-name)
      */
     getWorktreePath(repoPath: string, branch: string): string;
+    /**
+     * Ensure a directory is a valid git repository with at least one commit.
+     * If the directory is not a git repo, initializes it with `git init`
+     * and creates an empty initial commit. No-ops for existing repos.
+     *
+     * @param repoPath - Path to the directory to check/initialize
+     * @throws WorktreeError if git initialization fails
+     */
+    ensureGitRepository(repoPath: string): Promise<void>;
 }
 //# sourceMappingURL=worktree-service.interface.d.ts.map

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;;;;;;;;OAQG;IACH,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;IAEtF;;;;;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,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;CAC3D"}
+{"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,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/create/create-feature.use-case.d.ts

@@ -21,6 +21,7 @@ import type { IFeatureAgentProcessService } from '../../../ports/output/agents/f
 import type { IAgentRunRepository } from '../../../ports/output/agents/agent-run-repository.interface.js';
 import type { ISpecInitializerService } from '../../../ports/output/services/spec-initializer.interface.js';
 import type { IRepositoryRepository } from '../../../ports/output/repositories/repository-repository.interface.js';
+import type { IGitPrService } from '../../../ports/output/services/git-pr-service.interface.js';
 import { MetadataGenerator } from './metadata-generator.js';
 import { SlugResolver } from './slug-resolver.js';
 import type { CreateFeatureInput, CreateFeatureResult } from './types.js';
@@ -33,7 +34,8 @@ export declare class CreateFeatureUseCase {
     private readonly metadataGenerator;
     private readonly slugResolver;
     private readonly repositoryRepo;
-    constructor(featureRepo: IFeatureRepository, worktreeService: IWorktreeService, agentProcess: IFeatureAgentProcessService, runRepository: IAgentRunRepository, specInitializer: ISpecInitializerService, metadataGenerator: MetadataGenerator, slugResolver: SlugResolver, repositoryRepo: IRepositoryRepository);
+    private readonly gitPrService;
+    constructor(featureRepo: IFeatureRepository, worktreeService: IWorktreeService, agentProcess: IFeatureAgentProcessService, runRepository: IAgentRunRepository, specInitializer: ISpecInitializerService, metadataGenerator: MetadataGenerator, slugResolver: SlugResolver, repositoryRepo: IRepositoryRepository, gitPrService: IGitPrService);
     execute(input: CreateFeatureInput): Promise<CreateFeatureResult>;
 }
 //# sourceMappingURL=create-feature.use-case.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"create-feature.use-case.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/application/use-cases/features/create/create-feature.use-case.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAMH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oEAAoE,CAAC;AAC7G,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,8DAA8D,CAAC;AACrG,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,iEAAiE,CAAC;AACnH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gEAAgE,CAAC;AAC1G,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,8DAA8D,CAAC;AAC5G,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,uEAAuE,CAAC;AAEnH,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,KAAK,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAE1E,qBACa,oBAAoB;IAG7B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAE5B,OAAO,CAAC,QAAQ,CAAC,eAAe;IAEhC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAE7B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAE9B,OAAO,CAAC,QAAQ,CAAC,eAAe;IAEhC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAElC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAE7B,OAAO,CAAC,QAAQ,CAAC,cAAc;gBAdd,WAAW,EAAE,kBAAkB,EAE/B,eAAe,EAAE,gBAAgB,EAEjC,YAAY,EAAE,2BAA2B,EAEzC,aAAa,EAAE,mBAAmB,EAElC,eAAe,EAAE,uBAAuB,EAExC,iBAAiB,EAAE,iBAAiB,EAEpC,YAAY,EAAE,YAAY,EAE1B,cAAc,EAAE,qBAAqB;IAGlD,OAAO,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,mBAAmB,CAAC;CAmGvE"}
+{"version":3,"file":"create-feature.use-case.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/application/use-cases/features/create/create-feature.use-case.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAMH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oEAAoE,CAAC;AAC7G,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,8DAA8D,CAAC;AACrG,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,iEAAiE,CAAC;AACnH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gEAAgE,CAAC;AAC1G,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,8DAA8D,CAAC;AAC5G,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,uEAAuE,CAAC;AACnH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,4DAA4D,CAAC;AAEhG,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,KAAK,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAE1E,qBACa,oBAAoB;IAG7B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAE5B,OAAO,CAAC,QAAQ,CAAC,eAAe;IAEhC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAE7B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAE9B,OAAO,CAAC,QAAQ,CAAC,eAAe;IAEhC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAElC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAE7B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAE/B,OAAO,CAAC,QAAQ,CAAC,YAAY;gBAhBZ,WAAW,EAAE,kBAAkB,EAE/B,eAAe,EAAE,gBAAgB,EAEjC,YAAY,EAAE,2BAA2B,EAEzC,aAAa,EAAE,mBAAmB,EAElC,eAAe,EAAE,uBAAuB,EAExC,iBAAiB,EAAE,iBAAiB,EAEpC,YAAY,EAAE,YAAY,EAE1B,cAAc,EAAE,qBAAqB,EAErC,YAAY,EAAE,aAAa;IAGxC,OAAO,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,mBAAmB,CAAC;CAwGvE"}

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

@@ -42,7 +42,8 @@ let CreateFeatureUseCase = class CreateFeatureUseCase {
     metadataGenerator;
     slugResolver;
     repositoryRepo;
-    constructor(featureRepo, worktreeService, agentProcess, runRepository, specInitializer, metadataGenerator, slugResolver, repositoryRepo) {
+    gitPrService;
+    constructor(featureRepo, worktreeService, agentProcess, runRepository, specInitializer, metadataGenerator, slugResolver, repositoryRepo, gitPrService) {
         this.featureRepo = featureRepo;
         this.worktreeService = worktreeService;
         this.agentProcess = agentProcess;
@@ -51,8 +52,12 @@ let CreateFeatureUseCase = class CreateFeatureUseCase {
         this.metadataGenerator = metadataGenerator;
         this.slugResolver = slugResolver;
         this.repositoryRepo = repositoryRepo;
+        this.gitPrService = gitPrService;
     }
     async execute(input) {
+        // Ensure the target directory is a git repository (auto-init if needed)
+        // Must run before slug resolution which needs git commands
+        await this.worktreeService.ensureGitRepository(input.repositoryPath);
         const metadata = await this.metadataGenerator.generateMetadata(input.userInput);
         const originalSlug = metadata.slug;
         // Find a unique slug — the branch may exist from a previous (deleted) feature
@@ -64,9 +69,10 @@ let CreateFeatureUseCase = class CreateFeatureUseCase {
         const featureNumber = existingFeatures.length + 1;
         const now = new Date();
         const runId = randomUUID();
-        // Create git worktree for isolated development
+        // Create git worktree branching from the repo's default branch
+        const defaultBranch = await this.gitPrService.getDefaultBranch(input.repositoryPath);
         const worktreePath = this.worktreeService.getWorktreePath(input.repositoryPath, branch);
-        await this.worktreeService.create(input.repositoryPath, branch, worktreePath);
+        await this.worktreeService.create(input.repositoryPath, branch, worktreePath, defaultBranch);
         // Initialize spec directory — full user input goes into spec.yaml as-is
         const { specDir } = await this.specInitializer.initialize(worktreePath, slug, featureNumber, input.userInput);
         // Resolve or create repository entity for this path
@@ -143,7 +149,8 @@ CreateFeatureUseCase = __decorate([
     __param(5, inject(MetadataGenerator)),
     __param(6, inject(SlugResolver)),
     __param(7, inject('IRepositoryRepository')),
+    __param(8, inject('IGitPrService')),
     __metadata("design:paramtypes", [Object, Object, Object, Object, Object, MetadataGenerator,
-        SlugResolver, Object])
+        SlugResolver, Object, Object])
 ], CreateFeatureUseCase);
 export { CreateFeatureUseCase };

package/dist/packages/core/src/application/use-cases/features/get-plan-artifact.use-case.d.ts

@@ -0,0 +1,19 @@
+/**
+ * Get Plan Artifact Use Case
+ *
+ * Retrieves the parsed TechnicalPlanArtifact for a given feature by
+ * reading and parsing the plan.yaml from the feature's spec directory.
+ *
+ * Business Rules:
+ * - Throws if the feature does not exist
+ * - Throws if the feature has no specPath
+ * - Throws if plan.yaml cannot be read or parsed
+ */
+import type { TechnicalPlanArtifact } from '../../../domain/generated/output.js';
+import type { IFeatureRepository } from '../../ports/output/repositories/feature-repository.interface.js';
+export declare class GetPlanArtifactUseCase {
+    private readonly featureRepo;
+    constructor(featureRepo: IFeatureRepository);
+    execute(featureId: string): Promise<TechnicalPlanArtifact>;
+}
+//# sourceMappingURL=get-plan-artifact.use-case.d.ts.map

package/dist/packages/core/src/application/use-cases/features/get-plan-artifact.use-case.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-plan-artifact.use-case.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/application/use-cases/features/get-plan-artifact.use-case.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAKH,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAEjF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iEAAiE,CAAC;AAE1G,qBACa,sBAAsB;IAG/B,OAAO,CAAC,QAAQ,CAAC,WAAW;gBAAX,WAAW,EAAE,kBAAkB;IAG5C,OAAO,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC;CAgBjE"}

package/dist/packages/core/src/application/use-cases/features/get-plan-artifact.use-case.js

@@ -0,0 +1,52 @@
+/**
+ * Get Plan Artifact Use Case
+ *
+ * Retrieves the parsed TechnicalPlanArtifact for a given feature by
+ * reading and parsing the plan.yaml from the feature's spec directory.
+ *
+ * Business Rules:
+ * - Throws if the feature does not exist
+ * - Throws if the feature has no specPath
+ * - Throws if plan.yaml cannot be read or parsed
+ */
+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 { readFile } from 'node:fs/promises';
+import { join } from 'node:path';
+import { parsePlanYaml } from '../../../domain/factories/spec-yaml-parser.js';
+let GetPlanArtifactUseCase = class GetPlanArtifactUseCase {
+    featureRepo;
+    constructor(featureRepo) {
+        this.featureRepo = featureRepo;
+    }
+    async execute(featureId) {
+        const feature = (await this.featureRepo.findById(featureId)) ??
+            (await this.featureRepo.findByIdPrefix(featureId));
+        if (!feature) {
+            throw new Error(`Feature not found: "${featureId}"`);
+        }
+        if (!feature.specPath) {
+            throw new Error(`Feature "${featureId}" has no spec path`);
+        }
+        const planYamlPath = join(feature.specPath, 'plan.yaml');
+        const content = await readFile(planYamlPath, 'utf-8');
+        return parsePlanYaml(content);
+    }
+};
+GetPlanArtifactUseCase = __decorate([
+    injectable(),
+    __param(0, inject('IFeatureRepository')),
+    __metadata("design:paramtypes", [Object])
+], GetPlanArtifactUseCase);
+export { GetPlanArtifactUseCase };

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;AAgGrC;;;;;;GAMG;AACH,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,OAAO,SAAS,CAAC,CAsNrE;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;AAiGrC;;;;;;GAMG;AACH,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,OAAO,SAAS,CAAC,CA6NrE;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

@@ -63,6 +63,7 @@ import { DeleteFeatureUseCase } from '../../application/use-cases/features/delet
 import { ResumeFeatureUseCase } from '../../application/use-cases/features/resume-feature.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';
 import { ValidateToolAvailabilityUseCase } from '../../application/use-cases/tools/validate-tool-availability.use-case.js';
 import { InstallToolUseCase } from '../../application/use-cases/tools/install-tool.use-case.js';
 import { LaunchIdeUseCase } from '../../application/use-cases/ide/launch-ide.use-case.js';
@@ -224,6 +225,7 @@ export async function initializeContainer() {
     container.registerSingleton(ResumeFeatureUseCase);
     container.registerSingleton(GetFeatureArtifactUseCase);
     container.registerSingleton(GetResearchArtifactUseCase);
+    container.registerSingleton(GetPlanArtifactUseCase);
     container.registerSingleton(ValidateToolAvailabilityUseCase);
     container.registerSingleton(InstallToolUseCase);
     container.registerSingleton(LaunchIdeUseCase);
@@ -244,12 +246,18 @@ export async function initializeContainer() {
     container.register('ApproveAgentRunUseCase', {
         useFactory: (c) => c.resolve(ApproveAgentRunUseCase),
     });
+    container.register('RejectAgentRunUseCase', {
+        useFactory: (c) => c.resolve(RejectAgentRunUseCase),
+    });
     container.register('GetFeatureArtifactUseCase', {
         useFactory: (c) => c.resolve(GetFeatureArtifactUseCase),
     });
     container.register('GetResearchArtifactUseCase', {
         useFactory: (c) => c.resolve(GetResearchArtifactUseCase),
     });
+    container.register('GetPlanArtifactUseCase', {
+        useFactory: (c) => c.resolve(GetPlanArtifactUseCase),
+    });
     container.register('LaunchIdeUseCase', {
         useFactory: (c) => c.resolve(LaunchIdeUseCase),
     });

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

@@ -176,7 +176,7 @@ export function createFeatureAgentGraph(depsOrExecutor, checkpointer) {
         graph
             .addNode('merge', createMergeNode(mergeNodeDeps))
             .addEdge('implement', 'merge')
-            .addEdge('merge', END);
+            .addConditionalEdges('merge', routeReexecution('merge', END));
     }
     else {
         graph.addEdge('implement', END);

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;AAoB1B,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;CACxB;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,UAAU,CAoD1D;AAgCD;;;GAGG;AACH,wBAAsB,SAAS,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAkM/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;AAoB1B,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;CACxB;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,UAAU,CAoD1D;AAgCD;;;GAGG;AACH,wBAAsB,SAAS,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAoM/D"}

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

@@ -128,6 +128,8 @@ export async function runWorker(args) {
         executor,
         mergeNodeDeps: {
             getDiffSummary: (cwd, baseBranch) => gitPrService.getPrDiffSummary(cwd, baseBranch),
+            hasRemote: (cwd) => gitPrService.hasRemote(cwd),
+            getDefaultBranch: (cwd) => gitPrService.getDefaultBranch(cwd),
             featureRepository,
         },
     };

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

@@ -14,6 +14,8 @@ import type { DiffSummary } from '../../../../../application/ports/output/servic
 export interface MergeNodeDeps {
     executor: IAgentExecutor;
     getDiffSummary: (cwd: string, baseBranch: string) => Promise<DiffSummary>;
+    hasRemote: (cwd: string) => Promise<boolean>;
+    getDefaultBranch: (cwd: string) => Promise<string>;
     featureRepository: Pick<IFeatureRepository, 'findById' | 'update'>;
 }
 /**

package/dist/packages/core/src/infrastructure/services/agents/feature-agent/nodes/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.node.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+DAA+D,CAAC;AACpG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yEAAyE,CAAC;AAClH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iEAAiE,CAAC;AAkBnG,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,iBAAiB,EAAE,IAAI,CAAC,kBAAkB,EAAE,UAAU,GAAG,QAAQ,CAAC,CAAC;CACpE;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,aAAa,IAGnC,OAAO,iBAAiB,KAAG,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CA2H7E"}
+{"version":3,"file":"merge.node.d.ts","sourceRoot":"","sources":["../../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/nodes/merge.node.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+DAA+D,CAAC;AACpG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yEAAyE,CAAC;AAClH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iEAAiE,CAAC;AAqBnG,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;CACpE;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,aAAa,IAGnC,OAAO,iBAAiB,KAAG,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAoK7E"}

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

@@ -9,7 +9,7 @@
  */
 import { interrupt, isGraphBubbleUp } from '@langchain/langgraph';
 import { SdlcLifecycle, PrStatus } from '../../../../../domain/generated/output.js';
-import { createNodeLogger, shouldInterrupt, retryExecute, buildExecutorOptions, } from './node-helpers.js';
+import { createNodeLogger, shouldInterrupt, retryExecute, buildExecutorOptions, getCompletedPhases, clearCompletedPhase, markPhaseComplete, } from './node-helpers.js';
 import { reportNodeStart } from '../heartbeat.js';
 import { recordPhaseStart, recordPhaseEnd, recordApprovalWaitStart, } from '../phase-timing-context.js';
 import { updateNodeLifecycle } from '../lifecycle-context.js';
@@ -27,6 +27,24 @@ export function createMergeNode(deps) {
         log.info('Starting merge flow');
         reportNodeStart('merge');
         await updateNodeLifecycle('merge');
+        // --- Rejection detection on resume (same pattern as executeNode) ---
+        // On resume after interrupt, check if merge was already completed.
+        // Rejection: clear phase, schedule re-execution via conditional edge.
+        // Approval: fall through to post-interrupt work (lifecycle update, optional merge/squash).
+        const completedPhases = getCompletedPhases(state.specDir);
+        const isResumeAfterInterrupt = completedPhases.includes('merge') && shouldInterrupt('merge', state.approvalGates);
+        if (isResumeAfterInterrupt && state._approvalAction === 'rejected') {
+            const feedback = state._rejectionFeedback ?? '(no feedback)';
+            log.info(`Merge rejected with feedback: "${feedback}" — scheduling re-execution`);
+            clearCompletedPhase(state.specDir, 'merge', log);
+            return {
+                currentNode: 'merge',
+                messages: [`[merge] Rejected — will re-execute`],
+                _approvalAction: null,
+                _rejectionFeedback: null,
+                _needsReexecution: true,
+            };
+        }
         const messages = [];
         const startTime = Date.now();
         // Record merge phase timing
@@ -37,41 +55,56 @@ export function createMergeNode(deps) {
             // Resolve branch name from feature
             const feature = await deps.featureRepository.findById(state.featureId);
             const branch = feature?.branch ?? `feat/${state.featureId}`;
-            const baseBranch = 'main';
+            const baseBranch = await deps.getDefaultBranch(cwd);
             const options = buildExecutorOptions(state);
-            // --- Agent Call 1: Commit + Push + PR ---
-            log.info('Agent call 1: commit + push + PR');
-            const commitPushPrPrompt = buildCommitPushPrPrompt(state, branch, baseBranch);
-            const commitResult = await retryExecute(executor, commitPushPrPrompt, options, {
-                logger: log,
-            });
-            // Parse structured data from agent output
-            const commitHash = parseCommitHash(commitResult.result) ?? state.commitHash;
-            messages.push(`[merge] Agent completed commit/push/PR operations`);
+            let commitHash = state.commitHash;
             let prUrl = state.prUrl;
             let prNumber = state.prNumber;
             const ciStatus = state.ciStatus;
-            if (state.openPr) {
-                const prResult = parsePrUrl(commitResult.result);
-                if (prResult) {
-                    prUrl = prResult.url;
-                    prNumber = prResult.number;
-                    messages.push(`[merge] PR created: ${prUrl}`);
+            // --- Agent Call 1: Commit + Push + PR (skip on approval resume) ---
+            if (!isResumeAfterInterrupt) {
+                // --- Check for git remote ---
+                const remoteAvailable = await deps.hasRemote(cwd);
+                if (!remoteAvailable) {
+                    log.info('No git remote configured — skipping push and PR, will merge locally');
                 }
-            }
-            // --- Merge approval gate ---
-            if (shouldInterrupt('merge', state.approvalGates)) {
-                log.info('Interrupting for merge approval');
-                await recordPhaseEnd(mergeTimingId, Date.now() - startTime);
-                await recordApprovalWaitStart(mergeTimingId);
-                const diffSummary = await deps.getDiffSummary(cwd, baseBranch);
-                interrupt({
-                    node: 'merge',
-                    message: 'Merge approval required. Review the changes and approve to continue.',
-                    diffSummary,
-                    prUrl,
-                    prNumber,
+                // Override push/openPr when no remote is available
+                const effectiveState = remoteAvailable ? state : { ...state, push: false, openPr: false };
+                log.info('Agent call 1: commit + push + PR');
+                const commitPushPrPrompt = buildCommitPushPrPrompt(effectiveState, branch, baseBranch);
+                const commitResult = await retryExecute(executor, commitPushPrPrompt, options, {
+                    logger: log,
                 });
+                // Parse structured data from agent output
+                commitHash = parseCommitHash(commitResult.result) ?? state.commitHash;
+                messages.push(`[merge] Agent completed commit/push/PR operations`);
+                if (effectiveState.openPr) {
+                    const prResult = parsePrUrl(commitResult.result);
+                    if (prResult) {
+                        prUrl = prResult.url;
+                        prNumber = prResult.number;
+                        messages.push(`[merge] PR created: ${prUrl}`);
+                    }
+                }
+                // --- Merge approval gate ---
+                if (shouldInterrupt('merge', state.approvalGates)) {
+                    log.info('Interrupting for merge approval');
+                    markPhaseComplete(state.specDir, 'merge', log);
+                    await recordPhaseEnd(mergeTimingId, Date.now() - startTime);
+                    await recordApprovalWaitStart(mergeTimingId);
+                    const diffSummary = await deps.getDiffSummary(cwd, baseBranch);
+                    interrupt({
+                        node: 'merge',
+                        message: 'Merge approval required. Review the changes and approve to continue.',
+                        diffSummary,
+                        prUrl,
+                        prNumber,
+                    });
+                }
+            }
+            else {
+                log.info('Merge approved — skipping commit/push/PR, continuing to post-merge');
+                messages.push(`[merge] Approved — continuing`);
             }
             // --- Agent Call 2: Merge (if enabled) ---
             let merged = false;
@@ -114,6 +147,9 @@ export function createMergeNode(deps) {
                 prUrl,
                 prNumber,
                 ciStatus,
+                _approvalAction: null,
+                _rejectionFeedback: null,
+                _needsReexecution: false,
             };
         }
         catch (err) {

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

@@ -1 +1 @@
-{"version":3,"file":"merge-prompts.d.ts","sourceRoot":"","sources":["../../../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/nodes/prompts/merge-prompts.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAExD;;;;;GAKG;AACH,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,iBAAiB,EACxB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,GACjB,MAAM,CAwDR;AAED;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,iBAAiB,EACxB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,GACjB,MAAM,CAwDR"}
+{"version":3,"file":"merge-prompts.d.ts","sourceRoot":"","sources":["../../../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/nodes/prompts/merge-prompts.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAExD;;;;;GAKG;AACH,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,iBAAiB,EACxB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,GACjB,MAAM,CAwDR;AAED;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,iBAAiB,EACxB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,GACjB,MAAM,CAiER"}

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

@@ -94,6 +94,20 @@ export function buildMergeSquashPrompt(state, branch, baseBranch) {
     }
     // Non-PR path: local merge in the ORIGINAL repo (not the worktree)
     const originalRepo = state.repositoryPath;
+    const hasRemote = state.push || state.openPr;
+    const fetchSteps = hasRemote
+        ? `2. Fetch latest: \`git fetch origin\`
+3. Checkout the base branch: \`git checkout ${baseBranch}\`
+4. Pull latest base: \`git pull origin ${baseBranch}\`
+5. Merge the feature branch: \`git merge --squash ${branch}\`
+6. If merge conflicts are encountered, resolve them manually and complete the merge
+7. Commit the squash merge with a descriptive conventional commit message
+8. Delete the feature branch after successful merge: \`git branch -d ${branch}\``
+        : `2. Checkout the base branch: \`git checkout ${baseBranch}\`
+3. Merge the feature branch: \`git merge --squash ${branch}\`
+4. If merge conflicts are encountered, resolve them manually and complete the merge
+5. Commit the squash merge with a descriptive conventional commit message
+6. Delete the feature branch after successful merge: \`git branch -d ${branch}\``;
     return `You are performing a local merge in the original repository directory.
 
 IMPORTANT: You MUST run all git commands in the original repository directory, NOT in any worktree.
@@ -110,13 +124,7 @@ ${originalRepo}
 ## Instructions
 
 1. Change to the original repository: \`cd ${originalRepo}\`
-2. Fetch latest: \`git fetch origin\`
-3. Checkout the base branch: \`git checkout ${baseBranch}\`
-4. Pull latest base: \`git pull origin ${baseBranch}\`
-5. Merge the feature branch: \`git merge --squash ${branch}\`
-6. If merge conflicts are encountered, resolve them manually and complete the merge
-7. Commit the squash merge with a descriptive conventional commit message
-8. Delete the feature branch after successful merge: \`git branch -d ${branch}\`
+${fetchSteps}
 
 ## Constraints
 

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

@@ -10,6 +10,8 @@ import type { ExecFunction } from './worktree.service.js';
 export declare class GitPrService implements IGitPrService {
     private readonly execFile;
     constructor(execFile: ExecFunction);
+    hasRemote(cwd: string): Promise<boolean>;
+    getDefaultBranch(cwd: string): Promise<string>;
     hasUncommittedChanges(cwd: string): Promise<boolean>;
     commitAll(cwd: string, message: string): Promise<string>;
     push(cwd: string, branch: string, setUpstream?: boolean): Promise<void>;

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

@@ -1 +1 @@
-{"version":3,"file":"git-pr.service.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/infrastructure/services/git/git-pr.service.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wEAAwE,CAAC;AAC5G,OAAO,KAAK,EACV,cAAc,EACd,WAAW,EACX,aAAa,EACb,cAAc,EACf,MAAM,wEAAwE,CAAC;AAOhF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAE1D,qBACa,YAAa,YAAW,aAAa;IACZ,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAAR,QAAQ,EAAE,YAAY;IAErE,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAKpD,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAWxD,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAYvE,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAuClE,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,GAAE,aAAwB,GAAG,OAAO,CAAC,IAAI,CAAC;IAUzF,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAUnF,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAkBjE,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAuBjF,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAWhF,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAe7E,OAAO,CAAC,aAAa;IAcrB,OAAO,CAAC,YAAY;IAepB,OAAO,CAAC,oBAAoB;IAK5B,OAAO,CAAC,aAAa;CAiBtB"}
+{"version":3,"file":"git-pr.service.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/infrastructure/services/git/git-pr.service.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wEAAwE,CAAC;AAC5G,OAAO,KAAK,EACV,cAAc,EACd,WAAW,EACX,aAAa,EACb,cAAc,EACf,MAAM,wEAAwE,CAAC;AAOhF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAE1D,qBACa,YAAa,YAAW,aAAa;IACZ,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAAR,QAAQ,EAAE,YAAY;IAErE,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAKxC,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAuC9C,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAKpD,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAWxD,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAYvE,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAuClE,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,GAAE,aAAwB,GAAG,OAAO,CAAC,IAAI,CAAC;IAUzF,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAUnF,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAkBjE,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAuBjF,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAWhF,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAe7E,OAAO,CAAC,aAAa;IAcrB,OAAO,CAAC,YAAY;IAepB,OAAO,CAAC,oBAAoB;IAK5B,OAAO,CAAC,aAAa;CAiBtB"}