agentv 5.3.1-next.1 → 5.3.2-next.1

package/dist/{chunk-LKGARI3W.js → chunk-QSK3PC44.js}

@@ -1,7 +1,7 @@
 import { createRequire } from 'node:module'; const require = createRequire(import.meta.url);
 import {
   writeArtifactsFromResults
-} from "./chunk-RKE7SSET.js";
+} from "./chunk-WIAJ7JAV.js";
 import {
   RunBudgetTracker,
   buildWipBranchName,
@@ -18,12 +18,12 @@ import {
   resolveResultsRepoRunsDir,
   setupWipWorktree,
   syncResultsRepoForProject
-} from "./chunk-LXBI3SPX.js";
+} from "./chunk-JGSRUJZQ.js";
 import {
   AGENTV_LOCAL_CONFIG_FILE_NAME,
   AGENTV_LOCAL_CONFIG_YML_FILE_NAME,
   CLI_PLACEHOLDERS,
-  COMMON_TARGET_SETTINGS,
+  COMMON_PROVIDER_SETTINGS,
   DEFAULT_EVAL_PATTERNS,
   DEFAULT_THRESHOLD,
   KNOWN_PROVIDERS,
@@ -51,8 +51,9 @@ import {
   interpolateEnv,
   isAgentVConfigFileName,
   isGraderKind,
+  isScenarioFileReference,
   isTypeScriptEvalConfigFileName,
-  listTargetNames,
+  listProviderLabels,
   loadCasesFromDirectory,
   loadCasesFromFile,
   loadConfig,
@@ -61,17 +62,19 @@ import {
   loadTestSuiteFromYamlObject,
   normalizeComposableConfigGraph,
   normalizeMetricsArtifactWire,
+  normalizeProviderDefinition,
   normalizeResultRow,
-  normalizeTargetDefinition,
   parseJsonlResults,
   parseYamlValue,
-  readTargetDefinitions,
+  readProviderDefinitions,
   readTestSuiteMetadata,
   resolveConfigFieldReferences,
   resolveEnvironmentRecipe,
   resolveFileReference,
+  resolveProviderDefinition,
+  resolveProviderDefinitionEnvironments,
   resolveResultsConfigForProject,
-  resolveTargetDefinition,
+  resolveScenarioFileReference,
   runEvaluation,
   serializeEvaluationResultWire,
   shouldEnableCache,
@@ -86,7 +89,7 @@ import {
   traceEnvelopeToTranscriptMessages,
   typeScriptEvalConfigGlob,
   writeInitialRunSummaryArtifact
-} from "./chunk-ELCJ23K4.js";
+} from "./chunk-6262OKXM.js";
 
 // src/commands/eval/shared.ts
 import { constants } from "node:fs";
@@ -346,83 +349,6 @@ async function findRepoRoot(start) {
   return fallback;
 }
 
-// package.json
-var package_default = {
-  name: "agentv",
-  version: "5.3.1-next.1",
-  description: "CLI entry point for AgentV",
-  type: "module",
-  repository: {
-    type: "git",
-    url: "https://github.com/EntityProcess/agentv.git"
-  },
-  homepage: "https://agentv.dev",
-  bugs: {
-    url: "https://github.com/EntityProcess/agentv/issues"
-  },
-  bin: {
-    agentv: "./dist/cli.js"
-  },
-  files: ["dist", "README.md"],
-  scripts: {
-    dev: "bun src/cli.ts",
-    build: "(cd ../../packages/sdk && bun run build) && tsup && bun run copy-readme",
-    "copy-readme": `bun -e "import { cpSync } from 'fs'; cpSync('../../README.md', 'README.md')"`,
-    prepublishOnly: `node -e "if(process.env.ALLOW_PUBLISH!=='1'){console.error('ERROR: Use bun run publish:next, then bun run promote:latest');process.exit(1)}"`,
-    typecheck: "(cd ../../packages/sdk && bun run build) && tsc --noEmit",
-    lint: "biome check .",
-    format: "biome format --write .",
-    fix: "biome check --write .",
-    test: "(cd ../../packages/sdk && bun run build) && bun test",
-    "test:watch": "bun test --watch"
-  },
-  dependencies: {
-    "@hono/node-server": "^1.19.11",
-    "@inquirer/prompts": "^8.2.1",
-    "@earendil-works/pi-ai": "^0.74.0",
-    "cmd-ts": "^0.14.3",
-    dotenv: "^16.4.5",
-    "fast-glob": "^3.3.3",
-    hono: "^4.12.9",
-    json5: "^2.2.3",
-    micromatch: "^4.0.8",
-    semver: "^7.7.4",
-    yaml: "^2.8.3"
-  },
-  peerDependencies: {
-    "@anthropic-ai/claude-agent-sdk": "^0.2.89",
-    "@github/copilot-sdk": "^1.0.3",
-    "@openai/codex-sdk": "^0.136.0",
-    "@earendil-works/pi-coding-agent": "^0.74.0"
-  },
-  peerDependenciesMeta: {
-    "@anthropic-ai/claude-agent-sdk": {
-      optional: true
-    },
-    "@github/copilot-sdk": {
-      optional: true
-    },
-    "@openai/codex-sdk": {
-      optional: true
-    },
-    "@earendil-works/pi-coding-agent": {
-      optional: true
-    }
-  },
-  optionalDependencies: {
-    "@anthropic-ai/claude-agent-sdk": "^0.2.89",
-    "@github/copilot-sdk": "^1.0.3",
-    "@openai/codex-sdk": "^0.136.0",
-    "@earendil-works/pi-coding-agent": "^0.74.0"
-  },
-  devDependencies: {
-    "@agentv/core": "workspace:*",
-    "@agentv/sdk": "workspace:*",
-    "@types/semver": "^7.7.1",
-    execa: "^9.3.0"
-  }
-};
-
 // src/commands/eval/result-layout.ts
 import { existsSync, readdirSync, statSync } from "node:fs";
 import path2 from "node:path";
@@ -560,11 +486,17 @@ function relativeRunPathFromCwd(cwd, runDir) {
   return parts.join(path2.posix.sep);
 }
 
-// src/utils/targets.ts
+// src/utils/providers.ts
 import { constants as constants2 } from "node:fs";
-import { access as access2 } from "node:fs/promises";
+import { access as access2, stat as stat2 } from "node:fs/promises";
 import path3 from "node:path";
-var TARGET_FILE_CANDIDATES = [
+var PROVIDER_FILE_CANDIDATES = [
+  "providers.yaml",
+  "providers.yml",
+  path3.join(".agentv", "providers.yaml"),
+  path3.join(".agentv", "providers.yml")
+];
+var LEGACY_TARGET_FILE_CANDIDATES = [
   "targets.yaml",
   "targets.yml",
   path3.join(".agentv", "targets.yaml"),
@@ -578,20 +510,71 @@ async function fileExists(filePath) {
     return false;
   }
 }
-async function discoverTargetsFile(options) {
-  const { explicitPath, testFilePath, repoRoot, cwd } = options;
+async function pathKind(filePath) {
+  try {
+    const info = await stat2(filePath);
+    if (info.isDirectory()) {
+      return "directory";
+    }
+    if (info.isFile()) {
+      return "file";
+    }
+    return void 0;
+  } catch {
+    return void 0;
+  }
+}
+function isLegacyTargetFile(filePath) {
+  return /^targets\.ya?ml$/i.test(path3.basename(filePath));
+}
+function removedTargetsFileError(filePath) {
+  return new Error(
+    `Authored targets.yaml files were removed. Rename ${filePath} to providers.yaml and use --providers to specify it explicitly.`
+  );
+}
+async function findProviderFileInDirectory(directory) {
+  for (const candidate of PROVIDER_FILE_CANDIDATES) {
+    const fullPath = path3.join(directory, candidate);
+    if (await pathKind(fullPath) === "file") {
+      return fullPath;
+    }
+  }
+  return void 0;
+}
+async function findLegacyGeneratedTargetFileInDirectory(directory) {
+  for (const candidate of LEGACY_TARGET_FILE_CANDIDATES) {
+    const fullPath = path3.join(directory, candidate);
+    if (await pathKind(fullPath) === "file") {
+      return fullPath;
+    }
+  }
+  return void 0;
+}
+async function discoverProvidersFile(options) {
+  const { explicitPath, testFilePath, repoRoot, cwd, allowLegacyTargetFiles = false } = options;
   if (explicitPath) {
     const resolvedExplicit = path3.resolve(explicitPath);
-    if (await fileExists(resolvedExplicit)) {
+    const kind = await pathKind(resolvedExplicit);
+    if (kind === "file") {
+      if (!allowLegacyTargetFiles && isLegacyTargetFile(resolvedExplicit)) {
+        throw removedTargetsFileError(resolvedExplicit);
+      }
       return resolvedExplicit;
     }
-    for (const candidate of TARGET_FILE_CANDIDATES) {
-      const nested = path3.join(resolvedExplicit, candidate);
-      if (await fileExists(nested)) {
-        return nested;
+    if (kind === "directory") {
+      const providerFile = await findProviderFileInDirectory(resolvedExplicit);
+      if (providerFile) {
+        return providerFile;
+      }
+      const legacyTargetFile = await findLegacyGeneratedTargetFileInDirectory(resolvedExplicit);
+      if (legacyTargetFile) {
+        if (allowLegacyTargetFiles) {
+          return legacyTargetFile;
+        }
+        throw removedTargetsFileError(legacyTargetFile);
       }
     }
-    throw new Error(`targets.yaml not found at provided path: ${resolvedExplicit}`);
+    throw new Error(`providers.yaml not found at provided path: ${resolvedExplicit}`);
   }
   const directories = [...buildDirectoryChain(testFilePath, repoRoot)];
   const resolvedCwd = path3.resolve(cwd);
@@ -599,14 +582,23 @@ async function discoverTargetsFile(options) {
     directories.push(resolvedCwd);
   }
   for (const directory of directories) {
-    for (const candidate of TARGET_FILE_CANDIDATES) {
-      const fullPath = path3.join(directory, candidate);
-      if (await fileExists(fullPath)) {
-        return fullPath;
+    const providerFile = await findProviderFileInDirectory(directory);
+    if (providerFile) {
+      return providerFile;
+    }
+  }
+  for (const directory of directories) {
+    const legacyTargetFile = await findLegacyGeneratedTargetFileInDirectory(directory);
+    if (legacyTargetFile) {
+      if (allowLegacyTargetFiles) {
+        return legacyTargetFile;
       }
+      throw removedTargetsFileError(legacyTargetFile);
     }
   }
-  throw new Error("Unable to locate targets.yaml. Use --targets to specify the file explicitly.");
+  throw new Error(
+    "Unable to locate providers.yaml. Use --providers to specify the file explicitly."
+  );
 }
 
 // src/commands/eval/discover.ts
@@ -650,7 +642,7 @@ function filterByCategory(files, category) {
 import { constants as constants4, existsSync as existsSync5, mkdirSync } from "node:fs";
 import { access as access5, readFile as readFile8 } from "node:fs/promises";
 import { createRequire as createNodeRequire } from "node:module";
-import path12 from "node:path";
+import path13 from "node:path";
 import { pathToFileURL } from "node:url";
 
 // ../../node_modules/.bun/yocto-queue@1.2.2/node_modules/yocto-queue/index.js
@@ -794,6 +786,110 @@ function validateConcurrency(concurrency) {
 
 // src/version-check.ts
 import { coerce, satisfies, validRange } from "semver";
+
+// package.json
+var package_default = {
+  name: "agentv",
+  version: "5.3.2-next.1",
+  description: "CLI entry point for AgentV",
+  type: "module",
+  repository: {
+    type: "git",
+    url: "https://github.com/EntityProcess/agentv.git"
+  },
+  homepage: "https://agentv.dev",
+  bugs: {
+    url: "https://github.com/EntityProcess/agentv/issues"
+  },
+  bin: {
+    agentv: "./dist/cli.js"
+  },
+  main: "./dist/index.js",
+  types: "./dist/index.d.ts",
+  exports: {
+    ".": {
+      types: "./dist/index.d.ts",
+      import: "./dist/index.js"
+    },
+    "./sdk": {
+      types: "./dist/sdk.d.ts",
+      import: "./dist/sdk.js"
+    },
+    "./provider": {
+      types: "./dist/provider.d.ts",
+      import: "./dist/provider.js"
+    },
+    "./contracts": {
+      types: "./dist/contracts.d.ts",
+      import: "./dist/contracts.js"
+    },
+    "./config": {
+      types: "./dist/config.d.ts",
+      import: "./dist/config.js"
+    },
+    "./package.json": "./package.json"
+  },
+  files: ["dist", "README.md"],
+  scripts: {
+    dev: "bun src/cli.ts",
+    build: "tsup && bun run copy-readme",
+    "copy-readme": `bun -e "import { cpSync } from 'fs'; cpSync('../../README.md', 'README.md')"`,
+    prepublishOnly: `node -e "if(process.env.ALLOW_PUBLISH!=='1'){console.error('ERROR: Use bun run publish:next, then bun run promote:latest');process.exit(1)}"`,
+    typecheck: "tsc --noEmit",
+    lint: "biome check .",
+    format: "biome format --write .",
+    fix: "biome check --write .",
+    test: "bun test",
+    "test:watch": "bun test --watch"
+  },
+  dependencies: {
+    "@hono/node-server": "^1.19.11",
+    "@inquirer/prompts": "^8.2.1",
+    "@earendil-works/pi-ai": "^0.74.0",
+    "cmd-ts": "^0.14.3",
+    dotenv: "^16.4.5",
+    "fast-glob": "^3.3.3",
+    hono: "^4.12.9",
+    json5: "^2.2.3",
+    micromatch: "^4.0.8",
+    semver: "^7.7.4",
+    yaml: "^2.8.3"
+  },
+  peerDependencies: {
+    "@anthropic-ai/claude-agent-sdk": "^0.2.89",
+    "@github/copilot-sdk": "^1.0.3",
+    "@openai/codex-sdk": "^0.136.0",
+    "@earendil-works/pi-coding-agent": "^0.74.0"
+  },
+  peerDependenciesMeta: {
+    "@anthropic-ai/claude-agent-sdk": {
+      optional: true
+    },
+    "@github/copilot-sdk": {
+      optional: true
+    },
+    "@openai/codex-sdk": {
+      optional: true
+    },
+    "@earendil-works/pi-coding-agent": {
+      optional: true
+    }
+  },
+  optionalDependencies: {
+    "@anthropic-ai/claude-agent-sdk": "^0.2.89",
+    "@github/copilot-sdk": "^1.0.3",
+    "@openai/codex-sdk": "^0.136.0",
+    "@earendil-works/pi-coding-agent": "^0.74.0"
+  },
+  devDependencies: {
+    "@agentv/core": "workspace:*",
+    "@agentv/sdk": "workspace:*",
+    "@types/semver": "^7.7.1",
+    execa: "^9.3.0"
+  }
+};
+
+// src/version-check.ts
 var ANSI_YELLOW = "\x1B[33m";
 var ANSI_RED = "\x1B[31m";
 var ANSI_RESET = "\x1B[0m";
@@ -858,24 +954,6 @@ function manifestBaseDir(indexPath) {
   const dir = path5.dirname(indexPath);
   return path5.basename(dir) === ".internal" ? path5.dirname(dir) : dir;
 }
-function mapGradingAssertions(value) {
-  if (!Array.isArray(value)) {
-    return void 0;
-  }
-  return value.map((assertion) => {
-    const record = assertion;
-    return {
-      text: String(record.text ?? ""),
-      passed: Boolean(record.passed),
-      evidence: typeof record.evidence === "string" ? record.evidence : void 0
-    };
-  });
-}
-function readGradingAssertionResults(record) {
-  return mapGradingAssertions(
-    Array.isArray(record.assertion_results) ? record.assertion_results : record.assertions
-  );
-}
 function readNestedGradingScores(record) {
   if (Array.isArray(record.component_results)) {
     return record.component_results;
@@ -883,12 +961,6 @@ function readNestedGradingScores(record) {
   if (Array.isArray(record.scores)) {
     return record.scores;
   }
-  if (Array.isArray(record.graders)) {
-    return record.graders;
-  }
-  if (Array.isArray(record.evaluators)) {
-    return record.evaluators;
-  }
   return void 0;
 }
 function componentLabel(component) {
@@ -925,7 +997,7 @@ function collectComponentAssertions(value) {
   });
 }
 function mapGradingEvaluator(evaluator) {
-  const pass = typeof evaluator.pass === "boolean" ? evaluator.pass : evaluator.verdict === "pass" || typeof evaluator.score === "number" && evaluator.score >= 0.8;
+  const pass = evaluator.pass === true;
   const verdict = pass ? "pass" : "fail";
   const details = evaluator.details && typeof evaluator.details === "object" && !Array.isArray(evaluator.details) ? evaluator.details : void 0;
   const assertion = evaluator.assertion && typeof evaluator.assertion === "object" && !Array.isArray(evaluator.assertion) ? evaluator.assertion : void 0;
@@ -939,7 +1011,7 @@ function mapGradingEvaluator(evaluator) {
       if (nestedAssertions.length > 0) {
         return nestedAssertions;
       }
-      return readGradingAssertionResults(evaluator) ?? [mapComponentAssertion(evaluator)];
+      return [mapComponentAssertion(evaluator)];
     })(),
     scores: mapGradingEvaluators(readNestedGradingScores(evaluator)),
     weight: typeof evaluator.weight === "number" ? evaluator.weight : void 0,
@@ -1063,9 +1135,7 @@ function hydrateManifestRecord(baseDir, record, options) {
   const testId = record.test_id ?? "unknown";
   const gradingAssertions = grading ? collectComponentAssertions(grading.component_results) : void 0;
   const gradingRecord = grading;
-  const gradingScores = mapGradingEvaluators(
-    gradingRecord?.component_results ?? gradingRecord?.graders ?? gradingRecord?.evaluators
-  );
+  const gradingScores = mapGradingEvaluators(gradingRecord?.component_results);
   return {
     timestamp: record.timestamp,
     testId,
@@ -1081,11 +1151,7 @@ function hydrateManifestRecord(baseDir, record, options) {
       passed: assertion.passed,
       evidence: assertion.evidence
     })),
-    scores: (
-      // `evaluators` was renamed to `graders` in v4.13 — read both for backwards compat with old artifacts.
-      // TODO: remove `evaluators` fallback once old run directories are no longer in use.
-      gradingScores ?? record.scores
-    ),
+    scores: gradingScores ?? record.scores,
     tokenUsage: metrics?.tokens ? {
       input: metrics.tokens.input,
       output: metrics.tokens.output,
@@ -1149,8 +1215,16 @@ function loadLightweightResults(sourceFile) {
     executionStatus: record.execution_status,
     error: record.error,
     costUsd: record.cost_usd,
+    durationMs: record.duration_ms,
+    tokenUsage: record.token_usage,
     timestamp: record.timestamp,
-    runtimeSource: record.runtime_source
+    runtimeSource: record.runtime_source,
+    resultDir: record.result_dir,
+    outputPath: record.output_path,
+    answerPath: record.answer_path,
+    gradingPath: record.grading_path,
+    transcriptPath: record.transcript_path,
+    metricsPath: record.metrics_path
   }));
 }
 
@@ -1890,6 +1964,16 @@ function relativeRunPathFromManifestPath(relativeManifestPath) {
   const manifestDir = path7.posix.dirname(relativeManifestPath);
   return path7.posix.basename(manifestDir) === ".internal" ? path7.posix.dirname(manifestDir) : manifestDir;
 }
+function formatPendingMergeWarnings(pendingMerge) {
+  if (!pendingMerge) {
+    return [];
+  }
+  const { temp_branch, target_branch, compare_url } = pendingMerge;
+  const mergeSuffix = compare_url ? `: ${compare_url}` : ".";
+  return [
+    `Warning: results were pushed to '${temp_branch}' instead \u2014 they are not lost. Merge that branch into ${target_branch} with a pull request${mergeSuffix}`
+  ];
+}
 async function maybeAutoExportRunArtifacts(payload) {
   const config = await loadNormalizedResultsConfig(
     payload.cwd,
@@ -1914,6 +1998,9 @@ async function maybeAutoExportRunArtifacts(payload) {
         throw new Error(pushResult.block_reason ?? "Results branch push conflict");
       }
       console.warn(`Warning: skipping results export: ${pushResult.block_reason}`);
+      for (const line of formatPendingMergeWarnings(pushResult.pending_merge)) {
+        console.warn(line);
+      }
       return "failed";
     }
     if (!pushResult.changed) {
@@ -2716,10 +2803,13 @@ function formatMatrixSummary(results) {
   return lines.join("\n");
 }
 
+// src/commands/eval/targets.ts
+import path12 from "node:path";
+
 // ../../packages/core/dist/evaluation/validation/index.js
 import { readFile as readFile2 } from "node:fs/promises";
 import path11 from "node:path";
-import { readFile as readFile22, readdir, realpath, stat as stat2 } from "node:fs/promises";
+import { readFile as readFile22, readdir, realpath, stat as stat3 } from "node:fs/promises";
 import path22 from "node:path";
 import fg3 from "fast-glob";
 import { readFile as readFile3 } from "node:fs/promises";
@@ -2740,6 +2830,10 @@ async function detectFileType(filePath) {
     const content = await readFile2(filePath, "utf8");
     const parsed = parseYamlValue(content);
     if (Array.isArray(parsed)) {
+      const inferred = inferFileTypeFromPath(filePath);
+      if (inferred === "targets") {
+        return inferred;
+      }
       return "cases";
     }
     if (typeof parsed !== "object" || parsed === null) {
@@ -2774,7 +2868,7 @@ function inferFileTypeFromPath(filePath) {
     if (isAgentVConfigFileName(basename)) {
       return "config";
     }
-    if (basename === "targets.yaml" || basename === "targets.yml") {
+    if (basename === "providers.yaml" || basename === "providers.yml") {
       return "targets";
     }
   }
@@ -2801,6 +2895,7 @@ var ASSERTION_TYPES_WITH_ARRAY_VALUE = /* @__PURE__ */ new Set([
 var PROMPTFOO_ASSERTION_TYPES = /* @__PURE__ */ new Set([
   "assert-set",
   "llm-rubric",
+  "agent-rubric",
   "javascript",
   "python",
   "webhook",
@@ -2814,11 +2909,9 @@ var REMOVED_ASSERTION_TYPE_REPLACEMENTS = /* @__PURE__ */ new Map([
   ["rubrics", "llm-rubric with value"],
   ["rubric", "llm-rubric with value"],
   ["script-grader", "script"],
-  ["code-judge", "script"],
-  ["llm-judge", "llm-grader"]
+  ["code-judge", "script"]
 ]);
 var UNSUPPORTED_PROMPTFOO_ASSERTION_TYPES = /* @__PURE__ */ new Set([
-  "agent-rubric",
   "answer-relevance",
   "bleu",
   "classifier",
@@ -2911,6 +3004,9 @@ function staleToolTrajectoryMessage(value) {
 function staleAuthoredAssertionMessage(value) {
   if (typeof value.type !== "string") return void 0;
   const type = value.type.replace(/_/g, "-");
+  if (type === "llm-grader" || type === "llm-judge") {
+    return "Authored assertion type 'llm-grader' has been removed. Use 'llm-rubric' for free-form rubric checks or 'agent-rubric' for agentic rubric checks.";
+  }
   if (type === "skill-trigger") return staleSkillTriggerMessage(value);
   if (type === "tool-trajectory") return staleToolTrajectoryMessage(value);
   return void 0;
@@ -2941,6 +3037,7 @@ var KNOWN_TOP_LEVEL_FIELDS = /* @__PURE__ */ new Set([
   "input_files",
   "prompts",
   "tests",
+  "providers",
   "graders",
   "defaults",
   "environment",
@@ -2976,7 +3073,6 @@ var KNOWN_DEFAULT_TEST_FIELDS = /* @__PURE__ */ new Set([
   "provider",
   "providers",
   "prompts",
-  "provider_output",
   "assert",
   "assert_scoring_function",
   "options",
@@ -2994,8 +3090,6 @@ var KNOWN_EVALUATE_OPTION_FIELDS = /* @__PURE__ */ new Set([
   "max_eval_time_ms",
   "filter_range"
 ]);
-var KNOWN_REPEAT_FIELDS = /* @__PURE__ */ new Set(["count", "strategy", "early_exit", "cost_limit_usd"]);
-var KNOWN_REPEAT_STRATEGIES = /* @__PURE__ */ new Set(["pass_any", "pass_all", "mean", "confidence_interval"]);
 var KNOWN_TEST_EXECUTION_FIELDS = /* @__PURE__ */ new Set([
   "assert",
   "skip_defaults",
@@ -3009,9 +3103,13 @@ var KNOWN_TEST_EXECUTION_FIELDS = /* @__PURE__ */ new Set([
   "workspace"
 ]);
 var REMOVED_TOP_LEVEL_FIELDS = /* @__PURE__ */ new Map([
+  [
+    "experiment",
+    "Top-level 'experiment' has been removed from authored eval YAML. Use tags.experiment in the eval file or CLI --experiment at run time."
+  ],
   [
     "imports",
-    "Top-level 'imports' is not supported. Run eval files directly with CLI multi-file selection and tags for grouping. For raw case files, use tests: file://... or string entries under tests. For reusable config, use prompts: file://..., default_test: file://..., and environment: file://... for coding-agent testbeds."
+    "Top-level 'imports' is not supported. Run eval files directly with CLI multi-file selection and tags for grouping. For raw case files, use tests: file://... or string entries under tests. For reusable scenarios, use scenarios: [file://...]. For reusable config, use prompts: file://..., default_test: file://..., and environment: file://... for coding-agent testbeds."
   ],
   [
     "expected_output",
@@ -3025,14 +3123,15 @@ var REMOVED_TOP_LEVEL_FIELDS = /* @__PURE__ */ new Map([
     "workers",
     "'workers' has been removed from eval YAML. Set authored eval concurrency with evaluate_options.max_concurrency."
   ],
-  ["model", "Top-level 'model' is not part of eval YAML. Put model inside the target object."],
+  ["model", "Top-level 'model' is not part of eval YAML. Put model inside providers[].config."],
   [
     "policy",
     "Top-level 'policy' is not part of eval YAML. Put repeat under evaluate_options.repeat, timeout_seconds and threshold at the top level, and budget_usd under evaluate_options."
   ],
+  ["target", "Top-level 'target' has been removed. Use top-level 'providers' instead."],
   [
-    "providers",
-    "Top-level 'providers' is not a runtime alias in AgentV eval YAML. Use 'targets' for systems under test; provider names backend kind inside each target."
+    "targets",
+    "Top-level 'targets' has been removed. Use 'providers'; map targets[].id to providers[].label and targets[].provider to providers[].id."
   ],
   [
     "eval_cases",
@@ -3043,10 +3142,10 @@ var REMOVED_TOP_LEVEL_FIELDS = /* @__PURE__ */ new Map([
     "Top-level 'evalcases' has been removed from authored eval YAML. Use 'tests' instead."
   ],
   ["repeat", "Top-level 'repeat' has been removed. Use evaluate_options.repeat instead."],
-  ["runs", "Top-level 'runs' has been removed. Use evaluate_options.repeat.count instead."],
+  ["runs", "Top-level 'runs' has been removed. Use a positive integer evaluate_options.repeat."],
   [
     "early_exit",
-    "Top-level 'early_exit' has been removed. Use evaluate_options.repeat.early_exit instead."
+    "Top-level 'early_exit' has been removed. Use a positive integer evaluate_options.repeat."
   ],
   ["budget_usd", "Top-level 'budget_usd' has been removed. Use evaluate_options.budget_usd."],
   [
@@ -3057,8 +3156,8 @@ var REMOVED_TOP_LEVEL_FIELDS = /* @__PURE__ */ new Map([
     "preprocessors",
     "Top-level 'preprocessors' has been removed from authored eval YAML. Use default_test.options.transform or assertion-level transform instead."
   ],
-  ["providerPromptMap", "Top-level 'providerPromptMap' is not supported. Use 'targets'."],
-  ["provider_prompt_map", "Top-level 'provider_prompt_map' is not supported. Use 'targets'."]
+  ["providerPromptMap", "Top-level 'providerPromptMap' is not supported. Use 'providers'."],
+  ["provider_prompt_map", "Top-level 'provider_prompt_map' is not supported. Use 'providers'."]
 ]);
 var DEPRECATED_TOP_LEVEL_FIELDS = /* @__PURE__ */ new Map([
   ["evaluator", "'evaluator' is deprecated. Use 'assert' instead."]
@@ -3071,7 +3170,6 @@ var KNOWN_TEST_FIELDS = /* @__PURE__ */ new Set([
   "provider",
   "providers",
   "prompts",
-  "provider_output",
   "input",
   "input_files",
   "assert",
@@ -3111,6 +3209,10 @@ REMOVED_TEST_FIELDS.set(
   "input",
   "tests[].input has been removed from authored eval YAML. Put prompt text or chat/system/user messages in top-level 'prompts' and put row-specific data in tests[].vars."
 );
+REMOVED_TEST_FIELDS.set(
+  "provider_output",
+  "tests[].provider_output is not supported in authored AgentV YAML. Use an explicit deterministic target such as provider: cli for fixed outputs, or use a replay/fixture target for captured provider responses."
+);
 REMOVED_TEST_FIELDS.set(
   "preprocessors",
   "tests[].preprocessors has been removed from authored eval YAML. Use tests[].options.transform or assertion-level transform instead."
@@ -3215,14 +3317,6 @@ async function validateEvalFile(filePath) {
     };
   }
   validateMetadata(parsed, absolutePath, errors);
-  if (parsed.experiment !== void 0 && typeof parsed.experiment !== "string") {
-    errors.push({
-      severity: "error",
-      filePath: absolutePath,
-      location: "experiment",
-      message: "Top-level 'experiment' must be a string run/result grouping label."
-    });
-  }
   for (const key of Object.keys(parsed)) {
     const removedMessage = REMOVED_TOP_LEVEL_FIELDS.get(key);
     if (removedMessage) {
@@ -3252,6 +3346,7 @@ async function validateEvalFile(filePath) {
     }
   }
   await validateEnvironmentConfig(parsed.environment, absolutePath, errors, "environment");
+  await validateProviderEnvironmentFields(parsed.providers, "providers", absolutePath, errors);
   await validateSuiteWorkspaceConfigs(parsed, absolutePath, errors);
   validateTargetTestbedFields(parsed.target, "target", absolutePath, errors);
   validateTargetsTestbedFields(parsed.targets, "targets", absolutePath, errors);
@@ -3260,10 +3355,15 @@ async function validateEvalFile(filePath) {
   validateEvaluateOptions(parsed.evaluate_options, "evaluate_options", absolutePath, errors);
   validateAssertArray(parsed.assert, "assert", absolutePath, errors, customAssertionTypes);
   validateDefaultTest(parsed.default_test, absolutePath, errors, customAssertionTypes);
-  await validateScenarios(parsed.scenarios, parsed, absolutePath, errors, customAssertionTypes);
+  const expandedScenarios = await expandScenariosForValidation(
+    parsed.scenarios,
+    absolutePath,
+    errors
+  );
+  await validateScenarios(expandedScenarios, parsed, absolutePath, errors, customAssertionTypes);
   const cases = parsed.tests;
   const hasImports = collectImportEntries(parsed).length > 0;
-  const hasScenarios = Array.isArray(parsed.scenarios);
+  const hasScenarios = Array.isArray(expandedScenarios);
   if (typeof cases === "string") {
     await validateRawCaseImportPath(cases, absolutePath, "tests", errors);
     await validateCompositionDiagnostics(absolutePath, parsed, errors);
@@ -3390,7 +3490,7 @@ async function validateEvalFile(filePath) {
       suiteInputFiles: skipDefaults ? void 0 : parsed.input_files
     }) !== void 0 : false;
     validateInputField(evalCase.input, `${location}.input`, absolutePath, errors, {
-      required: !hasPromptMdFallback && evalCase.prompts === void 0 && parsed.prompts === void 0 && evalCase.provider_output === void 0
+      required: !hasPromptMdFallback && evalCase.prompts === void 0 && parsed.prompts === void 0
     });
     const expectedOutputField = evalCase.expected_output;
     if (expectedOutputField !== void 0) {
@@ -3436,7 +3536,7 @@ async function validateEvalFile(filePath) {
 async function validateTypeScriptEvalConfigFile(filePath) {
   const absolutePath = path22.resolve(filePath);
   try {
-    const { loadTsEvalSuite } = await import("./ts-eval-loader-2RFVZHCT-7CZ3DCDD.js");
+    const { loadTsEvalSuite } = await import("./ts-eval-loader-3G5GEAEC-6F52JLPP.js");
     await loadTsEvalSuite(absolutePath, process.cwd());
     return {
       valid: true,
@@ -3501,6 +3601,31 @@ function validateTargetTestbedFields(target, location, filePath, errors) {
     });
   }
 }
+async function validateProviderEnvironmentFields(providers, location, filePath, errors) {
+  const entries = Array.isArray(providers) ? providers : providers === void 0 ? [] : [providers];
+  for (let index = 0; index < entries.length; index++) {
+    const entry = entries[index];
+    if (!isObject(entry)) {
+      continue;
+    }
+    await validateEnvironmentConfig(
+      entry.environment,
+      filePath,
+      errors,
+      `${location}[${index}].environment`
+    );
+    for (const field of ["container", "install"]) {
+      if (entry[field] !== void 0) {
+        errors.push({
+          severity: "error",
+          filePath,
+          location: `${location}[${index}].${field}`,
+          message: `Provider definitions cannot include ${field}; use an environment recipe for testbed setup.`
+        });
+      }
+    }
+  }
+}
 function validateTargetsTestbedFields(targets, location, filePath, errors) {
   const entries = Array.isArray(targets) ? targets : targets === void 0 ? [] : [targets];
   entries.forEach((entry, index) => {
@@ -3688,7 +3813,7 @@ async function validateCompositionDiagnostics(filePath, parsed, errors) {
           severity: "warning",
           filePath,
           location: entry.location,
-          message: parentHasRuntime ? `Imported suite '${resolvedSuite.displayPath}' defines ${runtimeFields.join(", ")}, but child target and run controls are ignored by legacy tests[].include suite imports. Prefer running eval files directly with CLI multi-file selection and tags.` : `Imported suite '${resolvedSuite.displayPath}' defines ${runtimeFields.join(", ")}, but child target and run controls are ignored by legacy tests[].include suite imports. Prefer running eval files directly with CLI multi-file selection and tags.`
+          message: parentHasRuntime ? `Imported suite '${resolvedSuite.displayPath}' defines ${runtimeFields.join(", ")}, but child providers and run controls are ignored by legacy tests[].include suite imports. Prefer running eval files directly with CLI multi-file selection and tags.` : `Imported suite '${resolvedSuite.displayPath}' defines ${runtimeFields.join(", ")}, but child providers and run controls are ignored by legacy tests[].include suite imports. Prefer running eval files directly with CLI multi-file selection and tags.`
         });
       }
       continue;
@@ -3710,7 +3835,9 @@ async function validateCompositionDiagnostics(filePath, parsed, errors) {
 }
 var WRAPPER_RUNTIME_CONTROL_FIELDS = [
   "experiment",
+  "providers",
   "target",
+  "targets",
   "repeat",
   "timeout_seconds",
   "evaluate_options",
@@ -3906,10 +4033,18 @@ function validateDefaultTest(defaultTest, filePath, errors, customAssertionTypes
         severity: "error",
         filePath,
         location: `default_test.${key}`,
-        message: "Invalid default_test field. Supported fields: vars, provider, providers, prompts, provider_output, assert, assert_scoring_function, options, threshold, metadata."
+        message: "Invalid default_test field. Supported fields: vars, provider, providers, prompts, assert, assert_scoring_function, options, threshold, metadata."
       });
     }
   }
+  if (defaultTest.provider_output !== void 0) {
+    errors.push({
+      severity: "error",
+      filePath,
+      location: "default_test.provider_output",
+      message: "default_test.provider_output is not supported in authored AgentV YAML. Use an explicit deterministic target such as provider: cli for fixed outputs, or use a replay/fixture target for captured provider responses."
+    });
+  }
   if (defaultTest.expected_output !== void 0) {
     errors.push({
       severity: "error",
@@ -4011,10 +4146,8 @@ async function validateScenarios(scenarios, parsed, filePath, errors, customAsse
     }
     for (let testIndex = 0; testIndex < scenario.tests.length; testIndex++) {
       const test = scenario.tests[testIndex];
-      const everyConfigProvidesInput = scenarioConfigs.length > 0 && scenarioConfigs.every(
-        (config) => isObject(config) && (config.prompts !== void 0 || config.provider_output !== void 0)
-      );
-      const requireInput = isObject(test) && parsed.prompts === void 0 && test.prompts === void 0 && test.provider_output === void 0 && !everyConfigProvidesInput;
+      const everyConfigProvidesInput = scenarioConfigs.length > 0 && scenarioConfigs.every((config) => isObject(config) && config.prompts !== void 0);
+      const requireInput = isObject(test) && parsed.prompts === void 0 && test.prompts === void 0 && !everyConfigProvidesInput;
       await validateScenarioTestLikeRow(
         test,
         `${scenarioLocation}.tests[${testIndex}]`,
@@ -4026,6 +4159,35 @@ async function validateScenarios(scenarios, parsed, filePath, errors, customAsse
     }
   }
 }
+async function expandScenariosForValidation(scenarios, filePath, errors) {
+  if (!Array.isArray(scenarios)) {
+    return scenarios;
+  }
+  const expanded = [];
+  for (let scenarioIndex = 0; scenarioIndex < scenarios.length; scenarioIndex++) {
+    const scenario = scenarios[scenarioIndex];
+    if (!isScenarioFileReference(scenario)) {
+      expanded.push(scenario);
+      continue;
+    }
+    try {
+      const externalScenarios = await resolveScenarioFileReference(
+        scenario,
+        path22.dirname(filePath)
+      );
+      expanded.push(...externalScenarios);
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      errors.push({
+        severity: "error",
+        filePath,
+        location: `scenarios[${scenarioIndex}]`,
+        message
+      });
+    }
+  }
+  return expanded;
+}
 async function validateScenarioTestLikeRow(row, location, filePath, errors, customAssertionTypes, options) {
   if (!isObject(row)) {
     errors.push({
@@ -4118,7 +4280,7 @@ async function validateScenarioTestLikeRow(row, location, filePath, errors, cust
   }
   const targets = row.providers !== void 0 ? row.providers : row.provider;
   if (targets !== void 0) {
-    validateTargetTestbedFields(targets, `${location}.providers`, filePath, errors);
+    await validateProviderEnvironmentFields(targets, `${location}.providers`, filePath, errors);
   }
 }
 function validateEvaluateOptions(evaluateOptions, location, filePath, errors) {
@@ -4208,7 +4370,12 @@ function validateEvaluateOptionsRepeat(repeat, location, filePath, errors) {
     }
     return;
   }
-  validateRepeatOverride(repeat, location, filePath, errors);
+  errors.push({
+    severity: "error",
+    filePath,
+    location,
+    message: `Invalid '${location}' field (must be a positive integer). The repeat object shape has been removed; use ${location}: 2.`
+  });
 }
 function validateFilterRange(filterRange, location, filePath, errors) {
   if (filterRange === void 0 || typeof filterRange === "string") {
@@ -4227,57 +4394,12 @@ function validateRepeatOverride(repeat, location, filePath, errors) {
   if (repeat === void 0) {
     return;
   }
-  if (!isObject(repeat)) {
+  if (typeof repeat !== "number" || !Number.isInteger(repeat) || repeat < 1) {
     errors.push({
       severity: "error",
       filePath,
       location,
-      message: "Invalid 'repeat' field (must be an object)"
-    });
-    return;
-  }
-  for (const key of Object.keys(repeat)) {
-    if (!KNOWN_REPEAT_FIELDS.has(key)) {
-      errors.push({
-        severity: "error",
-        filePath,
-        location: `${location}.${key}`,
-        message: "Invalid repeat field. Supported fields: count, strategy, early_exit, cost_limit_usd."
-      });
-    }
-  }
-  if (typeof repeat.count !== "number" || !Number.isInteger(repeat.count) || repeat.count < 1) {
-    errors.push({
-      severity: "error",
-      filePath,
-      location: `${location}.count`,
-      message: "Invalid 'count' field (must be a positive integer)"
-    });
-  }
-  if (repeat.strategy !== void 0 && (typeof repeat.strategy !== "string" || !KNOWN_REPEAT_STRATEGIES.has(repeat.strategy))) {
-    errors.push({
-      severity: "error",
-      filePath,
-      location: `${location}.strategy`,
-      message: "Invalid 'strategy' field (must be pass_any, pass_all, mean, or confidence_interval; use pass_any instead of removed pass_at_k)"
-    });
-  }
-  const earlyExit = repeat.early_exit;
-  if (earlyExit !== void 0 && typeof earlyExit !== "boolean") {
-    errors.push({
-      severity: "error",
-      filePath,
-      location: `${location}.early_exit`,
-      message: "Invalid 'early_exit' field (must be a boolean)"
-    });
-  }
-  const costLimit = repeat.cost_limit_usd;
-  if (costLimit !== void 0 && (typeof costLimit !== "number" || costLimit < 0)) {
-    errors.push({
-      severity: "error",
-      filePath,
-      location: `${location}.cost_limit_usd`,
-      message: "Invalid 'cost_limit_usd' field (must be a non-negative number)"
+      message: "Invalid 'repeat' field (must be a positive integer). The repeat object shape has been removed; use repeat: 2."
     });
   }
 }
@@ -4719,7 +4841,7 @@ async function validateRawCaseImportPath(testsPath, filePath, location, errors)
     let caseIndex = 0;
     for (const casePath of caseFiles) {
       const statPath = casePath.match(/\.(?:mjs|cjs|js|py):[^/\\:]+$/i) ? casePath.slice(0, casePath.lastIndexOf(":")) : casePath;
-      const pathStat = await stat2(statPath).catch(() => void 0);
+      const pathStat = await stat3(statPath).catch(() => void 0);
       const externalCases = pathStat?.isDirectory() ? await loadCasesFromDirectory(casePath) : await loadCasesFromFile(casePath);
       for (const externalCase of externalCases) {
         await validateWorkspaceConfig(
@@ -5155,6 +5277,11 @@ async function validateCasesFile(filePath) {
   };
 }
 var LEGACY_ENV_PATTERN = /\$\{\{\s*([A-Z_][A-Z0-9_]*)\s*\}\}/g;
+var REMOVED_RUNNER_BATCHING_FIELDS = /* @__PURE__ */ new Set([
+  "batch_requests",
+  "provider_batching",
+  "providerBatching"
+]);
 function isObject3(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -5189,7 +5316,7 @@ function validateLegacyEnvTemplates(value, filePath, location, errors) {
     }
   }
 }
-var COMMON_SETTINGS = new Set(COMMON_TARGET_SETTINGS);
+var COMMON_SETTINGS = new Set(COMMON_PROVIDER_SETTINGS);
 var RETRY_SETTINGS = /* @__PURE__ */ new Set([
   "max_retries",
   "retry_initial_delay_ms",
@@ -5435,6 +5562,7 @@ function validateUnknownSettings(target, provider, absolutePath, location, error
     "name",
     "label",
     "provider",
+    "provider_spec",
     "config",
     "prompts",
     "transform",
@@ -5458,6 +5586,9 @@ function validateUnknownSettings(target, provider, absolutePath, location, error
   };
   const removedForProvider = removedPerProvider[provider];
   for (const key of Object.keys(target)) {
+    if (REMOVED_RUNNER_BATCHING_FIELDS.has(key)) {
+      continue;
+    }
     if (removedFields.has(key)) {
       errors.push({
         severity: "warning",
@@ -5476,15 +5607,6 @@ function validateUnknownSettings(target, provider, absolutePath, location, error
       });
       continue;
     }
-    if (key === "provider_batching") {
-      errors.push({
-        severity: "error",
-        filePath: absolutePath,
-        location: `${location}.${key}`,
-        message: "The 'provider_batching' field has been removed. Use 'batch_requests' instead."
-      });
-      continue;
-    }
     if (removedForProvider?.has(key)) {
       errors.push({
         severity: "error",
@@ -5504,6 +5626,22 @@ function validateUnknownSettings(target, provider, absolutePath, location, error
     }
   }
 }
+function buildRemovedRunnerBatchingMessage(field) {
+  return `The '${field}' field has been removed. Runner-level batching was removed; providers should implement internal queueing/batching behind per-request invocation.`;
+}
+function validateRemovedRunnerBatchingFields(target, absolutePath, location, errors) {
+  for (const key of Object.keys(target)) {
+    if (!REMOVED_RUNNER_BATCHING_FIELDS.has(key)) {
+      continue;
+    }
+    errors.push({
+      severity: "error",
+      filePath: absolutePath,
+      location: `${location}.${key}`,
+      message: buildRemovedRunnerBatchingMessage(key)
+    });
+  }
+}
 async function validateTargetsFile(filePath) {
   const errors = [];
   const absolutePath = path42.resolve(filePath);
@@ -5619,11 +5757,11 @@ async function validateTargetsFile(filePath) {
     }
     return result;
   }
-  if (!isObject3(parsed)) {
+  if (!Array.isArray(parsed) && !isObject3(parsed)) {
     errors.push({
       severity: "error",
       filePath: absolutePath,
-      message: "File must contain a YAML object"
+      message: "File must contain a YAML array or an object with a providers array"
     });
     return {
       valid: false,
@@ -5632,22 +5770,22 @@ async function validateTargetsFile(filePath) {
       errors
     };
   }
-  if (Array.isArray(parsed.providers)) {
+  if (isObject3(parsed) && Array.isArray(parsed.targets)) {
     errors.push({
       severity: "error",
       filePath: absolutePath,
-      location: "providers",
-      message: "Top-level 'providers' is not a runtime alias in targets.yaml. Use 'targets' for systems under test; provider names backend kind inside each target."
+      location: "targets",
+      message: "Top-level 'targets' has been removed. Use 'providers'; map targets[].id to providers[].label and targets[].provider to providers[].id."
     });
   }
-  const targets = parsed.targets;
-  const rawTargets = isObject3(rawParsed) && Array.isArray(rawParsed.targets) ? rawParsed.targets : [];
-  if (!Array.isArray(targets)) {
+  const providers = Array.isArray(parsed) ? parsed : parsed.providers;
+  const rawTargets = Array.isArray(rawParsed) ? rawParsed : isObject3(rawParsed) && Array.isArray(rawParsed.providers) ? rawParsed.providers : [];
+  if (!Array.isArray(providers)) {
     errors.push({
       severity: "error",
       filePath: absolutePath,
-      location: "targets",
-      message: "Missing or invalid 'targets' field (must be an array)"
+      location: "providers",
+      message: "Missing or invalid 'providers' field (must be an array)"
     });
     return {
       valid: errors.length === 0,
@@ -5657,22 +5795,24 @@ async function validateTargetsFile(filePath) {
     };
   }
   const knownProviders = [...KNOWN_PROVIDERS];
-  for (let i = 0; i < targets.length; i++) {
-    const target = targets[i];
-    const location = `targets[${i}]`;
-    if (!isObject3(target)) {
+  for (let i = 0; i < providers.length; i++) {
+    const providerEntry = providers[i];
+    const location = `providers[${i}]`;
+    if (!isObject3(providerEntry)) {
       errors.push({
         severity: "error",
         filePath: absolutePath,
         location,
-        message: "Target must be an object"
+        message: "Provider must be an object"
       });
       continue;
     }
-    validateLegacyEnvTemplates(rawTargets[i] ?? target, absolutePath, location, errors);
+    validateLegacyEnvTemplates(rawTargets[i] ?? providerEntry, absolutePath, location, errors);
     let normalizedTarget;
     try {
-      normalizedTarget = normalizeTargetDefinition(target);
+      normalizedTarget = normalizeProviderDefinition(providerEntry, {
+        location
+      });
     } catch (error) {
       errors.push({
         severity: "error",
@@ -5682,7 +5822,7 @@ async function validateTargetsFile(filePath) {
       });
     }
     for (const warning of findDeprecatedCamelCaseTargetWarnings(
-      normalizedTarget ?? target,
+      normalizedTarget ?? providerEntry,
       location
     )) {
       const fieldMatch = warning.message.match(/field '([^']+)'/);
@@ -5693,10 +5833,10 @@ async function validateTargetsFile(filePath) {
         severity: "error",
         filePath: absolutePath,
         location: warning.location,
-        message: `camelCase field '${field}' is no longer supported in targets.yaml. Use '${replacement}' instead.`
+        message: `camelCase field '${field}' is no longer supported in providers.yaml. Use '${replacement}' instead.`
       });
     }
-    const id = target.id;
+    const id = providerEntry.id;
     if (typeof id !== "string" || id.trim().length === 0) {
       errors.push({
         severity: "error",
@@ -5705,23 +5845,15 @@ async function validateTargetsFile(filePath) {
         message: "Missing or invalid 'id' field (must be a non-empty string)"
       });
     }
-    if (typeof target.label === "string" && target.label.trim().length > 0) {
-      errors.push({
-        severity: "error",
-        filePath: absolutePath,
-        location: `${location}.label`,
-        message: "The target 'label' field has been removed. Use 'id' instead."
-      });
-    }
-    if (typeof target.name === "string" && target.name.trim().length > 0) {
+    if (typeof providerEntry.name === "string" && providerEntry.name.trim().length > 0) {
       errors.push({
         severity: "error",
         filePath: absolutePath,
         location: `${location}.name`,
-        message: "The target 'name' field has been removed. Use 'id' instead."
+        message: "The provider 'name' field has been removed. Use 'label' instead."
       });
     }
-    const effectiveTarget = normalizedTarget ?? target;
+    const effectiveTarget = normalizedTarget ?? providerEntry;
     const provider = effectiveTarget.provider;
     const rawTarget = rawTargets[i];
     const rawUseTarget = isObject3(rawTarget) ? rawTarget.use_target : void 0;
@@ -5730,7 +5862,7 @@ async function validateTargetsFile(filePath) {
         severity: "error",
         filePath: absolutePath,
         location: `${location}.use_target`,
-        message: "The 'use_target' field has been removed from authored targets.yaml target definitions. Define a concrete target with 'provider' instead."
+        message: "The 'use_target' field has been removed from authored providers.yaml definitions. Define a concrete provider entry instead."
       });
     }
     const providerValue = typeof provider === "string" ? provider.trim().toLowerCase() : void 0;
@@ -5739,24 +5871,25 @@ async function validateTargetsFile(filePath) {
       errors.push({
         severity: "error",
         filePath: absolutePath,
-        location: `${location}.provider`,
-        message: "Missing or invalid 'provider' field (must be a non-empty string)"
+        location: `${location}.id`,
+        message: "Missing or invalid 'id' field (must be a non-empty provider backend string)"
       });
     } else if (!isTemplated && (providerValue === "claude" || providerValue === "copilot")) {
       errors.push({
         severity: "error",
         filePath: absolutePath,
-        location: `${location}.provider`,
+        location: `${location}.id`,
         message: `Ambiguous provider '${providerValue}' is not supported. Choose an explicit provider such as '${providerValue}-cli' or '${providerValue}-sdk'.`
       });
     } else if (typeof provider === "string" && !isTemplated && !knownProviders.includes(provider)) {
       errors.push({
         severity: "warning",
         filePath: absolutePath,
-        location: `${location}.provider`,
+        location: `${location}.id`,
         message: `Unknown provider '${provider}'. Known providers: ${knownProviders.join(", ")}`
       });
     }
+    validateRemovedRunnerBatchingFields(effectiveTarget, absolutePath, location, errors);
     if (providerValue === "cli") {
       validateCliSettings(effectiveTarget, absolutePath, location, errors);
     }
@@ -5906,6 +6039,7 @@ async function validateConfigFile(filePath, options = {}) {
       "results",
       "repo_resolvers",
       "refs",
+      "providers",
       "targets",
       "graders",
       "tests",
@@ -5942,7 +6076,7 @@ async function validateConfigFile(filePath, options = {}) {
 }
 function validateComposableGraph(errors, filePath, config) {
   try {
-    normalizeComposableConfigGraph(config, filePath);
+    normalizeComposableConfigGraph(config, filePath, { allowExecutionDefaultFields: true });
   } catch (error) {
     addError(errors, filePath, void 0, error.message);
   }
@@ -6453,13 +6587,13 @@ var ANSI_RESET3 = "\x1B[0m";
 function isTTY() {
   return process.stdout.isTTY ?? false;
 }
-function resolveUseTarget(name, definitions, env, targetsFilePath) {
+function resolveUseTarget(name, definitions, env, providersFilePath) {
   const maxDepth = 5;
   let current = definitions.find((d) => d.name === name);
   if (!current) {
-    const available = listTargetNames(definitions).join(", ");
+    const available = listProviderLabels(definitions).join(", ");
     throw new Error(
-      `Target '${name}' not found in ${targetsFilePath}. Available targets: ${available}`
+      `Provider '${name}' not found in ${providersFilePath}. Available providers: ${available}`
     );
   }
   for (let depth = 0; depth < maxDepth; depth++) {
@@ -6470,27 +6604,82 @@ function resolveUseTarget(name, definitions, env, targetsFilePath) {
     const envMatch = raw.match(/^\$\{\{\s*([A-Z0-9_]+)\s*\}\}$/i);
     const resolved = envMatch ? env[envMatch[1]] ?? "" : raw;
     if (resolved.trim().length === 0) break;
-    const next = definitions.find((d) => d.name === resolved.trim());
+    const next = definitions.find(
+      (d) => d.name === resolved.trim()
+    );
     if (!next) {
-      const available = listTargetNames(definitions).join(", ");
+      const available = listProviderLabels(definitions).join(", ");
       throw new Error(
-        `Target '${name}' use_target '${resolved.trim()}' not found in ${targetsFilePath}. Available targets: ${available}`
+        `Provider '${name}' use_target '${resolved.trim()}' not found in ${providersFilePath}. Available providers: ${available}`
       );
     }
     current = next;
   }
   return current;
 }
-async function readTestSuiteTarget(testFilePath) {
+async function readTestSuiteProvider(testFilePath) {
   const metadata = await readTestSuiteMetadata(testFilePath);
   return metadata.target;
 }
-function pickTargetName(options) {
-  const cliName = options.cliTargetName?.trim();
+async function readProviderCatalog(options) {
+  if (!options.explicitProvidersPath && options.providerDefinitions) {
+    return {
+      definitions: options.providerDefinitions,
+      sourcePath: options.providerDefinitionsSource ?? ".agentv/config.yaml:providers"
+    };
+  }
+  if (!options.explicitProvidersPath && options.requireExplicitProviderCatalog) {
+    throw new Error(
+      "No provider catalog configured. Add `providers:` to .agentv/config.yaml, use `providers: file://providers.yaml`, or pass --providers <path>."
+    );
+  }
+  const providersFilePath = await discoverProvidersFile({
+    explicitPath: options.explicitProvidersPath,
+    testFilePath: options.testFilePath,
+    repoRoot: options.repoRoot,
+    cwd: options.cwd,
+    allowLegacyTargetFiles: options.allowLegacyTargetFiles
+  });
+  await validateProviderCatalogFile(providersFilePath);
+  return {
+    definitions: await readProviderDefinitions(providersFilePath),
+    sourcePath: providersFilePath
+  };
+}
+async function validateProviderCatalogFile(providersFilePath) {
+  const validationResult = await validateTargetsFile(providersFilePath);
+  const warnings = validationResult.errors.filter((e) => e.severity === "warning");
+  const useColors2 = isTTY();
+  if (warnings.length > 0) {
+    console.warn(`
+Warnings in ${providersFilePath}:`);
+    for (const warning of warnings) {
+      const location = warning.location ? ` [${warning.location}]` : "";
+      const prefix = useColors2 ? `${ANSI_YELLOW3}  \u26A0${ANSI_RESET3}` : "  \u26A0";
+      const message = useColors2 ? `${ANSI_YELLOW3}${warning.message}${ANSI_RESET3}` : warning.message;
+      console.warn(`${prefix}${location} ${message}`);
+    }
+    console.warn("");
+  }
+  const errors = validationResult.errors.filter((e) => e.severity === "error");
+  if (errors.length > 0) {
+    console.error(`
+Errors in ${providersFilePath}:`);
+    for (const error of errors) {
+      const location = error.location ? ` [${error.location}]` : "";
+      const prefix = useColors2 ? `${ANSI_RED3}  \u2717${ANSI_RESET3}` : "  \u2717";
+      const message = useColors2 ? `${ANSI_RED3}${error.message}${ANSI_RESET3}` : error.message;
+      console.error(`${prefix}${location} ${message}`);
+    }
+    throw new Error(`Providers file validation failed with ${errors.length} error(s)`);
+  }
+}
+function pickProviderLabel(options) {
+  const cliName = options.cliProviderLabel?.trim();
   if (cliName && cliName !== "default") {
     return { name: cliName, source: "cli" };
   }
-  const fileName = options.fileTargetName?.trim();
+  const fileName = options.fileProviderLabel?.trim();
   if (fileName && fileName.length > 0) {
     return { name: fileName, source: "test-file" };
   }
@@ -6501,12 +6690,12 @@ function withModelOverride(target, modelOverride) {
   return model && model.length > 0 ? { ...target, model } : target;
 }
 function overlayTargetDefinition(params) {
-  const { spec, definitions, env, targetsFilePath } = params;
+  const { spec, definitions, env, providersFilePath } = params;
   if (!spec?.definition) {
     return void 0;
   }
   if (spec.extends) {
-    const base = resolveUseTarget(spec.extends, definitions, env, targetsFilePath);
+    const base = resolveUseTarget(spec.extends, definitions, env, providersFilePath);
     return {
       ...base,
       ...spec.definition,
@@ -6518,82 +6707,86 @@ function overlayTargetDefinition(params) {
 function definitionsWithEffectiveTarget(definitions, effective) {
   return [effective, ...definitions.filter((definition) => definition.name !== effective.name)];
 }
-async function selectTarget(options) {
-  const { testFilePath, repoRoot, cwd, explicitTargetsPath, cliTargetName, modelOverride, env } = options;
-  const targetsFilePath = await discoverTargetsFile({
-    explicitPath: explicitTargetsPath,
+async function resolveInlineDefinitionEnvironment(definition, testFilePath, location) {
+  const [resolved] = await resolveProviderDefinitionEnvironments(
+    [definition],
+    path12.dirname(path12.resolve(testFilePath)),
+    { location }
+  );
+  return resolved ?? definition;
+}
+async function selectProvider(options) {
+  const {
     testFilePath,
     repoRoot,
-    cwd
+    cwd,
+    explicitProvidersPath,
+    providerDefinitions,
+    providerDefinitionsSource,
+    requireExplicitProviderCatalog,
+    allowLegacyTargetFiles,
+    cliProviderLabel,
+    modelOverride,
+    env
+  } = options;
+  const providerCatalog = await readProviderCatalog({
+    explicitProvidersPath,
+    providerDefinitions,
+    providerDefinitionsSource,
+    requireExplicitProviderCatalog,
+    testFilePath,
+    repoRoot,
+    cwd,
+    allowLegacyTargetFiles
   });
-  const validationResult = await validateTargetsFile(targetsFilePath);
-  const warnings = validationResult.errors.filter((e) => e.severity === "warning");
-  const useColors2 = isTTY();
-  if (warnings.length > 0) {
-    console.warn(`
-Warnings in ${targetsFilePath}:`);
-    for (const warning of warnings) {
-      const location = warning.location ? ` [${warning.location}]` : "";
-      const prefix = useColors2 ? `${ANSI_YELLOW3}  \u26A0${ANSI_RESET3}` : "  \u26A0";
-      const message = useColors2 ? `${ANSI_YELLOW3}${warning.message}${ANSI_RESET3}` : warning.message;
-      console.warn(`${prefix}${location} ${message}`);
-    }
-    console.warn("");
-  }
-  const errors = validationResult.errors.filter((e) => e.severity === "error");
-  if (errors.length > 0) {
-    console.error(`
-Errors in ${targetsFilePath}:`);
-    for (const error of errors) {
-      const location = error.location ? ` [${error.location}]` : "";
-      const prefix = useColors2 ? `${ANSI_RED3}  \u2717${ANSI_RESET3}` : "  \u2717";
-      const message = useColors2 ? `${ANSI_RED3}${error.message}${ANSI_RESET3}` : error.message;
-      console.error(`${prefix}${location} ${message}`);
-    }
-    throw new Error(`Targets file validation failed with ${errors.length} error(s)`);
-  }
-  const definitions = await readTargetDefinitions(targetsFilePath);
+  const definitions = providerCatalog.definitions;
+  const providersFilePath = providerCatalog.sourcePath;
   const fileTargetSpec = options.fileTargetSpec;
-  const fileTargetName = options.fileTargetName ?? fileTargetSpec?.name ?? await readTestSuiteTarget(testFilePath);
-  const targetChoice = pickTargetName({ cliTargetName, fileTargetName });
-  const overlayDefinition = targetChoice.source === "test-file" ? overlayTargetDefinition({ spec: fileTargetSpec, definitions, env, targetsFilePath }) : void 0;
+  const fileProviderLabel = options.fileProviderLabel ?? fileTargetSpec?.name ?? await readTestSuiteProvider(testFilePath);
+  const providerChoice = pickProviderLabel({ cliProviderLabel, fileProviderLabel });
+  const rawOverlayDefinition = providerChoice.source === "test-file" ? overlayTargetDefinition({ spec: fileTargetSpec, definitions, env, providersFilePath }) : void 0;
+  const overlayDefinition = rawOverlayDefinition ? await resolveInlineDefinitionEnvironment(rawOverlayDefinition, testFilePath, "providers") : void 0;
   const targetDefinition = withModelOverride(
-    overlayDefinition ?? resolveUseTarget(targetChoice.name, definitions, env, targetsFilePath),
+    overlayDefinition ?? resolveUseTarget(providerChoice.name, definitions, env, providersFilePath),
     modelOverride
   );
   const effectiveDefinitions = overlayDefinition !== void 0 ? definitionsWithEffectiveTarget(definitions, targetDefinition) : definitions;
   try {
-    const resolvedTarget = resolveTargetDefinition(targetDefinition, env, testFilePath, {
+    const resolvedProvider = resolveProviderDefinition(targetDefinition, env, testFilePath, {
       emitDeprecationWarnings: false
     });
     return {
       definitions: effectiveDefinitions,
-      resolvedTarget,
-      targetName: targetChoice.name,
-      targetSource: targetChoice.source,
-      targetsFilePath,
-      ...targetChoice.source === "test-file" && fileTargetSpec?.hooks ? { targetHooks: fileTargetSpec.hooks } : {}
+      resolvedProvider,
+      providerLabel: providerChoice.name,
+      providerSource: providerChoice.source,
+      providersFilePath,
+      ...providerChoice.source === "test-file" && fileTargetSpec?.hooks ? { providerHooks: fileTargetSpec.hooks } : {}
     };
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
-    throw new Error(`Failed to resolve target '${targetChoice.name}': ${message}`);
+    throw new Error(`Failed to resolve provider '${providerChoice.name}': ${message}`);
   }
 }
-async function selectMultipleTargets(options) {
+async function selectMultipleProviders(options) {
   const {
     testFilePath,
     repoRoot,
     cwd,
-    explicitTargetsPath,
+    explicitProvidersPath,
+    providerDefinitions,
+    providerDefinitionsSource,
+    requireExplicitProviderCatalog,
+    allowLegacyTargetFiles,
     env,
-    targetNames,
-    targetRefs,
+    providerLabels,
+    providerRefs,
     modelOverride
   } = options;
   const hooksMap = /* @__PURE__ */ new Map();
   const labelsMap = /* @__PURE__ */ new Map();
-  if (targetRefs) {
-    for (const ref of targetRefs) {
+  if (providerRefs) {
+    for (const ref of providerRefs) {
       if (ref.hooks) {
         hooksMap.set(ref.name, ref.hooks);
       }
@@ -6602,73 +6795,54 @@ async function selectMultipleTargets(options) {
       }
     }
   }
-  const targetsFilePath = await discoverTargetsFile({
-    explicitPath: explicitTargetsPath,
+  const providerCatalog = await readProviderCatalog({
+    explicitProvidersPath,
+    providerDefinitions,
+    providerDefinitionsSource,
+    requireExplicitProviderCatalog,
     testFilePath,
     repoRoot,
-    cwd
+    cwd,
+    allowLegacyTargetFiles
   });
-  const validationResult = await validateTargetsFile(targetsFilePath);
-  const warnings = validationResult.errors.filter((e) => e.severity === "warning");
-  const useColors2 = isTTY();
-  if (warnings.length > 0) {
-    console.warn(`
-Warnings in ${targetsFilePath}:`);
-    for (const warning of warnings) {
-      const location = warning.location ? ` [${warning.location}]` : "";
-      const prefix = useColors2 ? `${ANSI_YELLOW3}  \u26A0${ANSI_RESET3}` : "  \u26A0";
-      const message = useColors2 ? `${ANSI_YELLOW3}${warning.message}${ANSI_RESET3}` : warning.message;
-      console.warn(`${prefix}${location} ${message}`);
-    }
-    console.warn("");
-  }
-  const errors = validationResult.errors.filter((e) => e.severity === "error");
-  if (errors.length > 0) {
-    console.error(`
-Errors in ${targetsFilePath}:`);
-    for (const error of errors) {
-      const location = error.location ? ` [${error.location}]` : "";
-      const prefix = useColors2 ? `${ANSI_RED3}  \u2717${ANSI_RESET3}` : "  \u2717";
-      const message = useColors2 ? `${ANSI_RED3}${error.message}${ANSI_RESET3}` : error.message;
-      console.error(`${prefix}${location} ${message}`);
-    }
-    throw new Error(`Targets file validation failed with ${errors.length} error(s)`);
-  }
-  const fileDefinitions = await readTargetDefinitions(targetsFilePath);
+  const providersFilePath = providerCatalog.sourcePath;
+  const fileDefinitions = providerCatalog.definitions;
   const definitions = [...fileDefinitions];
-  if (targetRefs) {
-    for (const ref of targetRefs) {
+  if (providerRefs) {
+    for (const ref of providerRefs) {
       if (ref.definition && !fileDefinitions.some((d) => d.name === ref.name)) {
-        definitions.push(ref.definition);
+        definitions.push(
+          await resolveInlineDefinitionEnvironment(ref.definition, testFilePath, "providers")
+        );
       } else if (ref.use_target && !fileDefinitions.some((d) => d.name === ref.name)) {
         definitions.push({ name: ref.name, use_target: ref.use_target });
       }
     }
   }
   const results = [];
-  for (const name of targetNames) {
+  for (const name of providerLabels) {
     const targetDefinition = withModelOverride(
-      resolveUseTarget(name, definitions, env, targetsFilePath),
+      resolveUseTarget(name, definitions, env, providersFilePath),
       modelOverride
     );
     const hooks = hooksMap.get(name);
-    const targetLabel = labelsMap.get(name);
+    const providerDisplayLabel = labelsMap.get(name);
     try {
-      const resolvedTarget = resolveTargetDefinition(targetDefinition, env, testFilePath, {
+      const resolvedProvider = resolveProviderDefinition(targetDefinition, env, testFilePath, {
         emitDeprecationWarnings: false
       });
       results.push({
         definitions,
-        resolvedTarget,
-        targetName: name,
-        ...targetLabel ? { targetLabel } : {},
-        targetSource: options.targetSource ?? "cli",
-        targetsFilePath,
-        ...hooks && { targetHooks: hooks }
+        resolvedProvider,
+        providerLabel: name,
+        ...providerDisplayLabel ? { providerDisplayLabel } : {},
+        providerSource: options.providerSource ?? "cli",
+        providersFilePath,
+        ...hooks && { providerHooks: hooks }
       });
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
-      throw new Error(`Failed to resolve target '${name}': ${message}`);
+      throw new Error(`Failed to resolve provider '${name}': ${message}`);
     }
   }
   return results;
@@ -6767,7 +6941,7 @@ var DEFAULT_WORKERS = 3;
 var loadCjsModule = createNodeRequire(import.meta.url);
 var micromatch = loadCjsModule("micromatch");
 async function loadCliEvalSuite(testFilePath, repoRoot, options) {
-  if (path12.extname(testFilePath).toLowerCase() === ".json") {
+  if (path13.extname(testFilePath).toLowerCase() === ".json") {
     const adapterSuite = readAgentSkillsEvalsFile(testFilePath);
     return loadTestSuiteFromYamlObject(
       testFilePath,
@@ -6883,8 +7057,8 @@ function resultsRepoOverride(value) {
   if (!value) {
     return {};
   }
-  if (value === "current" || value === "." || value.startsWith("./") || value.startsWith("../") || value.startsWith("/") || value.startsWith("~/") || value.startsWith("~\\") || /^[A-Za-z]:[/\\]/.test(value)) {
-    return { repo_path: value === "current" ? "." : value };
+  if (value === "current" || value === "current/." || value === "." || value.startsWith("./") || value.startsWith("../") || value.startsWith("/") || value.startsWith("~/") || value.startsWith("~\\") || /^[A-Za-z]:[/\\]/.test(value)) {
+    return { repo_path: value === "current" || value === "current/." ? "." : value };
   }
   return { repo: value };
 }
@@ -6921,13 +7095,32 @@ function normalizeSourceMetadataByEvalFile(value) {
     const entries = [...value.entries()].filter(
       (entry) => typeof entry[0] === "string" && typeof entry[1] === "object" && entry[1] !== null && !Array.isArray(entry[1])
     );
-    return entries.length > 0 ? new Map(entries.map(([key, metadata]) => [path12.resolve(key), metadata])) : void 0;
+    return entries.length > 0 ? new Map(entries.map(([key, metadata]) => [path13.resolve(key), metadata])) : void 0;
   }
   if (typeof value === "object" && value !== null && !Array.isArray(value)) {
     const entries = Object.entries(value).filter(
       (entry) => typeof entry[1] === "object" && entry[1] !== null && !Array.isArray(entry[1])
     );
-    return entries.length > 0 ? new Map(entries.map(([key, metadata]) => [path12.resolve(key), metadata])) : void 0;
+    return entries.length > 0 ? new Map(entries.map(([key, metadata]) => [path13.resolve(key), metadata])) : void 0;
+  }
+  return void 0;
+}
+function normalizeProviderCatalogPathByEvalFile(value) {
+  if (value instanceof Map) {
+    const entries = [...value.entries()].filter(
+      (entry) => typeof entry[0] === "string" && typeof entry[1] === "string" && entry[1].trim().length > 0
+    );
+    return entries.length > 0 ? new Map(
+      entries.map(([key, providerPath]) => [path13.resolve(key), path13.resolve(providerPath)])
+    ) : void 0;
+  }
+  if (typeof value === "object" && value !== null && !Array.isArray(value)) {
+    const entries = Object.entries(value).filter(
+      (entry) => typeof entry[1] === "string" && entry[1].trim().length > 0
+    );
+    return entries.length > 0 ? new Map(
+      entries.map(([key, providerPath]) => [path13.resolve(key), path13.resolve(providerPath)])
+    ) : void 0;
   }
   return void 0;
 }
@@ -6941,10 +7134,10 @@ var LEGACY_OUTPUT_FILE_EXTENSIONS = /* @__PURE__ */ new Set([
   ".htm"
 ]);
 function looksLikeLegacyOutputFilePath(value) {
-  return LEGACY_OUTPUT_FILE_EXTENSIONS.has(path12.extname(value).toLowerCase());
+  return LEGACY_OUTPUT_FILE_EXTENSIONS.has(path13.extname(value).toLowerCase());
 }
 function outputFileMigrationMessage(value) {
-  const ext = path12.extname(value).toLowerCase();
+  const ext = path13.extname(value).toLowerCase();
   const removalHint = ext === ".xml" ? "JUnit XML export from agentv eval has been removed." : "Flat result file export from agentv eval has been removed.";
   return `--output expects a run directory, not a file path: ${value}
 ${removalHint} Set --output <dir> for the canonical run artifacts; AgentV always writes <dir>/${RESULT_INDEX_FILENAME}.`;
@@ -6952,7 +7145,7 @@ ${removalHint} Set --output <dir> for the canonical run artifacts; AgentV always
 function artifactsMigrationMessage(artifactsDir, outputDir) {
   const lines = [`--artifacts was removed from agentv eval. Use --output ${artifactsDir} instead.`];
   if (outputDir && looksLikeLegacyOutputFilePath(outputDir)) {
-    const ext = path12.extname(outputDir).toLowerCase();
+    const ext = path13.extname(outputDir).toLowerCase();
     lines.push(
       ext === ".xml" ? "JUnit XML export from agentv eval has been removed." : "Flat result file export from agentv eval has been removed."
     );
@@ -7045,17 +7238,19 @@ function normalizeOptions(rawOptions, config, yamlExecution) {
   const configWorkers = config?.execution?.maxConcurrency ?? yamlExecution?.max_concurrency;
   const workers = cliWorkers ?? configWorkers ?? 0;
   const cliOutputDir = normalizeString(rawOptions.output);
-  const rawTarget = rawOptions.target;
-  let cliTargets = [];
-  let singleTarget;
-  if (Array.isArray(rawTarget)) {
-    cliTargets = rawTarget.filter((v) => typeof v === "string" && v.trim().length > 0);
-    singleTarget = cliTargets.length === 1 ? cliTargets[0] : void 0;
-  } else if (typeof rawTarget === "string") {
-    const trimmed = rawTarget.trim();
+  const rawProvider = rawOptions.provider;
+  let cliProviderLabels = [];
+  let singleProvider;
+  if (Array.isArray(rawProvider)) {
+    cliProviderLabels = rawProvider.filter(
+      (v) => typeof v === "string" && v.trim().length > 0
+    );
+    singleProvider = cliProviderLabels.length === 1 ? cliProviderLabels[0] : void 0;
+  } else if (typeof rawProvider === "string") {
+    const trimmed = rawProvider.trim();
     if (trimmed.length > 0 && trimmed !== "default") {
-      cliTargets = [trimmed];
-      singleTarget = trimmed;
+      cliProviderLabels = [trimmed];
+      singleProvider = trimmed;
     }
   }
   const cliAgentTimeout = normalizeOptionalNumber(rawOptions.agentTimeout);
@@ -7091,9 +7286,13 @@ function normalizeOptions(rawOptions, config, yamlExecution) {
   };
   const cliTags = splitCliTags(rawOptions.tag);
   return {
-    target: singleTarget,
-    cliTargets,
-    targetsPath: normalizeString(rawOptions.targets),
+    provider: singleProvider,
+    cliProviderLabels,
+    providersPath: normalizeString(rawOptions.providers),
+    allowLegacyTargetFiles: normalizeBoolean(rawOptions.allowLegacyTargetFiles),
+    providerCatalogPathByEvalFile: normalizeProviderCatalogPathByEvalFile(
+      rawOptions.providerCatalogPathByEvalFile
+    ),
     filter: normalizeFilter(rawOptions.filter),
     workers: workers > 0 ? workers : void 0,
     outputDir: cliOutputDir ?? configOutputDir,
@@ -7140,7 +7339,7 @@ function normalizeOptions(rawOptions, config, yamlExecution) {
   };
 }
 function withSourceMetadata(result, testFilePath, options) {
-  const sourceMetadata = options.sourceMetadataByEvalFile?.get(path12.resolve(testFilePath));
+  const sourceMetadata = options.sourceMetadataByEvalFile?.get(path13.resolve(testFilePath));
   if (!sourceMetadata) {
     return result;
   }
@@ -7163,11 +7362,11 @@ function deriveEvalResultGroupName(evalFilePath) {
   if (!evalFilePath) {
     return "eval";
   }
-  return path12.basename(evalFilePath).replace(/\.eval\.ya?ml$/i, "").replace(/\.ya?ml$/i, "").replace(/[^A-Za-z0-9._-]/g, "-") || "eval";
+  return path13.basename(evalFilePath).replace(/\.eval\.ya?ml$/i, "").replace(/\.ya?ml$/i, "").replace(/[^A-Za-z0-9._-]/g, "-") || "eval";
 }
 var CLI_RUNTIME_SOURCE_OPTION_KEYS = [
-  "target",
-  "targets",
+  "provider",
+  "providers",
   "filter",
   "tag",
   "excludeTag",
@@ -7210,10 +7409,10 @@ function toRuntimeSourcePath(cwd, filePath) {
   if (!trimmed) {
     return void 0;
   }
-  const resolved = path12.isAbsolute(trimmed) ? trimmed : path12.resolve(cwd, trimmed);
-  const relative = path12.relative(cwd, resolved);
-  const displayPath = relative && !relative.startsWith("..") && !path12.isAbsolute(relative) ? relative : trimmed;
-  return displayPath.split(path12.sep).join("/");
+  const resolved = path13.isAbsolute(trimmed) ? trimmed : path13.resolve(cwd, trimmed);
+  const relative = path13.relative(cwd, resolved);
+  const displayPath = relative && !relative.startsWith("..") && !path13.isAbsolute(relative) ? relative : trimmed;
+  return displayPath.split(path13.sep).join("/");
 }
 function uniqueRuntimeSourcePaths(values) {
   return [...new Set([...values].filter((value) => Boolean(value)))].sort();
@@ -7223,7 +7422,7 @@ function testSourceEvalPath(cwd, test) {
 }
 function testSourceEvalPathForComparison(test) {
   const sourcePath = test.source?.evalFileAbsolutePath ?? test.source?.evalFilePath;
-  return sourcePath ? path12.resolve(sourcePath) : void 0;
+  return sourcePath ? path13.resolve(sourcePath) : void 0;
 }
 function buildRuntimeConfigSource(params) {
   const inlineFingerprints = /* @__PURE__ */ new Set();
@@ -7254,7 +7453,7 @@ function buildRuntimeSourceMetadata(params) {
     params.activeTestFiles.map((filePath) => toRuntimeSourcePath(params.cwd, filePath))
   );
   const activeResolvedFiles = new Set(
-    params.activeTestFiles.map((filePath) => path12.resolve(filePath))
+    params.activeTestFiles.map((filePath) => path13.resolve(filePath))
   );
   const sourceEvalFiles = uniqueRuntimeSourcePaths(
     params.sourceTests.map((test) => testSourceEvalPath(params.cwd, test))
@@ -7285,22 +7484,21 @@ function applyExperimentOptions(options, experiment) {
   if (!experiment) {
     return options;
   }
-  const experimentTargetRefs = buildExperimentTargetRefs(experiment);
-  const experimentTargetNames = experimentTargetRefs?.map((target) => target.name) ?? [];
+  const experimentProviderRefs = buildExperimentTargetRefs(experiment);
+  const experimentProviderLabels = experimentProviderRefs?.map((target) => target.name) ?? [];
   const experimentTarget = experiment.target && experiment.target.trim().length > 0 ? experiment.target : void 0;
-  const experimentTargets = options.cliTargets.length === 0 ? experimentTargetNames.length > 0 ? experimentTargetNames : experimentTarget ? [experimentTarget] : void 0 : void 0;
+  const experimentProviders = options.cliProviderLabels.length === 0 ? experimentProviderLabels.length > 0 ? experimentProviderLabels : experimentTarget ? [experimentTarget] : void 0 : void 0;
   return {
     ...options,
-    target: options.target,
     agentTimeoutSeconds: options.agentTimeoutSeconds ?? experiment.timeoutSeconds,
     workspacePath: options.workspacePath,
     budgetUsd: options.budgetUsd ?? experiment.budgetUsd,
     threshold: options.threshold ?? experiment.threshold,
     experimentConfig: experiment,
     experimentMetadata: buildExperimentArtifactMetadata(experiment),
-    experimentTargets,
-    experimentTargetRefs: options.cliTargets.length === 0 ? experimentTargetRefs : void 0,
-    targetModelOverride: options.targetModelOverride ?? experiment.model,
+    experimentProviderLabels: experimentProviders,
+    experimentProviderRefs: options.cliProviderLabels.length === 0 ? experimentProviderRefs : void 0,
+    providerModelOverride: options.providerModelOverride ?? experiment.model,
     experimentTrialsConfig: buildExperimentTrialsConfig(experiment)
   };
 }
@@ -7328,11 +7526,7 @@ function buildExperimentTrialsConfig(experiment) {
     }
     return {
       count: experiment.repeat.count,
-      strategy: experiment.repeat.strategy,
-      ...experiment.repeat.costLimitUsd !== void 0 && {
-        costLimitUsd: experiment.repeat.costLimitUsd
-      },
-      ...experiment.repeat.earlyExit !== void 0 && { earlyExit: experiment.repeat.earlyExit }
+      strategy: experiment.repeat.strategy
     };
   }
   return void 0;
@@ -7344,9 +7538,7 @@ function buildRunOverrideTrialsConfig(run) {
   }
   return {
     count: repeat.count,
-    strategy: repeat.strategy,
-    ...repeat.costLimitUsd !== void 0 && { costLimitUsd: repeat.costLimitUsd },
-    ...repeat.earlyExit !== void 0 && { earlyExit: repeat.earlyExit }
+    strategy: repeat.strategy
   };
 }
 function resolveEffectiveRunPolicy(params) {
@@ -7408,7 +7600,7 @@ function createProgressReporter(maxWorkers, options) {
   };
 }
 function makeTestCaseKey(testFilePath, testId) {
-  return `${path12.resolve(testFilePath)}::${testId}`;
+  return `${path13.resolve(testFilePath)}::${testId}`;
 }
 function resolveTargetLabel(requestedName, resolvedName) {
   if (resolvedName !== requestedName) {
@@ -7447,23 +7639,23 @@ function buildTargetLabelSuffix(providerLabel, target) {
   return `[${parts.join(", ")}]`;
 }
 function applyVerboseOverride(selection, cliVerbose) {
-  const { resolvedTarget } = selection;
-  if (resolvedTarget.kind !== "cli") {
+  const { resolvedProvider } = selection;
+  if (resolvedProvider.kind !== "cli") {
     return selection;
   }
   return {
     ...selection,
-    resolvedTarget: {
-      ...resolvedTarget,
+    resolvedProvider: {
+      ...resolvedProvider,
       config: {
-        ...resolvedTarget.config,
+        ...resolvedProvider.config,
         verbose: cliVerbose
       }
     }
   };
 }
 function targetVariantForSelection(selection) {
-  const target = selection.resolvedTarget;
+  const target = selection.resolvedProvider;
   if (target.kind === "replay") {
     return target.config.variant;
   }
@@ -7505,20 +7697,24 @@ async function readExistingResultsFromRunDir(runDir) {
   }
   return results;
 }
+async function collectTerminalSummaryResults(params) {
+  const rawResults = params.isResumeAppend ? await (params.readExistingResults ?? readExistingResultsFromRunDir)(params.runDir) : params.allResults;
+  return deduplicateByTestIdTarget(rawResults);
+}
 async function resolveRerunFailedRunDir(cwd, source) {
   const trimmed = source.trim();
   if (!trimmed) {
     throw new Error("--rerun-failed requires a run ID, run workspace, or index.jsonl path.");
   }
-  const candidate = path12.isAbsolute(trimmed) ? trimmed : path12.resolve(cwd, trimmed);
+  const candidate = path13.isAbsolute(trimmed) ? trimmed : path13.resolve(cwd, trimmed);
   if (existsSync5(candidate)) {
-    if (path12.basename(candidate) !== RESULT_INDEX_FILENAME) {
+    if (path13.basename(candidate) !== RESULT_INDEX_FILENAME) {
       return candidate;
     }
-    const manifestDir = path12.dirname(candidate);
-    return path12.basename(manifestDir) === ".internal" ? path12.dirname(manifestDir) : manifestDir;
+    const manifestDir = path13.dirname(candidate);
+    return path13.basename(manifestDir) === ".internal" ? path13.dirname(manifestDir) : manifestDir;
   }
-  const runIdCandidate = path12.join(cwd, ".agentv", "results", trimmed);
+  const runIdCandidate = path13.join(cwd, ".agentv", "results", trimmed);
   if (existsSync5(runIdCandidate)) {
     return runIdCandidate;
   }
@@ -7527,14 +7723,23 @@ async function resolveRerunFailedRunDir(cwd, source) {
   );
 }
 async function prepareFileMetadata(params) {
-  const { testFilePath, repoRoot, cwd, options, suiteFilter } = params;
+  const {
+    testFilePath,
+    repoRoot,
+    cwd,
+    options,
+    providerCatalogPath,
+    providerDefinitions,
+    providerDefinitionsSource,
+    suiteFilter
+  } = params;
   await ensureFileExists(testFilePath, "Test file");
   await loadEnvFromHierarchy({
     testFilePath,
     repoRoot,
     verbose: options.verbose
   });
-  const relativePath = path12.relative(cwd, testFilePath);
+  const relativePath = path13.relative(cwd, testFilePath);
   const category = deriveCategory(relativePath);
   const suite = await loadCliEvalSuite(testFilePath, repoRoot, {
     verbose: options.verbose,
@@ -7543,21 +7748,24 @@ async function prepareFileMetadata(params) {
   });
   const experimentOptions = applyExperimentOptions(options, suite.experimentConfig);
   const effectiveOptions = experimentOptions.workers === void 0 && suite.workers !== void 0 ? { ...experimentOptions, workers: suite.workers } : experimentOptions;
+  const effectiveProviderCatalogPath = effectiveOptions.providersPath ?? providerCatalogPath;
   const testCases = suiteFilter && effectiveOptions.filter ? suite.tests.filter(
     (testCase) => matchesTestFilter(testCase.id, effectiveOptions.filter ?? "")
   ) : suite.tests;
   const testIds = testCases.map((value) => value.id);
   const suiteTargetSpec = suite.targetSpec;
+  const suiteDefaults = suite.defaults;
   const suiteTargets = suiteTargetSpec ? [suiteTargetSpec.name] : suite.targets;
+  const fileOptions = suiteDefaults?.grader && !effectiveOptions.graderTarget ? { ...effectiveOptions, defaultGraderTarget: suiteDefaults.grader } : effectiveOptions;
   const defaultBudgetUsd = effectiveOptions.cliBudgetUsd === void 0 ? effectiveOptions.budgetUsd ?? suite.budgetUsd : void 0;
   const suiteDefaultThreshold = suite.defaultTest?.threshold ?? suite.threshold;
   if (testCases.length === 0) {
     return {
-      options: effectiveOptions,
+      options: fileOptions,
       testIds,
       testCases,
       selections: [],
-      trialsConfig: effectiveOptions.experimentTrialsConfig,
+      trialsConfig: fileOptions.experimentTrialsConfig,
       suiteTargets,
       yamlCache: suite.cacheConfig?.enabled,
       yamlCachePath: suite.cacheConfig?.cachePath,
@@ -7569,42 +7777,47 @@ async function prepareFileMetadata(params) {
     };
   }
   let selections;
-  if (effectiveOptions.transcript) {
+  if (fileOptions.transcript) {
     const transcriptSelection = {
       definitions: [],
-      resolvedTarget: {
+      resolvedProvider: {
         kind: "transcript",
         name: "transcript",
         config: {}
       },
-      targetName: "transcript",
-      targetSource: "cli",
-      targetsFilePath: effectiveOptions.transcript
+      providerLabel: "transcript",
+      providerSource: "cli",
+      providersFilePath: fileOptions.transcript
     };
     selections = [
       {
         selection: transcriptSelection,
-        inlineTargetLabel: `transcript (${path12.basename(effectiveOptions.transcript)})`
+        inlineTargetLabel: `transcript (${path13.basename(fileOptions.transcript)})`
       }
     ];
-  } else if (suite.inlineTarget && effectiveOptions.cliTargets.length === 0) {
+  } else if (suite.inlineTarget && fileOptions.cliProviderLabels.length === 0) {
     const targetDefinition = suite.inlineTarget;
-    const resolvedTarget = resolveTargetDefinition(targetDefinition, process.env, testFilePath, {
-      emitDeprecationWarnings: false
-    });
+    const resolvedProvider = resolveProviderDefinition(
+      targetDefinition,
+      process.env,
+      testFilePath,
+      {
+        emitDeprecationWarnings: false
+      }
+    );
     selections = [
       {
         selection: {
           definitions: [targetDefinition],
-          resolvedTarget,
-          targetName: targetDefinition.name,
-          targetSource: "test-file",
-          targetsFilePath: testFilePath
+          resolvedProvider,
+          providerLabel: targetDefinition.name,
+          providerSource: "test-file",
+          providersFilePath: testFilePath
         },
-        inlineTargetLabel: resolveTargetLabel(targetDefinition.name, resolvedTarget.name)
+        inlineTargetLabel: resolveTargetLabel(targetDefinition.name, resolvedProvider.name)
       }
     ];
-  } else if (suite.providerFactory && effectiveOptions.cliTargets.length === 0) {
+  } else if (suite.providerFactory && fileOptions.cliProviderLabels.length === 0) {
     const taskTarget = {
       kind: "mock",
       name: "custom-task",
@@ -7615,89 +7828,100 @@ async function prepareFileMetadata(params) {
       {
         selection: {
           definitions: [],
-          resolvedTarget: taskTarget,
-          targetName: "custom-task",
-          targetSource: "test-file",
-          targetsFilePath: testFilePath
+          resolvedProvider: taskTarget,
+          providerLabel: "custom-task",
+          providerSource: "test-file",
+          providersFilePath: testFilePath
         },
         inlineTargetLabel: "custom-task"
       }
     ];
   } else {
-    const cliTargets = effectiveOptions.cliTargets;
-    const experimentTargets = effectiveOptions.experimentTargets ?? [];
+    const cliProviderLabels = fileOptions.cliProviderLabels;
+    const experimentProviderLabels = fileOptions.experimentProviderLabels ?? [];
     const suiteTargetSpec2 = suite.targetSpec;
-    const suiteTargets2 = suiteTargetSpec2 ? [suiteTargetSpec2.name] : suite.targets;
-    const suiteTargetRefs = suite.targetRefs;
-    const experimentTargetRefs = effectiveOptions.experimentTargetRefs;
-    let targetNames;
-    let targetRefs;
-    let targetSource = "test-file";
-    if (cliTargets.length > 0) {
-      targetNames = cliTargets;
-      targetRefs = experimentTargetRefs;
-      targetSource = "cli";
-    } else if (experimentTargets.length > 0) {
-      targetNames = experimentTargets;
-      targetRefs = experimentTargetRefs;
-    } else if (suiteTargets2 && suiteTargets2.length > 0) {
-      targetNames = suiteTargets2;
-      targetRefs = suiteTargetRefs;
+    const suiteProviderLabels = suiteTargetSpec2 ? [suiteTargetSpec2.name] : suite.targets;
+    const suiteProviderRefs = suite.targetRefs;
+    const experimentProviderRefs = fileOptions.experimentProviderRefs;
+    let providerLabels;
+    let providerRefs;
+    let providerSource = "test-file";
+    if (cliProviderLabels.length > 0) {
+      providerLabels = cliProviderLabels;
+      providerRefs = experimentProviderRefs;
+      providerSource = "cli";
+    } else if (experimentProviderLabels.length > 0) {
+      providerLabels = experimentProviderLabels;
+      providerRefs = experimentProviderRefs;
+    } else if (suiteProviderLabels && suiteProviderLabels.length > 0) {
+      providerLabels = suiteProviderLabels;
+      providerRefs = suiteProviderRefs;
+    } else if (suiteDefaults?.provider) {
+      providerLabels = [suiteDefaults.provider];
+      providerRefs = void 0;
     } else {
-      targetNames = [];
-      targetRefs = void 0;
+      providerLabels = [];
+      providerRefs = void 0;
     }
-    if (targetNames.length > 1 || targetNames.length === 1 && targetRefs) {
-      const multiSelections = await selectMultipleTargets({
+    if (providerLabels.length > 1 || providerLabels.length === 1 && providerRefs) {
+      const multiSelections = await selectMultipleProviders({
         testFilePath,
         repoRoot,
         cwd,
-        explicitTargetsPath: effectiveOptions.targetsPath,
+        explicitProvidersPath: effectiveProviderCatalogPath,
+        providerDefinitions,
+        providerDefinitionsSource,
+        requireExplicitProviderCatalog: true,
+        allowLegacyTargetFiles: fileOptions.allowLegacyTargetFiles,
         env: process.env,
-        targetNames,
-        targetRefs,
-        targetSource,
-        modelOverride: effectiveOptions.targetModelOverride
+        providerLabels,
+        providerRefs,
+        providerSource,
+        modelOverride: fileOptions.providerModelOverride
       });
       selections = multiSelections.map((sel) => ({
         selection: sel,
-        inlineTargetLabel: sel.targetLabel ?? resolveTargetLabel(sel.targetName, sel.resolvedTarget.name)
+        inlineTargetLabel: sel.providerDisplayLabel ?? resolveTargetLabel(sel.providerLabel, sel.resolvedProvider.name)
       }));
     } else {
-      const selection = await selectTarget({
+      const selection = await selectProvider({
         testFilePath,
         repoRoot,
         cwd,
-        explicitTargetsPath: effectiveOptions.targetsPath,
-        cliTargetName: targetSource === "cli" ? targetNames.length === 1 ? targetNames[0] : effectiveOptions.target : effectiveOptions.target,
-        fileTargetName: targetSource === "test-file" && targetNames.length === 1 ? targetNames[0] : void 0,
-        fileTargetSpec: targetSource === "test-file" && targetNames.length === 1 ? suiteTargetSpec2 : void 0,
-        modelOverride: effectiveOptions.targetModelOverride,
+        explicitProvidersPath: effectiveProviderCatalogPath,
+        providerDefinitions,
+        providerDefinitionsSource,
+        requireExplicitProviderCatalog: true,
+        allowLegacyTargetFiles: fileOptions.allowLegacyTargetFiles,
+        cliProviderLabel: providerSource === "cli" ? providerLabels.length === 1 ? providerLabels[0] : fileOptions.provider : fileOptions.provider,
+        fileProviderLabel: providerSource === "test-file" && providerLabels.length === 1 ? providerLabels[0] : void 0,
+        fileTargetSpec: providerSource === "test-file" && providerLabels.length === 1 ? suiteTargetSpec2 : void 0,
+        modelOverride: fileOptions.providerModelOverride,
         env: process.env
       });
-      const singleTargetRef = targetRefs?.find((ref) => ref.name === selection.targetName);
+      const singleProviderRef = providerRefs?.find((ref) => ref.name === selection.providerLabel);
       const augmentedSelection = {
         ...selection,
-        ...singleTargetRef?.label ? { targetLabel: singleTargetRef.label } : {},
-        ...singleTargetRef?.hooks ? { targetHooks: singleTargetRef.hooks } : {}
+        ...singleProviderRef?.label ? { providerDisplayLabel: singleProviderRef.label } : {},
+        ...singleProviderRef?.hooks ? { providerHooks: singleProviderRef.hooks } : {}
       };
       selections = [
         {
           selection: augmentedSelection,
-          inlineTargetLabel: augmentedSelection.targetLabel ?? resolveTargetLabel(
-            augmentedSelection.targetName,
-            augmentedSelection.resolvedTarget.name
+          inlineTargetLabel: augmentedSelection.providerDisplayLabel ?? resolveTargetLabel(
+            augmentedSelection.providerLabel,
+            augmentedSelection.resolvedProvider.name
           )
         }
       ];
     }
   }
   return {
-    options: effectiveOptions,
+    options: fileOptions,
     testIds,
     testCases,
     selections,
-    trialsConfig: effectiveOptions.experimentTrialsConfig,
+    trialsConfig: fileOptions.experimentTrialsConfig,
     suiteTargets,
     yamlCache: suite.cacheConfig?.enabled,
     yamlCachePath: suite.cacheConfig?.cachePath,
@@ -7708,7 +7932,7 @@ async function prepareFileMetadata(params) {
     providerFactory: suite.providerFactory
   };
 }
-function buildTaskBundleTargetSelections(activeTestFiles, fileMetadata) {
+function buildTaskBundleProviderSelections(activeTestFiles, fileMetadata) {
   return activeTestFiles.flatMap((testFilePath) => {
     const meta = fileMetadata.get(testFilePath);
     if (!meta) {
@@ -7716,8 +7940,8 @@ function buildTaskBundleTargetSelections(activeTestFiles, fileMetadata) {
     }
     return meta.selections.map(({ selection }) => ({
       evalFileAbsolutePath: testFilePath,
-      targetName: selection.targetName,
-      resolvedTargetName: selection.resolvedTarget.name,
+      providerLabel: selection.providerLabel,
+      resolvedProviderName: selection.resolvedProvider.name,
       definitions: selection.definitions
     }));
   });
@@ -7746,22 +7970,22 @@ async function runSingleEvalFile(params) {
     failOnError,
     providerFactory
   } = params;
-  const targetName = selection.targetName;
+  const providerLabel = selection.providerLabel;
   const replayRecording = options.recordReplay ? {
-    fixturesPath: path12.resolve(options.recordReplay),
-    sourceTarget: targetName,
+    fixturesPath: path13.resolve(options.recordReplay),
+    sourceTarget: providerLabel,
     variant: options.recordReplayVariant
   } : void 0;
   await ensureFileExists(testFilePath, "Test file");
-  const resolvedTargetSelection = applyVerboseOverride(selection, options.verbose);
-  const explicitVariant = targetVariantForSelection(resolvedTargetSelection);
-  const providerLabel = resolvedTargetSelection.resolvedTarget.kind;
-  const targetMessage = options.verbose ? `Using target (${resolvedTargetSelection.targetSource}): ${resolvedTargetSelection.targetName} ${buildTargetLabelSuffix(providerLabel, resolvedTargetSelection.resolvedTarget)} via ${resolvedTargetSelection.targetsFilePath}` : `Using target: ${inlineTargetLabel}`;
+  const resolvedProviderSelection = applyVerboseOverride(selection, options.verbose);
+  const explicitVariant = targetVariantForSelection(resolvedProviderSelection);
+  const providerId = resolvedProviderSelection.resolvedProvider.kind;
+  const targetMessage = options.verbose ? `Using provider (${resolvedProviderSelection.providerSource}): ${resolvedProviderSelection.providerLabel} ${buildTargetLabelSuffix(providerId, resolvedProviderSelection.resolvedProvider)} via ${resolvedProviderSelection.providersFilePath}` : `Using provider: ${inlineTargetLabel}`;
   if (!progressReporter.isInteractive || options.verbose) {
     console.log(`${targetMessage}`);
   }
-  const targetKind = resolvedTargetSelection.resolvedTarget.kind;
-  if (targetKind === "claude-cli" || targetKind === "copilot-cli") {
+  const providerKind = resolvedProviderSelection.resolvedProvider.kind;
+  if (providerKind === "claude-cli" || providerKind === "copilot-cli") {
     console.log("");
     console.log("  TIP: For subagent-mode evals, use `agentv pipeline` instead of `eval run`.");
     console.log("  The agent orchestrates executor + grader subagents directly.");
@@ -7770,12 +7994,12 @@ async function runSingleEvalFile(params) {
   }
   const agentTimeoutMs = agentTimeoutSeconds != null ? Math.max(0, agentTimeoutSeconds) * 1e3 : void 0;
   const workerPreference = workersOverride ?? options.workers;
-  let resolvedWorkers = workerPreference ?? resolvedTargetSelection.resolvedTarget.workers ?? DEFAULT_WORKERS;
+  let resolvedWorkers = workerPreference ?? resolvedProviderSelection.resolvedProvider.workers ?? DEFAULT_WORKERS;
   if (resolvedWorkers < 1 || resolvedWorkers > 50) {
     throw new Error(`Workers must be between 1 and 50, got: ${resolvedWorkers}`);
   }
   const isVSCodeProvider = ["vscode", "vscode-insiders"].includes(
-    resolvedTargetSelection.resolvedTarget.kind
+    resolvedProviderSelection.resolvedProvider.kind
   );
   if (isVSCodeProvider && resolvedWorkers > 1) {
     console.warn(
@@ -7784,9 +8008,9 @@ async function runSingleEvalFile(params) {
     resolvedWorkers = 1;
   }
   if (isVSCodeProvider) {
-    const vsConfig = resolvedTargetSelection.resolvedTarget.config;
+    const vsConfig = resolvedProviderSelection.resolvedProvider.config;
     await ensureVSCodeSubagents({
-      kind: resolvedTargetSelection.resolvedTarget.kind,
+      kind: resolvedProviderSelection.resolvedProvider.kind,
       count: resolvedWorkers,
       verbose: options.verbose,
       vscodeCmd: vsConfig.executable
@@ -7795,15 +8019,15 @@ async function runSingleEvalFile(params) {
   const results = await evaluationRunner({
     testFilePath,
     repoRoot,
-    target: resolvedTargetSelection.resolvedTarget,
-    targets: resolvedTargetSelection.definitions,
+    target: resolvedProviderSelection.resolvedProvider,
+    targets: resolvedProviderSelection.definitions,
     env: process.env,
     maxRetries: Math.max(0, options.maxRetries),
     agentTimeoutMs,
     cache,
     useCache: (() => {
       if (!cache) return false;
-      const targetConfig = resolvedTargetSelection.resolvedTarget.config;
+      const targetConfig = resolvedProviderSelection.resolvedProvider.config;
       if (shouldSkipCacheForTemperature(targetConfig)) {
         if (options.verbose) {
           console.log("Cache skipped: target temperature > 0");
@@ -7823,9 +8047,10 @@ async function runSingleEvalFile(params) {
     runBudgetTracker,
     failOnError,
     graderTarget: options.graderTarget,
+    defaultGraderTarget: options.defaultGraderTarget,
     model: options.model,
     threshold: params.threshold,
-    targetHooks: resolvedTargetSelection.targetHooks,
+    targetHooks: resolvedProviderSelection.providerHooks,
     replayRecording,
     providerFactory,
     onResult: async (result) => {
@@ -7835,7 +8060,7 @@ async function runSingleEvalFile(params) {
       await outputWriter.append(trimmedResult);
     },
     onProgress: async (event) => {
-      const testCaseKeyId = matrixMode ? `${event.testId}@${targetName}` : event.testId;
+      const testCaseKeyId = matrixMode ? `${event.testId}@${providerLabel}` : event.testId;
       const testCaseKey = makeTestCaseKey(testFilePath, testCaseKeyId);
       if (event.status === "pending" && !seenTestCases.has(testCaseKey)) {
         seenTestCases.add(testCaseKey);
@@ -7848,7 +8073,7 @@ async function runSingleEvalFile(params) {
       else if (event.executionStatus === "execution_error") verdict = "ERROR";
       progressReporter.update(displayId, {
         workerId: displayId,
-        testId: matrixMode ? `${event.testId}@${targetName}` : event.testId,
+        testId: matrixMode ? `${event.testId}@${providerLabel}` : event.testId,
         status: event.status,
         startedAt: event.startedAt,
         completedAt: event.completedAt,
@@ -7882,7 +8107,7 @@ async function runEvalCommand(input) {
     );
   }
   const repoRoot = await findRepoRoot(cwd);
-  const yamlConfig = await loadConfig(path12.join(cwd, "_"), repoRoot);
+  const yamlConfig = await loadConfig(path13.join(cwd, "_"), repoRoot);
   let requiredVersionCheck;
   if (yamlConfig?.required_version) {
     requiredVersionCheck = await enforceRequiredVersion(yamlConfig.required_version, {
@@ -7890,10 +8115,19 @@ async function runEvalCommand(input) {
     });
   }
   let options = normalizeOptions(input.rawOptions, config, yamlConfig?.execution);
+  if (yamlConfig?.defaults?.provider && options.cliProviderLabels.length === 0 && !options.provider) {
+    options = { ...options, provider: yamlConfig.defaults.provider };
+  }
+  if (yamlConfig?.defaults?.grader) {
+    options = { ...options, defaultGraderTarget: yamlConfig.defaults.grader };
+  }
+  const providerCatalogPath = yamlConfig?.providerCatalogPath;
+  const providerDefinitions = yamlConfig?.providerDefinitions;
+  const providerDefinitionsSource = providerDefinitions ? providerCatalogPath ?? ".agentv/config.yaml:providers" : void 0;
   const resolvedExperiment = resolveExperimentForRun(options.experiment);
   const evalPathInputs = input.testFiles.length > 0 ? [...input.testFiles] : [];
   if (evalPathInputs.length === 0 && process.stdin.isTTY) {
-    const { launchInteractiveWizard } = await import("./interactive-BN527UV3.js");
+    const { launchInteractiveWizard } = await import("./interactive-DL7N2C7K.js");
     await launchInteractiveWizard();
     return void 0;
   }
@@ -7904,7 +8138,7 @@ async function runEvalCommand(input) {
   const primarySuite = resolvedTestFiles.length > 0 ? await loadCliEvalSuite(resolvedTestFiles[0], repoRoot, {
     verbose: options.verbose,
     filter: options.filter,
-    category: deriveCategory(path12.relative(cwd, resolvedTestFiles[0]))
+    category: deriveCategory(path13.relative(cwd, resolvedTestFiles[0]))
   }) : void 0;
   const resultGroupName = resolvedTestFiles.length === 1 ? primarySuite?.metadata?.name ?? fallbackResultGroupName : fallbackResultGroupName;
   const resolvedTags = resolveEffectiveTags({
@@ -7933,7 +8167,7 @@ async function runEvalCommand(input) {
     process.env.AGENTV_EXPERIMENT = normalizedExperiment;
   }
   if (options.graderTarget === "agentv" && !options.model) {
-    throw new Error("--grader-target agentv requires --model (e.g., --model openai:gpt-5-mini)");
+    throw new Error("--grader-provider agentv requires --model (e.g., --model openai:gpt-5-mini)");
   }
   if (options.removedOut) {
     throw new Error(
@@ -7957,7 +8191,7 @@ async function runEvalCommand(input) {
   }
   let retryNonErrorResults;
   if (options.retryErrors) {
-    const retryPath = path12.resolve(options.retryErrors);
+    const retryPath = path13.resolve(options.retryErrors);
     await ensureFileExists(retryPath, "Retry-errors JSONL file");
     const completedIds = await loadFullyCompletedTestIds(retryPath);
     const errorIds = await loadErrorTestIds(retryPath);
@@ -7974,7 +8208,7 @@ async function runEvalCommand(input) {
     const cachedDir = await resolveCachedRunDir(cwd);
     if (cachedDir) {
       options = { ...options, outputDir: cachedDir };
-      const displayDir = path12.relative(cwd, cachedDir) || cachedDir;
+      const displayDir = path13.relative(cwd, cachedDir) || cachedDir;
       console.log(`Auto-detected last run dir for --resume: ${displayDir}`);
     }
   }
@@ -7982,7 +8216,7 @@ async function runEvalCommand(input) {
   let rerunIncludeKeys;
   let isResumeAppend = false;
   if (options.resume && !options.retryErrors) {
-    const sourceRunDir = options.rerunFailedSource ? await resolveRerunFailedRunDir(cwd, options.rerunFailedSource) : options.outputDir ? path12.resolve(options.outputDir) : void 0;
+    const sourceRunDir = options.rerunFailedSource ? await resolveRerunFailedRunDir(cwd, options.rerunFailedSource) : options.outputDir ? path13.resolve(options.outputDir) : void 0;
     if (sourceRunDir) {
       if (options.rerunFailedSource && !options.outputDir) {
         options = { ...options, outputDir: sourceRunDir };
@@ -8001,7 +8235,7 @@ async function runEvalCommand(input) {
             addResumeIdentityEntry(rerunIncludeKeys, entry);
           }
         }
-        isResumeAppend = options.outputDir !== void 0 && path12.resolve(options.outputDir) === path12.resolve(sourceRunDir);
+        isResumeAppend = options.outputDir !== void 0 && path13.resolve(options.outputDir) === path13.resolve(sourceRunDir);
         const modeLabel = options.rerunFailed ? "Rerun-failed" : "Resume";
         console.log(
           `${modeLabel}: found ${existingResults.length} existing result(s), skipping ${completedResultCount} completed.`
@@ -8019,10 +8253,10 @@ async function runEvalCommand(input) {
     }
   }
   if (options.workspacePath) {
-    const resolvedWorkspace = path12.resolve(options.workspacePath);
+    const resolvedWorkspace = path13.resolve(options.workspacePath);
     try {
-      const { stat: stat3 } = await import("node:fs/promises");
-      const stats = await stat3(resolvedWorkspace);
+      const { stat: stat4 } = await import("node:fs/promises");
+      const stats = await stat4(resolvedWorkspace);
       if (!stats.isDirectory()) {
         throw new Error(`--workspace-path is not a directory: ${resolvedWorkspace}`);
       }
@@ -8042,7 +8276,7 @@ async function runEvalCommand(input) {
   let outputPath;
   let runDirName = process.env.AGENTV_RUN_TIMESTAMP?.trim() || createRunDirName();
   if (explicitDir) {
-    runDir = path12.resolve(explicitDir);
+    runDir = path13.resolve(explicitDir);
     mkdirSync(runDir, { recursive: true });
     outputPath = runDir;
   } else {
@@ -8057,7 +8291,7 @@ async function runEvalCommand(input) {
     outputPath = runDir;
   }
   if (!process.env.AGENTV_RUN_TIMESTAMP) {
-    process.env.AGENTV_RUN_TIMESTAMP = path12.basename(runDir);
+    process.env.AGENTV_RUN_TIMESTAMP = path13.basename(runDir);
   }
   process.env.AGENTV_RUN_DIR = runDir;
   console.log(`Artifact directory: ${runDir}`);
@@ -8072,11 +8306,15 @@ async function runEvalCommand(input) {
   }
   const fileMetadata = /* @__PURE__ */ new Map();
   for (const testFilePath of resolvedTestFiles) {
+    const fileProviderCatalogPath = options.providerCatalogPathByEvalFile?.get(path13.resolve(testFilePath)) ?? providerCatalogPath;
     const meta = await prepareFileMetadata({
       testFilePath,
       repoRoot,
       cwd,
       options,
+      providerCatalogPath: fileProviderCatalogPath,
+      providerDefinitions,
+      providerDefinitionsSource: fileProviderCatalogPath ? fileProviderCatalogPath === providerCatalogPath ? providerDefinitionsSource : void 0 : providerDefinitionsSource,
       suiteFilter: void 0
     });
     fileMetadata.set(testFilePath, meta);
@@ -8087,7 +8325,7 @@ async function runEvalCommand(input) {
     for (const [testFilePath, meta] of fileMetadata.entries()) {
       if (!matchesTagFilters(meta.tags, options.tags, options.excludeTags)) {
         fileMetadata.delete(testFilePath);
-        skippedFiles.push(path12.relative(cwd, testFilePath));
+        skippedFiles.push(path13.relative(cwd, testFilePath));
       }
     }
     if (skippedFiles.length > 0 && options.verbose) {
@@ -8110,12 +8348,12 @@ async function runEvalCommand(input) {
     tsConfigCache: options.tsConfigCache
   });
   const activeCachePath = options.cachePath ?? yamlCachePath ?? options.tsConfigCachePath;
-  const cache = cacheEnabled ? new ResponseCache(activeCachePath ? path12.resolve(activeCachePath) : void 0) : void 0;
+  const cache = cacheEnabled ? new ResponseCache(activeCachePath ? path13.resolve(activeCachePath) : void 0) : void 0;
   if (cache) {
     console.log(`Response cache: enabled (${cache.cachePath})`);
   }
   if (options.recordReplay) {
-    console.log(`Replay recording: ${path12.resolve(options.recordReplay)}`);
+    console.log(`Replay recording: ${path13.resolve(options.recordReplay)}`);
   }
   const yamlThreshold = firstMeta?.threshold;
   const resolvedThreshold = options.threshold ?? yamlThreshold;
@@ -8129,7 +8367,7 @@ async function runEvalCommand(input) {
   for (const meta of fileMetadata.values()) {
     for (const test of meta.testCases) {
       for (const { selection } of meta.selections) {
-        const target = selection.targetName;
+        const target = selection.providerLabel;
         const variant = targetVariantForSelection(selection);
         if (rerunIncludeKeys) {
           if (resumeIdentityMatches(rerunIncludeKeys, test, target, variant)) {
@@ -8201,13 +8439,13 @@ async function runEvalCommand(input) {
       for (const testId of meta.testIds) {
         const testCaseKey = makeTestCaseKey(
           testFilePath,
-          meta.selections.length > 1 ? `${testId}@${selection.targetName}` : testId
+          meta.selections.length > 1 ? `${testId}@${selection.providerLabel}` : testId
         );
         seenTestCases.add(testCaseKey);
         const displayId = displayIdTracker.getOrAssign(testCaseKey);
         progressReporter.update(displayId, {
           workerId: displayId,
-          testId: meta.selections.length > 1 ? `${testId}@${selection.targetName}` : testId,
+          testId: meta.selections.length > 1 ? `${testId}@${selection.providerLabel}` : testId,
           status: "pending",
           targetLabel: inlineTargetLabel
         });
@@ -8233,7 +8471,7 @@ async function runEvalCommand(input) {
   });
   let transcriptProviderFactory;
   if (options.transcript) {
-    const { TranscriptProvider } = await import("./dist-NMXMI5SK.js");
+    const { TranscriptProvider } = await import("./dist-A3SGR7TW.js");
     const transcriptProvider = await TranscriptProvider.fromFile(options.transcript);
     const totalTests = [...fileMetadata.values()].reduce(
       (sum, meta) => sum + meta.testCases.length,
@@ -8266,12 +8504,12 @@ async function runEvalCommand(input) {
     );
   }
   if (!isResumeAppend && totalEvalCount > 0) {
-    const evalFile = activeTestFiles.length === 1 ? activeTestFiles[0] : "";
+    const evalFile = activeTestFiles.length === 1 ? path13.relative(cwd, activeTestFiles[0]) : "";
     await writeInitialRunSummaryArtifact(runDir, {
       evalFile,
       plannedTestCount: totalEvalCount,
       experiment: normalizeExperimentName(options.experiment),
-      runId: path12.basename(runDir),
+      runId: path13.basename(runDir),
       experimentMetadata: runExperimentMetadata,
       runtimeSource: runtimeSourceMetadata,
       tags: emittedTags
@@ -8307,7 +8545,7 @@ async function runEvalCommand(input) {
       if (fileBudgetTracker?.isExceeded()) {
         const budgetMsg = `Run budget exceeded ($${fileBudgetTracker.currentCostUsd.toFixed(4)} / $${fileBudgetTracker.budgetCapUsd.toFixed(4)})`;
         console.log(`
-\u26A0 ${budgetMsg} \u2014 skipping ${path12.basename(testFilePath)}`);
+\u26A0 ${budgetMsg} \u2014 skipping ${path13.basename(testFilePath)}`);
         for (const { selection } of targetPrep.selections) {
           const explicitVariant = targetVariantForSelection(selection);
           const skippedResults = targetPrep.testCases.map((testCase) => ({
@@ -8321,7 +8559,7 @@ async function runEvalCommand(input) {
               input: testCase.input,
               output: [{ role: "assistant", content: budgetMsg }],
               finalOutput: budgetMsg,
-              target: selection.targetName,
+              target: selection.providerLabel,
               testId: testCase.testId ?? testCase.id,
               conversationId: testCase.conversation_id,
               error: budgetMsg
@@ -8332,7 +8570,7 @@ async function runEvalCommand(input) {
             failureStage: "setup",
             failureReasonCode: "budget_exceeded",
             executionError: { message: budgetMsg, stage: "setup" },
-            target: selection.targetName,
+            target: selection.providerLabel,
             variant: explicitVariant
           }));
           for (const r of skippedResults) {
@@ -8351,18 +8589,18 @@ async function runEvalCommand(input) {
       const targetResults = await Promise.all(
         targetPrep.selections.map(
           ({ selection, inlineTargetLabel }) => limitTarget(async () => {
-            const targetName = selection.targetName;
+            const providerLabel = selection.providerLabel;
             const applicableTestCases = targetPrep.testCases;
             const filteredTestCases = rerunIncludeKeys ? applicableTestCases.filter(
               (test) => resumeIdentityMatches(
                 rerunIncludeKeys,
                 test,
-                targetName,
+                providerLabel,
                 targetVariantForSelection(selection)
               )
             ) : resumeSkipKeys ? applicableTestCases.filter((test) => {
               const variant = targetVariantForSelection(selection);
-              return !resumeIdentityMatches(resumeSkipKeys, test, targetName, variant);
+              return !resumeIdentityMatches(resumeSkipKeys, test, providerLabel, variant);
             }) : applicableTestCases;
             if (filteredTestCases.length === 0) {
               return [];
@@ -8405,7 +8643,7 @@ async function runEvalCommand(input) {
                 });
                 groupResults.push(...result.results);
               }
-              const evalFile = path12.relative(cwd, testFilePath);
+              const evalFile = path13.relative(cwd, testFilePath);
               const existingSummary = remoteEvalSummaries.find(
                 (summary2) => summary2.evalFile === evalFile
               );
@@ -8422,7 +8660,7 @@ async function runEvalCommand(input) {
               const message = fileError instanceof Error ? fileError.message : String(fileError);
               console.error(
                 `
-[ERROR] \u26A0 Eval file failed: ${path12.basename(testFilePath)} \u2014 ${message}
+[ERROR] \u26A0 Eval file failed: ${path13.basename(testFilePath)} \u2014 ${message}
 `
               );
               const explicitVariant = targetVariantForSelection(selection);
@@ -8439,7 +8677,7 @@ async function runEvalCommand(input) {
                       input: testCase.input,
                       output: [{ role: "assistant", content: message }],
                       finalOutput: message,
-                      target: selection.targetName,
+                      target: selection.providerLabel,
                       testId: testCase.testId ?? testCase.id,
                       conversationId: testCase.conversation_id,
                       error: message
@@ -8451,7 +8689,7 @@ async function runEvalCommand(input) {
                     failureReasonCode: "setup_error",
                     durationMs: 0,
                     tokenUsage: { input: 0, output: 0 },
-                    target: selection.targetName,
+                    target: selection.providerLabel,
                     variant: explicitVariant
                   },
                   testFilePath,
@@ -8481,7 +8719,11 @@ async function runEvalCommand(input) {
       );
     }
     await outputWriter.close().catch(() => void 0);
-    const summaryResults = deduplicateByTestIdTarget(await readExistingResultsFromRunDir(runDir));
+    const summaryResults = await collectTerminalSummaryResults({
+      allResults,
+      isResumeAppend,
+      runDir
+    });
     const thresholdOpts = hasScopedRunPolicies || hasPerFileRuntimeThresholds ? { thresholdLabel: "configured threshold(s)", useExecutionStatus: true } : resolvedThreshold !== void 0 ? { threshold: resolvedThreshold } : void 0;
     const summary = calculateEvaluationSummary(summaryResults, thresholdOpts);
     console.log(formatEvaluationSummary(summary, thresholdOpts));
@@ -8495,14 +8737,14 @@ ${formatRequiredVersionFailureNote(requiredVersionCheck)}`);
       console.log(formatMatrixSummary(summaryResults));
     }
     if (allResults.length > 0) {
-      const evalFile = activeTestFiles.length === 1 ? activeTestFiles[0] : "";
+      const evalFile = activeTestFiles.length === 1 ? path13.relative(cwd, activeTestFiles[0]) : "";
       const sourceTests = activeSourceTests;
-      const taskBundleTargets = buildTaskBundleTargetSelections(activeTestFiles, fileMetadata);
+      const taskBundleTargets = buildTaskBundleProviderSelections(activeTestFiles, fileMetadata);
       if (isResumeAppend) {
-        const { writePerTestArtifacts } = await import("./artifact-writer-7NBCOAYC.js");
+        const { writePerTestArtifacts } = await import("./artifact-writer-KJEOROKQ.js");
         await writePerTestArtifacts(allResults, runDir, {
           experiment: normalizeExperimentName(options.experiment),
-          runId: path12.basename(runDir),
+          runId: path13.basename(runDir),
           resultGroup: resultGroupName,
           cwd,
           repoRoot,
@@ -8514,7 +8756,7 @@ ${formatRequiredVersionFailureNote(requiredVersionCheck)}`);
         const { summaryPath } = await aggregateRunDir(runDir, {
           evalFile,
           experiment: normalizeExperimentName(options.experiment),
-          runId: path12.basename(runDir),
+          runId: path13.basename(runDir),
           experimentMetadata: runExperimentMetadata,
           runtimeSource: runtimeSourceMetadata,
           tags: emittedTags
@@ -8531,7 +8773,7 @@ ${formatRequiredVersionFailureNote(requiredVersionCheck)}`);
           {
             evalFile,
             experiment: normalizeExperimentName(options.experiment),
-            runId: path12.basename(runDir),
+            runId: path13.basename(runDir),
             experimentMetadata: runExperimentMetadata,
             resultGroup: resultGroupName,
             cwd,
@@ -8594,9 +8836,9 @@ Results written under: ${runDir}`);
       });
     }
     if (summary.executionErrorCount > 0 && !options.retryErrors && !options.resume) {
-      const evalFileArgs = activeTestFiles.map((f) => path12.relative(cwd, f)).join(" ");
-      const targetFlag = options.target ? ` --target ${options.target}` : "";
-      const relativeRunDir = path12.relative(cwd, runDir);
+      const evalFileArgs = activeTestFiles.map((f) => path13.relative(cwd, f)).join(" ");
+      const targetFlag = options.provider ? ` --provider ${options.provider}` : "";
+      const relativeRunDir = path13.relative(cwd, runDir);
       console.log(
         `
 Tip: ${summary.executionErrorCount} execution error(s) detected. Re-run failed tests with:
@@ -8618,7 +8860,7 @@ Tip: ${summary.executionErrorCount} execution error(s) detected. Re-run failed t
       executionErrorCount: summary.executionErrorCount,
       outputPath,
       testFiles: activeTestFiles,
-      target: options.target,
+      provider: options.provider,
       thresholdFailed,
       allExecutionErrors,
       budgetExceeded: runBudgetExceeded || void 0
@@ -8639,7 +8881,7 @@ async function resolveEvaluationRunner() {
   if (!overridePath) {
     return runEvaluation;
   }
-  const resolved = path12.isAbsolute(overridePath) ? overridePath : path12.resolve(process.cwd(), overridePath);
+  const resolved = path13.isAbsolute(overridePath) ? overridePath : path13.resolve(process.cwd(), overridePath);
   const moduleUrl = pathToFileURL(resolved).href;
   const mod = await import(moduleUrl);
   const candidate = mod.runEvaluation;
@@ -8673,9 +8915,9 @@ export {
   normalizeTagMap,
   loadLightweightResults,
   Mutex,
-  TARGET_FILE_CANDIDATES,
+  PROVIDER_FILE_CANDIDATES,
   fileExists,
-  discoverTargetsFile,
+  discoverProvidersFile,
   loadEnvFromHierarchy,
   detectFileType,
   validateEvalFile,
@@ -8685,9 +8927,9 @@ export {
   validateConfigFile,
   validateFileReferences,
   validateWorkspacePaths,
-  readTestSuiteTarget,
-  selectTarget,
-  selectMultipleTargets,
+  readTestSuiteProvider,
+  selectProvider,
+  selectMultipleProviders,
   enforceRequiredVersion,
   c,
   padRight,
@@ -8718,4 +8960,4 @@ export {
   filterByCategory,
   runEvalCommand
 };
-//# sourceMappingURL=chunk-LKGARI3W.js.map
+//# sourceMappingURL=chunk-QSK3PC44.js.map