takt 0.46.0 → 0.47.0

package/dist/infra/config/loaders/workflowParser.js

@@ -4,8 +4,9 @@
 import { WorkflowConfigRawSchema } from '../../../core/models/index.js';
 import { resolveLoopMonitorJudgeProviderModel, resolveStepProviderModel } from '../../../core/workflow/provider-resolution.js';
 import { validateProviderModelCompatibility } from '../../../core/workflow/provider-model-compatibility.js';
+import { isFindingsCondition } from '../../../core/workflow/evaluation/rule-utils.js';
 import { normalizeRateLimitFallback, normalizeRuntime } from '../configNormalizers.js';
-import { resolveSectionMapWithSource, unwrapResolvedSectionMap, } from './resource-resolver.js';
+import { extractPersonaDisplayName, resolvePersona, resolveRefToContent, resolveSectionMapWithSource, unwrapResolvedSectionMap, } from './resource-resolver.js';
 import { validateWorkflowRuntimePrepare, validateWorkflowCommandGates, } from './workflowNormalizationPolicies.js';
 import { normalizeLoopMonitors } from './workflowLoopMonitorNormalizer.js';
 import { normalizeProviderReference, normalizeStepFromRaw } from './workflowStepNormalizer.js';
@@ -31,6 +32,63 @@ function normalizeSubworkflowConfig(raw) {
             : undefined,
     };
 }
