@shepai/cli 1.52.2 → 1.53.0

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

@@ -5,22 +5,44 @@
  * SDLC lifecycle as they execute, following the same pattern as
  * phase-timing-context.ts.
  *
- * The worker calls setLifecycleContext() once after DI init.
- * Nodes call updateNodeLifecycle() at the start of execution.
- * Errors are swallowed so lifecycle updates never block graph execution.
+ * The worker calls setLifecycleContext() once after DI init, passing an
+ * UpdateFeatureLifecycleUseCase instance. Nodes call updateNodeLifecycle()
+ * at the start of execution. Errors are swallowed so lifecycle updates
+ * never block graph execution.
+ *
+ * Routing lifecycle updates through UpdateFeatureLifecycleUseCase ensures
+ * that CheckAndUnblockFeaturesUseCase fires on every transition,
+ * automatically unblocking blocked children that are now eligible to start.
+ */
+import { SdlcLifecycle } from '../../../../domain/generated/output.js';
+/**
+ * Minimal interface satisfied by UpdateFeatureLifecycleUseCase.
+ * Using a structural interface avoids a concrete import between infrastructure
+ * and application layer classes.
  */
-import type { IFeatureRepository } from '../../../../application/ports/output/repositories/feature-repository.interface.js';
+interface LifecycleUpdater {
+    execute(input: {
+        featureId: string;
+        lifecycle: SdlcLifecycle;
+    }): Promise<void>;
+}
 /**
  * Set the lifecycle context. Called once by the worker after DI init.
+ *
+ * @param featureId - The feature being processed.
+ * @param updater   - An UpdateFeatureLifecycleUseCase instance (or compatible updater).
  */
-export declare function setLifecycleContext(featureId: string, repository: IFeatureRepository): void;
+export declare function setLifecycleContext(featureId: string, updater: LifecycleUpdater): void;
 /**
  * Clear the lifecycle context. Useful for testing.
  */
 export declare function clearLifecycleContext(): void;
 /**
  * Update the feature's lifecycle to match the current graph node.
+ * Routes through UpdateFeatureLifecycleUseCase so that
+ * CheckAndUnblockFeaturesUseCase fires on every transition.
  * No-op if context is not set or the node name has no lifecycle mapping.
  */
 export declare function updateNodeLifecycle(nodeName: string): Promise<void>;
+export {};
 //# sourceMappingURL=lifecycle-context.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"lifecycle-context.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/lifecycle-context.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yEAAyE,CAAC;AAgBlH;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,kBAAkB,GAAG,IAAI,CAG3F;AAED;;GAEG;AACH,wBAAgB,qBAAqB,IAAI,IAAI,CAG5C;AAED;;;GAGG;AACH,wBAAsB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAkBzE"}
+{"version":3,"file":"lifecycle-context.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/lifecycle-context.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAE7D;;;;GAIG;AACH,UAAU,gBAAgB;IACxB,OAAO,CAAC,KAAK,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,aAAa,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAChF;AAeD;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,GAAG,IAAI,CAGtF;AAED;;GAEG;AACH,wBAAgB,qBAAqB,IAAI,IAAI,CAG5C;AAED;;;;;GAKG;AACH,wBAAsB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAWzE"}

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

@@ -5,13 +5,18 @@
  * SDLC lifecycle as they execute, following the same pattern as
  * phase-timing-context.ts.
  *
- * The worker calls setLifecycleContext() once after DI init.
- * Nodes call updateNodeLifecycle() at the start of execution.
- * Errors are swallowed so lifecycle updates never block graph execution.
+ * The worker calls setLifecycleContext() once after DI init, passing an
+ * UpdateFeatureLifecycleUseCase instance. Nodes call updateNodeLifecycle()
+ * at the start of execution. Errors are swallowed so lifecycle updates
+ * never block graph execution.
+ *
+ * Routing lifecycle updates through UpdateFeatureLifecycleUseCase ensures
+ * that CheckAndUnblockFeaturesUseCase fires on every transition,
+ * automatically unblocking blocked children that are now eligible to start.
  */
 import { SdlcLifecycle } from '../../../../domain/generated/output.js';
 let contextFeatureId;
