@shepai/cli 1.29.1 → 1.31.0

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

@@ -20,6 +20,7 @@ import { initializeSettings } from '../../../services/settings.service.js';
 import { InitializeSettingsUseCase } from '../../../../application/use-cases/settings/initialize-settings.use-case.js';
 import { setHeartbeatContext } from './heartbeat.js';
 import { setPhaseTimingContext } from './phase-timing-context.js';
+import { generatePrYaml } from './nodes/pr-yaml-generator.js';
 /**
  * Parse CLI arguments into a WorkerArgs object.
  * Throws if any required argument is missing.
@@ -47,6 +48,10 @@ export function parseWorkerArgs(args) {
     }
     const resume = args.includes('--resume');
     const resumeFromInterrupt = args.includes('--resume-from-interrupt');
+    const push = args.includes('--push');
+    const openPr = args.includes('--open-pr');
+    const autoMerge = args.includes('--auto-merge');
+    const allowMerge = args.includes('--allow-merge');
     const threadIdx = args.indexOf('--thread-id');
     const threadId = threadIdx !== -1 && threadIdx + 1 < args.length ? args[threadIdx + 1] : undefined;
     return {
@@ -59,6 +64,10 @@ export function parseWorkerArgs(args) {
         resume,
         threadId,
         resumeFromInterrupt,
+        push,
+        openPr,
+        autoMerge,
+        allowMerge,
     };
 }
 /** Simple worker logger — writes to stdout which is redirected to log file by the parent. */
@@ -111,13 +120,24 @@ export async function runWorker(args) {
     // Create executor from configured agent settings
     log('Creating executor from configured agent settings...');
     const executor = executorProvider.getExecutor();
+    // Resolve merge node dependencies
+    const gitPrService = container.resolve('IGitPrService');
+    const featureRepository = container.resolve('IFeatureRepository');
+    const graphDeps = {
+        executor,
+        mergeNodeDeps: {
+            gitPrService,
+            generatePrYaml,
+            featureRepository,
+        },
+    };
     // Use threadId for checkpoint path so resume runs share the same checkpoint DB.
     // Falls back to runId for backwards compatibility with existing runs.
     const checkpointId = args.threadId ?? args.runId;
     const checkpointPath = join(homedir(), '.shep', 'checkpoints', `${checkpointId}.db`);
     log(`Creating checkpointer at ${checkpointPath} (thread: ${checkpointId})`);
     const checkpointer = createCheckpointer(checkpointPath);
-    const graph = createFeatureAgentGraph(executor, checkpointer);
+    const graph = createFeatureAgentGraph(graphDeps, checkpointer);
     // Mark the run as running with our PID
     const now = new Date();
     log(`Updating status to running (PID ${process.pid})...`);
@@ -153,6 +173,10 @@ export async function runWorker(args) {
                 specDir: args.specDir,
                 error: undefined, // Clear previous error state
                 ...(args.approvalGates ? { approvalGates: args.approvalGates } : {}),
+                push: args.push ?? false,
+                openPr: args.openPr ?? false,
+                autoMerge: args.autoMerge ?? false,
+                allowMerge: args.allowMerge ?? false,
             }, graphConfig);
         }
         else {
@@ -163,6 +187,10 @@ export async function runWorker(args) {
                 worktreePath: args.worktreePath ?? args.repo,
                 specDir: args.specDir,
                 ...(args.approvalGates ? { approvalGates: args.approvalGates } : {}),
+                push: args.push ?? false,
+                openPr: args.openPr ?? false,
+                autoMerge: args.autoMerge ?? false,
+                allowMerge: args.allowMerge ?? false,
             }, graphConfig);
         }
         log(`Graph invocation completed. Error: ${result.error ?? 'none'}`);

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

