Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion packages/core/src/evaluation/providers/targets.ts
Original file line number Diff line number Diff line change
Expand Up @@ -908,7 +908,6 @@ export type ResolvedTarget =
* here automatically makes it valid in targets.yaml without a separate update.
*/
export const COMMON_TARGET_SETTINGS = [
'use_target',
'runtime',
'batch_requests',
'subagent_mode_allowed',
Expand Down
17 changes: 12 additions & 5 deletions packages/core/src/evaluation/validation/targets-validator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,7 @@ function validateUnknownSettings(
'env',
'grader_target',
'judge_target',
'use_target',
'workers',
'$schema',
'targets',
Expand Down Expand Up @@ -695,17 +696,23 @@ export async function validateTargetsFile(filePath: string): Promise<ValidationR
const provider = effectiveTarget.provider;
const rawTarget = rawTargets[i];
const rawUseTarget = isObject(rawTarget) ? rawTarget.use_target : undefined;
const hasUseTarget =
isNonEmptyString(effectiveTarget.use_target) || isNonEmptyString(rawUseTarget);
if (effectiveTarget.use_target !== undefined || rawUseTarget !== undefined) {
errors.push({
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.",
});
}
const providerValue = typeof provider === 'string' ? provider.trim().toLowerCase() : undefined;
const isTemplated = isEnvTemplated(provider);
if (!hasUseTarget && (typeof provider !== 'string' || provider.trim().length === 0)) {
if (typeof provider !== 'string' || provider.trim().length === 0) {
errors.push({
severity: 'error',
filePath: absolutePath,
location: `${location}.provider`,
message:
"Missing or invalid 'provider' field (must be a non-empty string, or use use_target for delegation)",
message: "Missing or invalid 'provider' field (must be a non-empty string)",
});
} else if (!isTemplated && (providerValue === 'claude' || providerValue === 'copilot')) {
errors.push({
Expand Down
46 changes: 18 additions & 28 deletions packages/core/test/evaluation/validation/targets-validator.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -408,12 +408,13 @@ targets:
).toBe(true);
});

it('accepts env-templated use_target values without resolving the env during validation', async () => {
it('rejects use_target on authored target definitions', async () => {
const filePath = path.join(tempDir, 'templated-use-target.yaml');
await writeFile(
filePath,
`targets:
- id: default
provider: mock
use_target: "{{ env.AGENT_TARGET }}"
- id: grader
use_target: "{{ env.GRADER_TARGET }}"
Expand All @@ -424,34 +425,23 @@ targets:
`,
);

const originalAgentTarget = process.env.AGENT_TARGET;
const originalGraderTarget = process.env.GRADER_TARGET;
Reflect.deleteProperty(process.env, 'AGENT_TARGET');
Reflect.deleteProperty(process.env, 'GRADER_TARGET');

try {
const result = await validateTargetsFile(filePath);
const result = await validateTargetsFile(filePath);

expect(result.valid).toBe(true);
expect(
result.errors.some(
(error) =>
error.severity === 'error' &&
error.message.includes("Missing or invalid 'provider' field"),
),
).toBe(false);
} finally {
if (originalAgentTarget === undefined) {
Reflect.deleteProperty(process.env, 'AGENT_TARGET');
} else {
process.env.AGENT_TARGET = originalAgentTarget;
}
if (originalGraderTarget === undefined) {
Reflect.deleteProperty(process.env, 'GRADER_TARGET');
} else {
process.env.GRADER_TARGET = originalGraderTarget;
}
}
expect(result.valid).toBe(false);
expect(result.errors).toContainEqual(
expect.objectContaining({
severity: 'error',
location: 'targets[0].use_target',
message: expect.stringContaining("'use_target' field has been removed"),
}),
);
expect(result.errors).toContainEqual(
expect.objectContaining({
severity: 'error',
location: 'targets[1].use_target',
message: expect.stringContaining("'use_target' field has been removed"),
}),
);
});

it('rejects legacy env interpolation in target YAML', async () => {
Expand Down
Loading