@urateam/core 0.1.54 → 0.1.56

package/dist/pipeline/runner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../src/pipeline/runner.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../src/pipeline/runner.ts"],"names":[],"mappings":"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"}

package/dist/pipeline/runner.js

@@ -1,3 +1,4 @@
+import { ResumePayloadSchema } from "../types.js"; // value import — cannot be `import type`
 import { pipelineRuns, stageRuns, reviewModelRuns } from "../db/schema.js";
 import { formatPRCostSummary, } from "./cost-summary.js";
 import { executeStage } from "../executor/executor.js";
@@ -16,7 +17,7 @@ import { DEFAULT_AGENT_CLAUDE_MD } from "../executor/agent-config.js";
 import { generatePRDescription } from "./pr-description.js";
 import { maybePostChangeSummary } from "./pr-change-summary.js";
 import { access, writeFile, appendFile } from "node:fs/promises";
-import { join, resolve } from "node:path";
+import { join, resolve, sep } from "node:path";
 import { homedir } from "node:os";
 import { execFile as execFileCb } from "node:child_process";
 import { promisify } from "node:util";
@@ -48,12 +49,30 @@ import { runTypecheck } from "./typecheck-gate.js";
 import { checkSpecVsImpl } from "./spec-vs-impl-gate.js";
 import { countNewPublicExports, shouldAutoDeepReview, DEFAULT_AUTO_DEEP_REVIEW_THRESHOLDS, } from "./auto-deep-review.js";
 import { startFeedbackPipeline, } from "./feedback-pipeline.js";
+import { runSurgicalReviewFix } from "./run-surgical-review-fix.js";
 // Re-export from extracted module so existing callers (including tests) still
 // find buildReviewFeedbackContext at pipeline/runner.js without changing their
 // import paths.
 export { buildReviewFeedbackContext } from "./feedback-pipeline.js";
 // Module-level logger (no runId yet — used for pre-run messages)
 const log = createLogger({ component: "PipelineRunner" });