@@ -0,0 +1,27 @@
+/**
+ * Merge Node — Post-Implementation Merge Flow
+ *
+ * Handles the complete merge workflow after implementation:
+ * 1. Commit uncommitted changes and push
+ * 2. Generate pr.yaml (always) and optionally create PR
+ * 3. Optionally auto-merge (via PR or direct branch merge)
+ * 4. Update feature lifecycle and clean up
+ *
+ * Uses interrupt() for the merge approval gate when allowMerge=false.
+ */
+import type { FeatureAgentState } from '../state.js';
+import type { IGitPrService } from '../../../../../application/ports/output/services/git-pr-service.interface.js';
+import type { IFeatureRepository } from '../../../../../application/ports/output/repositories/feature-repository.interface.js';
+export interface MergeNodeDeps {
+    gitPrService: IGitPrService;
+    generatePrYaml: (specDir: string, branch: string, baseBranch: string) => string;
+    featureRepository: Pick<IFeatureRepository, 'findById' | 'update'>;
+}
+/**
+ * Factory that creates the merge node function.
+ *
+ * @param deps - External dependencies injected by the graph factory
+ * @returns A LangGraph node function
+ */
+export declare function createMergeNode(deps: MergeNodeDeps): (state: FeatureAgentState) => Promise<Partial<FeatureAgentState>>;
+//# sourceMappingURL=merge.node.d.ts.map

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

@@ -0,0 +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;;;;;;;;;;GAUG;AAGH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iEAAiE,CAAC;AACrG,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yEAAyE,CAAC;AAKlH,MAAM,WAAW,aAAa;IAC5B,YAAY,EAAE,aAAa,CAAC;IAC5B,cAAc,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,KAAK,MAAM,CAAC;IAChF,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,CAwI7E"}

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

