@netlify/axis 1.1.6 → 1.3.1

package/dist/config/loader.js

@@ -1,9 +1,65 @@
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
+import { pathToFileURL } from "node:url";
+import { createJiti } from "jiti";
 import { validateConfig, validateScenario } from "./validator.js";
 import { formatError } from "../types/output.js";
+/** Extensions probed when no explicit config path is given, in priority order. */
+const DEFAULT_CONFIG_EXTENSIONS = [".ts", ".js", ".mjs", ".json"];
+const DEFAULT_CONFIG_BASENAME = "axis.config";
+const JS_EXTENSIONS = new Set([".js", ".mjs", ".cjs"]);
+const TS_EXTENSIONS = new Set([".ts", ".mts", ".cts"]);
 export async function loadConfig(configPath) {
-    const resolvedPath = path.resolve(configPath ?? "axis.config.json");
+    const resolvedPath = await resolveConfigPath(configPath);
+    const ext = path.extname(resolvedPath).toLowerCase();
+    let parsed;
+    if (ext === ".json" || ext === "") {
+        parsed = await loadJsonConfig(resolvedPath);
+    }
+    else if (JS_EXTENSIONS.has(ext) || TS_EXTENSIONS.has(ext)) {
+        parsed = await loadModuleConfig(resolvedPath);
+    }
+    else {
+        throw new Error(`Unsupported config file extension "${ext}" at ${resolvedPath}`);
+    }
+    // Support a default export that is either the config object or a (sync/async) function returning it.
+    if (typeof parsed === "function") {
+        parsed = await parsed();
+    }
+    validateConfig(parsed, resolvedPath);
+    normalizeConfigAgents(parsed);
+    // Default the scenarios source when omitted; downstream code can assume it is set.
+    if (parsed.scenarios === undefined) {
+        parsed.scenarios = "./scenarios";
+    }
+    return {
+        config: parsed,
+        configDir: path.dirname(resolvedPath),
+    };
+}
+async function resolveConfigPath(configPath) {
+    if (configPath) {
+        return path.resolve(configPath);
+    }
+    for (const ext of DEFAULT_CONFIG_EXTENSIONS) {
+        const candidate = path.resolve(`${DEFAULT_CONFIG_BASENAME}${ext}`);
+        if (await fileExists(candidate)) {
+            return candidate;
+        }
+    }
+    // Nothing found — fall back to .json so the existing "Could not read" error fires with the expected path.
+    return path.resolve(`${DEFAULT_CONFIG_BASENAME}.json`);
+}
+async function fileExists(filePath) {
+    try {
+        const stat = await fs.stat(filePath);
+        return stat.isFile();
+    }
+    catch {
+        return false;
+    }
+}
+async function loadJsonConfig(resolvedPath) {
     let raw;
     try {
         raw = await fs.readFile(resolvedPath, "utf-8");
@@ -11,33 +67,79 @@ export async function loadConfig(configPath) {
     catch (err) {
         throw new Error(`Could not read config file at ${resolvedPath}: ${formatError(err)}`);
     }
-    let parsed;
     try {
-        parsed = JSON.parse(raw);
+        return JSON.parse(raw);
     }
     catch {
         throw new Error(`Failed to parse JSON in ${resolvedPath}`);
     }
-    validateConfig(parsed, resolvedPath);
-    return {
-        config: parsed,
-        configDir: path.dirname(resolvedPath),
-    };
 }
-export async function discoverScenarios(configDir, scenariosPath, filter) {
-    const rootDir = path.resolve(configDir, scenariosPath);
-    let stat;
+async function loadModuleConfig(resolvedPath) {
+    if (!(await fileExists(resolvedPath))) {
+        throw new Error(`Could not read config file at ${resolvedPath}: file not found`);
+    }
+    let mod;
     try {
-        stat = await fs.stat(rootDir);
+        mod = await importModule(resolvedPath);
     }
     catch (err) {
-        throw new Error(`Could not read scenarios directory at ${rootDir}: ${formatError(err)}`);
+        throw new Error(`Failed to load config at ${resolvedPath}: ${formatError(err)}`);
+    }
+    if (!mod || typeof mod !== "object" || !("default" in mod) || mod.default === undefined) {
+        throw new Error(`Config at ${resolvedPath} must have a default export`);
     }
-    if (!stat.isDirectory()) {
-        throw new Error(`Scenarios path is not a directory: ${rootDir}`);
+    return mod.default;
+}
+/**
+ * Imports a JS or TS file by extension. Native dynamic import for `.js`/`.mjs`/`.cjs`,
+ * jiti for `.ts`/`.mts`/`.cts`. Returns the module namespace; callers extract `default`.
+ */
+async function importModule(filePath) {
+    const ext = path.extname(filePath).toLowerCase();
+    if (JS_EXTENSIONS.has(ext)) {
+        return (await import(pathToFileURL(filePath).href));
     }
+    if (TS_EXTENSIONS.has(ext)) {
+        const jiti = createJiti(import.meta.url, { interopDefault: false });
+        return (await jiti.import(filePath));
+    }
+    throw new Error(`Unsupported module extension "${ext}" at ${filePath}`);
+}
+/** Lowercase all agent names in a validated config (mutates in place). */
+function normalizeConfigAgents(config) {
+    for (let i = 0; i < config.agents.length; i++) {
+        const entry = config.agents[i];
+        if (typeof entry === "string") {
+            config.agents[i] = entry.toLowerCase();
+        }
+        else {
+            entry.adapter = entry.adapter.toLowerCase();
+        }
+    }
+}
+export async function discoverScenarios(configDir, scenariosInput, filter) {
+    // When omitted, fall back to the default scenarios directory.
+    const resolvedInput = scenariosInput ?? "./scenarios";
+    const entries = Array.isArray(resolvedInput) ? resolvedInput : [resolvedInput];
     const scenarios = [];
-    await walkDir(rootDir, rootDir, scenarios);
+    for (const entry of entries) {
+        if (typeof entry === "string") {
+            await collectFromPath(path.resolve(configDir, entry), scenarios);
+        }
+        else {
+            // Inline scenarios are validated by validateConfig; here we just normalize and expand.
+            scenarios.push(...expandInline(entry));
+        }
+    }
+    // Check for duplicate keys (can happen when variant keys collide with other scenario keys
+    // or when inline keys collide with on-disk keys)
+    const seen = new Set();
+    for (const s of scenarios) {
+        if (seen.has(s.key)) {
+            throw new Error(`Duplicate scenario key "${s.key}". Ensure variant names do not collide with other scenarios.`);
+        }
+        seen.add(s.key);
+    }
     // Sort by key for deterministic ordering
     scenarios.sort((a, b) => a.key.localeCompare(b.key));
     // Filter scenarios if agent specifies a subset
@@ -46,20 +148,80 @@ export async function discoverScenarios(configDir, scenariosPath, filter) {
     }
     return scenarios;
 }
+/** File extensions recognized by the scenarios walker. */
+const SCENARIO_EXTENSIONS = new Set([".json", ".js", ".mjs", ".cjs", ".ts", ".mts", ".cts"]);
+const SCENARIO_EXT_RE = /\.(json|js|mjs|cjs|ts|mts|cts)$/;
+async function collectFromPath(absolutePath, scenarios) {
+    let stat;
+    try {
+        stat = await fs.stat(absolutePath);
+    }
+    catch (err) {
+        throw new Error(`Could not read scenarios path at ${absolutePath}: ${formatError(err)}`);
+    }
+    if (stat.isDirectory()) {
+        await walkDir(absolutePath, absolutePath, scenarios);
+        return;
+    }
+    if (!stat.isFile()) {
+        throw new Error(`Scenarios path must be a directory or scenario file: ${absolutePath}`);
+    }
+    const ext = path.extname(absolutePath).toLowerCase();
+    if (!SCENARIO_EXTENSIONS.has(ext)) {
+        throw new Error(`Scenario file must end in one of ${[...SCENARIO_EXTENSIONS].join(", ")}: ${absolutePath}`);
+    }
+    // Single-file entry is explicit, so missing default exports are an error (not silent skip).
+    const baseKey = path.basename(absolutePath, ext);
+    const loaded = await loadScenarioFromPath(absolutePath, baseKey, false);
+    if (loaded)
+        scenarios.push(...loaded);
+}
 async function walkDir(dir, rootDir, scenarios) {
     const entries = await fs.readdir(dir, { withFileTypes: true });
     for (const entry of entries) {
         const fullPath = path.join(dir, entry.name);
         if (entry.isDirectory()) {
             await walkDir(fullPath, rootDir, scenarios);
+            continue;
         }
-        else if (entry.isFile() && entry.name.endsWith(".json")) {
-            const scenario = await loadScenarioFile(fullPath, rootDir);
-            scenarios.push(scenario);
-        }
+        if (!entry.isFile())
+            continue;
+        const ext = path.extname(entry.name).toLowerCase();
+        if (!SCENARIO_EXTENSIONS.has(ext))
+            continue;
+        // Derive key from path relative to the walk root: scenarios/cms/create-post.ts → "cms/create-post"
+        const baseKey = path
+            .relative(rootDir, fullPath)
+            .replace(SCENARIO_EXT_RE, "")
+            .split(path.sep)
+            .join("/");
+        // Walking a directory: silently skip module files that don't default-export a scenario object,
+        // so user-authored helpers/utilities can live alongside scenarios without special handling.
+        const loaded = await loadScenarioFromPath(fullPath, baseKey, true);
+        if (loaded)
+            scenarios.push(...loaded);
+    }
+}
+/**
+ * Loads a single scenario from disk, dispatching by extension.
+ *
+ * @param silentSkip  When true, JS/TS modules without a default object export return null
+ *                    instead of throwing. Used when walking a directory so non-scenario
+ *                    helper modules can coexist with scenario files.
+ */
+async function loadScenarioFromPath(filePath, baseKey, silentSkip) {
+    const ext = path.extname(filePath).toLowerCase();
+    if (ext === ".json") {
+        return loadJsonScenario(filePath, baseKey);
+    }
+    if (JS_EXTENSIONS.has(ext) || TS_EXTENSIONS.has(ext)) {
+        return loadModuleScenario(filePath, baseKey, silentSkip);
     }
+    if (silentSkip)
+        return null;
+    throw new Error(`Unsupported scenario file extension "${ext}" at ${filePath}`);
 }
-async function loadScenarioFile(filePath, rootDir) {
+async function loadJsonScenario(filePath, baseKey) {
     const raw = await fs.readFile(filePath, "utf-8");
     let parsed;
     try {
@@ -68,30 +230,116 @@ async function loadScenarioFile(filePath, rootDir) {
     catch {
         throw new Error(`Failed to parse JSON in scenario file ${filePath}`);
     }
-    validateScenario(parsed, filePath);
-    // Derive key from relative path: scenarios/cms/create-post.json → "cms/create-post"
-    const relativePath = path.relative(rootDir, filePath);
-    const key = relativePath
-        .replace(/\.json$/, "")
-        .split(path.sep)
-        .join("/");
-    parsed.key = key;
-    return parsed;
+    return finalizeScenarioObject(parsed, filePath, baseKey);
+}
+async function loadModuleScenario(filePath, baseKey, silentSkip) {
+    let mod;
+    try {
+        mod = await importModule(filePath);
+    }
+    catch (err) {
+        throw new Error(`Failed to load scenario module at ${filePath}: ${formatError(err)}`);
+    }
+    let def = mod && typeof mod === "object" ? mod.default : undefined;
+    if (typeof def === "function") {
+        def = await def();
+    }
+    if (def === undefined || def === null || typeof def !== "object" || Array.isArray(def)) {
+        if (silentSkip)
+            return null;
+        throw new Error(`Scenario module at ${filePath} must default-export an object (or function returning one)`);
+    }
+    return finalizeScenarioObject(def, filePath, baseKey);
+}
+function finalizeScenarioObject(parsed, filePath, baseKey) {
+    validateScenario(parsed, filePath, "file");
+    normalizeScenarioAgents(parsed);
+    const scenario = parsed;
+    // If the file declares a key, it must match the key derived from its path.
+    // The path-derived key is always authoritative; this surfaces drift after a rename.
+    if (scenario.key !== undefined && scenario.key !== baseKey) {
+        throw new Error(`Scenario at ${filePath}: declared key "${scenario.key}" does not match path-derived key "${baseKey}". ` +
+            `Either remove the "key" field or set it to "${baseKey}".`);
+    }
+    if (!scenario.variants || scenario.variants.length === 0) {
+        scenario.key = baseKey;
+        return [scenario];
+    }
+    // Expand variants: each becomes a standalone Scenario, base does not run
+    return scenario.variants.map((variant) => expandVariant(scenario, variant, baseKey));
+}
+function expandInline(input) {
+    // Shallow clone so we don't mutate the caller's config object.
+    const scenario = { ...input };
+    normalizeScenarioAgents(scenario);
+    if (!scenario.variants || scenario.variants.length === 0) {
+        return [scenario];
+    }
+    return scenario.variants.map((variant) => expandVariant(scenario, variant, scenario.key));
+}
+/** Lowercase agent-name entries in a scenario and any variants (mutates in place). */
+function normalizeScenarioAgents(scenario) {
+    if (scenario.agents) {
+        scenario.agents = scenario.agents.map((a) => a.toLowerCase());
+    }
+    if (scenario.variants) {
+        for (const v of scenario.variants) {
+            if (v.agents)
+                v.agents = v.agents.map((a) => a.toLowerCase());
+        }
+    }
+}
+function expandVariant(parent, variant, baseKey) {
+    const expanded = {
+        key: `${baseKey}@${variant.name}`,
+        name: `${parent.name} [${variant.name}]`,
+        prompt: variant.prompt ?? parent.prompt,
+        rubric: variant.rubric ?? parent.rubric,
+        skip: variant.skip ?? parent.skip,
+        setup: variant.setup ?? parent.setup,
+        teardown: variant.teardown ?? parent.teardown,
+        agents: variant.agents ?? parent.agents,
+        skills: variant.skills !== undefined ? variant.skills : parent.skills,
+        mcp_servers: variant.mcp_servers !== undefined
+            ? { ...parent.mcp_servers, ...variant.mcp_servers }
+            : parent.mcp_servers,
+        limits: variant.limits ?? parent.limits,
+    };
+    // Strip undefined optional fields to keep objects clean
+    if (expanded.skip === undefined)
+        delete expanded.skip;
+    if (expanded.setup === undefined)
+        delete expanded.setup;
+    if (expanded.teardown === undefined)
+        delete expanded.teardown;
+    if (expanded.agents === undefined)
+        delete expanded.agents;
+    if (expanded.skills === undefined)
+        delete expanded.skills;
+    if (expanded.mcp_servers === undefined)
+        delete expanded.mcp_servers;
+    if (expanded.limits === undefined)
+        delete expanded.limits;
+    return expanded;
 }
 function matchesFilter(key, filter) {
+    const baseKey = key.includes("@") ? key.split("@")[0] : key;
     return filter.some((pattern) => {
-        // Exact match
+        // Exact match (full key including variant)
         if (pattern === key)
             return true;
-        // Simple glob: "cms/*" matches "cms/create-post" and "cms/delete-post"
+        // Base key match: "cms/create-post" matches all its variants
+        if (pattern === baseKey && pattern !== key)
+            return true;
+        // Simple glob: "cms/*" matches "cms/create-post" and "cms/create-post@variant"
         if (pattern.endsWith("/*")) {
             const prefix = pattern.slice(0, -2);
-            return key.startsWith(prefix + "/");
+            return baseKey.startsWith(prefix + "/");
         }
         // Prefix glob: "cms/**" matches any depth under cms/
         if (pattern.endsWith("/**")) {
             const prefix = pattern.slice(0, -3);
-            return key.startsWith(prefix + "/");
+            return baseKey.startsWith(prefix + "/");
         }
         return false;
     });

package/dist/config/loader.js.map

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

package/dist/config/validator.d.ts

@@ -1,7 +1,16 @@
 import type { AxisConfig } from "../types/config.js";
 import type { RubricCriterion, Scenario } from "../types/scenario.js";
 export declare function validateConfig(data: unknown, filePath: string): asserts data is AxisConfig;
-export declare function validateScenario(data: unknown, filePath: string): asserts data is Scenario;
+/**
+ * Validates a scenario object.
+ *
+ * @param mode  "file" — loaded from a JSON scenario file; the loader will assign
+ *              the `key` from the file path and rejects any user-supplied `key`.
+ *              "inline" — declared inline in `axis.config.*`; the user must
+ *              provide a non-empty `key` string.
+ */
+export declare function validateScenario(data: unknown, filePath: string, mode?: "file" | "inline"): asserts data is Scenario;
+export declare function validateMcpServers(data: unknown, filePath: string): void;
 /**
  * Resolve optional weights on rubric entries. Entries with explicit weights
  * keep them; entries without a weight split the remaining budget equally.

package/dist/config/validator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validator.d.ts","sourceRoot":"","sources":["../../src/config/validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,KAAK,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEtE,wBAAgB,cAAc,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,IAAI,UAAU,CAuD1F;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,IAAI,QAAQ,CAwD1F;AA+DD;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,eAAe,EAAE,GAAG,eAAe,EAAE,CAajF"}
+{"version":3,"file":"validator.d.ts","sourceRoot":"","sources":["../../src/config/validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,KAAK,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEtE,wBAAgB,cAAc,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,IAAI,UAAU,CAkE1F;AAwBD;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,OAAO,EACb,QAAQ,EAAE,MAAM,EAChB,IAAI,GAAE,MAAM,GAAG,QAAiB,GAC/B,OAAO,CAAC,IAAI,IAAI,QAAQ,CAmF1B;AA4FD,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAqDxE;AAQD;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,eAAe,EAAE,GAAG,eAAe,EAAE,CAajF"}

package/dist/config/validator.js

@@ -3,9 +3,7 @@ export function validateConfig(data, filePath) {
         throw new Error(`Invalid config at ${filePath}: must be a JSON object`);
     }
     const obj = data;
-    if (typeof obj.scenarios !== "string") {
-        throw new Error(`Invalid config at ${filePath}: "scenarios" must be a string path`);
-    }
+    validateScenariosField(obj.scenarios, filePath);
     if (!Array.isArray(obj.agents)) {
         throw new Error(`Invalid config at ${filePath}: "agents" must be an array`);
     }
@@ -39,6 +37,18 @@ export function validateConfig(data, filePath) {
             throw new Error(`Invalid config at ${filePath}: "settings.concurrency" must be a positive integer`);
         }
     }
+    if (settings?.limits !== undefined) {
+        const limits = settings.limits;
+        if (typeof limits !== "object" || limits === null || Array.isArray(limits)) {
+            throw new Error(`Invalid config at ${filePath}: "settings.limits" must be an object`);
+        }
+        if (limits.run !== undefined) {
+            validateLimits(limits.run, filePath, "settings.limits.run");
+        }
+        if (limits.scenario !== undefined) {
+            validateLimits(limits.scenario, filePath, "settings.limits.scenario");
+        }
+    }
     if (obj.mcp_servers !== undefined) {
         validateMcpServers(obj.mcp_servers, filePath);
     }
@@ -46,11 +56,50 @@ export function validateConfig(data, filePath) {
         validateSkillsSources(obj.skills, filePath, "skills");
     }
 }
-export function validateScenario(data, filePath) {
+function validateScenariosField(data, filePath) {
+    if (data === undefined)
+        return; // optional — loader fills in the default
+    if (typeof data === "string")
+        return;
+    if (!Array.isArray(data)) {
+        throw new Error(`Invalid config at ${filePath}: "scenarios" must be a string path or an array of paths and/or scenario objects`);
+    }
+    for (let i = 0; i < data.length; i++) {
+        const entry = data[i];
+        if (typeof entry === "string")
+            continue;
+        if (typeof entry !== "object" || entry === null) {
+            throw new Error(`Invalid config at ${filePath}: scenarios[${i}] must be a string path or a scenario object`);
+        }
+        validateScenario(entry, `${filePath} (scenarios[${i}])`, "inline");
+    }
+}
+/**
+ * Validates a scenario object.
+ *
+ * @param mode  "file" — loaded from a JSON scenario file; the loader will assign
+ *              the `key` from the file path and rejects any user-supplied `key`.
+ *              "inline" — declared inline in `axis.config.*`; the user must
+ *              provide a non-empty `key` string.
+ */
+export function validateScenario(data, filePath, mode = "file") {
     if (typeof data !== "object" || data === null) {
         throw new Error(`Invalid scenario at ${filePath}: must be a JSON object`);
     }
     const obj = data;
+    if (mode === "inline") {
+        if (typeof obj.key !== "string" || obj.key.length === 0) {
+            throw new Error(`Invalid scenario at ${filePath}: inline scenarios must include a non-empty "key" string`);
+        }
+    }
+    else if (obj.key !== undefined) {
+        // File-mode: an explicit `key` is allowed (helpers like `withSharedVariants` may
+        // require it on their input), but it must be a non-empty string. The loader
+        // verifies it matches the path-derived key — see finalizeScenarioObject in loader.ts.
+        if (typeof obj.key !== "string" || obj.key.length === 0) {
+            throw new Error(`Invalid scenario at ${filePath}: "key" must be a non-empty string`);
+        }
+    }
     if (typeof obj.name !== "string") {
         throw new Error(`Invalid scenario at ${filePath}: missing required field "name"`);
     }
@@ -92,14 +141,94 @@ export function validateScenario(data, filePath) {
     if (obj.skills !== undefined) {
         validateSkillsSources(obj.skills, filePath, "skills");
     }
+    if (obj.mcp_servers !== undefined) {
+        validateMcpServers(obj.mcp_servers, filePath);
+    }
+    if (obj.limits !== undefined) {
+        validateLimits(obj.limits, filePath, "limits");
+    }
     if (obj.setup !== undefined) {
         validateLifecycleActions(obj.setup, filePath, "setup");
     }
     if (obj.teardown !== undefined) {
         validateLifecycleActions(obj.teardown, filePath, "teardown");
     }
+    if (obj.variants !== undefined) {
+        validateVariants(obj.variants, filePath);
+    }
+}
+const VARIANT_NAME_RE = /^[a-zA-Z0-9_-]+$/;
+function validateVariants(data, filePath) {
+    if (!Array.isArray(data)) {
+        throw new Error(`Invalid scenario at ${filePath}: "variants" must be an array`);
+    }
+    const names = new Set();
+    for (let i = 0; i < data.length; i++) {
+        const variant = data[i];
+        if (typeof variant !== "object" || variant === null) {
+            throw new Error(`Invalid scenario at ${filePath}: variants[${i}] must be an object`);
+        }
+        if (typeof variant.name !== "string" || !VARIANT_NAME_RE.test(variant.name)) {
+            throw new Error(`Invalid scenario at ${filePath}: variants[${i}].name must be a string matching /^[a-zA-Z0-9_-]+$/`);
+        }
+        if (names.has(variant.name)) {
+            throw new Error(`Invalid scenario at ${filePath}: duplicate variant name "${variant.name}"`);
+        }
+        names.add(variant.name);
+        if (variant.prompt !== undefined && typeof variant.prompt !== "string") {
+            throw new Error(`Invalid scenario at ${filePath}: variants[${i}].prompt must be a string`);
+        }
+        if (variant.rubric !== undefined) {
+            if (typeof variant.rubric === "string") {
+                // String rubric — freeform evaluation description
+            }
+            else if (Array.isArray(variant.rubric)) {
+                for (let j = 0; j < variant.rubric.length; j++) {
+                    const entry = variant.rubric[j];
+                    if (typeof entry.check !== "string") {
+                        throw new Error(`Invalid scenario at ${filePath}: variants[${i}].rubric[${j}] missing "check" string`);
+                    }
+                    if (entry.weight !== undefined && typeof entry.weight !== "number") {
+                        throw new Error(`Invalid scenario at ${filePath}: variants[${i}].rubric[${j}].weight must be a number`);
+                    }
+                }
+                variant.rubric = resolveRubricWeights(variant.rubric);
+            }
+            else {
+                throw new Error(`Invalid scenario at ${filePath}: variants[${i}].rubric must be a string or array`);
+            }
+        }
+        if (variant.skip !== undefined && typeof variant.skip !== "boolean") {
+            throw new Error(`Invalid scenario at ${filePath}: variants[${i}].skip must be a boolean`);
+        }
+        if (variant.agents !== undefined) {
+            if (!Array.isArray(variant.agents) || variant.agents.length === 0) {
+                throw new Error(`Invalid scenario at ${filePath}: variants[${i}].agents must be a non-empty array of strings`);
+            }
+            for (let j = 0; j < variant.agents.length; j++) {
+                if (typeof variant.agents[j] !== "string") {
+                    throw new Error(`Invalid scenario at ${filePath}: variants[${i}].agents[${j}] must be a string`);
+                }
+            }
+        }
+        if (variant.skills !== undefined) {
+            validateSkillsSources(variant.skills, filePath, `variants[${i}].skills`);
+        }
+        if (variant.mcp_servers !== undefined) {
+            validateMcpServers(variant.mcp_servers, filePath);
+        }
+        if (variant.setup !== undefined) {
+            validateLifecycleActions(variant.setup, filePath, `variants[${i}].setup`);
+        }
+        if (variant.teardown !== undefined) {
+            validateLifecycleActions(variant.teardown, filePath, `variants[${i}].teardown`);
+        }
+        if (variant.limits !== undefined) {
+            validateLimits(variant.limits, filePath, `variants[${i}].limits`);
+        }
+    }
 }
-function validateMcpServers(data, filePath) {
+export function validateMcpServers(data, filePath) {
     if (typeof data !== "object" || data === null || Array.isArray(data)) {
         throw new Error(`Invalid config at ${filePath}: "mcp_servers" must be an object`);
     }
@@ -171,6 +300,22 @@ export function resolveRubricWeights(rubric) {
     const share = unspecified.length > 0 ? remaining / unspecified.length : 0;
     return rubric.map((r) => (r.weight !== undefined ? r : { ...r, weight: share }));
 }
+function validateLimits(data, filePath, field) {
+    if (typeof data !== "object" || data === null || Array.isArray(data)) {
+        throw new Error(`Invalid config at ${filePath}: "${field}" must be an object`);
+    }
+    const obj = data;
+    if (obj.time_minutes !== undefined) {
+        if (typeof obj.time_minutes !== "number" || obj.time_minutes <= 0) {
+            throw new Error(`Invalid config at ${filePath}: "${field}.time_minutes" must be a positive number`);
+        }
+    }
+    if (obj.tokens !== undefined) {
+        if (typeof obj.tokens !== "number" || !Number.isInteger(obj.tokens) || obj.tokens <= 0) {
+            throw new Error(`Invalid config at ${filePath}: "${field}.tokens" must be a positive integer`);
+        }
+    }
+}
 function validateLifecycleActions(data, filePath, field) {
     if (!Array.isArray(data)) {
         throw new Error(`Invalid scenario at ${filePath}: "${field}" must be an array`);