+/**
+ * Serialise a resume payload to the JSON string stored in
+ * `pipeline_runs.resume_payload`.  Both the await-approval pause path and the
+ * transient-failure retry path use this helper so their serialization stays in
+ * sync with `ResumePayloadSchema` — a single place to update if the schema
+ * evolves.
+ */
+function buildResumePayload(handoff, pipelineConfig, repoConfig, sanitizedIssue, worktreePath, currentStageIndex) {
+    return JSON.stringify({
+        handoff,
+        pipelineConfig,
+        repoConfig,
+        sanitizedIssue,
+        worktreePath,
+        currentStageIndex,
+    });
+}
 export class PipelineRunner {
     queue;
     /** Push queue: concurrency=1 serialises push+PR creation within this process.
@@ -181,15 +200,16 @@ export class PipelineRunner {
                 .where(eq(pipelineRuns.id, existingRunId));
             return;
         }
-        // Look up a paused run in the DB for this issue
+        // Look up a paused or retriable run in the DB for this issue.
+        // "paused" = awaiting approval; "retriable" = transient failure awaiting manual retry.
         const db = this.db;
         const rows = await db
             .select()
             .from(pipelineRuns)
-            .where(and(eq(pipelineRuns.issueId, issueId), eq(pipelineRuns.status, "paused")))
+            .where(and(eq(pipelineRuns.issueId, issueId), inArray(pipelineRuns.status, ["paused", "retriable"])))
             .limit(1);
         if (rows.length === 0) {
-            resumeLog.info("resume() called but no paused run found in DB — no-op");
+            resumeLog.info("resume() called but no paused or retriable run found in DB — no-op");
             return;
         }
         const pausedRun = rows[0];
@@ -197,6 +217,15 @@ export class PipelineRunner {
         const runLog = createLogger({ component: "PipelineRunner", runId, issueId });
         // Claim the slot immediately to prevent concurrent resume() calls
         this.activeRuns.set(issueId, runId);
+        // For retriable runs: flip status to "paused" so the PM tick's
+        // recoverRetriableRuns() won't find and double-recover this run while
+        // execution is queued. The paused-run execution path is identical.
+        if (pausedRun.status === "retriable") {
+            await db
+                .update(pipelineRuns)
+                .set({ status: "paused" })
+                .where(eq(pipelineRuns.id, runId));
+        }
         // Validate that the run has a full resume payload (saved at await-approval)
         if (pausedRun.currentStageIndex == null || !pausedRun.resumePayload) {
             runLog.error("resume payload missing — cannot resume pipeline; marking as failed");
@@ -211,9 +240,22 @@ export class PipelineRunner {
             this.activeRuns.delete(issueId);
             return;
         }
-        let payload;
+        // Parse and validate the resume payload using the Zod schema.
+        // This replaces the former hand-rolled property-existence checks and catches
+        // schema mismatches from older DB rows (e.g. missing handoff, wrong types)
+        // before any git or executor operations run.
+        //
+        // BC: paused runs created before currentStageIndex was added to the payload
+        // schema (BEC-192) only have it on the DB row. Inject it from the DB column
+        // so those existing in-flight runs don't get falsely failed on first resume
+        // after deploy.
+        let parsed;
         try {
-            payload = JSON.parse(pausedRun.resumePayload);
+            const raw = JSON.parse(pausedRun.resumePayload);
+            if (raw.currentStageIndex === undefined && pausedRun.currentStageIndex != null) {
+                raw.currentStageIndex = pausedRun.currentStageIndex;
+            }
+            parsed = ResumePayloadSchema.safeParse(raw);
         }
         catch {
             runLog.error("resume payload is invalid JSON — failing run");
@@ -228,26 +270,33 @@ export class PipelineRunner {
             this.activeRuns.delete(issueId);
             return;
         }
-        const { handoff, pipelineConfig, repoConfig, sanitizedIssue, worktreePath } = payload;
-        // Structural validation of deserialized payload
-        if (typeof worktreePath !== "string" ||
-            !pipelineConfig?.stages ||
-            !sanitizedIssue?.id) {
-            runLog.error("resume payload has invalid structure — failing run");
+        if (!parsed.success) {
+            const zodErrors = parsed.error.issues
+                .map((e) => `${e.path.join(".") || "(root)"}: ${e.message}`)
+                .join("; ");
+            runLog.error({ zodErrors }, "resume payload failed schema validation — failing run");
             await db
                 .update(pipelineRuns)
                 .set({
                 status: "failed",
                 completedAt: new Date(),
-                errorMessage: "Invalid resume payload structure — cannot resume",
+                errorMessage: `Invalid resume payload structure — cannot resume: ${zodErrors}`,
             })
                 .where(eq(pipelineRuns.id, runId));
             this.activeRuns.delete(issueId);
             return;
         }
-        // Path containment check — worktreePath must be within agentRunDir
+        const { handoff, pipelineConfig, repoConfig, sanitizedIssue, worktreePath, currentStageIndex } = parsed.data;
+        // Path containment check — worktreePath must be within agentRunDir.
+        // We append sep to agentRunDir before the startsWith check so that a
+        // crafted path like /home/ura/data/runs-evil cannot slip past as a prefix match
+        // of /home/ura/data/runs.  An exact match (resolvedPath === this.agentRunDir)
+        // is also accepted for symmetry, even though real worktrees are always subdirs.
         const resolvedPath = resolve(worktreePath); // canonicalize — collapses .. segments
-        if (!resolvedPath.startsWith(this.agentRunDir)) {
+        const normalizedBase = this.agentRunDir.endsWith(sep)
+            ? this.agentRunDir
+            : this.agentRunDir + sep;
+        if (!resolvedPath.startsWith(normalizedBase) && resolvedPath !== this.agentRunDir) {
             runLog.error({ worktreePath, agentRunDir: this.agentRunDir }, "resume: worktreePath outside agentRunDir — failing run");
             await db
                 .update(pipelineRuns)
@@ -306,13 +355,13 @@ export class PipelineRunner {
             this.activeRuns.delete(issueId);
             return;
         }
-        runLog.info({ stageIndex: pausedRun.currentStageIndex, worktreePath }, "resuming pipeline — re-queuing execution from stage after await-approval");
+        runLog.info({ stageIndex: currentStageIndex, worktreePath }, "resuming pipeline — re-queuing execution from stage after await-approval");
         this.queue.enqueue(async () => {
             if (!this.activeRuns.has(issueId))
                 return;
             try {
                 await runWithLogContext({ runId, issueId }, () => this.executePipeline(runId, run, pipelineConfig, repoConfig, sanitizedIssue, pausedRun.branch, {
-                    startStageIndex: pausedRun.currentStageIndex,
+                    startStageIndex: currentStageIndex,
                     worktreePath,
                     initialHandoff: handoff ?? undefined,
                     // BEC-227 — carry the per-run SDK session id across the
@@ -672,13 +721,7 @@ export class PipelineRunner {
                     // Save the full resume context so resume() can re-attach the worktree
                     // and continue from the next stage with the correct handoff artifact.
                     const stageIndex = config.stages.indexOf(stage);
-                    const resumePayload = JSON.stringify({
-                        handoff: handoff ?? null,
-                        pipelineConfig: config,
-                        repoConfig,
-                        sanitizedIssue,
-                        worktreePath: worktreePath,
-                    });
+                    const resumePayload = buildResumePayload(handoff ?? null, config, repoConfig, sanitizedIssue, worktreePath, stageIndex);
                     await db
                         .update(pipelineRuns)
                         .set({
@@ -820,6 +863,11 @@ export class PipelineRunner {
                             agentSessionId: runAgentSessionId,
                             isFirstResumableStage: isFirstResumableStageForRalph,
                             suppressHandoff: suppressRalphHandoff,
+                            // BEC-227 Phase 4 / Track D — RALPH iteration counter (1..N)
+                            // surfaces in pipeline_run_decisions.iteration so operators
+                            // can correlate persisted decisions with the RALPH loop pass
+                            // that produced them.
+                            iteration,
                         });
                         // Accumulate each RALPH iteration's tokens
                         run.totalInputTokens += result.inputTokens;
@@ -933,6 +981,11 @@ export class PipelineRunner {
                     const validation = await validateHandoff(stage, {
                         artifact: result.handoffArtifact,
                         structured: result.handoffIsStructured ?? false,
+                        // BEC-227 Phase 4 / Track D — validator doesn't consume the
+                        // decisions artifact (Track B's review-fix loop does). The
+                        // executor already persisted it before returning; we don't
+                        // need to thread it through validateHandoff.
+                        decisions: null,
                     }, sanitizedIssue, repoConfig, worktreePath, mainStageRunMode);
                     validationPassed = validation.valid;
                     let lastValidationIssues = validation.issues;
@@ -971,6 +1024,8 @@ export class PipelineRunner {
                                     const retryValidation = await validateHandoff(stage, {
                                         artifact: result.handoffArtifact,
                                         structured: result.handoffIsStructured ?? false,
+                                        // BEC-227 Phase 4 / Track D — see main-stage call above.
+                                        decisions: null,
                                     }, sanitizedIssue, repoConfig, worktreePath, valRetryRunMode);
                                     if (retryValidation.valid) {
                                         validationPassed = true;
@@ -1070,6 +1125,32 @@ export class PipelineRunner {
                     runLog.info({ rfIteration, maxIterations: reviewFixIterations, blockingFindings: blockingCount }, "review-fix loop: re-running stages to address blocking findings");
                     for (const fixStage of fixStages) {
                         runLog.info({ stage: fixStage, rfIteration }, "review-fix: executing stage");
+                        // BEC-227 Phase 4 / Track B — for the implement fixStage, decide
+                        // surgical vs legacy review-fix. Surgical = the per-run SDK session
+                        // is intact (JSONL on disk) so we can send a focused
+                        // findings-plus-prior-decisions prompt instead of re-running the
+                        // full implement template. The audit event fires inside
+                        // runSurgicalReviewFix for BOTH paths so operators can monitor
+                        // fallback rates.
+                        let surgicalPrompt;
+                        let surgicalSuppressHandoff = false;
+                        if (fixStage === "implement") {
+                            const blocking = (handoff?.context?.reviewFindings ?? []).filter((f) => f.severity === "blocking");
+                            if (blocking.length > 0) {
+                                const decision = await runSurgicalReviewFix({
+                                    db: this.db,
+                                    runId,
+                                    issueId: sanitizedIssue.id,
+                                    agentSessionId: runAgentSessionId,
+                                    worktreePath,
+                                    blockingFindings: blocking,
+                                });
+                                if (decision.path === "surgical") {
+                                    surgicalPrompt = decision.prompt;
+                                    surgicalSuppressHandoff = true;
+                                }
+                            }
+                        }
                         const isFirstResumableStageForFix = claimFirstResumableStage(fixStage);
                         const fixResult = await executeStage({
                             runId,
@@ -1085,6 +1166,16 @@ export class PipelineRunner {
                             stageModels: config.stageModels,
                             agentSessionId: runAgentSessionId,
                             isFirstResumableStage: isFirstResumableStageForFix,
+                            // BEC-227 Phase 4 / Track D — review-fix iteration counter
+                            // (1..N) for the implement fixStage's decision artifact. Other
+                            // fixStages (test/review) don't emit decisions, so the value
+                            // is harmless when unused.
+                            iteration: rfIteration,
+                            // BEC-227 Phase 4 / Track B — undefined when the surgical
+                            // decision returned `legacy` (or fixStage !== "implement"),
+                            // which preserves the legacy assembled-prompt path.
+                            promptOverride: surgicalPrompt,
+                            suppressHandoff: surgicalSuppressHandoff,
                         });
                         // BEC-134: track latest review stage_run id for fanout persistence.
                         if (fixStage === "review") {
@@ -1118,7 +1209,12 @@ export class PipelineRunner {
                                 : isFirstResumableStageForFix
                                     ? "first-resumed"
                                     : "resumed";
-                            const validation = await validateHandoff(fixStage, { artifact: fixResult.handoffArtifact, structured: fixResult.handoffIsStructured ?? false }, sanitizedIssue, repoConfig, worktreePath, fixStageRunMode);
+                            const validation = await validateHandoff(fixStage, {
+                                artifact: fixResult.handoffArtifact,
+                                structured: fixResult.handoffIsStructured ?? false,
+                                // BEC-227 Phase 4 / Track D — see main-stage call above.
+                                decisions: null,
+                            }, sanitizedIssue, repoConfig, worktreePath, fixStageRunMode);
                             if (!validation.valid) {
                                 runLog.warn({ stage: fixStage, rfIteration, issues: validation.issues }, "review-fix: handoff validation failed");
                             }
@@ -1716,6 +1812,11 @@ export class PipelineRunner {
                         }
                         else {
                             runLog.warn("push queue: rebase conflicts detected, running implement pass to resolve");
+                            // Abort the in-progress rebase so the worktree HEAD returns to the
+                            // named branch ref before the agent starts writing new commits.
+                            // Without this, HEAD stays detached on the tentative rebase commit
+                            // and verifyBranchMatch() (BEC-99 guard) will reject the push.
+                            await abortRebase(wtPath);
                             const isFirstResumableStageForResolve = claimFirstResumableStage("implement");
                             const resolveResult = await executeStage({
                                 runId,
@@ -1736,8 +1837,7 @@ export class PipelineRunner {
                             run.totalInputTokens += resolveResult.inputTokens;
                             run.totalOutputTokens += resolveResult.outputTokens;
                             if (resolveResult.status !== "completed") {
-                                runLog.warn("push queue: conflict resolution failed — aborting rebase and force-pushing for human review");
-                                await abortRebase(wtPath);
+                                runLog.warn("push queue: conflict resolution failed — force-pushing for human review");
                                 rebaseConflict = true;
                             }
                             else {
@@ -1769,9 +1869,11 @@ export class PipelineRunner {
                     const [qualityResult, agentCommits] = await Promise.all([
                         (async () => {
                             try {
-                                const stored = await getTriageResult(this.db, sanitizedIssue.id);
+                                const [stored, actualFiles] = await Promise.all([
+                                    getTriageResult(this.db, sanitizedIssue.id),
+                                    getChangedFiles(wtPath, repoConfig.defaultBranch),
+                                ]);
                                 const predicted = stored?.affectedFiles;
-                                const actualFiles = await getChangedFiles(wtPath, repoConfig.defaultBranch);
                                 const quality = computeAffectedFilesPredictionQuality(predicted, actualFiles);
                                 await logAuditEvent(this.db, pmTriageQualityScoreEvent({
                                     runId,
@@ -2437,13 +2539,6 @@ export class PipelineRunner {
             context.pipelineConfig &&
             context.repoConfig &&
             context.sanitizedIssue) {
-            const resumePayload = JSON.stringify({
-                handoff: context.handoff ?? null,
-                pipelineConfig: context.pipelineConfig,
-                repoConfig: context.repoConfig,
-                sanitizedIssue: context.sanitizedIssue,
-                worktreePath: context.worktreePath,
-            });
             // Store currentStageIndex - 1 so the existing resume path's
             // `slice(startStageIndex + 1)` lands back on the failed stage.
             // (await-approval stores the completed stage index; we need to re-run the failed one.)
@@ -2451,6 +2546,7 @@ export class PipelineRunner {
             // re-runs the full stage list. The await-approval path stores the completed
             // stage index; we store failedIndex - 1 so the same +1 offset re-runs the failed stage.
             const resumeStageIndex = (context.currentStageIndex ?? 0) - 1;
+            const resumePayload = buildResumePayload(context.handoff ?? null, context.pipelineConfig, context.repoConfig, context.sanitizedIssue, context.worktreePath, resumeStageIndex);
             await db
                 .update(pipelineRuns)
                 .set({