@@ -0,0 +1,146 @@
+/**
+ * Merge Node — Post-Implementation Merge Flow
+ *
+ * Handles the complete merge workflow after implementation:
+ * 1. Commit uncommitted changes and push
+ * 2. Generate pr.yaml (always) and optionally create PR
+ * 3. Optionally auto-merge (via PR or direct branch merge)
+ * 4. Update feature lifecycle and clean up
+ *
+ * Uses interrupt() for the merge approval gate when allowMerge=false.
+ */
+import { interrupt, isGraphBubbleUp } from '@langchain/langgraph';
+import { SdlcLifecycle } from '../../../../../domain/generated/output.js';
+import { createNodeLogger, shouldInterrupt } from './node-helpers.js';
+import { reportNodeStart } from '../heartbeat.js';
+/**
+ * Factory that creates the merge node function.
+ *
+ * @param deps - External dependencies injected by the graph factory
+ * @returns A LangGraph node function
+ */
+export function createMergeNode(deps) {
+    const log = createNodeLogger('merge');
+    return async (state) => {
+        log.info('Starting merge flow');
+        reportNodeStart('merge');
+        const messages = [];
+        const startTime = Date.now();
+        try {
+            const { gitPrService } = deps;
+            const cwd = state.worktreePath;
+            // Resolve branch name from feature
+            const feature = await deps.featureRepository.findById(state.featureId);
+            const branch = feature?.branch ?? `feat/${state.featureId}`;
+            const baseBranch = 'main';
+            // --- Step 1: Commit and Push ---
+            let commitHash = state.commitHash;
+            const hasChanges = await gitPrService.hasUncommittedChanges(cwd);
+            if (hasChanges) {
+                log.info('Uncommitted changes detected, committing...');
+                commitHash = await gitPrService.commitAll(cwd, `feat: implementation complete for ${state.featureId}`);
+                messages.push(`[merge] Committed changes: ${commitHash}`);
+            }
+            else {
+                log.info('No uncommitted changes');
+                messages.push('[merge] No uncommitted changes to commit');
+            }
+            // Push is controlled by the push flag (--push, or implied by --pr)
+            const shouldPush = state.push || state.openPr;
+            if (shouldPush) {
+                log.info('Pushing to remote...');
+                await gitPrService.push(cwd, branch, true);
+                messages.push(`[merge] Pushed branch ${branch}`);
+            }
+            else {
+                log.info('Push skipped (--push not set)');
+                messages.push('[merge] Push skipped (use --push to push to remote)');
+            }
+            // --- Step 2: Generate pr.yaml (always) ---
+            log.info('Generating pr.yaml...');
+            const prYamlPath = deps.generatePrYaml(state.specDir, branch, baseBranch);
+            messages.push(`[merge] Generated pr.yaml at ${prYamlPath}`);
+            // --- Step 3: Create PR (if openPr=true and not already created) ---
+            let prUrl = state.prUrl;
+            let prNumber = state.prNumber;
+            let ciStatus = state.ciStatus;
+            if (state.openPr && !state.prUrl) {
+                log.info('Creating pull request...');
+                const prResult = await gitPrService.createPr(cwd, prYamlPath);
+                prUrl = prResult.url;
+                prNumber = prResult.number;
+                messages.push(`[merge] PR created: ${prUrl}`);
+                // Watch CI if we're going to auto-merge
+                if (state.autoMerge) {
+                    log.info('Watching CI...');
+                    const ciResult = await gitPrService.watchCi(cwd, branch);
+                    ciStatus = ciResult.status;
+                    messages.push(`[merge] CI status: ${ciStatus}`);
+                }
+            }
+            // --- Step 4: Merge approval gate ---
+            if (shouldInterrupt('merge', state.approvalGates, state.autoMerge)) {
+                log.info('Interrupting for merge approval');
+                const diffSummary = await gitPrService.getPrDiffSummary(cwd, baseBranch);
+                interrupt({
+                    node: 'merge',
+                    message: 'Merge approval required. Review the changes and approve to continue.',
+                    diffSummary,
+                    prUrl,
+                    prNumber,
+                });
+            }
+            // --- Step 5: Auto-merge (if enabled) ---
+            let merged = false;
+            if (state.autoMerge) {
+                if (state.openPr && prNumber) {
+                    log.info(`Auto-merging PR #${prNumber}...`);
+                    await gitPrService.mergePr(cwd, prNumber, 'squash');
+                    messages.push(`[merge] PR #${prNumber} merged via squash`);
+                    merged = true;
+                }
+                else {
+                    log.info(`Auto-merging branch ${branch} into ${baseBranch}...`);
+                    await gitPrService.mergeBranch(cwd, branch, baseBranch);
+                    messages.push(`[merge] Branch ${branch} merged into ${baseBranch}`);
+                    merged = true;
+                }
+            }
+            // --- Step 6: Update feature lifecycle ---
+            const newLifecycle = merged ? SdlcLifecycle.Maintain : SdlcLifecycle.Review;
+            if (feature) {
+                await deps.featureRepository.update({
+                    ...feature,
+                    lifecycle: newLifecycle,
+                    prUrl: prUrl ?? undefined,
+                    prNumber: prNumber ?? undefined,
+                    updatedAt: new Date(),
+                });
+                messages.push(`[merge] Feature lifecycle → ${newLifecycle}`);
+            }
+            const elapsed = ((Date.now() - startTime) / 1000).toFixed(1);
+            messages.push(`[merge] Complete (${elapsed}s)`);
+            log.info(`Merge flow complete (${elapsed}s)`);
+            return {
+                currentNode: 'merge',
+                messages,
+                commitHash,
+                prUrl,
+                prNumber,
+                ciStatus,
+            };
+        }
+        catch (err) {
+            // Re-throw LangGraph control-flow exceptions (interrupt, etc.)
+            if (isGraphBubbleUp(err))
+                throw err;
+            const message = err instanceof Error ? err.message : String(err);
+            const elapsed = ((Date.now() - startTime) / 1000).toFixed(1);
+            log.error(`Merge failed: ${message} (${elapsed}s)`);
+            // Re-throw so LangGraph does NOT checkpoint this node as completed.
+            // This allows `feat resume` to retry the merge node instead of
+            // restarting the entire graph from scratch.
+            throw err;
+        }
+    };
+}

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

@@ -37,12 +37,15 @@ export declare function safeYamlLoad(content: string): unknown;
  * Gates control which phases auto-approve:
  * - allowPrd: when true, skip interrupt after requirements phase
  * - allowPlan: when true, skip interrupt after plan phase
+ * - allowMerge: when true, skip interrupt after merge phase
  *
  * Nodes not covered by a gate (analyze, research) never interrupt.
  * The implement node always interrupts when gates are present