-let contextRepository;
+let contextUpdater;
 /** Map graph node names to their corresponding SDLC lifecycle stage. */
 const NODE_TO_LIFECYCLE = {
     analyze: SdlcLifecycle.Analyze,
@@ -23,37 +28,35 @@ const NODE_TO_LIFECYCLE = {
 };
 /**
  * Set the lifecycle context. Called once by the worker after DI init.
+ *
+ * @param featureId - The feature being processed.
+ * @param updater   - An UpdateFeatureLifecycleUseCase instance (or compatible updater).
  */
-export function setLifecycleContext(featureId, repository) {
+export function setLifecycleContext(featureId, updater) {
     contextFeatureId = featureId;
-    contextRepository = repository;
+    contextUpdater = updater;
 }
 /**
  * Clear the lifecycle context. Useful for testing.
  */
 export function clearLifecycleContext() {
     contextFeatureId = undefined;
-    contextRepository = undefined;
+    contextUpdater = undefined;
 }
 /**
  * Update the feature's lifecycle to match the current graph node.
+ * Routes through UpdateFeatureLifecycleUseCase so that
+ * CheckAndUnblockFeaturesUseCase fires on every transition.
  * No-op if context is not set or the node name has no lifecycle mapping.
  */
 export async function updateNodeLifecycle(nodeName) {
-    if (!contextFeatureId || !contextRepository)
+    if (!contextFeatureId || !contextUpdater)
         return;
     const lifecycle = NODE_TO_LIFECYCLE[nodeName];
     if (!lifecycle)
         return;
     try {
-        const feature = await contextRepository.findById(contextFeatureId);
-        if (!feature)
-            return;
-        await contextRepository.update({
-            ...feature,
-            lifecycle,
-            updatedAt: new Date(),
-        });
+        await contextUpdater.execute({ featureId: contextFeatureId, lifecycle });
     }
     catch {
         // Swallow — lifecycle update failure is non-fatal

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

@@ -0,0 +1,24 @@
+/**
+ * CI Helper Utilities
+ *
+ * Shared helpers for the CI watch/fix loop and merge node:
+ * - extractRunId: parse GitHub Actions run ID from URL
+ * - handleCiTerminalFailure: update feature repo on CI failure
+ * - buildCiExhaustedError: structured error for exhausted/timed-out loops
+ */
+import type { IFeatureRepository } from '../../../../../../application/ports/output/repositories/feature-repository.interface.js';
+import { type CiFixRecord } from '../../../../../../domain/generated/output.js';
+/**
+ * Extract the numeric GitHub Actions run ID from a run URL.
+ * Example: https://github.com/org/repo/actions/runs/12345 → "12345"
+ */
+export declare function extractRunId(runUrl: string): string | undefined;
+/**
+ * Update the feature repository to mark CI as failed before throwing.
+ */
+export declare function handleCiTerminalFailure(feature: Awaited<ReturnType<Pick<IFeatureRepository, 'findById'>['findById']>>, prUrl: string | null, prNumber: number | null, featureRepository: Pick<IFeatureRepository, 'findById' | 'update'>, messages: string[]): Promise<void>;
+/**
+ * Build a structured error message describing the CI fix loop outcome.
+ */
+export declare function buildCiExhaustedError(attempts: number, history: CiFixRecord[], reason: 'exhausted' | 'timeout'): Error;
+//# sourceMappingURL=ci-helpers.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ci-helpers.d.ts","sourceRoot":"","sources":["../../../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/nodes/merge/ci-helpers.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yEAAyE,CAAC;AAClH,OAAO,EAAsB,KAAK,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAEpF;;;GAGG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAG/D;AAED;;GAEG;AACH,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,kBAAkB,EAAE,UAAU,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EAC9E,KAAK,EAAE,MAAM,GAAG,IAAI,EACpB,QAAQ,EAAE,MAAM,GAAG,IAAI,EACvB,iBAAiB,EAAE,IAAI,CAAC,kBAAkB,EAAE,UAAU,GAAG,QAAQ,CAAC,EAClE,QAAQ,EAAE,MAAM,EAAE,GACjB,OAAO,CAAC,IAAI,CAAC,CAef;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,WAAW,EAAE,EACtB,MAAM,EAAE,WAAW,GAAG,SAAS,GAC9B,KAAK,CAUP"}

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

@@ -0,0 +1,47 @@
+/**
+ * CI Helper Utilities
+ *
+ * Shared helpers for the CI watch/fix loop and merge node:
+ * - extractRunId: parse GitHub Actions run ID from URL
+ * - handleCiTerminalFailure: update feature repo on CI failure
+ * - buildCiExhaustedError: structured error for exhausted/timed-out loops
+ */
+import { PrStatus, CiStatus } from '../../../../../../domain/generated/output.js';
+/**
+ * Extract the numeric GitHub Actions run ID from a run URL.
+ * Example: https://github.com/org/repo/actions/runs/12345 → "12345"
+ */
+export function extractRunId(runUrl) {
+    const match = runUrl.match(/\/runs\/(\d+)/);
+    return match ? match[1] : undefined;
+}
+/**
+ * Update the feature repository to mark CI as failed before throwing.
+ */
+export async function handleCiTerminalFailure(feature, prUrl, prNumber, featureRepository, messages) {
+    if (feature && prUrl && prNumber) {
+        await featureRepository.update({
+            ...feature,
+            lifecycle: feature.lifecycle,
+            pr: {
+                url: prUrl,
+                number: prNumber,
+                status: PrStatus.Open,
+                ciStatus: CiStatus.Failure,
+            },
+            updatedAt: new Date(),
+        });
+    }
+    messages.push(`[merge] CI watch/fix loop failed — feature halted`);
+}
+/**
+ * Build a structured error message describing the CI fix loop outcome.
+ */
+export function buildCiExhaustedError(attempts, history, reason) {
+    const reasonStr = reason === 'timeout' ? 'CI watch timed out' : `all ${attempts} fix attempt(s) exhausted`;
+    const historyStr = history
+        .map((r) => `  - Attempt ${r.attempt}: ${r.outcome} (started ${r.startedAt})`)
+        .join('\n');
+    const detail = historyStr ? `\nAttempt history:\n${historyStr}` : '';
+    return new Error(`CI watch/fix loop failed — ${reasonStr}.${detail}\nReview CI logs and fix manually.`);
+}

package/dist/packages/core/src/infrastructure/services/agents/feature-agent/nodes/merge/ci-watch-fix-loop.d.ts

@@ -0,0 +1,43 @@
+/**
+ * CI Watch/Fix Loop
+ *
+ * After a push, watches CI status and attempts automatic fixes when CI fails.
+ * Respects configurable max attempts, timeout, and log size from settings.
+ */
+import type { IAgentExecutor } from '../../../../../../application/ports/output/agents/agent-executor.interface.js';
+import type { IFeatureRepository } from '../../../../../../application/ports/output/repositories/feature-repository.interface.js';
+import type { IGitPrService } from '../../../../../../application/ports/output/services/git-pr-service.interface.js';
+import { CiStatus, type CiFixRecord } from '../../../../../../domain/generated/output.js';
+import type { NodeLogger } from '../node-helpers.js';
+import type { AgentExecutionOptions } from '../../../../../../application/ports/output/agents/agent-executor.interface.js';
+export interface CiWatchFixDeps {
+    executor: IAgentExecutor;
+    gitPrService: IGitPrService;
+    featureRepository: Pick<IFeatureRepository, 'findById' | 'update'>;
+}
+export interface CiWatchFixParams {
+    cwd: string;
+    branch: string;
+    options: AgentExecutionOptions;
+    feature: Awaited<ReturnType<Pick<IFeatureRepository, 'findById'>['findById']>>;
+    prUrl: string | null;
+    prNumber: number | null;
+    existingAttempts: number;
+    messages: string[];
+    log: NodeLogger;
+}
+export type CiFixStatusValue = 'idle' | 'watching' | 'fixing' | 'success' | 'exhausted' | 'timeout';
+export interface CiWatchFixResult {
+    ciStatus: CiStatus;
+    ciFixAttempts: number;
+    ciFixHistory: CiFixRecord[];
+    ciFixStatus: CiFixStatusValue;
+}
+/**
+ * Run the CI watch/fix loop. Watches for the initial CI result, then
+ * iteratively attempts fixes up to the configured maximum.
+ *
+ * Throws on timeout or exhausted attempts (after updating feature state).
+ */
+export declare function runCiWatchFixLoop(deps: CiWatchFixDeps, params: CiWatchFixParams): Promise<CiWatchFixResult>;
+//# sourceMappingURL=ci-watch-fix-loop.d.ts.map

package/dist/packages/core/src/infrastructure/services/agents/feature-agent/nodes/merge/ci-watch-fix-loop.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ci-watch-fix-loop.d.ts","sourceRoot":"","sources":["../../../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/nodes/merge/ci-watch-fix-loop.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+DAA+D,CAAC;AACpG,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yEAAyE,CAAC;AAClH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iEAAiE,CAAC;AAKrG,OAAO,EAAE,QAAQ,EAAE,KAAK,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,+DAA+D,CAAC;AAK3G,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,cAAc,CAAC;IACzB,YAAY,EAAE,aAAa,CAAC;IAC5B,iBAAiB,EAAE,IAAI,CAAC,kBAAkB,EAAE,UAAU,GAAG,QAAQ,CAAC,CAAC;CACpE;AAED,MAAM,WAAW,gBAAgB;IAC/B,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,qBAAqB,CAAC;IAC/B,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,kBAAkB,EAAE,UAAU,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IAC/E,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,GAAG,EAAE,UAAU,CAAC;CACjB;AAED,MAAM,MAAM,gBAAgB,GAAG,MAAM,GAAG,UAAU,GAAG,QAAQ,GAAG,SAAS,GAAG,WAAW,GAAG,SAAS,CAAC;AAEpG,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,QAAQ,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,WAAW,EAAE,CAAC;IAC5B,WAAW,EAAE,gBAAgB,CAAC;CAC/B;AAED;;;;;GAKG;AACH,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,cAAc,EACpB,MAAM,EAAE,gBAAgB,GACvB,OAAO,CAAC,gBAAgB,CAAC,CAiH3B"}

package/dist/packages/core/src/infrastructure/services/agents/feature-agent/nodes/merge/ci-watch-fix-loop.js

@@ -0,0 +1,118 @@
+/**
+ * CI Watch/Fix Loop
+ *
+ * After a push, watches CI status and attempts automatic fixes when CI fails.
+ * Respects configurable max attempts, timeout, and log size from settings.
+ */
+import { GitPrError, GitPrErrorCode, } from '../../../../../../application/ports/output/services/git-pr-service.interface.js';
+import { CiStatus } from '../../../../../../domain/generated/output.js';
+import { retryExecute } from '../node-helpers.js';
+import { buildCiWatchFixPrompt } from '../prompts/merge-prompts.js';
+import { extractRunId, handleCiTerminalFailure, buildCiExhaustedError } from './ci-helpers.js';
+import { getSettings } from '../../../../../services/settings.service.js';
+/**
+ * Run the CI watch/fix loop. Watches for the initial CI result, then
+ * iteratively attempts fixes up to the configured maximum.
+ *
+ * Throws on timeout or exhausted attempts (after updating feature state).
+ */
+export async function runCiWatchFixLoop(deps, params) {
+    const { executor, gitPrService } = deps;
+    const { cwd, branch, options, feature, prUrl, prNumber, messages, log } = params;
+    const settings = getSettings();
+    const maxAttempts = settings.workflow?.ciMaxFixAttempts ?? 3;
+    const timeoutMs = settings.workflow?.ciWatchTimeoutMs ?? 600_000;
+    const logMaxChars = settings.workflow?.ciLogMaxChars ?? 50_000;
+    let ciFixAttempts = params.existingAttempts;
+    const ciFixHistory = [];
+    let ciFixStatus;
+    log.info(`Starting CI watch (maxAttempts=${maxAttempts}, timeout=${timeoutMs}ms)`);
+    // Check if any CI run exists for this branch
+    const initialCiStatus = await gitPrService.getCiStatus(cwd, branch);
+    if (!initialCiStatus.runUrl) {
+        log.info('No CI run detected after push — skipping CI watch');
+        return { ciStatus: CiStatus.Success, ciFixAttempts, ciFixHistory, ciFixStatus: 'idle' };
+    }
+    let runUrl = initialCiStatus.runUrl;
+    // Initial CI watch
+    let watchResult;
+    try {
+        watchResult = await gitPrService.watchCi(cwd, branch, timeoutMs);
+    }
+    catch (err) {
+        if (err instanceof GitPrError && err.code === GitPrErrorCode.CI_TIMEOUT) {
+            log.info('Initial CI watch timed out');
+            ciFixHistory.push({
+                attempt: ciFixAttempts + 1,
+                startedAt: new Date().toISOString(),
+                failureSummary: 'CI watch timed out',
+                outcome: 'timeout',
+            });
+            await handleCiTerminalFailure(feature, prUrl, prNumber, deps.featureRepository, messages);
+            throw buildCiExhaustedError(ciFixAttempts + 1, ciFixHistory, 'timeout');
+        }
+        throw err;
+    }
+    if (watchResult.status === 'success') {
+        log.info('CI passed on first watch');
+        return { ciStatus: CiStatus.Success, ciFixAttempts, ciFixHistory, ciFixStatus: 'success' };
+    }
+    // CI failed — enter fix loop
+    while (true) {
+        // Fail-fast: check attempt count BEFORE invoking executor (NFR-3)
+        if (ciFixAttempts >= maxAttempts) {
+            log.info(`CI fix loop exhausted after ${ciFixAttempts} attempt(s)`);
+            ciFixStatus = 'exhausted';
+            break;
+        }
+        // Fetch failure logs
+        const runId = extractRunId(runUrl) ?? '';
+        const failureLogs = await gitPrService.getFailureLogs(runId, branch, logMaxChars);
+        const startedAt = new Date().toISOString();
+        log.info(`CI fix attempt ${ciFixAttempts + 1}/${maxAttempts} for run ${runId}`);
+        // Invoke fix executor
+        const fixPrompt = buildCiWatchFixPrompt(failureLogs, ciFixAttempts + 1, maxAttempts, branch);
+        await retryExecute(executor, fixPrompt, options, { logger: log });
+        ciFixAttempts++;
+        // Get updated run URL (new run triggered by push in fix)
+        const updatedCiStatus = await gitPrService.getCiStatus(cwd, branch);
+        if (updatedCiStatus.runUrl)
+            runUrl = updatedCiStatus.runUrl;
+        // Watch CI after fix
+        let fixWatchResult;
+        try {
+            fixWatchResult = await gitPrService.watchCi(cwd, branch, timeoutMs);
+        }
+        catch (err) {
+            if (err instanceof GitPrError && err.code === GitPrErrorCode.CI_TIMEOUT) {
+                log.info(`CI watch timed out during fix attempt ${ciFixAttempts}`);
+                ciFixHistory.push({
+                    attempt: ciFixAttempts,
+                    startedAt,
+                    failureSummary: failureLogs.slice(0, 500),
+                    outcome: 'timeout',
+                });
+                ciFixStatus = 'timeout';
+                break;
+            }
+            throw err;
+        }
+        const outcome = fixWatchResult.status === 'success' ? 'fixed' : 'failed';
+        ciFixHistory.push({
+            attempt: ciFixAttempts,
+            startedAt,
+            failureSummary: failureLogs.slice(0, 500),
+            outcome,
+        });
+        if (fixWatchResult.status === 'success') {
+            log.info(`CI passed after fix attempt ${ciFixAttempts}`);
+            ciFixStatus = 'success';
+            return { ciStatus: CiStatus.Success, ciFixAttempts, ciFixHistory, ciFixStatus };
+        }
+        log.info(`CI still failing after fix attempt ${ciFixAttempts}`);
+        messages.push(`[merge] CI fix attempt ${ciFixAttempts}/${maxAttempts} — still failing`);
+    }
+    // Handle terminal failure states
+    await handleCiTerminalFailure(feature, prUrl, prNumber, deps.featureRepository, messages);
+    throw buildCiExhaustedError(ciFixAttempts, ciFixHistory, ciFixStatus);
+}

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

@@ -0,0 +1 @@
+{"version":3,"file":"merge-output-parser.d.ts","sourceRoot":"","sources":["../../../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/nodes/merge/merge-output-parser.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AASH,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAI7D;AAED;;;GAGG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa,GAAG,IAAI,CAI/D"}

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

@@ -6,11 +6,16 @@
  * 2. Merge/squash (via agent executor, after approval gate)
  *
  * Uses interrupt() for the merge approval gate when allowMerge=false.
+ *
+ * Sub-modules:
+ * - ci-watch-fix-loop.ts: CI watch + automatic fix loop
+ * - ci-helpers.ts: shared CI utility functions
+ * - merge-output-parser.ts: structured data extraction from agent output
  */
-import type { IAgentExecutor } from '../../../../../application/ports/output/agents/agent-executor.interface.js';
-import type { FeatureAgentState } from '../state.js';
-import type { IFeatureRepository } from '../../../../../application/ports/output/repositories/feature-repository.interface.js';
-import type { DiffSummary } from '../../../../../application/ports/output/services/git-pr-service.interface.js';
+import type { IAgentExecutor } from '../../../../../../application/ports/output/agents/agent-executor.interface.js';
+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';
 export interface MergeNodeDeps {
     executor: IAgentExecutor;
     getDiffSummary: (cwd: string, baseBranch: string) => Promise<DiffSummary>;
@@ -22,6 +27,7 @@ export interface MergeNodeDeps {
      * Returns true if baseBranch contains all commits from featureBranch.
      */
     verifyMerge: (cwd: string, featureBranch: string, baseBranch: string) => Promise<boolean>;
+    gitPrService: IGitPrService;
 }
 /**
  * Factory that creates the merge node function.

package/dist/packages/core/src/infrastructure/services/agents/feature-agent/nodes/merge/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/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;AAsBzE,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,CA6M7E"}

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

@@ -6,15 +6,21 @@
  * 2. Merge/squash (via agent executor, after approval gate)
  *
  * Uses interrupt() for the merge approval gate when allowMerge=false.
+ *
+ * Sub-modules:
+ * - ci-watch-fix-loop.ts: CI watch + automatic fix loop
+ * - ci-helpers.ts: shared CI utility functions
+ * - merge-output-parser.ts: structured data extraction from agent output
  */
 import { interrupt, isGraphBubbleUp } from '@langchain/langgraph';
-import { SdlcLifecycle, PrStatus } from '../../../../../domain/generated/output.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';
-import { buildCommitPushPrPrompt, buildMergeSquashPrompt } from './prompts/merge-prompts.js';
+import { SdlcLifecycle, PrStatus } from '../../../../../../domain/generated/output.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';
+import { buildCommitPushPrPrompt, buildMergeSquashPrompt } from '../prompts/merge-prompts.js';
 import { parseCommitHash, parsePrUrl } from './merge-output-parser.js';
+import { runCiWatchFixLoop } from './ci-watch-fix-loop.js';
 /**
  * Factory that creates the merge node function.
  *
@@ -28,9 +34,6 @@ export function createMergeNode(deps) {
         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') {
@@ -47,12 +50,10 @@ export function createMergeNode(deps) {
         }
         const messages = [];
         const startTime = Date.now();
-        // Record merge phase timing
         const mergeTimingId = await recordPhaseStart('merge');
         try {
             const { executor } = 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 = await deps.getDefaultBranch(cwd);
@@ -60,7 +61,10 @@ export function createMergeNode(deps) {
             let commitHash = state.commitHash;
             let prUrl = state.prUrl;
             let prNumber = state.prNumber;
-            const ciStatus = state.ciStatus;
+            let ciStatus = state.ciStatus;
+            let ciFixAttempts = state.ciFixAttempts ?? 0;
+            let ciFixHistory = state.ciFixHistory ?? [];
+            let ciFixStatus = state.ciFixStatus ?? 'idle';
             // --- Check for git remote (needed by both agent calls) ---
             const remoteAvailable = await deps.hasRemote(cwd);
             // --- Agent Call 1: Commit + Push + PR (skip on approval resume) ---
@@ -68,14 +72,12 @@ export function createMergeNode(deps) {
                 if (!remoteAvailable) {
                     log.info('No git remote configured — skipping push and PR, will merge locally');
                 }
-                // 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) {
@@ -86,6 +88,28 @@ export function createMergeNode(deps) {
                         messages.push(`[merge] PR created: ${prUrl}`);
                     }
                 }
+                // --- CI watch/fix loop (when push or openPr is enabled) ---
+                if (effectiveState.push || effectiveState.openPr) {
+                    const ciResult = await runCiWatchFixLoop({
+                        executor,
+                        gitPrService: deps.gitPrService,
+                        featureRepository: deps.featureRepository,
+                    }, {
+                        cwd,
+                        branch,
+                        options,
+                        feature,
+                        prUrl,
+                        prNumber,
+                        existingAttempts: ciFixAttempts,
+                        messages,
+                        log,
+                    });
+                    ciStatus = ciResult.ciStatus;
+                    ciFixAttempts = ciResult.ciFixAttempts;
+                    ciFixHistory = ciResult.ciFixHistory;
+                    ciFixStatus = ciResult.ciFixStatus;
+                }
                 // --- Merge approval gate ---
                 if (shouldInterrupt('merge', state.approvalGates)) {
                     log.info('Interrupting for merge approval');
@@ -99,6 +123,7 @@ export function createMergeNode(deps) {
                         diffSummary,
                         prUrl,
                         prNumber,
+                        ciStatus,
                     });
                 }
             }
@@ -141,6 +166,8 @@ export function createMergeNode(deps) {
                                 status: merged ? PrStatus.Merged : PrStatus.Open,
                                 ...(commitHash ? { commitHash } : {}),
                                 ...(ciStatus ? { ciStatus: ciStatus } : {}),
+                                ...(ciFixAttempts > 0 ? { ciFixAttempts } : {}),
+                                ...(ciFixHistory.length > 0 ? { ciFixHistory } : {}),
                             },
                         }
                         : {}),
@@ -159,21 +186,21 @@ export function createMergeNode(deps) {
                 prUrl,
                 prNumber,
                 ciStatus,
+                ciFixAttempts,
+                ciFixHistory,
+                ciFixStatus,
                 _approvalAction: null,
                 _rejectionFeedback: null,
                 _needsReexecution: false,
             };
         }
         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)`);
-            // Record phase end even on failure so timing shows duration, not "running"
             await recordPhaseEnd(mergeTimingId, Date.now() - startTime);
-            // Re-throw so LangGraph does NOT checkpoint this node as completed.
             throw err;
         }
     };

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

@@ -13,6 +13,18 @@ import type { FeatureAgentState } from '../../state.js';
  * on state.push and state.openPr flags.
  */
 export declare function buildCommitPushPrPrompt(state: FeatureAgentState, branch: string, baseBranch: string): string;
+/**
+ * Build a prompt for the CI watch/fix agent call.
+ *
+ * Instructs the executor to diagnose CI failure logs, apply a targeted fix,
+ * commit with the prescribed conventional message format, and push to the branch.
+ *
+ * @param failureLogs - Truncated CI failure log output
+ * @param attemptNumber - 1-based current attempt number
+ * @param maxAttempts - Maximum allowed attempts
+ * @param branch - Feature branch name to push to after fixing
+ */
+export declare function buildCiWatchFixPrompt(failureLogs: string, attemptNumber: number, maxAttempts: number, branch: string): string;
 /**
  * Build a prompt for the merge/squash agent call.
  *

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;AAIH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAqCxD;;;;;GAKG;AACH,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,iBAAiB,EACxB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,GACjB,MAAM,CAyDR;AAED;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,iBAAiB,EACxB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,SAAS,UAAQ,GAChB,MAAM,CAkER"}
+{"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;AAIH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAqCxD;;;;;GAKG;AACH,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,iBAAiB,EACxB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,GACjB,MAAM,CAyDR;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,qBAAqB,CACnC,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,GACb,MAAM,CA0BR;AAED;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,iBAAiB,EACxB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,SAAS,UAAQ,GAChB,MAAM,CAkER"}

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

@@ -97,6 +97,44 @@ ${steps.join('\n')}
 - Do NOT amend existing commits
 - If there are no changes to commit, skip the commit step and report that no changes were found`;
 }
+/**
+ * Build a prompt for the CI watch/fix agent call.
+ *
+ * Instructs the executor to diagnose CI failure logs, apply a targeted fix,
+ * commit with the prescribed conventional message format, and push to the branch.
+ *
+ * @param failureLogs - Truncated CI failure log output
+ * @param attemptNumber - 1-based current attempt number
+ * @param maxAttempts - Maximum allowed attempts
+ * @param branch - Feature branch name to push to after fixing
+ */
+export function buildCiWatchFixPrompt(failureLogs, attemptNumber, maxAttempts, branch) {
+    return `You are fixing a CI failure on branch \`${branch}\` (attempt ${attemptNumber}/${maxAttempts}).
+
+## CI Failure Logs
+
+The following logs were retrieved from the failed GitHub Actions run:
+
+\`\`\`
+${failureLogs}
+\`\`\`
+
+## Instructions
+
+1. Analyze the CI failure logs above to diagnose the root cause
+2. Apply a targeted fix to resolve the failure — change only what is necessary
+3. Stage all changes: \`git add -A\`
+4. Commit with this exact conventional commit message format:
+   \`fix(ci): attempt ${attemptNumber}/${maxAttempts} — <short description of what you fixed>\`
+5. Push the fix to the branch: \`git push origin ${branch}\`
+
+## Constraints
+
+- Fix ONLY the issue(s) causing the CI failure — do not refactor unrelated code
+- The commit message MUST start with \`fix(ci): attempt ${attemptNumber}/${maxAttempts} — \`
+- Do NOT create a new branch — push directly to \`${branch}\`
+- If the failure is unclear, make your best diagnosis and explain your reasoning in the commit message`;
+}
 /**
  * Build a prompt for the merge/squash agent call.
  *

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

@@ -1,4 +1,4 @@
-import type { ApprovalGates } from '../../../../domain/generated/output.js';
+import type { ApprovalGates, CiFixRecord } from '../../../../domain/generated/output.js';
 /**
  * State annotation for the feature-agent graph.
  *
@@ -47,6 +47,9 @@ export declare const FeatureAgentAnnotation: import("@langchain/langgraph").Anno
     ciStatus: import("@langchain/langgraph").BinaryOperatorAggregate<string | null, string | null>;
     push: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
     openPr: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
+    ciFixAttempts: import("@langchain/langgraph").BinaryOperatorAggregate<number, number>;
+    ciFixHistory: import("@langchain/langgraph").BinaryOperatorAggregate<CiFixRecord[], CiFixRecord[]>;
+    ciFixStatus: import("@langchain/langgraph").BinaryOperatorAggregate<"success" | "timeout" | "idle" | "watching" | "fixing" | "exhausted", "success" | "timeout" | "idle" | "watching" | "fixing" | "exhausted">;
 }>;
 export type FeatureAgentState = typeof FeatureAgentAnnotation.State;
 //# sourceMappingURL=state.d.ts.map