@shepai/cli 1.122.1 → 1.122.2-pr381.7d9e407

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

@@ -98,66 +98,94 @@ export function createMergeNode(deps) {
                 : undefined;
             // --- Agent Call 1: Commit + Push + PR (skip on approval resume) ---
             if (!isResumeAfterInterrupt) {
-                if (!remoteAvailable) {
-                    log.info('No git remote configured — skipping push and PR, will merge locally');
-                }
                 const effectiveState = remoteAvailable ? state : { ...state, push: false, openPr: false };
-                log.info('Agent call 1: commit + push + PR');
-                const commitPushPrPrompt = buildCommitPushPrPrompt(effectiveState, branch, baseBranch, repoUrl);
-                const commitResult = await retryExecute(executor, commitPushPrPrompt, options, {
-                    logger: log,
-                });
-                totalInputTokens += commitResult.usage?.inputTokens ?? 0;
-                totalOutputTokens += commitResult.usage?.outputTokens ?? 0;
-                totalCostUsd += commitResult.usage?.costUsd ?? 0;
-                totalNumTurns += commitResult.usage?.numTurns ?? 0;
-                totalDurationApiMs += commitResult.usage?.durationApiMs ?? 0;
-                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;
-                        // Cross-validate agent-parsed PR URL against authoritative source.
-                        // The agent may hallucinate the repo URL or PR number, so we look up
-                        // the real PR for this branch via the GitHub API.
-                        try {
-                            const prStatuses = await deps.gitPrService.listPrStatuses(cwd);
-                            const matchingPr = prStatuses.find((pr) => pr.headRefName === branch);
-                            if (matchingPr) {
-                                prUrl = matchingPr.url;
-                                prNumber = matchingPr.number;
-                            }
+                const needsAgentCall = effectiveState.push || effectiveState.openPr;
+                if (!needsAgentCall) {
+                    // Local-only: commit programmatically in worktree, no agent needed.
+                    // This avoids calling the agent executor just to run git commit,
+                    // which is slow/unreliable on some platforms (e.g. cursor on Windows hangs).
+                    log.info('Local-only mode — committing in worktree programmatically (no agent)');
+                    const worktreeCwd = state.worktreePath ?? cwd;
+                    try {
+                        const msg = `feat: ${branch}`;
+                        const hash = await deps.commitAll(worktreeCwd, msg);
+                        if (hash) {
+                            commitHash = hash;
+                            log.info(`Committed changes in worktree: ${commitHash}`);
+                            messages.push(`[merge] Programmatic commit: ${commitHash}`);
                         }
-                        catch {
-                            // gh CLI unavailable or API failure — fall back to agent-parsed URL
+                        else {
+                            log.info('No changes to commit in worktree');
+                            messages.push(`[merge] No changes to commit`);
                         }
-                        messages.push(`[merge] PR created: ${prUrl}`);
+                    }
+                    catch (commitErr) {
+                        const errMsg = commitErr instanceof Error ? commitErr.message : String(commitErr);
+                        log.info(`Programmatic commit failed: ${errMsg} — falling back to agent`);
+                        messages.push(`[merge] Programmatic commit failed, falling back to agent`);
+                        // Fall through — needsAgentCall stays false so agent won't run either.
+                        // The localMergeSquash will handle uncommitted changes via --squash.
                     }
                 }
-                // --- CI watch/fix loop (when push or openPr is enabled and CI watch is not disabled) ---
-                const ciWatchEnabled = getSettings().workflow?.ciWatchEnabled !== false;
-                if (ciWatchEnabled && (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,
+                if (needsAgentCall) {
+                    if (!remoteAvailable) {
+                        log.info('No git remote configured — skipping push and PR, will merge locally');
+                    }
+                    log.info('Agent call 1: commit + push + PR');
+                    const commitPushPrPrompt = buildCommitPushPrPrompt(effectiveState, branch, baseBranch, repoUrl);
+                    const commitResult = await retryExecute(executor, commitPushPrPrompt, options, {
+                        logger: log,
                     });
-                    ciStatus = ciResult.ciStatus;
-                    ciFixAttempts = ciResult.ciFixAttempts;
-                    ciFixHistory = ciResult.ciFixHistory;
-                    ciFixStatus = ciResult.ciFixStatus;
+                    totalInputTokens += commitResult.usage?.inputTokens ?? 0;
+                    totalOutputTokens += commitResult.usage?.outputTokens ?? 0;
+                    totalCostUsd += commitResult.usage?.costUsd ?? 0;
+                    totalNumTurns += commitResult.usage?.numTurns ?? 0;
+                    totalDurationApiMs += commitResult.usage?.durationApiMs ?? 0;
+                    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;
+                            // Cross-validate agent-parsed PR URL against authoritative source.
+                            try {
+                                const prStatuses = await deps.gitPrService.listPrStatuses(cwd);
+                                const matchingPr = prStatuses.find((pr) => pr.headRefName === branch);
+                                if (matchingPr) {
+                                    prUrl = matchingPr.url;
+                                    prNumber = matchingPr.number;
+                                }
+                            }
+                            catch {
+                                // gh CLI unavailable or API failure — fall back to agent-parsed URL
+                            }
+                            messages.push(`[merge] PR created: ${prUrl}`);
+                        }
+                    }
+                    // --- CI watch/fix loop (when push or openPr is enabled and CI watch is not disabled) ---
+                    const ciWatchEnabled = getSettings().workflow?.ciWatchEnabled !== false;
+                    if (ciWatchEnabled && (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;
+                    }
                 }
                 // --- Persist lifecycle + PR data before approval gate ---
                 // Setting lifecycle to Review serves as the resume detection marker

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

@@ -32,7 +32,7 @@ export declare function getStageTimeoutMs(nodeName: string): number;
 /**
  * Build executor options with cwd. Each node gets a clean agent context.
  * The timeout is resolved per-stage from settings (workflow.stageTimeouts)
- * with a fallback to DEFAULT_STAGE_TIMEOUT_MS (10 min).
+ * with a fallback to DEFAULT_STAGE_TIMEOUT_MS (10 min per call, 30 min max with retries).
  *
  * When no `nodeName` is provided, the current node from state is used.
  */

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

@@ -46,7 +46,7 @@ export function readSpecFile(specDir, filename) {
     }
 }
 /** Default timeout per agent call (30 minutes) — prevents infinite hangs. */
-const DEFAULT_STAGE_TIMEOUT_MS = 1_800_000;
+const DEFAULT_STAGE_TIMEOUT_MS = 600_000; // 10 minutes per agent call (retryExecute retries 3x, so 30min max per phase)
 /**
  * Map from node name to the corresponding StageTimeouts field.
  * `fast-implement` reuses the implement timeout; `evidence` also reuses implement.
@@ -80,7 +80,7 @@ export function getStageTimeoutMs(nodeName) {
 /**
  * Build executor options with cwd. Each node gets a clean agent context.
  * The timeout is resolved per-stage from settings (workflow.stageTimeouts)
- * with a fallback to DEFAULT_STAGE_TIMEOUT_MS (10 min).
+ * with a fallback to DEFAULT_STAGE_TIMEOUT_MS (10 min per call, 30 min max with retries).
  *
  * When no `nodeName` is provided, the current node from state is used.
  */

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

@@ -6,7 +6,13 @@ type SchemaValidator = (data: unknown) => ValidationResult;
  *
  * On success: resets validationRetries to 0, clears errors.
  * On failure: increments validationRetries, sets errors for repair node.
+ *
+ * @param successorPhase - The phase that runs AFTER this validation passes.
+ *   If provided, skip validation when the successor is already completed — this
+ *   proves the validation already passed in a prior run and the pipeline progressed
+ *   beyond it. Checking the successor (not the producer) avoids skipping validation
+ *   when the producer ran but validation itself failed.
  */
-export declare function createValidateNode(filename: string, schema: SchemaValidator): (state: FeatureAgentState) => Promise<Partial<FeatureAgentState>>;
+export declare function createValidateNode(filename: string, schema: SchemaValidator, successorPhase?: string): (state: FeatureAgentState) => Promise<Partial<FeatureAgentState>>;
 export {};
 //# sourceMappingURL=validate.node.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"validate.node.d.ts","sourceRoot":"","sources":["../../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/nodes/validate.node.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAGhE,KAAK,eAAe,GAAG,CAAC,IAAI,EAAE,OAAO,KAAK,gBAAgB,CAAC;AAE3D;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,eAAe,GACtB,CAAC,KAAK,EAAE,iBAAiB,KAAK,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAuDnE"}
+{"version":3,"file":"validate.node.d.ts","sourceRoot":"","sources":["../../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/nodes/validate.node.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAQhE,KAAK,eAAe,GAAG,CAAC,IAAI,EAAE,OAAO,KAAK,gBAAgB,CAAC;AAE3D;;;;;;;;;;;GAWG;AACH,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,eAAe,EACvB,cAAc,CAAC,EAAE,MAAM,GACtB,CAAC,KAAK,EAAE,iBAAiB,KAAK,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAyEnE"}

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

@@ -1,14 +1,36 @@
-import { readSpecFile, safeYamlLoad, createNodeLogger } from './node-helpers.js';
+import { readSpecFile, safeYamlLoad, createNodeLogger, getCompletedPhases, } from './node-helpers.js';
 /**
  * Factory that creates a validate node for a specific YAML file.
  *
  * On success: resets validationRetries to 0, clears errors.
  * On failure: increments validationRetries, sets errors for repair node.
+ *
+ * @param successorPhase - The phase that runs AFTER this validation passes.
+ *   If provided, skip validation when the successor is already completed — this
+ *   proves the validation already passed in a prior run and the pipeline progressed
+ *   beyond it. Checking the successor (not the producer) avoids skipping validation
+ *   when the producer ran but validation itself failed.
  */
-export function createValidateNode(filename, schema) {
+export function createValidateNode(filename, schema, successorPhase) {
     const log = createNodeLogger(`validate:${filename}`);
     return async (state) => {
         log.activate();
+        // Skip validation when the successor phase is already completed.
+        // This means: the validation already passed in a prior run AND the next phase
+        // ran successfully. On resume, LangGraph replays nodes from the last checkpoint.
+        // The producer node skips (via getCompletedPhases), but if we only checked the
+        // producer we'd also skip validation when it previously FAILED (since
+        // markPhaseComplete runs before validation). Checking the successor is safe:
+        // if the successor completed, this validation must have passed to get there.
+        if (successorPhase && getCompletedPhases(state.specDir).includes(successorPhase)) {
+            log.info(`Successor phase '${successorPhase}' already completed, skipping validation`);
+            return {
+                lastValidationTarget: filename,
+                lastValidationErrors: [],
+                validationRetries: 0,
+                messages: [`[validate:${filename}] SKIP (successor '${successorPhase}' already completed)`],
+            };
+        }
         log.info(`Validating ${filename}`);
         const content = readSpecFile(state.specDir, filename);
         if (!content) {