+function normalizeFindingContractConfig(raw, workflowDir, sections, context) {
+    if (!raw) {
+        return undefined;
+    }
+    const { personaSpec, personaPath } = resolvePersona(raw.manager.persona, sections, workflowDir, context);
+    const instruction = resolveRefToContent(raw.manager.instruction, sections.resolvedInstructionsWithSource ?? sections.resolvedInstructions, workflowDir, 'instructions', context);
+    const outputContract = resolveRefToContent(raw.manager.output_contract, sections.resolvedReportFormatsWithSource ?? sections.resolvedReportFormats, workflowDir, 'output-contracts', context);
+    if (!personaSpec) {
+        throw new Error('Configuration error: finding_contract.manager.persona is required');
+    }
+    if (!instruction) {
+        throw new Error(`Configuration error: failed to resolve finding_contract.manager.instruction "${raw.manager.instruction}"`);
+    }
+    if (!outputContract) {
+        throw new Error(`Configuration error: failed to resolve finding_contract.manager.output_contract "${raw.manager.output_contract}"`);
+    }
+    return {
+        ledgerPath: raw.ledger_path,
+        rawFindingsPath: raw.raw_findings_path,
+        manager: {
+            persona: personaSpec,
+            personaDisplayName: personaPath ? extractPersonaDisplayName(personaPath) : personaSpec,
+            ...(personaPath ? { personaPath } : {}),
+            instruction,
+            outputContract,
+        },
+    };
+}
+function validateFindingsRulesRequireContract(steps, loopMonitors, findingContract) {
+    if (findingContract) {
+        return;
+    }
+    for (const step of steps) {
+        for (const rule of step.rules ?? []) {
+            if (rule.isAiCondition || !isFindingsCondition(rule.condition)) {
+                continue;
+            }
+            throw new Error(`Configuration error: step "${step.name}" uses findings.* rule but finding_contract is not configured`);
+        }
+        for (const subStep of step.parallel ?? []) {
+            for (const rule of subStep.rules ?? []) {
+                if (rule.isAiCondition || !isFindingsCondition(rule.condition)) {
+                    continue;
+                }
+                throw new Error(`Configuration error: parallel sub-step "${subStep.name}" in step "${step.name}" uses findings.* rule but finding_contract is not configured`);
+            }
+        }
+    }
+    for (const monitor of loopMonitors ?? []) {
+        for (const rule of monitor.judge.rules) {
+            if (!isFindingsCondition(rule.condition)) {
+                continue;
+            }
+            throw new Error('Configuration error: loop_monitor judge uses findings.* rule but finding_contract is not configured');
+        }
+    }
+}
 export function normalizeWorkflowConfig(raw, workflowDir, context, projectOverrides, globalOverrides, workflowRuntimePreparePolicy, workflowArpeggioPolicy, workflowMcpServersPolicy, callableArgs, callableArgPolicy, callableArgMode = 'runtime', workflowCommandGatesPolicy) {
     const parsedRaw = WorkflowConfigRawSchema.parse(raw);
     const callableDiscovery = callableArgMode === 'discovery'
@@ -60,8 +118,8 @@ export function normalizeWorkflowConfig(raw, workflowDir, context, projectOverri
     const workflowRuntime = normalizeRuntime(parsed.workflow_config?.runtime);
     validateWorkflowRuntimePrepare(workflowRuntime, workflowRuntimePreparePolicy);
     validateWorkflowCommandGates(parsed.steps, workflowCommandGatesPolicy);
-    const normalizedWorkflowProvider = normalizeProviderReference(parsed.workflow_config?.provider, parsed.workflow_config?.model, parsed.workflow_config?.provider_options, workflowDir);
-    const steps = parsed.steps.map((step) => normalizeStepFromRaw(step, workflowDir, sections, parsed.schemas, normalizedWorkflowProvider.provider, normalizedWorkflowProvider.model, normalizedWorkflowProvider.providerOptions, undefined, context, projectOverrides, globalOverrides, workflowArpeggioPolicy, workflowMcpServersPolicy));
+    const normalizedWorkflowProvider = normalizeProviderReference(parsed.workflow_config?.provider, parsed.workflow_config?.model, parsed.workflow_config?.provider_options, workflowDir, context);
+    const steps = parsed.steps.map((step) => normalizeStepFromRaw(step, workflowDir, sections, parsed.schemas, normalizedWorkflowProvider.provider, normalizedWorkflowProvider.model, undefined, normalizedWorkflowProvider.providerOptions, undefined, true, true, context, projectOverrides, globalOverrides, workflowArpeggioPolicy, workflowMcpServersPolicy));
     const loopMonitors = normalizeLoopMonitors(parsed.loop_monitors, workflowDir, sections, context);
     for (const monitor of loopMonitors ?? []) {
         const triggeringStep = steps.find((step) => step.name === monitor.cycle[monitor.cycle.length - 1]);
@@ -83,10 +141,13 @@ export function normalizeWorkflowConfig(raw, workflowDir, context, projectOverri
             modelFieldName: 'Configuration error: loop_monitors.judge.model',
         });
     }
+    const findingContract = normalizeFindingContractConfig(parsed.finding_contract, workflowDir, sections, context);
+    validateFindingsRulesRequireContract(steps, loopMonitors, findingContract);
     return {
         name: parsed.name,
         description: parsed.description,
         subworkflow: normalizeSubworkflowConfig(parsed.subworkflow),
+        findingContract,
         schemas: parsed.schemas,
         provider: normalizedWorkflowProvider.provider,
         model: normalizedWorkflowProvider.model,

package/dist/infra/config/loaders/workflowParser.js.map

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

package/dist/infra/config/loaders/workflowPreview.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workflowPreview.d.ts","sourceRoot":"","sources":["../../../../src/infra/config/loaders/workflowPreview.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAgC,MAAM,+BAA+B,CAAC;AAoBnG,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,kBAAkB,EAAE,MAAM,CAAC;IAC3B,cAAc,EAAE,MAAM,CAAC;IACvB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,aAAa;IAC5B,cAAc,EAAE,MAAM,CAAC;IACvB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB;AAyID,wBAAgB,sBAAsB,CACpC,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,YAAY,CAAC,EAAE,MAAM,EACrB,SAAS,SAAa,GACrB;IACD,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,YAAY,EAAE,WAAW,EAAE,CAAC;IAC5B,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,SAAS,CAAC,EAAE,aAAa,CAAC;CAC3B,CAgBA"}
+{"version":3,"file":"workflowPreview.d.ts","sourceRoot":"","sources":["../../../../src/infra/config/loaders/workflowPreview.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAgC,MAAM,+BAA+B,CAAC;AAqBnG,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,kBAAkB,EAAE,MAAM,CAAC;IAC3B,cAAc,EAAE,MAAM,CAAC;IACvB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,aAAa;IAC5B,cAAc,EAAE,MAAM,CAAC;IACvB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB;AA6ID,wBAAgB,sBAAsB,CACpC,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,YAAY,CAAC,EAAE,MAAM,EACrB,SAAS,SAAa,GACrB;IACD,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,YAAY,EAAE,WAAW,EAAE,CAAC;IAC5B,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,SAAS,CAAC,EAAE,aAAa,CAAC;CAC3B,CAgBA"}

package/dist/infra/config/loaders/workflowPreview.js

@@ -3,7 +3,7 @@ import { assertProviderResolvedForCapabilitySensitiveOptions, resolveAllowedTool
 import { createLogger, getErrorMessage } from '../../../shared/utils/index.js';
 import { resolveWorkflowConfigValues } from '../resolveWorkflowConfigValue.js';
 import { resolveProviderOptionsWithTrace } from '../resolveConfigValue.js';
-import { resolveEffectiveProviderOptions, resolvePersonaProviderOptions, } from '../providerOptions.js';
+import { resolveEffectiveProviderOptions, resolveDirectStepProviderOptions, mergeStepProviderOptionsLayers, } from '../providerOptions.js';
 import { loadPersonaPromptFromPath } from './agentLoader.js';
 import { loadWorkflowByIdentifier } from './workflowResolver.js';
 const log = createLogger('workflow-preview');
@@ -32,23 +32,28 @@ function readStepPersona(step, projectCwd) {
     }
 }
 function resolvePreviewProviderResolution(projectCwd) {
-    const { provider, model, personaProviders, } = resolveWorkflowConfigValues(projectCwd, ['provider', 'model', 'personaProviders']);
+    const { provider, model, personaProviders, providerRouting, } = resolveWorkflowConfigValues(projectCwd, ['provider', 'model', 'personaProviders', 'providerRouting']);
     const { value: providerOptions, source: providerOptionsSource, originResolver: providerOptionsOriginResolver, } = resolveProviderOptionsWithTrace(projectCwd);
     return {
         provider,
         model,
         personaProviders,
+        providerRouting,
         providerOptions,
         providerOptionsSource,
         providerOptionsOriginResolver,
     };
 }
 function resolvePreviewAllowedTools(step, resolution) {
-    const mergedProviderOptions = resolveEffectiveProviderOptions(resolution.providerOptionsSource, resolution.providerOptionsOriginResolver, resolution.providerOptions, step.providerOptions, resolvePersonaProviderOptions(resolution.personaProviders, step.personaDisplayName));
+    const mergedProviderOptions = resolveEffectiveProviderOptions(resolution.providerOptionsSource, resolution.providerOptionsOriginResolver, resolution.providerOptions, resolveDirectStepProviderOptions(step), mergeStepProviderOptionsLayers(step, {
+        providerRouting: resolution.providerRouting,
+        personaProviders: resolution.personaProviders,
+    }));
     const resolvedProvider = resolveStepProviderModel({
         step,
         provider: resolution.provider,
         model: resolution.model,
+        providerRouting: resolution.providerRouting,
         personaProviders: resolution.personaProviders,
     }).provider;
     assertProviderResolvedForCapabilitySensitiveOptions(resolvedProvider, {

package/dist/infra/config/loaders/workflowPreview.js.map

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

package/dist/infra/config/loaders/workflowProviderOptionsResolver.d.ts

@@ -1,7 +1,25 @@
 import type { StepProviderOptions } from '../../../core/models/workflow-types.js';
+import type { FacetResolutionContext } from './workflowPackageScope.js';
+import { type ScopedProviderOptionsCandidateDirs } from './providerOptionsLookupDirectories.js';
 type RawWorkflowProviderOptions = Record<string, unknown> & {
-    $ref?: string;
+    extends?: string;
 };
-export declare function resolveWorkflowProviderOptions(raw: RawWorkflowProviderOptions | undefined, workflowDir: string): StepProviderOptions | undefined;
+interface ProviderOptionsResolutionScope {
+    context?: FacetResolutionContext;
+    candidateDirs?: readonly string[];
+    scopedCandidateDirs?: ScopedProviderOptionsCandidateDirs;
+}
+export interface ProviderOptionsFileAccess {
+    exists(path: string): boolean;
+    readText(path: string): string;
+    realpath(path: string): string;
+    isSymlink?(path: string): boolean;
+}
+export interface WorkflowProviderOptionsResolutionHost extends ProviderOptionsResolutionScope {
+    rootDir: string;
+    fileAccess?: ProviderOptionsFileAccess;
+}
+export declare function resolveWorkflowProviderOptions(raw: RawWorkflowProviderOptions | undefined, workflowDir: string, context?: FacetResolutionContext): StepProviderOptions | undefined;
+export declare function resolveWorkflowProviderOptionsWithHost(raw: RawWorkflowProviderOptions | undefined, workflowDir: string, host: WorkflowProviderOptionsResolutionHost): StepProviderOptions | undefined;
 export {};
 //# sourceMappingURL=workflowProviderOptionsResolver.d.ts.map

package/dist/infra/config/loaders/workflowProviderOptionsResolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workflowProviderOptionsResolver.d.ts","sourceRoot":"","sources":["../../../../src/infra/config/loaders/workflowProviderOptionsResolver.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;AAGlF,KAAK,0BAA0B,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG;IAC1D,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAsDF,wBAAgB,8BAA8B,CAC5C,GAAG,EAAE,0BAA0B,GAAG,SAAS,EAC3C,WAAW,EAAE,MAAM,GAClB,mBAAmB,GAAG,SAAS,CAEjC"}
+{"version":3,"file":"workflowProviderOptionsResolver.d.ts","sourceRoot":"","sources":["../../../../src/infra/config/loaders/workflowProviderOptionsResolver.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;AAGlF,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACxE,OAAO,EAIL,KAAK,kCAAkC,EACxC,MAAM,uCAAuC,CAAC;AAE/C,KAAK,0BAA0B,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG;IAC1D,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AASF,UAAU,8BAA8B;IACtC,OAAO,CAAC,EAAE,sBAAsB,CAAC;IACjC,aAAa,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAClC,mBAAmB,CAAC,EAAE,kCAAkC,CAAC;CAC1D;AAED,MAAM,WAAW,yBAAyB;IACxC,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;IAC9B,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IAC/B,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IAC/B,SAAS,CAAC,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;CACnC;AAED,MAAM,WAAW,qCAAsC,SAAQ,8BAA8B;IAC3F,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,yBAAyB,CAAC;CACxC;AA+ID,wBAAgB,8BAA8B,CAC5C,GAAG,EAAE,0BAA0B,GAAG,SAAS,EAC3C,WAAW,EAAE,MAAM,EACnB,OAAO,CAAC,EAAE,sBAAsB,GAC/B,mBAAmB,GAAG,SAAS,CAKjC;AAED,wBAAgB,sCAAsC,CACpD,GAAG,EAAE,0BAA0B,GAAG,SAAS,EAC3C,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,qCAAqC,GAC1C,mBAAmB,GAAG,SAAS,CAajC"}

package/dist/infra/config/loaders/workflowProviderOptionsResolver.js

@@ -1,68 +1,150 @@
-import { existsSync, readFileSync, realpathSync } from 'node:fs';
-import { dirname, isAbsolute, relative, resolve } from 'node:path';
+import * as fs from 'node:fs';
+import { dirname, isAbsolute, resolve } from 'node:path';
+import { isScopeRef } from 'faceted-prompting';
 import { parse as parseYaml } from 'yaml';
 import { z } from 'zod/v4';
 import { StepProviderOptionsObjectSchema } from '../../../core/models/schema-base.js';
+import { isPathInside } from '../../../shared/utils/index.js';
 import { mergeProviderOptions, normalizeProviderOptions } from '../providerOptions.js';
+import { buildProviderOptionsLookupDirs, resolveProviderOptionsByName, resolveProviderOptionsScopeRef, } from './providerOptionsLookupDirectories.js';
+const nodeFileAccess = {
+    exists: (path) => fs.existsSync(path),
+    readText: (path) => fs.readFileSync(path, 'utf-8'),
+    realpath: (path) => fs.realpathSync(path),
+    isSymlink: (path) => fs.lstatSync(path).isSymbolicLink(),
+};
 function isRecord(value) {
     return typeof value === 'object' && value !== null && !Array.isArray(value);
 }
-function removeProviderOptionsRef(raw) {
+function removeProviderOptionsExtends(raw) {
     const inline = { ...raw };
-    delete inline.$ref;
+    delete inline.extends;
     return Object.keys(inline).length > 0 ? inline : undefined;
 }
-const ProviderOptionsWithRefSchema = StepProviderOptionsObjectSchema.extend({
-    $ref: z.string().min(1).optional(),
-});
-function isPathInsideDirectory(path, directory) {
-    const relativePath = relative(directory, path);
-    return relativePath === '' || (!relativePath.startsWith('..') && !isAbsolute(relativePath));
+const ProviderOptionsWithExtendsSchema = StepProviderOptionsObjectSchema.extend({
+    extends: z.string().min(1).optional(),
+}).strict();
+function isProviderOptionsExtendsPath(ref) {
+    return ref.startsWith('./')
+        || ref.startsWith('../')
+        || ref.startsWith('/')
+        || ref.startsWith('~')
+        || ref.includes('/')
+        || ref.includes('\\')
+        || ref.endsWith('.yaml')
+        || ref.endsWith('.yml');
 }
-function resolveProviderOptionsRefPath(ref, currentDir, rootDir) {
+function requireProviderOptionsContext(ref, context) {
+    if (!context) {
+        throw new Error(`Configuration error: provider_options.extends requires workflow loader context to resolve named resource: ${ref}`);
+    }
+    return context;
+}
+function resolvePathLikeProviderOptionsExtends(ref, currentDir, rootDir, fileAccess) {
     if (isAbsolute(ref)) {
-        throw new Error(`Configuration error: provider_options.$ref must be a relative path inside the workflow directory: ${ref}`);
+        throw new Error(`Configuration error: provider_options.extends must be a relative path inside the workflow directory: ${ref}`);
     }
     const refPath = resolve(currentDir, ref);
     const resolvedRootDir = resolve(rootDir);
-    if (!isPathInsideDirectory(refPath, resolvedRootDir)) {
-        throw new Error(`Configuration error: provider_options.$ref must stay inside the workflow directory: ${ref}`);
+    if (!isPathInside(resolvedRootDir, refPath)) {
+        throw new Error(`Configuration error: provider_options.extends must stay inside the workflow directory: ${ref}`);
+    }
+    if (!fileAccess.exists(refPath)) {
+        throw new Error(`Configuration error: provider_options.extends not found: ${ref}`);
     }
-    if (!existsSync(refPath)) {
-        throw new Error(`Configuration error: provider_options.$ref not found: ${ref}`);
+    const realRootDir = fileAccess.realpath(rootDir);
+    const realRefPath = fileAccess.realpath(refPath);
+    if (!isPathInside(realRootDir, realRefPath)) {
+        throw new Error(`Configuration error: provider_options.extends must stay inside the workflow directory: ${ref}`);
     }
-    const realRootDir = realpathSync(rootDir);
-    const realRefPath = realpathSync(refPath);
-    if (!isPathInsideDirectory(realRefPath, realRootDir)) {
-        throw new Error(`Configuration error: provider_options.$ref must stay inside the workflow directory: ${ref}`);
+    return { path: refPath, realPath: realRefPath, kind: 'path' };
+}
+function getProviderOptionsCandidateDirs(scope, ref) {
+    if (scope.candidateDirs) {
+        return scope.candidateDirs;
     }
-    return { path: refPath, realPath: realRefPath };
+    const context = requireProviderOptionsContext(ref, scope.context);
+    return buildProviderOptionsLookupDirs(context);
+}
+function resolveProviderOptionsByNameExtends(name, candidateDirs, fileAccess) {
+    const resolved = resolveProviderOptionsByName(name, candidateDirs, fileAccess);
+    return resolved
+        ? {
+            path: resolved.path,
+            realPath: fileAccess.realpath(resolved.path),
+            kind: 'name',
+            candidateDirs: candidateDirs.slice(resolved.sourceLayerIndex),
+        }
+        : undefined;
+}
+function resolveProviderOptionsScopeRefPath(ref, context, fileAccess, scopedCandidateDirs) {
+    const resolved = resolveProviderOptionsScopeRef(ref, context, fileAccess, scopedCandidateDirs);
+    return resolved
+        ? {
+            path: resolved.path,
+            realPath: fileAccess.realpath(resolved.path),
+            kind: 'scope',
+            candidateDirs: [resolved.candidateDir],
+        }
+        : undefined;
+}
+function resolveProviderOptionsExtendsPath(ref, currentDir, rootDir, scope, fileAccess) {
+    if (isScopeRef(ref)) {
+        const resolved = resolveProviderOptionsScopeRefPath(ref, requireProviderOptionsContext(ref, scope.context), fileAccess, scope.scopedCandidateDirs);
+        if (!resolved) {
+            throw new Error(`Configuration error: provider_options.extends not found: ${ref}`);
+        }
+        return resolved;
+    }
+    if (isProviderOptionsExtendsPath(ref)) {
+        return resolvePathLikeProviderOptionsExtends(ref, currentDir, rootDir, fileAccess);
+    }
+    const candidateDirs = getProviderOptionsCandidateDirs(scope, ref);
+    const resolved = resolveProviderOptionsByNameExtends(ref, candidateDirs, fileAccess);
+    if (!resolved) {
+        throw new Error(`Configuration error: provider_options.extends not found: ${ref}`);
+    }
+    return resolved;
+}
+export function resolveWorkflowProviderOptions(raw, workflowDir, context) {
+    return resolveWorkflowProviderOptionsWithHost(raw, workflowDir, {
+        rootDir: workflowDir,
+        context,
+    });
 }
-export function resolveWorkflowProviderOptions(raw, workflowDir) {
-    return resolveWorkflowProviderOptionsFromDir(raw, workflowDir, workflowDir, new Set());
+export function resolveWorkflowProviderOptionsWithHost(raw, workflowDir, host) {
+    return resolveWorkflowProviderOptionsFromDir(raw, workflowDir, host.rootDir, {
+        context: host.context,
+        candidateDirs: host.candidateDirs,
+        scopedCandidateDirs: host.scopedCandidateDirs,
+    }, host.fileAccess ?? nodeFileAccess, new Set());
 }
-function resolveWorkflowProviderOptionsFromDir(raw, currentDir, rootDir, seenRefs) {
+function resolveWorkflowProviderOptionsFromDir(raw, currentDir, rootDir, scope, fileAccess, seenRefs) {
     if (!raw) {
         return undefined;
     }
-    const parsedRaw = ProviderOptionsWithRefSchema.parse(raw);
-    const ref = parsedRaw.$ref;
+    const parsedRaw = ProviderOptionsWithExtendsSchema.parse(raw);
+    const ref = parsedRaw.extends;
     if (ref === undefined) {
         return normalizeProviderOptions(parsedRaw);
     }
-    const refPath = resolveProviderOptionsRefPath(ref, currentDir, rootDir);
+    const refPath = resolveProviderOptionsExtendsPath(ref, currentDir, rootDir, scope, fileAccess);
     if (seenRefs.has(refPath.realPath)) {
-        throw new Error(`Configuration error: provider_options.$ref contains a circular reference: ${ref}`);
+        throw new Error(`Configuration error: provider_options.extends contains a circular reference: ${ref}`);
     }
-    const referencedRaw = parseYaml(readFileSync(refPath.path, 'utf-8'));
+    const referencedRaw = parseYaml(fileAccess.readText(refPath.path));
     if (!isRecord(referencedRaw)) {
-        throw new Error(`Configuration error: provider_options.$ref must point to a YAML object: ${ref}`);
+        throw new Error(`Configuration error: provider_options.extends must point to a YAML object: ${ref}`);
     }
-    const parsedReferencedRaw = ProviderOptionsWithRefSchema.parse(referencedRaw);
+    const parsedReferencedRaw = ProviderOptionsWithExtendsSchema.parse(referencedRaw);
     const nextSeenRefs = new Set(seenRefs);
     nextSeenRefs.add(refPath.realPath);
-    const referencedOptions = resolveWorkflowProviderOptionsFromDir(parsedReferencedRaw, dirname(refPath.path), rootDir, nextSeenRefs);
-    const inlineOptions = normalizeProviderOptions(removeProviderOptionsRef(parsedRaw));
+    const referencedOptions = resolveWorkflowProviderOptionsFromDir(parsedReferencedRaw, dirname(refPath.path), refPath.kind === 'path' ? rootDir : dirname(refPath.path), {
+        context: scope.context,
+        candidateDirs: refPath.candidateDirs ?? scope.candidateDirs,
+        scopedCandidateDirs: scope.scopedCandidateDirs,
+    }, fileAccess, nextSeenRefs);
+    const inlineOptions = normalizeProviderOptions(removeProviderOptionsExtends(parsedRaw));
     return mergeProviderOptions(referencedOptions, inlineOptions);
 }
 //# sourceMappingURL=workflowProviderOptionsResolver.js.map

package/dist/infra/config/loaders/workflowProviderOptionsResolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"workflowProviderOptionsResolver.js","sourceRoot":"","sources":["../../../../src/infra/config/loaders/workflowProviderOptionsResolver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"workflowProviderOptionsResolver.js","sourceRoot":"","sources":["../../../../src/infra/config/loaders/workflowProviderOptionsResolver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,KAAK,IAAI,SAAS,EAAE,MAAM,MAAM,CAAC;AAC1C,OAAO,EAAE,CAAC,EAAE,MAAM,QAAQ,CAAC;AAC3B,OAAO,EAAE,+BAA+B,EAAE,MAAM,qCAAqC,CAAC;AAEtF,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAEvF,OAAO,EACL,8BAA8B,EAC9B,4BAA4B,EAC5B,8BAA8B,GAE/B,MAAM,uCAAuC,CAAC;AA+B/C,MAAM,cAAc,GAA8B;IAChD,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC;IACrC,QAAQ,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC;IAClD,QAAQ,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC;IACzC,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,cAAc,EAAE;CACzD,CAAC;AAEF,SAAS,QAAQ,CAAC,KAAc;IAC9B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC9E,CAAC;AAED,SAAS,4BAA4B,CAAC,GAA+B;IACnE,MAAM,MAAM,GAAG,EAAE,GAAG,GAAG,EAAE,CAAC;IAC1B,OAAO,MAAM,CAAC,OAAO,CAAC;IACtB,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;AAC7D,CAAC;AAED,MAAM,gCAAgC,GAAG,+BAA+B,CAAC,MAAM,CAAC;IAC9E,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;CACtC,CAAC,CAAC,MAAM,EAAE,CAAC;AAEZ,SAAS,4BAA4B,CAAC,GAAW;IAC/C,OAAO,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC;WACtB,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC;WACrB,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC;WACnB,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC;WACnB,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC;WACjB,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC;WAClB,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC;WACrB,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;AAC5B,CAAC;AAED,SAAS,6BAA6B,CAAC,GAAW,EAAE,OAA2C;IAC7F,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,6GAA6G,GAAG,EAAE,CAAC,CAAC;IACtI,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,qCAAqC,CAC5C,GAAW,EACX,UAAkB,EAClB,OAAe,EACf,UAAqC;IAErC,IAAI,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QACpB,MAAM,IAAI,KAAK,CAAC,wGAAwG,GAAG,EAAE,CAAC,CAAC;IACjI,CAAC;IAED,MAAM,OAAO,GAAG,OAAO,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;IACzC,MAAM,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACzC,IAAI,CAAC,YAAY,CAAC,eAAe,EAAE,OAAO,CAAC,EAAE,CAAC;QAC5C,MAAM,IAAI,KAAK,CAAC,0FAA0F,GAAG,EAAE,CAAC,CAAC;IACnH,CAAC;IAED,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;QAChC,MAAM,IAAI,KAAK,CAAC,4DAA4D,GAAG,EAAE,CAAC,CAAC;IACrF,CAAC;IAED,MAAM,WAAW,GAAG,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACjD,MAAM,WAAW,GAAG,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACjD,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,WAAW,CAAC,EAAE,CAAC;QAC5C,MAAM,IAAI,KAAK,CAAC,0FAA0F,GAAG,EAAE,CAAC,CAAC;IACnH,CAAC;IAED,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;AAChE,CAAC;AAED,SAAS,+BAA+B,CAAC,KAAqC,EAAE,GAAW;IACzF,IAAI,KAAK,CAAC,aAAa,EAAE,CAAC;QACxB,OAAO,KAAK,CAAC,aAAa,CAAC;IAC7B,CAAC;IACD,MAAM,OAAO,GAAG,6BAA6B,CAAC,GAAG,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;IAClE,OAAO,8BAA8B,CAAC,OAAO,CAAC,CAAC;AACjD,CAAC;AAED,SAAS,mCAAmC,CAC1C,IAAY,EACZ,aAAgC,EAChC,UAAqC;IAErC,MAAM,QAAQ,GAAG,4BAA4B,CAAC,IAAI,EAAE,aAAa,EAAE,UAAU,CAAC,CAAC;IAC/E,OAAO,QAAQ;QACb,CAAC,CAAC;YACE,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,QAAQ,EAAE,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC;YAC5C,IAAI,EAAE,MAAM;YACZ,aAAa,EAAE,aAAa,CAAC,KAAK,CAAC,QAAQ,CAAC,gBAAgB,CAAC;SAC9D;QACH,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC;AAED,SAAS,kCAAkC,CACzC,GAAW,EACX,OAA+B,EAC/B,UAAqC,EACrC,mBAAmE;IAEnE,MAAM,QAAQ,GAAG,8BAA8B,CAAC,GAAG,EAAE,OAAO,EAAE,UAAU,EAAE,mBAAmB,CAAC,CAAC;IAC/F,OAAO,QAAQ;QACb,CAAC,CAAC;YACE,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,QAAQ,EAAE,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC;YAC5C,IAAI,EAAE,OAAO;YACb,aAAa,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC;SACvC;QACH,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC;AAED,SAAS,iCAAiC,CACxC,GAAW,EACX,UAAkB,EAClB,OAAe,EACf,KAAqC,EACrC,UAAqC;IAErC,IAAI,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QACpB,MAAM,QAAQ,GAAG,kCAAkC,CACjD,GAAG,EACH,6BAA6B,CAAC,GAAG,EAAE,KAAK,CAAC,OAAO,CAAC,EACjD,UAAU,EACV,KAAK,CAAC,mBAAmB,CAC1B,CAAC;QACF,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,IAAI,KAAK,CAAC,4DAA4D,GAAG,EAAE,CAAC,CAAC;QACrF,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,IAAI,4BAA4B,CAAC,GAAG,CAAC,EAAE,CAAC;QACtC,OAAO,qCAAqC,CAAC,GAAG,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;IACrF,CAAC;IAED,MAAM,aAAa,GAAG,+BAA+B,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAClE,MAAM,QAAQ,GAAG,mCAAmC,CAAC,GAAG,EAAE,aAAa,EAAE,UAAU,CAAC,CAAC;IACrF,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,IAAI,KAAK,CAAC,4DAA4D,GAAG,EAAE,CAAC,CAAC;IACrF,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,MAAM,UAAU,8BAA8B,CAC5C,GAA2C,EAC3C,WAAmB,EACnB,OAAgC;IAEhC,OAAO,sCAAsC,CAAC,GAAG,EAAE,WAAW,EAAE;QAC9D,OAAO,EAAE,WAAW;QACpB,OAAO;KACR,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,sCAAsC,CACpD,GAA2C,EAC3C,WAAmB,EACnB,IAA2C;IAE3C,OAAO,qCAAqC,CAC1C,GAAG,EACH,WAAW,EACX,IAAI,CAAC,OAAO,EACZ;QACE,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,aAAa,EAAE,IAAI,CAAC,aAAa;QACjC,mBAAmB,EAAE,IAAI,CAAC,mBAAmB;KAC9C,EACD,IAAI,CAAC,UAAU,IAAI,cAAc,EACjC,IAAI,GAAG,EAAU,CAClB,CAAC;AACJ,CAAC;AAED,SAAS,qCAAqC,CAC5C,GAA2C,EAC3C,UAAkB,EAClB,OAAe,EACf,KAAqC,EACrC,UAAqC,EACrC,QAAqB;IAErB,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,SAAS,GAAG,gCAAgC,CAAC,KAAK,CAAC,GAAG,CAA+B,CAAC;IAC5F,MAAM,GAAG,GAAG,SAAS,CAAC,OAAO,CAAC;IAC9B,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;QACtB,OAAO,wBAAwB,CAAC,SAAS,CAAC,CAAC;IAC7C,CAAC;IAED,MAAM,OAAO,GAAG,iCAAiC,CAAC,GAAG,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;IAC/F,IAAI,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QACnC,MAAM,IAAI,KAAK,CAAC,gFAAgF,GAAG,EAAE,CAAC,CAAC;IACzG,CAAC;IAED,MAAM,aAAa,GAAG,SAAS,CAAC,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IACnE,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CAAC,8EAA8E,GAAG,EAAE,CAAC,CAAC;IACvG,CAAC;IACD,MAAM,mBAAmB,GAAG,gCAAgC,CAAC,KAAK,CAAC,aAAa,CAA+B,CAAC;IAEhH,MAAM,YAAY,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC;IACvC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACnC,MAAM,iBAAiB,GAAG,qCAAqC,CAC7D,mBAAmB,EACnB,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EACrB,OAAO,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EACzD;QACE,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,aAAa,EAAE,OAAO,CAAC,aAAa,IAAI,KAAK,CAAC,aAAa;QAC3D,mBAAmB,EAAE,KAAK,CAAC,mBAAmB;KAC/C,EACD,UAAU,EACV,YAAY,CACb,CAAC;IACF,MAAM,aAAa,GAAG,wBAAwB,CAAC,4BAA4B,CAAC,SAAS,CAAC,CAAC,CAAC;IACxF,OAAO,oBAAoB,CAAC,iBAAiB,EAAE,aAAa,CAAC,CAAC;AAChE,CAAC"}

package/dist/infra/config/loaders/workflowRuleNormalizer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workflowRuleNormalizer.d.ts","sourceRoot":"","sources":["../../../../src/infra/config/loaders/workflowRuleNormalizer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAqBlE,wBAAgB,aAAa,CAAC,IAAI,EAAE;IAClC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,GAAG,YAAY,CA4Cf"}
+{"version":3,"file":"workflowRuleNormalizer.d.ts","sourceRoot":"","sources":["../../../../src/infra/config/loaders/workflowRuleNormalizer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAOlE,wBAAgB,aAAa,CAAC,IAAI,EAAE;IAClC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,GAAG,YAAY,CA+Cf"}

package/dist/infra/config/loaders/workflowRuleNormalizer.js

@@ -1,18 +1,4 @@
-import { parseAggregateConditionExpression, parseAiConditionExpression, } from '../../../core/models/workflow-condition-expression.js';
-function parseAggregateConditions(argsText) {
-    const conditions = [];
-    const regex = /"([^"]+)"/g;
-    let match;
-    while ((match = regex.exec(argsText)) !== null) {
-        if (match[1]) {
-            conditions.push(match[1]);
-        }
-    }
-    if (conditions.length === 0) {
-        throw new Error(`Invalid aggregate condition format: ${argsText}`);
-    }
-    return conditions;
-}
+import { parseAggregateConditionArgs, parseAggregateConditionExpression, parseAiConditionExpression, } from '../../../core/models/workflow-condition-expression.js';
 export function normalizeRule(rule) {
     const condition = rule.condition ?? rule.when;
     if (!condition) {
@@ -34,7 +20,7 @@ export function normalizeRule(rule) {
     }
     const aggregateExpression = parseAggregateConditionExpression(condition);
     if (aggregateExpression) {
-        const conditions = parseAggregateConditions(aggregateExpression.argsText);
+        const conditions = parseAggregateConditionArgs(aggregateExpression.argsText);
         return {
             condition,
             next,
@@ -45,6 +31,9 @@ export function normalizeRule(rule) {
             isAggregateCondition: true,
             aggregateType: aggregateExpression.type,
             aggregateConditionText: conditions.length === 1 ? conditions[0] : conditions,
+            ...(aggregateExpression.guardCondition !== undefined
+                ? { aggregateGuardCondition: aggregateExpression.guardCondition }
+                : {}),
         };
     }
     return {

package/dist/infra/config/loaders/workflowRuleNormalizer.js.map

@@ -1 +1 @@
-{"version":3,"file":"workflowRuleNormalizer.js","sourceRoot":"","sources":["../../../../src/infra/config/loaders/workflowRuleNormalizer.ts"],"names":[],"mappings":"AACA,OAAO,EACL,iCAAiC,EACjC,0BAA0B,GAC3B,MAAM,uDAAuD,CAAC;AAE/D,SAAS,wBAAwB,CAAC,QAAgB;IAChD,MAAM,UAAU,GAAa,EAAE,CAAC;IAChC,MAAM,KAAK,GAAG,YAAY,CAAC;IAC3B,IAAI,KAA6B,CAAC;IAClC,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QAC/C,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;YACb,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAC5B,CAAC;IACH,CAAC;IACD,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC5B,MAAM,IAAI,KAAK,CAAC,uCAAuC,QAAQ,EAAE,CAAC,CAAC;IACrE,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,IAQ7B;IACC,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,IAAI,CAAC;IAC9C,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;IAC9D,CAAC;IACD,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC;IAC7B,MAAM,YAAY,GAAG,0BAA0B,CAAC,SAAS,CAAC,CAAC;IAC3D,IAAI,YAAY,EAAE,CAAC;QACjB,OAAO;YACL,SAAS;YACT,IAAI;YACJ,WAAW,EAAE,IAAI,CAAC,MAAM;YACxB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,iBAAiB,EAAE,IAAI,CAAC,mBAAmB;YAC3C,eAAe,EAAE,IAAI,CAAC,gBAAgB;YACtC,aAAa,EAAE,IAAI;YACnB,eAAe,EAAE,YAAY,CAAC,IAAI;SACnC,CAAC;IACJ,CAAC;IAED,MAAM,mBAAmB,GAAG,iCAAiC,CAAC,SAAS,CAAC,CAAC;IACzE,IAAI,mBAAmB,EAAE,CAAC;QACxB,MAAM,UAAU,GAAG,wBAAwB,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;QAC1E,OAAO;YACL,SAAS;YACT,IAAI;YACJ,WAAW,EAAE,IAAI,CAAC,MAAM;YACxB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,iBAAiB,EAAE,IAAI,CAAC,mBAAmB;YAC3C,eAAe,EAAE,IAAI,CAAC,gBAAgB;YACtC,oBAAoB,EAAE,IAAI;YAC1B,aAAa,EAAE,mBAAmB,CAAC,IAAI;YACvC,sBAAsB,EAAE,UAAU,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAE,CAAC,CAAC,CAAC,UAAU;SAC9E,CAAC;IACJ,CAAC;IAED,OAAO;QACL,SAAS;QACT,IAAI;QACJ,WAAW,EAAE,IAAI,CAAC,MAAM;QACxB,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,iBAAiB,EAAE,IAAI,CAAC,mBAAmB;QAC3C,eAAe,EAAE,IAAI,CAAC,gBAAgB;KACvC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"workflowRuleNormalizer.js","sourceRoot":"","sources":["../../../../src/infra/config/loaders/workflowRuleNormalizer.ts"],"names":[],"mappings":"AACA,OAAO,EACL,2BAA2B,EAC3B,iCAAiC,EACjC,0BAA0B,GAC3B,MAAM,uDAAuD,CAAC;AAE/D,MAAM,UAAU,aAAa,CAAC,IAQ7B;IACC,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,IAAI,CAAC;IAC9C,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;IAC9D,CAAC;IACD,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC;IAC7B,MAAM,YAAY,GAAG,0BAA0B,CAAC,SAAS,CAAC,CAAC;IAC3D,IAAI,YAAY,EAAE,CAAC;QACjB,OAAO;YACL,SAAS;YACT,IAAI;YACJ,WAAW,EAAE,IAAI,CAAC,MAAM;YACxB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,iBAAiB,EAAE,IAAI,CAAC,mBAAmB;YAC3C,eAAe,EAAE,IAAI,CAAC,gBAAgB;YACtC,aAAa,EAAE,IAAI;YACnB,eAAe,EAAE,YAAY,CAAC,IAAI;SACnC,CAAC;IACJ,CAAC;IAED,MAAM,mBAAmB,GAAG,iCAAiC,CAAC,SAAS,CAAC,CAAC;IACzE,IAAI,mBAAmB,EAAE,CAAC;QACxB,MAAM,UAAU,GAAG,2BAA2B,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;QAC7E,OAAO;YACL,SAAS;YACT,IAAI;YACJ,WAAW,EAAE,IAAI,CAAC,MAAM;YACxB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,iBAAiB,EAAE,IAAI,CAAC,mBAAmB;YAC3C,eAAe,EAAE,IAAI,CAAC,gBAAgB;YACtC,oBAAoB,EAAE,IAAI;YAC1B,aAAa,EAAE,mBAAmB,CAAC,IAAI;YACvC,sBAAsB,EAAE,UAAU,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAE,CAAC,CAAC,CAAC,UAAU;YAC7E,GAAG,CAAC,mBAAmB,CAAC,cAAc,KAAK,SAAS;gBAClD,CAAC,CAAC,EAAE,uBAAuB,EAAE,mBAAmB,CAAC,cAAc,EAAE;gBACjE,CAAC,CAAC,EAAE,CAAC;SACR,CAAC;IACJ,CAAC;IAED,OAAO;QACL,SAAS;QACT,IAAI;QACJ,WAAW,EAAE,IAAI,CAAC,MAAM;QACxB,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,iBAAiB,EAAE,IAAI,CAAC,mBAAmB;QAC3C,eAAe,EAAE,IAAI,CAAC,gBAAgB;KACvC,CAAC;AACJ,CAAC"}

package/dist/infra/config/loaders/workflowStepNormalizer.d.ts

@@ -5,12 +5,13 @@ import type { StepProviderOptions } from '../../../core/models/workflow-types.js
 import { type FacetResolutionContext, type WorkflowSections } from './resource-resolver.js';
 type RawStep = z.output<typeof WorkflowStepRawSchema>;
 type RawProviderReference = RawStep['provider'];
-export declare function normalizeProviderReference(provider: RawProviderReference, model: RawStep['model'], providerOptions: RawStep['provider_options'], workflowDir: string): {
+export declare function normalizeProviderReference(provider: RawProviderReference, model: RawStep['model'], providerOptions: RawStep['provider_options'], workflowDir: string, context?: FacetResolutionContext): {
     provider: WorkflowStep['provider'];
     model: WorkflowStep['model'];
     providerOptions: StepProviderOptions | undefined;
     providerSpecified: boolean;
+    modelSpecified: boolean;
 };
-export declare function normalizeStepFromRaw(step: RawStep, workflowDir: string, sections: WorkflowSections, workflowSchemas: Record<string, string> | undefined, inheritedProvider?: WorkflowStep['provider'], inheritedModel?: WorkflowStep['model'], inheritedProviderOptions?: WorkflowStep['providerOptions'], inheritedAllowGitCommit?: boolean, context?: FacetResolutionContext, projectOverrides?: WorkflowOverrides, globalOverrides?: WorkflowOverrides, workflowArpeggioPolicy?: WorkflowArpeggioConfig, workflowMcpServersPolicy?: WorkflowMcpServersConfig): WorkflowStep;
+export declare function normalizeStepFromRaw(step: RawStep, workflowDir: string, sections: WorkflowSections, workflowSchemas: Record<string, string> | undefined, inheritedProvider?: WorkflowStep['provider'], inheritedModel?: WorkflowStep['model'], inheritedDirectProviderOptions?: WorkflowStep['providerOptions'], inheritedWorkflowProviderOptions?: WorkflowStep['providerOptions'], inheritedAllowGitCommit?: boolean, inheritedProviderIsWorkflowFallback?: boolean, inheritedModelIsWorkflowFallback?: boolean, context?: FacetResolutionContext, projectOverrides?: WorkflowOverrides, globalOverrides?: WorkflowOverrides, workflowArpeggioPolicy?: WorkflowArpeggioConfig, workflowMcpServersPolicy?: WorkflowMcpServersConfig): WorkflowStep;
 export {};
 //# sourceMappingURL=workflowStepNormalizer.d.ts.map

package/dist/infra/config/loaders/workflowStepNormalizer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workflowStepNormalizer.d.ts","sourceRoot":"","sources":["../../../../src/infra/config/loaders/workflowStepNormalizer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAC7B,OAAO,KAAK,EAIV,YAAY,EACZ,qBAAqB,EACtB,MAAM,+BAA+B,CAAC;AAEvC,OAAO,KAAK,EAAE,sBAAsB,EAAE,wBAAwB,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AAChI,OAAO,KAAK,EACV,mBAAmB,EAEpB,MAAM,wCAAwC,CAAC;AAEhD,OAAO,EACL,KAAK,sBAAsB,EAC3B,KAAK,gBAAgB,EAMtB,MAAM,wBAAwB,CAAC;AAYhC,KAAK,OAAO,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,qBAAqB,CAAC,CAAC;AACtD,KAAK,oBAAoB,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AAIhD,wBAAgB,0BAA0B,CACxC,QAAQ,EAAE,oBAAoB,EAC9B,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,EACvB,eAAe,EAAE,OAAO,CAAC,kBAAkB,CAAC,EAC5C,WAAW,EAAE,MAAM,GAClB;IACD,QAAQ,EAAE,YAAY,CAAC,UAAU,CAAC,CAAC;IACnC,KAAK,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;IAC7B,eAAe,EAAE,mBAAmB,GAAG,SAAS,CAAC;IACjD,iBAAiB,EAAE,OAAO,CAAC;CAC5B,CAwBA;AAoDD,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,OAAO,EACb,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,gBAAgB,EAC1B,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,EACnD,iBAAiB,CAAC,EAAE,YAAY,CAAC,UAAU,CAAC,EAC5C,cAAc,CAAC,EAAE,YAAY,CAAC,OAAO,CAAC,EACtC,wBAAwB,CAAC,EAAE,YAAY,CAAC,iBAAiB,CAAC,EAC1D,uBAAuB,CAAC,EAAE,OAAO,EACjC,OAAO,CAAC,EAAE,sBAAsB,EAChC,gBAAgB,CAAC,EAAE,iBAAiB,EACpC,eAAe,CAAC,EAAE,iBAAiB,EACnC,sBAAsB,CAAC,EAAE,sBAAsB,EAC/C,wBAAwB,CAAC,EAAE,wBAAwB,GAClD,YAAY,CAiLd"}
+{"version":3,"file":"workflowStepNormalizer.d.ts","sourceRoot":"","sources":["../../../../src/infra/config/loaders/workflowStepNormalizer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAC7B,OAAO,KAAK,EAIV,YAAY,EACZ,qBAAqB,EACtB,MAAM,+BAA+B,CAAC;AAEvC,OAAO,KAAK,EAAE,sBAAsB,EAAE,wBAAwB,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AAChI,OAAO,KAAK,EACV,mBAAmB,EAEpB,MAAM,wCAAwC,CAAC;AAEhD,OAAO,EACL,KAAK,sBAAsB,EAC3B,KAAK,gBAAgB,EAMtB,MAAM,wBAAwB,CAAC;AAYhC,KAAK,OAAO,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,qBAAqB,CAAC,CAAC;AACtD,KAAK,oBAAoB,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AAIhD,wBAAgB,0BAA0B,CACxC,QAAQ,EAAE,oBAAoB,EAC9B,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,EACvB,eAAe,EAAE,OAAO,CAAC,kBAAkB,CAAC,EAC5C,WAAW,EAAE,MAAM,EACnB,OAAO,CAAC,EAAE,sBAAsB,GAC/B;IACD,QAAQ,EAAE,YAAY,CAAC,UAAU,CAAC,CAAC;IACnC,KAAK,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;IAC7B,eAAe,EAAE,mBAAmB,GAAG,SAAS,CAAC;IACjD,iBAAiB,EAAE,OAAO,CAAC;IAC3B,cAAc,EAAE,OAAO,CAAC;CACzB,CA2BA;AAuDD,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,OAAO,EACb,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,gBAAgB,EAC1B,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,EACnD,iBAAiB,CAAC,EAAE,YAAY,CAAC,UAAU,CAAC,EAC5C,cAAc,CAAC,EAAE,YAAY,CAAC,OAAO,CAAC,EACtC,8BAA8B,CAAC,EAAE,YAAY,CAAC,iBAAiB,CAAC,EAChE,gCAAgC,CAAC,EAAE,YAAY,CAAC,iBAAiB,CAAC,EAClE,uBAAuB,CAAC,EAAE,OAAO,EACjC,mCAAmC,UAAQ,EAC3C,gCAAgC,UAAsC,EACtE,OAAO,CAAC,EAAE,sBAAsB,EAChC,gBAAgB,CAAC,EAAE,iBAAiB,EACpC,eAAe,CAAC,EAAE,iBAAiB,EACnC,sBAAsB,CAAC,EAAE,sBAAsB,EAC/C,wBAAwB,CAAC,EAAE,wBAAwB,GAClD,YAAY,CA0Md"}