@redwoodjs/agent-ci 0.7.1 → 0.8.0

package/dist/cli.js

@@ -2,18 +2,20 @@
 import { execSync } from "child_process";
 import path from "path";
 import fs from "fs";
-import { config, loadMachineSecrets } from "./config.js";
+import { config, loadMachineSecrets, resolveRepoSlug } from "./config.js";
 import { getNextLogNum } from "./output/logger.js";
 import { setWorkingDirectory, DEFAULT_WORKING_DIR, PROJECT_ROOT, } from "./output/working-directory.js";
 import { debugCli } from "./output/debug.js";
 import { executeLocalJob } from "./runner/local-job.js";
-import { getWorkflowTemplate, parseWorkflowSteps, parseWorkflowServices, parseWorkflowContainer, validateSecrets, parseMatrixDef, expandMatrixCombinations, collapseMatrixToSingle, isWorkflowRelevant, getChangedFiles, parseJobOutputDefs, parseJobIf, evaluateJobIf, parseFailFast, } from "./workflow/workflow-parser.js";
+import { parseWorkflowSteps, parseWorkflowServices, parseWorkflowContainer, validateSecrets, parseMatrixDef, expandMatrixCombinations, collapseMatrixToSingle, isWorkflowRelevant, getChangedFiles, parseJobOutputDefs, parseJobIf, evaluateJobIf, parseFailFast, expandExpressions, } from "./workflow/workflow-parser.js";
 import { resolveJobOutputs } from "./runner/result-builder.js";
 import { createConcurrencyLimiter, getDefaultMaxConcurrentJobs } from "./output/concurrency.js";
 import { isWarmNodeModules, computeLockfileHash } from "./output/cleanup.js";
 import { getWorkingDirectory } from "./output/working-directory.js";
 import { pruneOrphanedDockerResources } from "./docker/shutdown.js";
-import { parseJobDependencies, topoSort } from "./workflow/job-scheduler.js";
+import { topoSort } from "./workflow/job-scheduler.js";
+import { expandReusableJobs } from "./workflow/reusable-workflow.js";
+import { prefetchRemoteWorkflows } from "./workflow/remote-workflow-fetch.js";
 import { printSummary } from "./output/reporter.js";
 import { syncWorkspaceForRetry } from "./runner/sync.js";
 import { RunStateStore } from "./output/run-state.js";
