@farmslot/recipe-harness 0.7.0 → 0.9.0

package/dist/cli/support.js

@@ -1,7 +1,10 @@
 import { readdir, readFile } from 'node:fs/promises';
 import path from 'node:path';
-import { isRecord, mergeRecipeValidationResults, validateArtifactManifestDocument, validateRecipeArtifactPackage, validateRecipeDocument, validateRecipeWithManifest, } from '@farmslot/protocol';
+import { applyRecipeParamDefaults, digestRecipeDocument, isRecord, mergeRecipeValidationResults, resolvedRecipeArtifactPath, validateArtifactManifestDocument, validateRecipeArtifactPackage, validateRecipeDocument, validateRecipeParams, validateRecipeWithManifest, } from '@farmslot/protocol';
+import { resolveRecipeDependencies, rootResolutionRef, validateRecipeDependencyParams, } from '../core/compose.js';
 import { loadRecipeLibraries } from '../core/library.js';
+import { readFileWithinRoot } from '../core/path.js';
+import { RecipeResolutionError } from '../core/resolution-error.js';
 export function recipeCliBaseDir() {
     return process.env.INIT_CWD ?? process.cwd();
 }
@@ -15,6 +18,36 @@ export function parsePositiveInteger(value) {
     }
     return parsed;
 }
+export function parseRecipeParamAssignments(values) {
+    const params = {};
+    for (const value of values) {
+        const separator = value.indexOf('=');
+        if (separator <= 0) {
+            throw new Error(`Recipe parameter ${JSON.stringify(value)} must use key=value.`);
+        }
+        const key = value.slice(0, separator).trim();
+        if (!key || Object.hasOwn(params, key)) {
+            throw new Error(Object.hasOwn(params, key)
+                ? `Recipe parameter ${key} was provided more than once.`
+                : `Recipe parameter ${JSON.stringify(value)} has an empty key.`);
+        }
+        const raw = value.slice(separator + 1);
+        let parsed;
+        try {
+            parsed = JSON.parse(raw);
+        }
+        catch {
+            parsed = raw;
+        }
+        Object.defineProperty(params, key, {
+            value: parsed,
+            enumerable: true,
+            configurable: true,
+            writable: true,
+        });
+    }
+    return params;
+}
 export function parseRecordingTarget(options) {
     if (options.recordPid)
         return { kind: 'pid', pid: parsePositiveInteger(options.recordPid) };
@@ -44,19 +77,26 @@ export async function readRecipeCliJsonFile(filePath, baseDir = recipeCliBaseDir
     }
     return parseRecipeCliJsonText(filePath, text);
 }