- * (unless both gates are true, meaning fully autonomous).
+ * (unless all three gates are true, meaning fully autonomous).
+ *
+ * @param autoMerge - When true, overrides allowMerge to treat merge as approved.
  */
-export declare function shouldInterrupt(nodeName: string, gates: ApprovalGates | undefined): boolean;
+export declare function shouldInterrupt(nodeName: string, gates: ApprovalGates | undefined, autoMerge?: boolean): boolean;
 export type ErrorCategory = 'retryable-api' | 'retryable-network' | 'non-retryable' | 'unknown';
 /**
  * Classify an error message into a retry category.

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

@@ -1 +1 @@
-{"version":3,"file":"node-helpers.d.ts","sourceRoot":"","sources":["../../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/nodes/node-helpers.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAMH,OAAO,KAAK,EACV,cAAc,EACd,qBAAqB,EACrB,oBAAoB,EACrB,MAAM,+DAA+D,CAAC;AACvE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAIrD;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM;kBAE/B,MAAM,GAAG,IAAI;mBAIZ,MAAM,GAAG,IAAI;EAK/B;AAED,MAAM,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAE7D;;GAEG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAMtE;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,iBAAiB,GAAG,qBAAqB,CAMpF;AAeD;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAQrD;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,GAAG,SAAS,GAAG,OAAO,CAO3F;AAMD,MAAM,MAAM,aAAa,GAAG,eAAe,GAAG,mBAAmB,GAAG,eAAe,GAAG,SAAS,CAAC;AAMhG;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,YAAY,EAAE,MAAM,GAAG,aAAa,CAKjE;AAED,MAAM,WAAW,YAAY;IAC3B,wDAAwD;IACxD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,kFAAkF;IAClF,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,0CAA0C;IAC1C,MAAM,CAAC,EAAE,UAAU,CAAC;CACrB;AAED;;;;;;GAMG;AACH,wBAAsB,YAAY,CAChC,QAAQ,EAAE,cAAc,EACxB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,qBAAqB,EAC9B,SAAS,CAAC,EAAE,YAAY,GACvB,OAAO,CAAC,oBAAoB,CAAC,CA6B/B;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CAW5D;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,UAAU,GAAG,IAAI,CAwB1F;AAED;;;;;;;GAOG;AACH,wBAAgB,WAAW,CACzB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,cAAc,EACxB,WAAW,EAAE,CAAC,KAAK,EAAE,iBAAiB,EAAE,GAAG,EAAE,UAAU,KAAK,MAAM,GACjE,CAAC,KAAK,EAAE,iBAAiB,KAAK,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CA4EnE"}
+{"version":3,"file":"node-helpers.d.ts","sourceRoot":"","sources":["../../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/nodes/node-helpers.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAMH,OAAO,KAAK,EACV,cAAc,EACd,qBAAqB,EACrB,oBAAoB,EACrB,MAAM,+DAA+D,CAAC;AACvE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAIrD;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM;kBAE/B,MAAM,GAAG,IAAI;mBAIZ,MAAM,GAAG,IAAI;EAK/B;AAED,MAAM,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAE7D;;GAEG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAMtE;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,iBAAiB,GAAG,qBAAqB,CAMpF;AAeD;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAQrD;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,aAAa,GAAG,SAAS,EAChC,SAAS,CAAC,EAAE,OAAO,GAClB,OAAO,CAWT;AAMD,MAAM,MAAM,aAAa,GAAG,eAAe,GAAG,mBAAmB,GAAG,eAAe,GAAG,SAAS,CAAC;AAMhG;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,YAAY,EAAE,MAAM,GAAG,aAAa,CAKjE;AAED,MAAM,WAAW,YAAY;IAC3B,wDAAwD;IACxD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,kFAAkF;IAClF,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,0CAA0C;IAC1C,MAAM,CAAC,EAAE,UAAU,CAAC;CACrB;AAED;;;;;;GAMG;AACH,wBAAsB,YAAY,CAChC,QAAQ,EAAE,cAAc,EACxB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,qBAAqB,EAC9B,SAAS,CAAC,EAAE,YAAY,GACvB,OAAO,CAAC,oBAAoB,CAAC,CA6B/B;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CAW5D;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,UAAU,GAAG,IAAI,CAwB1F;AAED;;;;;;;GAOG;AACH,wBAAgB,WAAW,CACzB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,cAAc,EACxB,WAAW,EAAE,CAAC,KAAK,EAAE,iBAAiB,EAAE,GAAG,EAAE,UAAU,KAAK,MAAM,GACjE,CAAC,KAAK,EAAE,iBAAiB,KAAK,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CA4EnE"}

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

@@ -78,20 +78,26 @@ export function safeYamlLoad(content) {
  * Gates control which phases auto-approve:
  * - allowPrd: when true, skip interrupt after requirements phase
  * - allowPlan: when true, skip interrupt after plan phase
+ * - allowMerge: when true, skip interrupt after merge phase
  *
  * Nodes not covered by a gate (analyze, research) never interrupt.
  * The implement node always interrupts when gates are present
- * (unless both gates are true, meaning fully autonomous).
+ * (unless all three gates are true, meaning fully autonomous).
+ *
+ * @param autoMerge - When true, overrides allowMerge to treat merge as approved.
  */