@@ -351,7 +353,8 @@ async function runWorkflows(options) {
             // Multiple workflows (--all mode)
             // Determine warm-cache status from the first workflow's repo root
             const firstRepoRoot = resolveRepoRootFromWorkflow(workflowPaths[0]);
-            const repoSlug = resolveRepoInfo(firstRepoRoot).replace("/", "-");
+            config.GITHUB_REPO ?? (config.GITHUB_REPO = resolveRepoSlug(firstRepoRoot));
+            const repoSlug = config.GITHUB_REPO.replace("/", "-");
             let lockfileHash = "no-lockfile";
             try {
                 lockfileHash = computeLockfileHash(firstRepoRoot);
@@ -437,307 +440,424 @@ async function runWorkflows(options) {
 async function handleWorkflow(options) {
     const { sha, pauseOnFailure, noMatrix = false, store } = options;
     let workflowPath = options.workflowPath;
-    try {
-        if (!fs.existsSync(workflowPath)) {
-            throw new Error(`Workflow file not found: ${workflowPath}`);
-        }
-        const repoRoot = resolveRepoRootFromWorkflow(workflowPath);
-        if (!process.env.AGENT_CI_WORKING_DIR) {
-            setWorkingDirectory(DEFAULT_WORKING_DIR);
-        }
-        const { headSha, shaRef } = sha
-            ? resolveHeadSha(repoRoot, sha)
-            : { headSha: undefined, shaRef: undefined };
-        const githubRepo = resolveRepoInfo(repoRoot);
-        const [owner, name] = githubRepo.split("/");
-        const template = await getWorkflowTemplate(workflowPath);
-        const jobs = template.jobs.filter((j) => j.type === "job");
-        if (jobs.length === 0) {
-            debugCli(`[Agent CI] No jobs found in workflow: ${path.basename(workflowPath)}`);
-            return [];
-        }
-        const expandedJobs = [];
-        for (const job of jobs) {
-            const id = job.id.toString();
-            const matrixDef = await parseMatrixDef(workflowPath, id);
-            if (matrixDef) {
-                const combos = noMatrix
-                    ? collapseMatrixToSingle(matrixDef)
-                    : expandMatrixCombinations(matrixDef);
-                const total = combos.length;
-                for (let ci = 0; ci < combos.length; ci++) {
-                    expandedJobs.push({
-                        workflowPath,
-                        taskName: id,
-                        matrixContext: noMatrix
-                            ? combos[ci]
-                            : {
-                                ...combos[ci],
-                                __job_total: String(total),
-                                __job_index: String(ci),
-                            },
-                    });
-                }
+    if (!fs.existsSync(workflowPath)) {
+        throw new Error(`Workflow file not found: ${workflowPath}`);
+    }
+    const repoRoot = resolveRepoRootFromWorkflow(workflowPath);
+    if (!process.env.AGENT_CI_WORKING_DIR) {
+        setWorkingDirectory(DEFAULT_WORKING_DIR);
+    }
+    const { headSha, shaRef } = sha
+        ? resolveHeadSha(repoRoot, sha)
+        : { headSha: undefined, shaRef: undefined };
+    // Always resolve the real HEAD SHA for the push event context (before/after).
+    // This is separate from headSha which may be undefined for dirty workspace copies.
+    const realHeadSha = headSha ?? resolveHeadSha(repoRoot, "HEAD").headSha;
+    const baseSha = resolveBaseSha(repoRoot, realHeadSha);
+    const githubRepo = config.GITHUB_REPO ?? resolveRepoSlug(repoRoot);
+    config.GITHUB_REPO = githubRepo;
+    const [owner, name] = githubRepo.split("/");
+    const remoteCacheDir = path.resolve(getWorkingDirectory(), "cache", "remote-workflows");
+    const remoteCache = await prefetchRemoteWorkflows(workflowPath, remoteCacheDir);
+    const expandedEntries = expandReusableJobs(workflowPath, repoRoot, remoteCache);
+    if (expandedEntries.length === 0) {
+        debugCli(`[Agent CI] No jobs found in workflow: ${path.basename(workflowPath)}`);
+        return [];
+    }
+    const expandedJobs = [];
+    for (const entry of expandedEntries) {
+        const matrixDef = await parseMatrixDef(entry.workflowPath, entry.sourceTaskName);
+        if (matrixDef) {
+            const combos = noMatrix
+                ? collapseMatrixToSingle(matrixDef)
+                : expandMatrixCombinations(matrixDef);
+            const total = combos.length;
+            for (let ci = 0; ci < combos.length; ci++) {
+                expandedJobs.push({
+                    workflowPath: entry.workflowPath,
+                    taskName: entry.id,
+                    sourceTaskName: entry.sourceTaskName,
+                    matrixContext: noMatrix
+                        ? combos[ci]
+                        : {
+                            ...combos[ci],
+                            __job_total: String(total),
+                            __job_index: String(ci),
+                        },
+                    inputs: entry.inputs,
+                    inputDefaults: entry.inputDefaults,
+                    workflowCallOutputDefs: entry.workflowCallOutputDefs,
+                    callerJobId: entry.callerJobId,
+                });
             }
-            else {
-                expandedJobs.push({ workflowPath, taskName: id });
-            }
-        }
-        // For single-job workflows, run directly without extra orchestration
-        if (expandedJobs.length === 1) {
-            const ej = expandedJobs[0];
-            const secrets = loadMachineSecrets(repoRoot);
-            const secretsFilePath = path.join(repoRoot, ".env.agent-ci");
-            validateSecrets(workflowPath, ej.taskName, secrets, secretsFilePath);
-            const steps = await parseWorkflowSteps(workflowPath, ej.taskName, secrets, ej.matrixContext);
-            const services = await parseWorkflowServices(workflowPath, ej.taskName);
-            const container = await parseWorkflowContainer(workflowPath, ej.taskName);
-            const job = {
-                deliveryId: `run-${Date.now()}`,
-                eventType: "workflow_job",
-                githubJobId: `local-${Date.now()}-${Math.floor(Math.random() * 100000)}`,
-                githubRepo: githubRepo,
-                githubToken: "mock_token",
-                headSha: headSha,
-                shaRef: shaRef,
-                env: { AGENT_CI_LOCAL: "true" },
-                repository: {
-                    name: name,
-                    full_name: githubRepo,
-                    owner: { login: owner },
-                    default_branch: "main",
-                },
-                steps,
-                services,
-                container: container ?? undefined,
-                workflowPath,
-                taskId: ej.taskName,
-            };
-            const result = await executeLocalJob(job, { pauseOnFailure, store });
-            return [result];
-        }
-        // ── Multi-job orchestration ────────────────────────────────────────────────
-        const maxJobs = getDefaultMaxConcurrentJobs();
-        // ── Warm-cache check ───────────────────────────────────────────────────────
-        const repoSlug = githubRepo.replace("/", "-");
-        let lockfileHash = "no-lockfile";
-        try {
-            lockfileHash = computeLockfileHash(repoRoot);
-        }
-        catch { }
-        const warmModulesDir = path.resolve(getWorkingDirectory(), "cache", "warm-modules", repoSlug, lockfileHash);
-        let warm = isWarmNodeModules(warmModulesDir);
-        // Naming convention: agent-ci-<N>[-j<idx>][-m<shardIdx>]
-        const baseRunNum = options.baseRunNum ?? getNextLogNum("agent-ci");
-        let globalIdx = 0;
-        const buildJob = (ej) => {
-            const secrets = loadMachineSecrets(repoRoot);
-            const secretsFilePath = path.join(repoRoot, ".env.agent-ci");
-            validateSecrets(workflowPath, ej.taskName, secrets, secretsFilePath);
-            const idx = globalIdx++;
-            let suffix = `-j${idx + 1}`;
-            if (ej.matrixContext) {
-                const shardIdx = parseInt(ej.matrixContext.__job_index ?? "0", 10) + 1;
-                suffix += `-m${shardIdx}`;
-            }
-            const derivedRunnerName = `agent-ci-${baseRunNum}${suffix}`;
-            return {
-                deliveryId: `run-${Date.now()}`,
-                eventType: "workflow_job",
-                githubJobId: Math.floor(Math.random() * 1000000).toString(),
-                githubRepo: githubRepo,
-                githubToken: "mock_token",
-                headSha: headSha,
-                shaRef: shaRef,
-                env: { AGENT_CI_LOCAL: "true" },
-                repository: {
-                    name: name,
-                    full_name: githubRepo,
-                    owner: { login: owner },
-                    default_branch: "main",
-                },
-                runnerName: derivedRunnerName,
-                steps: undefined,
-                services: undefined,
-                container: undefined,
-                workflowPath,
-                taskId: ej.taskName,
-            };
-        };
-        const runJob = async (ej, needsContext) => {
-            const { taskName, matrixContext } = ej;
-            debugCli(`Running: ${path.basename(workflowPath)} | Task: ${taskName}${matrixContext ? ` | Matrix: ${JSON.stringify(Object.fromEntries(Object.entries(matrixContext).filter(([k]) => !k.startsWith("__"))))}` : ""}`);
-            const secrets = loadMachineSecrets(repoRoot);
-            const secretsFilePath = path.join(repoRoot, ".env.agent-ci");
-            validateSecrets(workflowPath, taskName, secrets, secretsFilePath);
-            const steps = await parseWorkflowSteps(workflowPath, taskName, secrets, matrixContext, needsContext);
-            const services = await parseWorkflowServices(workflowPath, taskName);
-            const container = await parseWorkflowContainer(workflowPath, taskName);
-            const job = buildJob(ej);
-            job.steps = steps;
-            job.services = services;
-            job.container = container ?? undefined;
-            const result = await executeLocalJob(job, { pauseOnFailure, store });
-            // result.outputs now contains raw step outputs (extracted inside executeLocalJob
-            // before workspace cleanup). Resolve them to job-level outputs using the
-            // output definitions from the workflow YAML.
-            if (result.outputs && Object.keys(result.outputs).length > 0) {
-                const outputDefs = parseJobOutputDefs(workflowPath, taskName);
-                if (Object.keys(outputDefs).length > 0) {
-                    result.outputs = resolveJobOutputs(outputDefs, result.outputs);
+        }
+        else {
+            expandedJobs.push({
+                workflowPath: entry.workflowPath,
+                taskName: entry.id,
+                sourceTaskName: entry.sourceTaskName,
+                inputs: entry.inputs,
+                inputDefaults: entry.inputDefaults,
+                workflowCallOutputDefs: entry.workflowCallOutputDefs,
+                callerJobId: entry.callerJobId,
+            });
+        }
+    }
+    // For single-job workflows, run directly without extra orchestration
+    if (expandedJobs.length === 1) {
+        const ej = expandedJobs[0];
+        const actualTaskName = ej.sourceTaskName ?? ej.taskName;
+        const secrets = loadMachineSecrets(repoRoot);
+        const secretsFilePath = path.join(repoRoot, ".env.agent-ci");
+        validateSecrets(ej.workflowPath, actualTaskName, secrets, secretsFilePath);
+        // Resolve inputs for called workflow jobs
+        let inputsContext;
+        if (ej.callerJobId) {
+            inputsContext = { ...ej.inputDefaults };
+            if (ej.inputs) {
+                for (const [k, v] of Object.entries(ej.inputs)) {
+                    inputsContext[k] = expandExpressions(v, repoRoot, secrets);
                 }
             }
-            return result;
-        };
-        pruneOrphanedDockerResources();
-        const limiter = createConcurrencyLimiter(maxJobs);
-        const allResults = [];
-        // Accumulate job outputs across waves for needs.*.outputs.* resolution
-        const jobOutputs = new Map();
-        // ── Dependency-aware wave scheduling ──────────────────────────────────────
-        const deps = parseJobDependencies(workflowPath);
-        const waves = topoSort(deps);
-        const taskNamesInWf = new Set(expandedJobs.map((j) => j.taskName));
-        const filteredWaves = waves
-            .map((wave) => wave.filter((jobId) => taskNamesInWf.has(jobId)))
-            .filter((wave) => wave.length > 0);
-        if (filteredWaves.length === 0) {
-            filteredWaves.push(Array.from(taskNamesInWf));
-        }
-        /** Build a needsContext for a job from its dependencies' accumulated outputs */
-        const buildNeedsContext = (jobId) => {
-            const jobDeps = deps.get(jobId);
-            if (!jobDeps || jobDeps.length === 0) {
-                return undefined;
-            }
-            const ctx = {};
-            for (const depId of jobDeps) {
-                ctx[depId] = jobOutputs.get(depId) ?? {};
+            if (Object.keys(inputsContext).length === 0) {
+                inputsContext = undefined;
             }
-            return ctx;
+        }
+        const steps = await parseWorkflowSteps(ej.workflowPath, actualTaskName, secrets, ej.matrixContext, undefined, inputsContext);
+        const services = await parseWorkflowServices(ej.workflowPath, actualTaskName);
+        const container = await parseWorkflowContainer(ej.workflowPath, actualTaskName);
+        const job = {
+            deliveryId: `run-${Date.now()}`,
+            eventType: "workflow_job",
+            githubJobId: `local-${Date.now()}-${Math.floor(Math.random() * 100000)}`,
+            githubRepo: githubRepo,
+            githubToken: "mock_token",
+            headSha: headSha,
+            baseSha: baseSha,
+            realHeadSha: realHeadSha,
+            repoRoot: repoRoot,
+            shaRef: shaRef,
+            env: { AGENT_CI_LOCAL: "true" },
+            repository: {
+                name: name,
+                full_name: githubRepo,
+                owner: { login: owner },
+                default_branch: "main",
+            },
+            steps,
+            services,
+            container: container ?? undefined,
+            workflowPath: ej.workflowPath,
+            taskId: ej.taskName,
         };
-        /** Collect outputs from a completed job result */
-        const collectOutputs = (result, taskName) => {
-            if (result.outputs && Object.keys(result.outputs).length > 0) {
-                jobOutputs.set(taskName, result.outputs);
-            }
+        const result = await executeLocalJob(job, { pauseOnFailure, store });
+        return [result];
+    }
+    // ── Multi-job orchestration ────────────────────────────────────────────────
+    const maxJobs = getDefaultMaxConcurrentJobs();
+    // ── Warm-cache check ───────────────────────────────────────────────────────
+    const repoSlug = githubRepo.replace("/", "-");
+    let lockfileHash = "no-lockfile";
+    try {
+        lockfileHash = computeLockfileHash(repoRoot);
+    }
+    catch { }
+    const warmModulesDir = path.resolve(getWorkingDirectory(), "cache", "warm-modules", repoSlug, lockfileHash);
+    let warm = isWarmNodeModules(warmModulesDir);
+    // Naming convention: agent-ci-<N>[-j<idx>][-m<shardIdx>]
+    const baseRunNum = options.baseRunNum ?? getNextLogNum("agent-ci");
+    let globalIdx = 0;
+    const buildJob = (ej) => {
+        const actualTaskName = ej.sourceTaskName ?? ej.taskName;
+        const secrets = loadMachineSecrets(repoRoot);
+        const secretsFilePath = path.join(repoRoot, ".env.agent-ci");
+        validateSecrets(ej.workflowPath, actualTaskName, secrets, secretsFilePath);
+        const idx = globalIdx++;
+        let suffix = `-j${idx + 1}`;
+        if (ej.matrixContext) {
+            const shardIdx = parseInt(ej.matrixContext.__job_index ?? "0", 10) + 1;
+            suffix += `-m${shardIdx}`;
+        }
+        const derivedRunnerName = `agent-ci-${baseRunNum}${suffix}`;
+        return {
+            deliveryId: `run-${Date.now()}`,
+            eventType: "workflow_job",
+            githubJobId: Math.floor(Math.random() * 1000000).toString(),
+            githubRepo: githubRepo,
+            githubToken: "mock_token",
+            headSha: headSha,
+            baseSha: baseSha,
+            realHeadSha: realHeadSha,
+            repoRoot: repoRoot,
+            shaRef: shaRef,
+            env: { AGENT_CI_LOCAL: "true" },
+            repository: {
+                name: name,
+                full_name: githubRepo,
+                owner: { login: owner },
+                default_branch: "main",
+            },
+            runnerName: derivedRunnerName,
+            steps: undefined,
+            services: undefined,
+            container: undefined,
+            workflowPath: ej.workflowPath,
+            taskId: ej.taskName,
         };
-        // Track job results for if-condition evaluation (success/failure status)
-        const jobResultStatus = new Map();
-        /** Check if a job should be skipped based on its if: condition */
-        const shouldSkipJob = (jobId) => {
-            const ifExpr = parseJobIf(workflowPath, jobId);
-            if (ifExpr === null) {
-                // No if: condition — default behavior is success() (skip if any upstream failed)
-                const jobDeps = deps.get(jobId);
-                if (jobDeps && jobDeps.length > 0) {
-                    const anyFailed = jobDeps.some((d) => jobResultStatus.get(d) === "failure");
-                    if (anyFailed) {
-                        return true;
-                    }
+    };
+    // Cache resolved inputs per callerJobId (all sub-jobs share the same inputs)
+    const resolvedInputsCache = new Map();
+    const resolveInputsForJob = (ej, secrets, needsContext) => {
+        if (!ej.callerJobId) {
+            return undefined;
+        }
+        const cached = resolvedInputsCache.get(ej.callerJobId);
+        if (cached) {
+            return cached;
+        }
+        // Start with defaults, then override with caller's `with:` values (expanded)
+        const resolved = { ...ej.inputDefaults };
+        if (ej.inputs) {
+            for (const [k, v] of Object.entries(ej.inputs)) {
+                resolved[k] = expandExpressions(v, repoRoot, secrets, undefined, needsContext);
+            }
+        }
+        resolvedInputsCache.set(ej.callerJobId, resolved);
+        return Object.keys(resolved).length > 0 ? resolved : undefined;
+    };
+    const runJob = async (ej, needsContext) => {
+        const { taskName, matrixContext } = ej;
+        const actualTaskName = ej.sourceTaskName ?? taskName;
+        debugCli(`Running: ${path.basename(ej.workflowPath)} | Task: ${taskName}${matrixContext ? ` | Matrix: ${JSON.stringify(Object.fromEntries(Object.entries(matrixContext).filter(([k]) => !k.startsWith("__"))))}` : ""}`);
+        const secrets = loadMachineSecrets(repoRoot);
+        const secretsFilePath = path.join(repoRoot, ".env.agent-ci");
+        validateSecrets(ej.workflowPath, actualTaskName, secrets, secretsFilePath);
+        const inputsContext = resolveInputsForJob(ej, secrets, needsContext);
+        const steps = await parseWorkflowSteps(ej.workflowPath, actualTaskName, secrets, matrixContext, needsContext, inputsContext);
+        const services = await parseWorkflowServices(ej.workflowPath, actualTaskName);
+        const container = await parseWorkflowContainer(ej.workflowPath, actualTaskName);
+        const job = buildJob(ej);
+        job.steps = steps;
+        job.services = services;
+        job.container = container ?? undefined;
+        const result = await executeLocalJob(job, { pauseOnFailure, store });
+        // result.outputs now contains raw step outputs (extracted inside executeLocalJob
+        // before workspace cleanup). Resolve them to job-level outputs using the
+        // output definitions from the workflow YAML.
+        if (result.outputs && Object.keys(result.outputs).length > 0) {
+            const outputDefs = parseJobOutputDefs(ej.workflowPath, actualTaskName);
+            if (Object.keys(outputDefs).length > 0) {
+                result.outputs = resolveJobOutputs(outputDefs, result.outputs);
+            }
+        }
+        return result;
+    };
+    pruneOrphanedDockerResources();
+    const limiter = createConcurrencyLimiter(maxJobs);
+    const allResults = [];
+    // Accumulate job outputs across waves for needs.*.outputs.* resolution
+    const jobOutputs = new Map();
+    // ── Dependency-aware wave scheduling ──────────────────────────────────────
+    const deps = new Map();
+    for (const entry of expandedEntries) {
+        deps.set(entry.id, entry.needs);
+    }
+    const waves = topoSort(deps);
+    const taskNamesInWf = new Set(expandedJobs.map((j) => j.taskName));
+    const filteredWaves = waves
+        .map((wave) => wave.filter((jobId) => taskNamesInWf.has(jobId)))
+        .filter((wave) => wave.length > 0);
+    if (filteredWaves.length === 0) {
+        filteredWaves.push(Array.from(taskNamesInWf));
+    }
+    /** Build a needsContext for a job from its dependencies' accumulated outputs */
+    const buildNeedsContext = (jobId) => {
+        const jobDeps = deps.get(jobId);
+        if (!jobDeps || jobDeps.length === 0) {
+            return undefined;
+        }
+        const ctx = {};
+        for (const depId of jobDeps) {
+            ctx[depId] = jobOutputs.get(depId) ?? {};
+            if (depId.includes("/")) {
+                const callerJobId = depId.split("/")[0];
+                const calledJobId = depId.split("/").slice(1).join("/");
+                // For composite IDs like "lint/setup", also add the called job ID ("setup")
+                // so intra-workflow `needs.setup.outputs.*` references resolve correctly
+                if (!ctx[calledJobId]) {
+                    ctx[calledJobId] = jobOutputs.get(depId) ?? {};
+                }
+                // If workflow_call outputs were resolved for the caller (e.g. "lint"),
+                // add them so downstream `needs.lint.outputs.*` references work
+                if (jobOutputs.has(callerJobId)) {
+                    ctx[callerJobId] = jobOutputs.get(callerJobId);
                 }
-                return false;
             }
-            // Build upstream job results for the evaluator
-            const upstreamResults = {};
-            const jobDeps = deps.get(jobId) ?? [];
-            for (const depId of jobDeps) {
-                upstreamResults[depId] = jobResultStatus.get(depId) ?? "success";
+        }
+        return Object.keys(ctx).length > 0 ? ctx : undefined;
+    };
+    /** Collect outputs from a completed job result */
+    const collectOutputs = (result, taskName) => {
+        if (result.outputs && Object.keys(result.outputs).length > 0) {
+            jobOutputs.set(taskName, result.outputs);
+        }
+    };
+    /**
+     * After a wave completes, resolve workflow_call outputs for any caller jobs
+     * whose sub-jobs have all finished. This allows downstream jobs to access
+     * `needs.<callerJobId>.outputs.*`.
+     */
+    const resolveWorkflowCallOutputs = () => {
+        // Group expanded jobs by callerJobId
+        const byCallerJobId = new Map();
+        for (const ej of expandedJobs) {
+            if (ej.callerJobId) {
+                const group = byCallerJobId.get(ej.callerJobId) ?? [];
+                group.push(ej);
+                byCallerJobId.set(ej.callerJobId, group);
             }
-            const needsCtx = buildNeedsContext(jobId);
-            return !evaluateJobIf(ifExpr, upstreamResults, needsCtx);
-        };
-        /** Create a synthetic skipped result for a job that was skipped by if: */
-        const skippedResult = (ej) => ({
-            name: `agent-ci-skipped-${ej.taskName}`,
-            workflow: path.basename(workflowPath),
-            taskId: ej.taskName,
-            succeeded: true,
-            durationMs: 0,
-            debugLogPath: "",
-            steps: [],
-        });
-        /** Run a job or skip it based on if: condition */
-        const runOrSkipJob = async (ej) => {
-            if (shouldSkipJob(ej.taskName)) {
-                debugCli(`Skipping ${ej.taskName} (if: condition is false)`);
-                const result = skippedResult(ej);
-                jobResultStatus.set(ej.taskName, "skipped");
-                return result;
-            }
-            const ctx = buildNeedsContext(ej.taskName);
-            const result = await runJob(ej, ctx);
-            jobResultStatus.set(ej.taskName, result.succeeded ? "success" : "failure");
-            collectOutputs(result, ej.taskName);
-            return result;
-        };
-        for (let wi = 0; wi < filteredWaves.length; wi++) {
-            const waveJobIds = new Set(filteredWaves[wi]);
-            const waveJobs = expandedJobs.filter((j) => waveJobIds.has(j.taskName));
-            if (waveJobs.length === 0) {
+        }
+        for (const [callerJobId, subJobs] of byCallerJobId) {
+            // Check if all sub-jobs have completed (have results)
+            const allDone = subJobs.every((sj) => jobResultStatus.has(sj.taskName));
+            if (!allDone) {
                 continue;
             }
-            // ── Warm-cache serialization for the first wave ────────────────────────
-            if (!warm && wi === 0 && waveJobs.length > 1) {
-                debugCli("Cold cache — running first job to populate warm modules...");
-                const firstResult = await runOrSkipJob(waveJobs[0]);
-                allResults.push(firstResult);
-                const results = await Promise.allSettled(waveJobs.slice(1).map((ej) => limiter.run(() => runOrSkipJob(ej).catch((error) => {
-                    throw wrapJobError(ej.taskName, error);
-                }))));
-                for (const r of results) {
-                    if (r.status === "fulfilled") {
-                        allResults.push(r.value);
-                    }
-                    else {
-                        const taskName = isJobError(r.reason) ? r.reason.taskName : "unknown";
-                        const errorMessage = isJobError(r.reason) ? r.reason.message : String(r.reason);
-                        console.error(`\n[Agent CI] Job failed with error: ${taskName}`);
-                        console.error(`  Error: ${errorMessage}`);
-                        allResults.push(createFailedJobResult(taskName, workflowPath, r.reason));
-                    }
+            // Already resolved
+            if (jobOutputs.has(callerJobId)) {
+                continue;
+            }
+            // Find the output defs (all sub-jobs share the same defs)
+            const outputDefs = subJobs[0]?.workflowCallOutputDefs;
+            if (!outputDefs || Object.keys(outputDefs).length === 0) {
+                continue;
+            }
+            // Resolve each output value expression: ${{ jobs.<id>.outputs.<name> }}
+            const resolved = {};
+            for (const [outputName, valueExpr] of Object.entries(outputDefs)) {
+                resolved[outputName] = valueExpr.replace(/\$\{\{\s*jobs\.([^.]+)\.outputs\.([^}\s]+)\s*\}\}/g, (_match, jobId, outputKey) => {
+                    const compositeId = `${callerJobId}/${jobId}`;
+                    return jobOutputs.get(compositeId)?.[outputKey] ?? "";
+                });
+            }
+            jobOutputs.set(callerJobId, resolved);
+        }
+    };
+    // Track job results for if-condition evaluation (success/failure status)
+    const jobResultStatus = new Map();
+    /** Check if a job should be skipped based on its if: condition */
+    const shouldSkipJob = (jobId, ej) => {
+        const ejWorkflowPath = ej?.workflowPath ?? workflowPath;
+        const actualTaskName = ej?.sourceTaskName ?? jobId;
+        const ifExpr = parseJobIf(ejWorkflowPath, actualTaskName);
+        if (ifExpr === null) {
+            // No if: condition — default behavior is success() (skip if any upstream failed)
+            const jobDeps = deps.get(jobId);
+            if (jobDeps && jobDeps.length > 0) {
+                const anyFailed = jobDeps.some((d) => jobResultStatus.get(d) === "failure");
+                if (anyFailed) {
+                    return true;
                 }
-                warm = true;
             }
-            else {
-                const results = await Promise.allSettled(waveJobs.map((ej) => limiter.run(() => runOrSkipJob(ej).catch((error) => {
-                    throw wrapJobError(ej.taskName, error);
-                }))));
-                for (const r of results) {
-                    if (r.status === "fulfilled") {
-                        allResults.push(r.value);
-                    }
-                    else {
-                        const taskName = isJobError(r.reason) ? r.reason.taskName : "unknown";
-                        const errorMessage = isJobError(r.reason) ? r.reason.message : String(r.reason);
-                        console.error(`\n[Agent CI] Job failed with error: ${taskName}`);
-                        console.error(`  Error: ${errorMessage}`);
-                        allResults.push(createFailedJobResult(taskName, workflowPath, r.reason));
-                    }
+            return false;
+        }
+        // Build upstream job results for the evaluator
+        const upstreamResults = {};
+        const jobDeps = deps.get(jobId) ?? [];
+        for (const depId of jobDeps) {
+            upstreamResults[depId] = jobResultStatus.get(depId) ?? "success";
+        }
+        const needsCtx = buildNeedsContext(jobId);
+        return !evaluateJobIf(ifExpr, upstreamResults, needsCtx);
+    };
+    /** Create a synthetic skipped result for a job that was skipped by if: */
+    const skippedResult = (ej) => ({
+        name: `agent-ci-skipped-${ej.taskName}`,
+        workflow: path.basename(ej.workflowPath),
+        taskId: ej.taskName,
+        succeeded: true,
+        durationMs: 0,
+        debugLogPath: "",
+        steps: [],
+    });
+    /** Run a job or skip it based on if: condition */
+    const runOrSkipJob = async (ej) => {
+        if (shouldSkipJob(ej.taskName, ej)) {
+            debugCli(`Skipping ${ej.taskName} (if: condition is false)`);
+            const result = skippedResult(ej);
+            jobResultStatus.set(ej.taskName, "skipped");
+            return result;
+        }
+        const ctx = buildNeedsContext(ej.taskName);
+        const result = await runJob(ej, ctx);
+        jobResultStatus.set(ej.taskName, result.succeeded ? "success" : "failure");
+        collectOutputs(result, ej.taskName);
+        return result;
+    };
+    for (let wi = 0; wi < filteredWaves.length; wi++) {
+        const waveJobIds = new Set(filteredWaves[wi]);
+        const waveJobs = expandedJobs.filter((j) => waveJobIds.has(j.taskName));
+        if (waveJobs.length === 0) {
+            continue;
+        }
+        // ── Warm-cache serialization for the first wave ────────────────────────
+        if (!warm && wi === 0 && waveJobs.length > 1) {
+            debugCli("Cold cache — running first job to populate warm modules...");
+            const firstResult = await runOrSkipJob(waveJobs[0]);
+            allResults.push(firstResult);
+            const results = await Promise.allSettled(waveJobs.slice(1).map((ej) => limiter.run(() => runOrSkipJob(ej).catch((error) => {
+                throw wrapJobError(ej.taskName, error);
+            }))));
+            for (const r of results) {
+                if (r.status === "fulfilled") {
+                    allResults.push(r.value);
+                }
+                else {
+                    const taskName = isJobError(r.reason) ? r.reason.taskName : "unknown";
+                    const errorMessage = isJobError(r.reason) ? r.reason.message : String(r.reason);
+                    console.error(`\n[Agent CI] Job failed with error: ${taskName}`);
+                    console.error(`  Error: ${errorMessage}`);
+                    allResults.push(createFailedJobResult(taskName, workflowPath, r.reason));
                 }
             }
-            // Check whether to abort remaining waves on failure
-            const waveHadFailures = allResults.some((r) => !r.succeeded);
-            if (waveHadFailures && wi < filteredWaves.length - 1) {
-                // Check fail-fast setting for jobs in this wave
-                const waveFailFastSettings = waveJobs.map((ej) => parseFailFast(workflowPath, ej.taskName));
-                // Abort unless ALL jobs in the wave explicitly set fail-fast: false
-                const shouldAbort = !waveFailFastSettings.every((ff) => ff === false);
-                if (shouldAbort) {
-                    debugCli(`Wave ${wi + 1} had failures — aborting remaining waves for ${path.basename(workflowPath)}`);
-                    break;
+            warm = true;
+        }
+        else {
+            const results = await Promise.allSettled(waveJobs.map((ej) => limiter.run(() => runOrSkipJob(ej).catch((error) => {
+                throw wrapJobError(ej.taskName, error);
+            }))));
+            for (const r of results) {
+                if (r.status === "fulfilled") {
+                    allResults.push(r.value);
                 }
                 else {
-                    debugCli(`Wave ${wi + 1} had failures but fail-fast is disabled — continuing`);
+                    const taskName = isJobError(r.reason) ? r.reason.taskName : "unknown";
+                    const errorMessage = isJobError(r.reason) ? r.reason.message : String(r.reason);
+                    console.error(`\n[Agent CI] Job failed with error: ${taskName}`);
+                    console.error(`  Error: ${errorMessage}`);
+                    allResults.push(createFailedJobResult(taskName, workflowPath, r.reason));
                 }
             }
         }
-        return allResults;
-    }
-    catch (error) {
-        console.error(`[Agent CI] Failed to run workflow ${path.basename(workflowPath)}: ${error.message}`);
-        throw error;
+        // After each wave, resolve workflow_call outputs for completed caller jobs
+        resolveWorkflowCallOutputs();
+        // Check whether to abort remaining waves on failure
+        const waveHadFailures = allResults.some((r) => !r.succeeded);
+        if (waveHadFailures && wi < filteredWaves.length - 1) {
+            // Check fail-fast setting for jobs in this wave
+            const waveFailFastSettings = waveJobs.map((ej) => parseFailFast(ej.workflowPath, ej.sourceTaskName ?? ej.taskName));
+            // Abort unless ALL jobs in the wave explicitly set fail-fast: false
+            const shouldAbort = !waveFailFastSettings.every((ff) => ff === false);
+            if (shouldAbort) {
+                debugCli(`Wave ${wi + 1} had failures — aborting remaining waves for ${path.basename(workflowPath)}`);
+                break;
+            }
+            else {
+                debugCli(`Wave ${wi + 1} had failures but fail-fast is disabled — continuing`);
+            }
+        }
     }
+    return allResults;
 }
 // ─── Utilities ────────────────────────────────────────────────────────────────
 function printUsage() {
@@ -772,20 +892,6 @@ function resolveRepoRootFromWorkflow(workflowPath) {
     }
     return repoRoot === "/" ? resolveRepoRoot() : repoRoot;
 }
-function resolveRepoInfo(repoRoot) {
-    let githubRepo = config.GITHUB_REPO;
-    try {
-        const remoteUrl = execSync("git remote get-url origin", { cwd: repoRoot }).toString().trim();
-        const match = remoteUrl.match(/[:/]([^/]+\/[^/]+)\.git$/);
-        if (match) {
-            githubRepo = match[1];
-        }
-    }
-    catch {
-        debugCli("Could not detect remote 'origin', using config default.");
-    }
-    return githubRepo;
-}
 function resolveHeadSha(repoRoot, sha) {
     try {
         return {
@@ -797,6 +903,16 @@ function resolveHeadSha(repoRoot, sha) {
         throw new Error(`Failed to resolve ref: ${sha}`);
     }
 }
+/** Resolve the parent commit SHA for push-event `before` context. */
+function resolveBaseSha(repoRoot, headSha) {
+    try {
+        const ref = headSha && headSha !== "HEAD" ? `${headSha}~1` : "HEAD~1";
+        return execSync(`git rev-parse ${ref}`, { cwd: repoRoot, stdio: "pipe" }).toString().trim();
+    }
+    catch {
+        return undefined;
+    }
+}
 run().catch((err) => {
     console.error("[Agent CI] Fatal error:", err);
     process.exit(1);