-async function readOptionalRecipeCliJsonFile(filePath, baseDir = recipeCliBaseDir()) {
-    const resolvedPath = resolveRecipeCliPath(filePath, baseDir);
+export async function readRecipeCliJsonFileWithinRoot(root, relativePath) {
     let text;
     try {
-        text = await readFile(resolvedPath, 'utf-8');
+        text = (await readFileWithinRoot(root, relativePath)).toString('utf-8');
     }
     catch (error) {
-        if (error?.code === 'ENOENT')
-            return undefined;
         const message = error instanceof Error ? error.message : String(error);
-        throw new Error(`Failed to read JSON from ${filePath}: ${message}`);
+        throw new Error(`Failed to read JSON from ${relativePath}: ${message}`, { cause: error });
+    }
+    return parseRecipeCliJsonText(relativePath, text);
+}
+async function readOptionalRecipeCliJsonFileWithinRoot(root, relativePath) {
+    try {
+        return await readRecipeCliJsonFileWithinRoot(root, relativePath);
+    }
+    catch (error) {
+        if (error?.cause?.code === 'ENOENT')
+            return undefined;
+        throw error;
     }
-    return parseRecipeCliJsonText(filePath, text);
 }
 function parseRecipeCliJsonText(filePath, text) {
     try {
@@ -67,12 +107,44 @@ function parseRecipeCliJsonText(filePath, text) {
         throw new Error(`Failed to parse JSON from ${filePath}: ${message}`);
     }
 }
-export async function validateRecipeCliInput({ recipePath, actionManifestPath, artifactManifestPath, artifactDir, baseDir = recipeCliBaseDir(), librarySources, }) {
+export async function validateRecipeCliInput({ recipePath, actionManifestPath, artifactManifestPath, artifactDir, baseDir = recipeCliBaseDir(), librarySources, params = {}, }) {
     const recipe = await readRecipeCliJsonFile(recipePath, baseDir);
     const results = [];
-    const validationOptions = librarySources && librarySources.length > 0
-        ? { externalFlowIds: new Set((await loadRecipeLibraries(librarySources)).flows.keys()) }
+    const effectiveParams = isRecord(recipe)
+        ? applyRecipeParamDefaults(params, recipe.paramsSchema)
+        : params;
+    if (isRecord(recipe))
+        results.push(validateRecipeParams(effectiveParams, recipe.paramsSchema));
+    const artifactRoot = artifactDir ? resolveRecipeCliPath(artifactDir, baseDir) : undefined;
+    const artifactPaths = artifactRoot ? await listRelativeRecipeCliFiles(artifactRoot) : undefined;
+    const recipeResolution = artifactRoot
+        ? await readOptionalRecipeCliJsonFileWithinRoot(artifactRoot, 'recipe-resolution.json')
         : undefined;
+    const resolvedRecipes = {};
+    if (artifactRoot && isRecord(recipeResolution) && Array.isArray(recipeResolution.dependencies)) {
+        for (const dependency of recipeResolution.dependencies) {
+            if (!isRecord(dependency))
+                continue;
+            const artifact = resolvedRecipeArtifactPath(dependency.digest);
+            if (!artifact)
+                continue;
+            const document = await readOptionalRecipeCliJsonFileWithinRoot(artifactRoot, artifact);
+            if (document !== undefined)
+                resolvedRecipes[String(dependency.digest)] = document;
+        }
+    }
+    const libraryResolution = librarySources && librarySources.length > 0
+        ? await loadRecipeLibraries(librarySources)
+        : undefined;
+    const externalRecipeIds = new Set(libraryResolution?.recipes.keys() ?? []);
+    if (isRecord(recipeResolution) && Array.isArray(recipeResolution.dependencies)) {
+        for (const dependency of recipeResolution.dependencies) {
+            if (isRecord(dependency) && typeof dependency.ref === 'string') {
+                externalRecipeIds.add(dependency.ref);
+            }
+        }
+    }
+    const validationOptions = externalRecipeIds.size > 0 ? { externalRecipeIds } : undefined;
     if (actionManifestPath) {
         const actionManifest = await readRecipeCliJsonFile(actionManifestPath, baseDir);
         results.push(validateRecipeWithManifest(recipe, actionManifest, validationOptions));
@@ -80,16 +152,57 @@ export async function validateRecipeCliInput({ recipePath, actionManifestPath, a
     else {
         results.push(validateRecipeDocument(recipe, validationOptions));
     }
-    const artifactPaths = artifactDir
-        ? await listRelativeRecipeCliFiles(resolveRecipeCliPath(artifactDir, baseDir))
-        : undefined;
+    if (!artifactDir &&
+        libraryResolution &&
+        isRecord(recipe) &&
+        results.every((result) => result.status === 'valid')) {
+        try {
+            const rootDigest = digestRecipeDocument(recipe);
+            resolveRecipeDependencies({
+                rootRef: rootResolutionRef(rootDigest),
+                root: recipe,
+                rootSource: {
+                    kind: 'operator',
+                    trust: 'unknown',
+                    path: resolveRecipeCliPath(recipePath, baseDir),
+                    digest: rootDigest,
+                },
+                recipes: libraryResolution.recipes,
+            });
+            validateRecipeDependencyParams({
+                root: recipe,
+                params: effectiveParams,
+                recipes: libraryResolution.recipes,
+            });
+        }
+        catch (error) {
+            results.push({
+                status: 'invalid',
+                findings: [
+                    {
+                        severity: 'error',
+                        code: error instanceof RecipeResolutionError
+                            ? error.code.toLowerCase()
+                            : 'recipe.unresolved_dependency_graph',
+                        path: 'workflow',
+                        message: error instanceof RecipeResolutionError
+                            ? `${error.message} Next: ${error.userAction}.`
+                            : error instanceof Error
+                                ? error.message
+                                : String(error),
+                    },
+                ],
+                summary: { errors: 1, warnings: 0 },
+            });
+        }
+    }
     const manifestPath = artifactManifestPath ??
         (artifactDir ? path.join(artifactDir, 'artifact-manifest.json') : undefined);
     let manifest;
     if (manifestPath) {
         manifest = artifactManifestPath
             ? await readRecipeCliJsonFile(manifestPath, baseDir)
-            : await readOptionalRecipeCliJsonFile(manifestPath, baseDir);
+            : await readOptionalRecipeCliJsonFileWithinRoot(artifactRoot, 'artifact-manifest.json');
         if (manifest !== undefined && !artifactDir) {
             results.push(validateArtifactManifestDocument(manifest, {
                 recipe,
@@ -98,19 +211,12 @@ export async function validateRecipeCliInput({ recipePath, actionManifestPath, a
         }
     }
     if (artifactDir) {
-        // Flow-call resolution already ran above via validateRecipeWithManifest with the
-        // configured library. Always read resolved-recipe.json so a present-but-malformed
-        // file throws (never silently skipped); the validator then checks the composition
-        // in full only for a passing run (runPassed) — matching the runner/gateway.
-        const resolvedRecipe = await readOptionalRecipeCliJsonFile(path.join(artifactDir, 'resolved-recipe.json'), baseDir);
         results.push(validateRecipeArtifactPackage({
             recipe,
             manifest,
             artifactPaths,
-            ...(resolvedRecipe !== undefined ? { resolvedRecipe } : {}),
-            // Only a confirmed failure relaxes composition enforcement; unknown/missing
-            // status still requires the composition to be proven.
-            runPassed: !(isRecord(manifest) && manifest.runStatus === 'fail'),
+            resolvedRecipes,
+            recipeResolution,
         }));
     }
     return mergeRecipeValidationResults(results);
@@ -124,7 +230,7 @@ async function listRelativeRecipeCliFiles(root) {
             if (entry.isDirectory()) {
                 await visit(relativePath);
             }
-            else if (entry.isFile()) {
+            else if (entry.isFile() || entry.isSymbolicLink()) {
                 output.push(relativePath.split(path.sep).join('/'));
             }
         }

package/dist/cli/support.js.map

@@ -1 +1 @@
-{"version":3,"file":"support.js","sourceRoot":"","sources":["../../src/cli/support.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EACL,QAAQ,EACR,4BAA4B,EAE5B,gCAAgC,EAChC,6BAA6B,EAC7B,sBAAsB,EACtB,0BAA0B,GAC3B,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAoBzD,MAAM,UAAU,gBAAgB;IAC9B,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;AAC/C,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,QAAgB,EAAE,OAAO,GAAG,gBAAgB,EAAE;IACjF,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;AACzC,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,KAAa;IAChD,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IAC7B,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,MAAM,IAAI,CAAC,EAAE,CAAC;QAC7C,MAAM,IAAI,KAAK,CAAC,oCAAoC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAChF,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,oBAAoB,CAClC,OAAwC;IAExC,IAAI,OAAO,CAAC,SAAS;QAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,oBAAoB,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;IAC5F,IAAI,OAAO,CAAC,cAAc;QAAE,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,OAAO,CAAC,cAAc,EAAE,CAAC;IAC3F,IAAI,OAAO,CAAC,aAAa,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;QACtD,IAAI,CAAC,OAAO,CAAC,aAAa,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC;YACxD,MAAM,IAAI,KAAK,CAAC,uEAAuE,CAAC,CAAC;QAC3F,CAAC;QACD,OAAO;YACL,IAAI,EAAE,YAAY;YAClB,OAAO,EAAE,OAAO,CAAC,aAAa;YAC9B,UAAU,EAAE,OAAO,CAAC,gBAAgB;SACrC,CAAC;IACJ,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,QAAgB,EAChB,OAAO,GAAG,gBAAgB,EAAE;IAE5B,MAAM,YAAY,GAAG,oBAAoB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC7D,IAAI,IAAY,CAAC;IACjB,IAAI,CAAC;QACH,IAAI,GAAG,MAAM,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IAC/C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACvE,MAAM,IAAI,KAAK,CAAC,4BAA4B,QAAQ,KAAK,OAAO,EAAE,CAAC,CAAC;IACtE,CAAC;IACD,OAAO,sBAAsB,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;AAChD,CAAC;AAED,KAAK,UAAU,6BAA6B,CAC1C,QAAgB,EAChB,OAAO,GAAG,gBAAgB,EAAE;IAE5B,MAAM,YAAY,GAAG,oBAAoB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC7D,IAAI,IAAY,CAAC;IACjB,IAAI,CAAC;QACH,IAAI,GAAG,MAAM,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IAC/C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAK,KAA+B,EAAE,IAAI,KAAK,QAAQ;YAAE,OAAO,SAAS,CAAC;QAC1E,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACvE,MAAM,IAAI,KAAK,CAAC,4BAA4B,QAAQ,KAAK,OAAO,EAAE,CAAC,CAAC;IACtE,CAAC;IACD,OAAO,sBAAsB,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;AAChD,CAAC;AAED,SAAS,sBAAsB,CAAC,QAAgB,EAAE,IAAY;IAC5D,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACvE,MAAM,IAAI,KAAK,CAAC,6BAA6B,QAAQ,KAAK,OAAO,EAAE,CAAC,CAAC;IACvE,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,EAC3C,UAAU,EACV,kBAAkB,EAClB,oBAAoB,EACpB,WAAW,EACX,OAAO,GAAG,gBAAgB,EAAE,EAC5B,cAAc,GACe;IAC7B,MAAM,MAAM,GAAG,MAAM,qBAAqB,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAChE,MAAM,OAAO,GAA6B,EAAE,CAAC;IAE7C,MAAM,iBAAiB,GACrB,cAAc,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC;QACzC,CAAC,CAAC,EAAE,eAAe,EAAE,IAAI,GAAG,CAAC,CAAC,MAAM,mBAAmB,CAAC,cAAc,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,EAAE;QACxF,CAAC,CAAC,SAAS,CAAC;IAChB,IAAI,kBAAkB,EAAE,CAAC;QACvB,MAAM,cAAc,GAAG,MAAM,qBAAqB,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAC;QAChF,OAAO,CAAC,IAAI,CAAC,0BAA0B,CAAC,MAAM,EAAE,cAAc,EAAE,iBAAiB,CAAC,CAAC,CAAC;IACtF,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAAC;IAClE,CAAC;IAED,MAAM,aAAa,GAAG,WAAW;QAC/B,CAAC,CAAC,MAAM,0BAA0B,CAAC,oBAAoB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QAC9E,CAAC,CAAC,SAAS,CAAC;IACd,MAAM,YAAY,GAChB,oBAAoB;QACpB,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,wBAAwB,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAE/E,IAAI,QAAiB,CAAC;IACtB,IAAI,YAAY,EAAE,CAAC;QACjB,QAAQ,GAAG,oBAAoB;YAC7B,CAAC,CAAC,MAAM,qBAAqB,CAAC,YAAY,EAAE,OAAO,CAAC;YACpD,CAAC,CAAC,MAAM,6BAA6B,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QAC/D,IAAI,QAAQ,KAAK,SAAS,IAAI,CAAC,WAAW,EAAE,CAAC;YAC3C,OAAO,CAAC,IAAI,CACV,gCAAgC,CAAC,QAAQ,EAAE;gBACzC,MAAM;gBACN,aAAa;aACd,CAAC,CACH,CAAC;QACJ,CAAC;IACH,CAAC;IAED,IAAI,WAAW,EAAE,CAAC;QAChB,iFAAiF;QACjF,kFAAkF;QAClF,kFAAkF;QAClF,4EAA4E;QAC5E,MAAM,cAAc,GAAG,MAAM,6BAA6B,CACxD,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,sBAAsB,CAAC,EAC9C,OAAO,CACR,CAAC;QACF,OAAO,CAAC,IAAI,CACV,6BAA6B,CAAC;YAC5B,MAAM;YACN,QAAQ;YACR,aAAa;YACb,GAAG,CAAC,cAAc,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC3D,4EAA4E;YAC5E,sDAAsD;YACtD,SAAS,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,SAAS,KAAK,MAAM,CAAC;SAClE,CAAC,CACH,CAAC;IACJ,CAAC;IAED,OAAO,4BAA4B,CAAC,OAAO,CAAC,CAAC;AAC/C,CAAC;AAED,KAAK,UAAU,0BAA0B,CAAC,IAAY;IACpD,MAAM,MAAM,GAAa,EAAE,CAAC;IAE5B,KAAK,UAAU,KAAK,CAAC,WAAmB;QACtC,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;QACrF,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;YAC5B,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;YACxD,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;gBACxB,MAAM,KAAK,CAAC,YAAY,CAAC,CAAC;YAC5B,CAAC;iBAAM,IAAI,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC;gBAC1B,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;YACtD,CAAC;QACH,CAAC;IACH,CAAC;IAED,MAAM,KAAK,CAAC,EAAE,CAAC,CAAC;IAChB,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC;AACvB,CAAC"}
+{"version":3,"file":"support.js","sourceRoot":"","sources":["../../src/cli/support.ts"],"names":[],"mappings":"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"}

package/dist/cli/validate-command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validate-command.d.ts","sourceRoot":"","sources":["../../src/cli/validate-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,WAAW,CAAC;AAczC,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAoC9D"}
+{"version":3,"file":"validate-command.d.ts","sourceRoot":"","sources":["../../src/cli/validate-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,WAAW,CAAC;AAczC,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAuC9D"}

package/dist/cli/validate-command.js

@@ -11,7 +11,10 @@ export function registerValidateCommand(program) {
         .option('--library <entry>', 'Recipe library source as name=path or path (repeatable; order is precedence, first wins). Defaults to RECIPE_LIBRARY_PATH, then the personal library under the farmslot home — same resolution as run.', collectRepeatable, [])
         .option('--json', 'Print validation result as JSON')
         .action(async (recipePath, options) => {
-        const librarySources = await resolveRecipeLibrarySources({ cliEntries: options.library });
+        const librarySources = await resolveRecipeLibrarySources({
+            cliEntries: options.library,
+            recipePath,
+        });
         const result = await validateRecipeCliInput({
             recipePath,
             actionManifestPath: options.actionManifest,

package/dist/cli/validate-command.js.map

@@ -1 +1 @@
-{"version":3,"file":"validate-command.js","sourceRoot":"","sources":["../../src/cli/validate-command.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,2BAA2B,EAAE,MAAM,oBAAoB,CAAC;AAEjE,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAUtD,MAAM,UAAU,uBAAuB,CAAC,OAAgB;IACtD,OAAO;SACJ,OAAO,CAAC,UAAU,CAAC;SACnB,WAAW,CAAC,oDAAoD,CAAC;SACjE,QAAQ,CAAC,UAAU,EAAE,qBAAqB,CAAC;SAC3C,MAAM,CAAC,8BAA8B,EAAE,6BAA6B,CAAC;SACrE,MAAM,CAAC,gCAAgC,EAAE,wBAAwB,CAAC;SAClE,MAAM,CAAC,sBAAsB,EAAE,4BAA4B,CAAC;SAC5D,MAAM,CACL,mBAAmB,EACnB,wMAAwM,EACxM,iBAAiB,EACjB,EAAc,CACf;SACA,MAAM,CAAC,QAAQ,EAAE,iCAAiC,CAAC;SACnD,MAAM,CAAC,KAAK,EAAE,UAAkB,EAAE,OAA+B,EAAE,EAAE;QACpE,MAAM,cAAc,GAAG,MAAM,2BAA2B,CAAC,EAAE,UAAU,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;QAC1F,MAAM,MAAM,GAAG,MAAM,sBAAsB,CAAC;YAC1C,UAAU;YACV,kBAAkB,EAAE,OAAO,CAAC,cAAc;YAC1C,oBAAoB,EAAE,OAAO,CAAC,gBAAgB;YAC9C,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,GAAG,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACzD,CAAC,CAAC;QACH,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;YACjB,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAC/C,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,GAAG,CACT,sBAAsB,MAAM,CAAC,MAAM,KAAK,MAAM,CAAC,OAAO,CAAC,MAAM,YAAY,MAAM,CAAC,OAAO,CAAC,QAAQ,YAAY,CAC7G,CAAC;YACF,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;gBACtC,OAAO,CAAC,GAAG,CAAC,KAAK,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,KAAK,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;YAC3F,CAAC;QACH,CAAC;QACD,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS;YAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,iBAAiB,CAAC,KAAa,EAAE,QAAkB;IAC1D,OAAO,CAAC,GAAG,QAAQ,EAAE,KAAK,CAAC,CAAC;AAC9B,CAAC"}
+{"version":3,"file":"validate-command.js","sourceRoot":"","sources":["../../src/cli/validate-command.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,2BAA2B,EAAE,MAAM,oBAAoB,CAAC;AAEjE,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAUtD,MAAM,UAAU,uBAAuB,CAAC,OAAgB;IACtD,OAAO;SACJ,OAAO,CAAC,UAAU,CAAC;SACnB,WAAW,CAAC,oDAAoD,CAAC;SACjE,QAAQ,CAAC,UAAU,EAAE,qBAAqB,CAAC;SAC3C,MAAM,CAAC,8BAA8B,EAAE,6BAA6B,CAAC;SACrE,MAAM,CAAC,gCAAgC,EAAE,wBAAwB,CAAC;SAClE,MAAM,CAAC,sBAAsB,EAAE,4BAA4B,CAAC;SAC5D,MAAM,CACL,mBAAmB,EACnB,wMAAwM,EACxM,iBAAiB,EACjB,EAAc,CACf;SACA,MAAM,CAAC,QAAQ,EAAE,iCAAiC,CAAC;SACnD,MAAM,CAAC,KAAK,EAAE,UAAkB,EAAE,OAA+B,EAAE,EAAE;QACpE,MAAM,cAAc,GAAG,MAAM,2BAA2B,CAAC;YACvD,UAAU,EAAE,OAAO,CAAC,OAAO;YAC3B,UAAU;SACX,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,sBAAsB,CAAC;YAC1C,UAAU;YACV,kBAAkB,EAAE,OAAO,CAAC,cAAc;YAC1C,oBAAoB,EAAE,OAAO,CAAC,gBAAgB;YAC9C,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,GAAG,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACzD,CAAC,CAAC;QACH,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;YACjB,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAC/C,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,GAAG,CACT,sBAAsB,MAAM,CAAC,MAAM,KAAK,MAAM,CAAC,OAAO,CAAC,MAAM,YAAY,MAAM,CAAC,OAAO,CAAC,QAAQ,YAAY,CAC7G,CAAC;YACF,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;gBACtC,OAAO,CAAC,GAAG,CAAC,KAAK,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,KAAK,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;YAC3F,CAAC;QACH,CAAC;QACD,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS;YAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,iBAAiB,CAAC,KAAa,EAAE,QAAkB;IAC1D,OAAO,CAAC,GAAG,QAAQ,EAAE,KAAK,CAAC,CAAC;AAC9B,CAAC"}

package/dist/core/compose.d.ts

@@ -1,33 +1,23 @@
-import { type InlineFlow } from './flows.js';
-import type { RecipeLibrarySource, RecipeLogger } from './types.js';
-/**
- * Inlines the flows the recipe requires into `flows`, yielding a self-contained
- * recipe whose `call.ref`s resolve without the recipe library. Only referenced
- * flows are inlined (not the whole catalog, and not unreferenced authored inline
- * flows), and `uses` is dropped so `validateFlowCalls` verifies every ref is
- * present inline rather than short-circuiting on the external catalog. Returns the
- * recipe unchanged (same reference) when nothing external was composed — recipe.json
- * is already the full composition.
- */
-export declare function buildResolvedRecipe(recipe: unknown, flowCatalog: ReadonlyMap<string, InlineFlow>): unknown;
-export interface ComposeRecipeOptions {
-    projectRoot: string;
-    recipeDir: string;
-    /** Library sources whose flows count as resolvable, mirroring run resolution. */
-    librarySources?: RecipeLibrarySource[];
-    logger?: RecipeLogger;
+import { type RecipeResolutionDocument, type RecipeResolutionEdge, type RecipeSourceProvenance } from '@farmslot/protocol';
+import type { ResolvedLibraryRecipe } from './library.js';
+export interface ResolvedRecipeDependencies {
+    recipes: ReadonlyMap<string, ResolvedLibraryRecipe>;
+    edges: RecipeResolutionEdge[];
+    document: RecipeResolutionDocument;
 }
-export interface ComposeRecipeResult {
-    /** The self-contained recipe with every reachable flow inlined under `flows`. */
-    resolved: unknown;
-    /** Flows inlined into the resolved recipe; 0 means nothing external was composed. */
-    flowCount: number;
-}
-/**
- * Resolves a recipe's full flow composition — inline `flows`, `uses` catalogs,
- * and configured library sources, transitively — and returns the fully-composed,
- * self-contained recipe. Shared by the runner (executed path) and the CLI/CI
- * static resolve-check so both derive the same `resolved-recipe.json`.
- */
-export declare function composeRecipe(recipe: unknown, options: ComposeRecipeOptions): Promise<ComposeRecipeResult>;
+export declare function rootResolutionRef(digest: string): string;
+/** Validate every static call boundary after parent defaults and parameters are applied. */
+export declare function validateRecipeDependencyParams(options: {
+    root: Record<string, unknown>;
+    params: Record<string, unknown>;
+    recipes: ReadonlyMap<string, ResolvedLibraryRecipe>;
+}): void;
+/** Resolve the exact static recipe call DAG before any side effect. */
+export declare function resolveRecipeDependencies(options: {
+    rootRef: string;
+    root: Record<string, unknown>;
+    rootSource: RecipeSourceProvenance;
+    recipes: ReadonlyMap<string, ResolvedLibraryRecipe>;
+    maxDepth?: number;
+}): ResolvedRecipeDependencies;
 //# sourceMappingURL=compose.d.ts.map

package/dist/core/compose.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compose.d.ts","sourceRoot":"","sources":["../../src/core/compose.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,UAAU,EAAE,MAAM,YAAY,CAAC;AAO3D,OAAO,KAAK,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAwFpE;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,OAAO,EACf,WAAW,EAAE,WAAW,CAAC,MAAM,EAAE,UAAU,CAAC,GAC3C,OAAO,CAsBT;AAED,MAAM,WAAW,oBAAoB;IACnC,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,iFAAiF;IACjF,cAAc,CAAC,EAAE,mBAAmB,EAAE,CAAC;IACvC,MAAM,CAAC,EAAE,YAAY,CAAC;CACvB;AAED,MAAM,WAAW,mBAAmB;IAClC,iFAAiF;IACjF,QAAQ,EAAE,OAAO,CAAC;IAClB,qFAAqF;IACrF,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;;;;GAKG;AACH,wBAAsB,aAAa,CACjC,MAAM,EAAE,OAAO,EACf,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,mBAAmB,CAAC,CAsB9B"}
+{"version":3,"file":"compose.d.ts","sourceRoot":"","sources":["../../src/core/compose.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,wBAAwB,EAC7B,KAAK,oBAAoB,EACzB,KAAK,sBAAsB,EAE5B,MAAM,oBAAoB,CAAC;AAK5B,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAI1D,MAAM,WAAW,0BAA0B;IACzC,OAAO,EAAE,WAAW,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;IACpD,KAAK,EAAE,oBAAoB,EAAE,CAAC;IAC9B,QAAQ,EAAE,wBAAwB,CAAC;CACpC;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAExD;AAED,4FAA4F;AAC5F,wBAAgB,8BAA8B,CAAC,OAAO,EAAE;IACtD,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,OAAO,EAAE,WAAW,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;CACrD,GAAG,IAAI,CAkBP;AAED,uEAAuE;AACvE,wBAAgB,yBAAyB,CAAC,OAAO,EAAE;IACjD,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9B,UAAU,EAAE,sBAAsB,CAAC;IACnC,OAAO,EAAE,WAAW,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;IACpD,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,GAAG,0BAA0B,CAuF7B"}

package/dist/core/compose.js

@@ -1,136 +1,104 @@
-import { collectFlows } from './flows.js';
+import { normalizeRecipeRef, resolvedRecipeArtifactPath, } from '@farmslot/protocol';
+import { DEFAULT_MAX_RECIPE_CALL_DEPTH } from './execution.js';
+import { extractWorkflowGraph } from './graph.js';
 import { isRecord } from './json.js';
-import { createEffectiveFlowCatalog, loadRecipeLibraries, } from './library.js';
-/** Locate a flow definition's node map, tolerating both `{entry,nodes}` and `{workflow:{...}}`. */
-function flowNodes(flow) {
-    if (!isRecord(flow))
-        return undefined;
-    const workflow = isRecord(flow.workflow) ? flow.workflow : flow;
-    return isRecord(workflow.nodes) ? workflow.nodes : undefined;
+import { resolveRecipeParams, resolveRecipeValue } from './parameters.js';
+import { RecipeResolutionError } from './resolution-error.js';
+export function rootResolutionRef(digest) {
+    return `$root:${digest}`;
 }
-/**
- * Every `call.ref` on any node in a node map. This mirrors `validateFlowCalls`,
- * which checks all nodes of every inline flow (not just graph-reachable ones), so
- * the resolved recipe must inline every referenced flow to be self-contained.
- */
-function callRefsInNodes(nodes) {
-    if (!nodes)
-        return [];
-    const refs = [];
-    for (const node of Object.values(nodes)) {
-        if (isRecord(node) &&
-            node.action === 'call' &&
-            typeof node.ref === 'string' &&
-            node.ref.trim()) {
-            refs.push(node.ref);
+/** Validate every static call boundary after parent defaults and parameters are applied. */
+export function validateRecipeDependencyParams(options) {
+    const visit = (document, params) => {
+        for (const rawNode of Object.values(extractWorkflowGraph(document).nodes)) {
+            if (rawNode.action !== 'call' || typeof rawNode.ref !== 'string')
+                continue;
+            const ref = normalizeRecipeRef(rawNode.ref);
+            const dependency = options.recipes.get(ref);
+            if (!dependency)
+                continue;
+            const node = resolveRecipeValue(rawNode, params);
+            const childParams = resolveRecipeParams(ref, dependency.document, isRecord(node) && isRecord(node.params) ? node.params : {}, { allowTemplates: true });
+            visit(dependency.document, childParams);
         }
-    }
-    return refs;
+    };
+    visit(options.root, options.params);
 }
-/** Lifecycle arrays (setup/teardown) always execute, so every `call` in them counts. */
-function callRefsInLifecycle(list) {
-    if (!Array.isArray(list))
-        return [];
-    const refs = [];
-    for (const node of list) {
-        if (isRecord(node) &&
-            node.action === 'call' &&
-            typeof node.ref === 'string' &&
-            node.ref.trim()) {
-            refs.push(node.ref);
+/** Resolve the exact static recipe call DAG before any side effect. */
+export function resolveRecipeDependencies(options) {
+    const maxDepth = options.maxDepth ?? DEFAULT_MAX_RECIPE_CALL_DEPTH;
+    const resolved = new Map();
+    const edges = [];
+    const visiting = [];
+    const visited = new Set();
+    const visit = (from, document, depth) => {
+        if (depth >= maxDepth) {
+            throw new RecipeResolutionError('RECIPE_CALL_DEPTH_EXCEEDED', `Recipe call depth exceeded maximum ${maxDepth}.`, `reduce nested recipe calls below ${maxDepth}`);
         }
-    }
-    return refs;
-}
-/**
- * Computes the flow ids the resolved recipe must inline: every flow referenced by
- * any node of the recipe's workflow, its setup/teardown lifecycle, or `startState`,
- * then transitively every flow referenced by any node of those flows. Matches
- * `validateFlowCalls`' all-nodes check, so the result is exactly the set required
- * for the resolved recipe to be self-contained — never the whole library, and never
- * an unreferenced authored inline flow.
- */
-function collectRequiredFlowRefs(recipe, flowCatalog) {
-    const seeds = [];
-    const validate = isRecord(recipe.validate) ? recipe.validate : undefined;
-    const workflow = validate && isRecord(validate.workflow) ? validate.workflow : undefined;
-    if (workflow) {
-        seeds.push(...callRefsInNodes(isRecord(workflow.nodes) ? workflow.nodes : undefined));
-        seeds.push(...callRefsInLifecycle(workflow.setup));
-        seeds.push(...callRefsInLifecycle(workflow.teardown));
-    }
-    if (isRecord(recipe.startState) &&
-        recipe.startState.action === 'call' &&
-        typeof recipe.startState.ref === 'string') {
-        seeds.push(recipe.startState.ref);
-    }
-    const required = new Set();
-    const queue = [...seeds];
-    while (queue.length > 0) {
-        const ref = queue.shift();
-        if (required.has(ref))
-            continue;
-        required.add(ref);
-        for (const child of callRefsInNodes(flowNodes(flowCatalog.get(ref)))) {
-            if (!required.has(child))
-                queue.push(child);
+        for (const ref of callRefs(document)) {
+            edges.push({ from, to: ref });
+            const cycleStart = visiting.indexOf(ref);
+            if (cycleStart >= 0 || ref === options.rootRef) {
+                const cycle = [...visiting.slice(Math.max(cycleStart, 0)), ref];
+                throw new RecipeResolutionError('RECIPE_CALL_CYCLE', `Recipe call cycle detected: ${cycle.join(' -> ')}.`, 'remove one call edge so the recipe dependency graph is acyclic');
+            }
+            const dependency = options.recipes.get(ref);
+            if (!dependency) {
+                throw new RecipeResolutionError('RECIPE_REFERENCE_NOT_FOUND', `Recipe ${ref} is not available from configured libraries.`, `add ${ref} to a configured recipe library or correct call.ref`);
+            }
+            resolved.set(ref, dependency);
+            if (visited.has(ref))
+                continue;
+            visiting.push(ref);
+            visit(ref, dependency.document, depth + 1);
+            visiting.pop();
+            visited.add(ref);
         }
+    };
+    visiting.push(options.rootRef);
+    visit(options.rootRef, options.root, 0);
+    visiting.pop();
+    const rootDigest = options.rootSource.digest;
+    if (!rootDigest) {
+        throw new RecipeResolutionError('RECIPE_RESOLUTION_DIGEST_MISSING', 'Resolved root recipe source is missing its content digest.', 'reload the root recipe through the runner so its digest is computed');
     }
-    return required;
+    const dependencies = [...resolved.values()]
+        .sort((left, right) => compareStrings(left.ref, right.ref))
+        .map((recipe) => {
+        const digest = recipe.provenance.digest;
+        if (!digest) {
+            throw new RecipeResolutionError('RECIPE_RESOLUTION_DIGEST_MISSING', `Resolved recipe ${recipe.ref} is missing its content digest.`, `reload ${recipe.ref} through the library resolver so its digest is computed`);
+        }
+        return {
+            ref: recipe.ref,
+            source: recipe.source,
+            file: recipe.file,
+            digest,
+            artifact: resolvedRecipeArtifactPath(digest),
+            ...(recipe.adapter ? { adapter: recipe.adapter } : {}),
+        };
+    });
+    return {
+        recipes: resolved,
+        edges,
+        document: {
+            schema_version: 1,
+            root: { ref: options.rootRef, digest: rootDigest },
+            dependencies,
+            edges: [...edges].sort((left, right) => compareStrings(`${left.from}:${left.to}`, `${right.from}:${right.to}`)),
+        },
+    };
 }
-/**
- * Inlines the flows the recipe requires into `flows`, yielding a self-contained
- * recipe whose `call.ref`s resolve without the recipe library. Only referenced
- * flows are inlined (not the whole catalog, and not unreferenced authored inline
- * flows), and `uses` is dropped so `validateFlowCalls` verifies every ref is
- * present inline rather than short-circuiting on the external catalog. Returns the
- * recipe unchanged (same reference) when nothing external was composed — recipe.json
- * is already the full composition.
- */
-export function buildResolvedRecipe(recipe, flowCatalog) {
-    if (!isRecord(recipe) || flowCatalog.size === 0)
-        return recipe;
-    const refs = collectRequiredFlowRefs(recipe, flowCatalog);
-    const flows = {};
-    for (const ref of refs) {
-        const flow = flowCatalog.get(ref);
-        if (flow)
-            flows[ref] = flow;
-    }
-    if (Object.keys(flows).length === 0)
-        return recipe;
-    // Emit only when `uses`/library composition contributed — either a reached flow
-    // is not an authored inline flow, or the recipe declared `uses` (now inlined and
-    // dropped). Otherwise recipe.json is already self-contained.
-    const authoredFlowKeys = new Set(isRecord(recipe.flows) ? Object.keys(recipe.flows) : []);
-    const hasUses = Array.isArray(recipe.uses) && recipe.uses.length > 0;
-    const composedExternal = Object.keys(flows).some((ref) => !authoredFlowKeys.has(ref));
-    if (!composedExternal && !hasUses)
-        return recipe;
-    const { uses: _uses, ...rest } = recipe;
-    void _uses;
-    return { ...rest, flows };
+function compareStrings(left, right) {
+    return left < right ? -1 : left > right ? 1 : 0;
 }
-/**
- * Resolves a recipe's full flow composition — inline `flows`, `uses` catalogs,
- * and configured library sources, transitively — and returns the fully-composed,
- * self-contained recipe. Shared by the runner (executed path) and the CLI/CI
- * static resolve-check so both derive the same `resolved-recipe.json`.
- */
-export async function composeRecipe(recipe, options) {
-    const recipeLocalFlows = await collectFlows(recipe, {
-        projectRoot: options.projectRoot,
-        recipeDir: options.recipeDir,
-    });
-    const resolution = options.librarySources && options.librarySources.length > 0
-        ? await loadRecipeLibraries(options.librarySources, options.logger)
-        : undefined;
-    const usedLibraryFlows = new Map();
-    const { catalog } = createEffectiveFlowCatalog(recipeLocalFlows, resolution, usedLibraryFlows, options.logger);
-    const resolved = buildResolvedRecipe(recipe, catalog);
-    const flowCount = resolved !== recipe && isRecord(resolved) && isRecord(resolved.flows)
-        ? Object.keys(resolved.flows).length
-        : 0;
-    return { resolved, flowCount };
+function callRefs(recipe) {
+    const refs = [];
+    for (const node of Object.values(extractWorkflowGraph(recipe).nodes)) {
+        if (node.action === 'call' && typeof node.ref === 'string' && node.ref.trim()) {
+            refs.push(normalizeRecipeRef(node.ref));
+        }
+    }
+    return refs;
 }
 //# sourceMappingURL=compose.js.map