-export function shouldInterrupt(nodeName, gates) {
+export function shouldInterrupt(nodeName, gates, autoMerge) {
     if (!gates)
         return false;
-    if (gates.allowPrd && gates.allowPlan)
+    const effectiveAllowMerge = autoMerge ?? gates.allowMerge;
+    if (gates.allowPrd && gates.allowPlan && effectiveAllowMerge)
         return false;
     if (nodeName === 'requirements')
         return !gates.allowPrd;
     if (nodeName === 'plan')
         return !gates.allowPlan;
+    if (nodeName === 'merge')
+        return !effectiveAllowMerge;
     if (nodeName === 'implement')
         return true;
     return false;

package/dist/packages/core/src/infrastructure/services/agents/feature-agent/nodes/pr-yaml-generator.d.ts

@@ -0,0 +1,17 @@
+/**
+ * Generates a pr.yaml file from spec metadata for pull request creation.
+ *
+ * Reads spec.yaml from the spec directory, extracts feature name, description,
+ * scope, and success criteria, then writes a pr.yaml with PR metadata in
+ * conventional commit format.
+ */
+/**
+ * Generate a pr.yaml file in the spec directory with PR metadata.
+ *
+ * @param specDir - Path to the spec directory containing spec.yaml
+ * @param branch - Feature branch name (used as headBranch)
+ * @param baseBranch - Target branch for the PR (default: 'main')
+ * @returns Path to the generated pr.yaml file
+ */
+export declare function generatePrYaml(specDir: string, branch: string, baseBranch?: string): string;
+//# sourceMappingURL=pr-yaml-generator.d.ts.map

package/dist/packages/core/src/infrastructure/services/agents/feature-agent/nodes/pr-yaml-generator.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pr-yaml-generator.d.ts","sourceRoot":"","sources":["../../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/nodes/pr-yaml-generator.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAsBH;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,SAAS,GAAG,MAAM,CA+B3F"}

package/dist/packages/core/src/infrastructure/services/agents/feature-agent/nodes/pr-yaml-generator.js

@@ -0,0 +1,43 @@
+/**
+ * Generates a pr.yaml file from spec metadata for pull request creation.
+ *
+ * Reads spec.yaml from the spec directory, extracts feature name, description,
+ * scope, and success criteria, then writes a pr.yaml with PR metadata in
+ * conventional commit format.
+ */
+import yaml from 'js-yaml';
+import { readFileSync, writeFileSync } from 'node:fs';
+import { join } from 'node:path';
+/**
+ * Generate a pr.yaml file in the spec directory with PR metadata.
+ *
+ * @param specDir - Path to the spec directory containing spec.yaml
+ * @param branch - Feature branch name (used as headBranch)
+ * @param baseBranch - Target branch for the PR (default: 'main')
+ * @returns Path to the generated pr.yaml file
+ */
+export function generatePrYaml(specDir, branch, baseBranch = 'main') {
+    const specContent = readFileSync(join(specDir, 'spec.yaml'), 'utf-8');
+    const spec = yaml.load(specContent);
+    const name = spec.name ?? 'Untitled feature';
+    const description = spec.description ?? '';
+    const scope = spec.scope;
+    const successCriteria = spec.successCriteria ?? [];
+    const title = scope ? `feat(${scope}): ${name}` : `feat: ${name}`;
+    const bodyParts = [];
+    bodyParts.push(`## Summary\n\n${description}`);
+    if (successCriteria.length > 0) {
+        bodyParts.push(`## Test Criteria\n\n${successCriteria.map((c) => `- ${c}`).join('\n')}`);
+    }
+    const prData = {
+        title,
+        body: bodyParts.join('\n\n'),
+        baseBranch,
+        headBranch: branch,
+        labels: ['feature'],
+        draft: false,
+    };
+    const outputPath = join(specDir, 'pr.yaml');
+    writeFileSync(outputPath, yaml.dump(prData, { indent: 2, lineWidth: -1 }), 'utf-8');
+    return outputPath;
+}

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

@@ -0,0 +1,17 @@
+/**
+ * Merge Node Prompts
+ *
+ * Prompt builders for the merge node: CI fix instructions.
+ */
+export interface CiFixPromptParams {
+    logExcerpt: string;
+    specSummary: string;
+    attempt: number;
+    maxAttempts: number;
+}
+/**
+ * Build a constrained prompt for the AI agent when CI fails.
+ * Instructs the agent to fix the specific CI failure within bounded scope.
+ */
+export declare function buildCiFixPrompt(params: CiFixPromptParams): string;
+//# sourceMappingURL=merge.prompt.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"merge.prompt.d.ts","sourceRoot":"","sources":["../../../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/nodes/prompts/merge.prompt.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,iBAAiB,GAAG,MAAM,CAkClE"}

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

@@ -0,0 +1,42 @@
+/**
+ * Merge Node Prompts
+ *
+ * Prompt builders for the merge node: CI fix instructions.
+ */
+const MAX_LOG_EXCERPT_LENGTH = 6000;
+/**
+ * Build a constrained prompt for the AI agent when CI fails.
+ * Instructs the agent to fix the specific CI failure within bounded scope.
+ */
+export function buildCiFixPrompt(params) {
+    const { specSummary, attempt, maxAttempts } = params;
+    const truncatedLog = params.logExcerpt.length > MAX_LOG_EXCERPT_LENGTH
+        ? `${params.logExcerpt.slice(0, MAX_LOG_EXCERPT_LENGTH)}\n... (truncated)`
+        : params.logExcerpt;
+    return `You are a senior software engineer fixing a CI failure.
+This is attempt ${attempt} of ${maxAttempts}.
+
+## Feature Context
+
+${specSummary}
+
+## CI Failure Log
+
+\`\`\`
+${truncatedLog}
+\`\`\`
+
+## Instructions
+
+1. Analyze the CI failure log above carefully
+2. Identify the root cause of the failure
+3. Apply the minimal fix to resolve the CI issue
+4. Run the failing checks locally to verify your fix
+
+## Constraints
+
+- Fix ONLY the issue shown in the CI log — do not refactor or improve unrelated code
+- Do not add new features or change behavior beyond what is needed to pass CI
+- Keep changes as small and focused as possible
+- Commit with a conventional commit message (e.g. \`fix(scope): resolve CI failure\`)`;
+}

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

@@ -38,6 +38,14 @@ export declare const FeatureAgentAnnotation: import("@langchain/langgraph").Anno
     validationRetries: import("@langchain/langgraph").BinaryOperatorAggregate<number, number>;
     lastValidationTarget: import("@langchain/langgraph").BinaryOperatorAggregate<string, string>;
     lastValidationErrors: import("@langchain/langgraph").BinaryOperatorAggregate<string[], string[]>;
+    prUrl: import("@langchain/langgraph").BinaryOperatorAggregate<string | null, string | null>;
+    prNumber: import("@langchain/langgraph").BinaryOperatorAggregate<number | null, number | null>;
+    commitHash: import("@langchain/langgraph").BinaryOperatorAggregate<string | null, string | null>;
+    ciStatus: import("@langchain/langgraph").BinaryOperatorAggregate<string | null, string | null>;
+    push: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
+    openPr: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
+    autoMerge: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
+    allowMerge: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
 }>;
 export type FeatureAgentState = typeof FeatureAgentAnnotation.State;
 //# sourceMappingURL=state.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"state.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/state.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAElE;;;;;;GAMG;AACH,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA+BjC,CAAC;AAEH,MAAM,MAAM,iBAAiB,GAAG,OAAO,sBAAsB,CAAC,KAAK,CAAC"}
+{"version":3,"file":"state.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/state.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAElE;;;;;;GAMG;AACH,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAgEjC,CAAC;AAEH,MAAM,MAAM,iBAAiB,GAAG,OAAO,sBAAsB,CAAC,KAAK,CAAC"}

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

@@ -37,4 +37,37 @@ export const FeatureAgentAnnotation = Annotation.Root({
         reducer: (_prev, next) => next,
         default: () => [],
     }),
+    // --- Merge and workflow state channels ---
+    prUrl: Annotation({
+        reducer: (_prev, next) => (next !== undefined ? next : _prev),
+        default: () => null,
+    }),
+    prNumber: Annotation({
+        reducer: (_prev, next) => (next !== undefined ? next : _prev),
+        default: () => null,
+    }),
+    commitHash: Annotation({
+        reducer: (_prev, next) => (next !== undefined ? next : _prev),
+        default: () => null,
+    }),
+    ciStatus: Annotation({
+        reducer: (_prev, next) => (next !== undefined ? next : _prev),
+        default: () => null,
+    }),
+    push: Annotation({
+        reducer: (_prev, next) => next,
+        default: () => false,
+    }),
+    openPr: Annotation({
+        reducer: (_prev, next) => next,
+        default: () => false,
+    }),
+    autoMerge: Annotation({
+        reducer: (_prev, next) => next,
+        default: () => false,
+    }),
+    allowMerge: Annotation({
+        reducer: (_prev, next) => next,
+        default: () => false,
+    }),
 });

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

@@ -0,0 +1,28 @@
+/**
+ * Git PR Service Implementation
+ *
+ * Manages git operations for PR creation, merging, and CI status checks.
+ * Uses constructor dependency injection for the command executor.
+ */
+import type { IGitPrService } from '../../../application/ports/output/services/git-pr-service.interface.js';
+import type { CiStatusResult, DiffSummary, MergeStrategy, PrCreateResult } from '../../../application/ports/output/services/git-pr-service.interface.js';
+import type { ExecFunction } from './worktree.service.js';
+export declare class GitPrService implements IGitPrService {
+    private readonly execFile;
+    constructor(execFile: ExecFunction);
+    hasUncommittedChanges(cwd: string): Promise<boolean>;
+    commitAll(cwd: string, message: string): Promise<string>;
+    push(cwd: string, branch: string, setUpstream?: boolean): Promise<void>;
+    createPr(cwd: string, prYamlPath: string): Promise<PrCreateResult>;
+    mergePr(cwd: string, prNumber: number, strategy?: MergeStrategy): Promise<void>;
+    mergeBranch(cwd: string, sourceBranch: string, targetBranch: string): Promise<void>;
+    getCiStatus(cwd: string, branch: string): Promise<CiStatusResult>;
+    watchCi(cwd: string, branch: string, timeoutMs?: number): Promise<CiStatusResult>;
+    deleteBranch(cwd: string, branch: string, deleteRemote?: boolean): Promise<void>;
+    getPrDiffSummary(cwd: string, baseBranch: string): Promise<DiffSummary>;
+    private parseGitError;
+    private parseGhError;
+    private parsePrNumberFromUrl;
+    private parseDiffStat;
+}
+//# sourceMappingURL=git-pr.service.d.ts.map

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

@@ -0,0 +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;AAKhF,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;IAelE,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"}