@introspection-ai/recipes 0.13.0 → 0.14.0

package/dist/recipe-package.d.ts

@@ -17,42 +17,25 @@ export interface RecipeMcpToolSelection {
 }
 /** Parse a selection while preserving whether its source shape was malformed. */
 export declare function parseRecipeMcpToolSelection(value: unknown): RecipeMcpToolSelection;
-/** Minimal runtime guard; recipe-check owns detailed authoring diagnostics. */
+/** Minimal session guard; the Recipe checker owns authoring diagnostics. */
 export declare function isValidRecipeMcpToolSelection(selection: RecipeMcpToolSelection): boolean;
 export interface RecipePackageMcpConfig {
     manifests: string[];
     servers: RecipePackageMcpServer[];
 }
-export type RecipeEvalSuite = {
-    name: string;
-    type: "registry";
-    dataset: string;
-    version: string;
-} | {
-    name: string;
-    type: "git";
-    repo: string;
-    rev: string;
-    dataset: string;
-};
-export interface RecipeEvalsConfig {
-    suites: RecipeEvalSuite[];
-    raw?: unknown;
-}
 export interface RecipePackageManifest {
     name: string;
     version: string;
     description?: string;
     path: string;
     resources: RecipePackageResources;
+    /** Whether each resource key was explicitly authored in package.json#pi. */
+    resourceDeclarations?: Record<keyof RecipePackageResources, boolean>;
     mcp: RecipePackageMcpConfig;
-    evals: RecipeEvalsConfig;
 }
 export type PiPackageResources = RecipePackageResources;
 export type PiPackageManifest = RecipePackageManifest;
-export type RecipeValidationSeverity = "error" | "warning";
 export interface RecipeValidationFinding {
-    severity: RecipeValidationSeverity;
     code: string;
     message: string;
     packageName?: string;
@@ -61,18 +44,13 @@ export interface RecipeValidationReport {
     valid: boolean;
     findings: RecipeValidationFinding[];
 }
+export declare function assertRecipePathContained(packageDir: string, path: string, label: string): void;
 export declare class RecipePackageError extends Error {
     constructor(message: string);
 }
-export declare function parseEvalsConfig(value: unknown, present?: boolean): RecipeEvalsConfig;
-export declare function validateRecipeEvalsConfig(evals: RecipeEvalsConfig, packageName?: string): RecipeValidationReport;
 export declare function readPiPackageManifest(packageDir: string): RecipePackageManifest;
-export declare function resolvePiPackageMcpManifestPaths(pkg: RecipePackageManifest, opts?: {
-    allowEmptyGlobMatches?: boolean;
-}): string[];
-export declare function resolvePiPackageResourcePaths(pkg: RecipePackageManifest, key: keyof RecipePackageResources, opts?: {
-    allowEmptyGlobMatches?: boolean;
-}): string[];
+export declare function resolvePiPackageMcpManifestPaths(pkg: RecipePackageManifest): string[];
+export declare function resolvePiPackageResourcePaths(pkg: RecipePackageManifest, key: keyof RecipePackageResources): string[];
 export declare function defaultPiPackageResourcePaths(pkg: RecipePackageManifest, key: keyof RecipePackageResources): string[];
 export declare function packageResourcePaths(pkg: RecipePackageManifest, key: keyof RecipePackageResources): string[];
 export declare function validatePiPackageManifest(pkg: RecipePackageManifest): RecipeValidationReport;

package/dist/recipe-package.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"recipe-package.d.ts","sourceRoot":"","sources":["../src/recipe-package.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"recipe-package.d.ts","sourceRoot":"","sources":["../src/recipe-package.ts"],"names":[],"mappings":"AASA,MAAM,WAAW,sBAAsB;IACrC,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,MAAM,WAAW,sBAAsB;IACrC,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,OAAO,CAAC;IAClB,KAAK,EAAE,sBAAsB,CAAC;CAC/B;AAED,MAAM,WAAW,sBAAsB;IACrC,6FAA6F;IAC7F,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,gDAAgD;IAChD,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB;AAQD,iFAAiF;AACjF,wBAAgB,2BAA2B,CACzC,KAAK,EAAE,OAAO,GACb,sBAAsB,CAoBxB;AAED,4EAA4E;AAC5E,wBAAgB,6BAA6B,CAC3C,SAAS,EAAE,sBAAsB,GAChC,OAAO,CAWT;AAED,MAAM,WAAW,sBAAsB;IACrC,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,OAAO,EAAE,sBAAsB,EAAE,CAAC;CACnC;AAED,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,sBAAsB,CAAC;IAClC,4EAA4E;IAC5E,oBAAoB,CAAC,EAAE,MAAM,CAAC,MAAM,sBAAsB,EAAE,OAAO,CAAC,CAAC;IACrE,GAAG,EAAE,sBAAsB,CAAC;CAC7B;AAED,MAAM,MAAM,kBAAkB,GAAG,sBAAsB,CAAC;AACxD,MAAM,MAAM,iBAAiB,GAAG,qBAAqB,CAAC;AAEtD,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,sBAAsB;IACrC,KAAK,EAAE,OAAO,CAAC;IACf,QAAQ,EAAE,uBAAuB,EAAE,CAAC;CACrC;AAkRD,wBAAgB,yBAAyB,CACvC,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,GACZ,IAAI,CAaN;AAwID,qBAAa,kBAAmB,SAAQ,KAAK;gBAC/B,OAAO,EAAE,MAAM;CAI5B;AAwED,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,MAAM,GAAG,qBAAqB,CAmC/E;AAED,wBAAgB,gCAAgC,CAC9C,GAAG,EAAE,qBAAqB,GACzB,MAAM,EAAE,CAyDV;AAED,wBAAgB,6BAA6B,CAC3C,GAAG,EAAE,qBAAqB,EAC1B,GAAG,EAAE,MAAM,sBAAsB,GAChC,MAAM,EAAE,CA0CV;AAED,wBAAgB,6BAA6B,CAC3C,GAAG,EAAE,qBAAqB,EAC1B,GAAG,EAAE,MAAM,sBAAsB,GAChC,MAAM,EAAE,CAOV;AAED,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,qBAAqB,EAC1B,GAAG,EAAE,MAAM,sBAAsB,GAChC,MAAM,EAAE,CAKV;AAED,wBAAgB,yBAAyB,CACvC,GAAG,EAAE,qBAAqB,GACzB,sBAAsB,CA+CxB"}

package/dist/recipe-package.js

@@ -1,5 +1,5 @@
-import { existsSync, readdirSync, readFileSync } from "node:fs";
-import { isAbsolute, join, relative, resolve } from "node:path";
+import { existsSync, realpathSync, readdirSync, readFileSync, statSync, } from "node:fs";
+import { isAbsolute, join, relative, resolve, sep } from "node:path";
 const INVALID_MCP_TOOL_SELECTION = Symbol("invalidMcpToolSelection");
 /** Parse a selection while preserving whether its source shape was malformed. */
 export function parseRecipeMcpToolSelection(value) {
@@ -20,7 +20,7 @@ export function parseRecipeMcpToolSelection(value) {
     }
     return selection;
 }
-/** Minimal runtime guard; recipe-check owns detailed authoring diagnostics. */
+/** Minimal session guard; the Recipe checker owns authoring diagnostics. */
 export function isValidRecipeMcpToolSelection(selection) {
     if (selection[INVALID_MCP_TOOL_SELECTION]) {
         return false;
@@ -39,6 +39,8 @@ const RESOURCE_KEYS = [
     "skills",
     "prompts",
 ];
+const PI_KEYS = new Set([...RESOURCE_KEYS, "mcp"]);
+const SOURCE_FINDINGS = Symbol("recipeSourceFindings");
 function stringArray(value) {
     return Array.isArray(value)
         ? value.filter((item) => typeof item === "string")
@@ -52,17 +54,119 @@ function emptyResources() {
         prompts: [],
     };
 }
+function resourceDeclarations(pi) {
+    return Object.fromEntries(RESOURCE_KEYS.map((key) => [key, Object.hasOwn(pi, key)]));
+}
+function sourceShapeFindings(pi, packageName) {
+    const findings = [];
+    for (const key of Object.keys(pi)) {
+        if (!PI_KEYS.has(key)) {
+            findings.push(finding("pi.unknown_key", `package.json#pi contains unknown key '${key}'`, packageName));
+        }
+    }
+    for (const key of RESOURCE_KEYS) {
+        if (!Object.hasOwn(pi, key))
+            continue;
+        const value = pi[key];
+        if (!Array.isArray(value) ||
+            value.some((item) => typeof item !== "string" || item.trim().length === 0)) {
+            findings.push(finding(`pi.${key}_invalid`, `package.json#pi.${key} must be an array of non-empty strings`, packageName));
+        }
+        else if (new Set(value.map((item) => String(item).trim())).size !== value.length) {
+            findings.push(finding(`pi.${key}_duplicate`, `package.json#pi.${key} must not contain duplicate entries`, packageName));
+        }
+    }
+    findings.push(...mcpSourceShapeFindings(pi.mcp, packageName));
+    return findings;
+}
+function mcpSourceShapeFindings(value, packageName) {
+    if (value === undefined)
+        return [];
+    const invalid = (message) => finding("pi.mcp_invalid", message, packageName);
+    if (!value || typeof value !== "object" || Array.isArray(value)) {
+        return [invalid("package.json#pi.mcp must be an object")];
+    }
+    const data = value;
+    const findings = [];
+    const unknown = Object.keys(data).filter((key) => !["manifests", "servers"].includes(key));
+    if (unknown.length > 0) {
+        findings.push(invalid(`package.json#pi.mcp contains unknown field(s): ${unknown.join(", ")}`));
+    }
+    const manifests = Array.isArray(data.manifests) ? data.manifests : [];
+    if (Object.hasOwn(data, "manifests") &&
+        (!Array.isArray(data.manifests) ||
+            data.manifests.some((item) => typeof item !== "string" || !item.trim()))) {
+        findings.push(invalid("package.json#pi.mcp manifests must be non-empty strings"));
+    }
+    if (manifests.every((item) => typeof item === "string") &&
+        new Set(manifests.map((item) => item.trim())).size !== manifests.length) {
+        findings.push(invalid("package.json#pi.mcp manifests must not contain duplicates"));
+    }
+    if (Object.hasOwn(data, "servers") &&
+        !Array.isArray(data.servers)) {
+        findings.push(invalid("package.json#pi.mcp.servers must be an array"));
+        return findings;
+    }
+    const ids = new Set();
+    const normalizedIds = new Set();
+    for (const [index, raw] of (Array.isArray(data.servers) ? data.servers : []).entries()) {
+        if (!raw || typeof raw !== "object" || Array.isArray(raw)) {
+            findings.push(invalid(`package.json#pi.mcp.servers[${index}] must be an object`));
+            continue;
+        }
+        const server = raw;
+        const serverUnknown = Object.keys(server).filter((key) => !["id", "required", "tools"].includes(key));
+        if (serverUnknown.length > 0) {
+            findings.push(invalid(`package.json#pi.mcp.servers[${index}] contains unknown field(s): ${serverUnknown.join(", ")}`));
+        }
+        const id = typeof server.id === "string" && server.id.trim()
+            ? server.id.trim()
+            : undefined;
+        if (!id) {
+            findings.push(invalid(`package.json#pi.mcp.servers[${index}].id must be non-empty`));
+        }
+        else if (ids.has(id)) {
+            findings.push(invalid(`package.json#pi.mcp contains duplicate server id '${id}'`));
+        }
+        else {
+            ids.add(id);
+            const normalized = id
+                .trim()
+                .toLowerCase()
+                .replace(/[^a-z0-9_-]+/g, "-")
+                .replace(/^-+|-+$/g, "") || "mcp";
+            if (normalizedIds.has(normalized)) {
+                findings.push(invalid(`package.json#pi.mcp server id '${id}' collides after normalization`));
+            }
+            normalizedIds.add(normalized);
+        }
+        if (Object.hasOwn(server, "required") &&
+            typeof server.required !== "boolean") {
+            findings.push(invalid(`package.json#pi.mcp.servers[${index}].required must be boolean`));
+        }
+        if (Object.hasOwn(server, "tools")) {
+            if (!server.tools ||
+                typeof server.tools !== "object" ||
+                Array.isArray(server.tools)) {
+                findings.push(invalid(`package.json#pi.mcp.servers[${index}].tools must be an object`));
+            }
+            else {
+                const tools = server.tools;
+                const toolsUnknown = Object.keys(tools).filter((key) => !["include", "exclude"].includes(key));
+                if (toolsUnknown.length > 0) {
+                    findings.push(invalid(`package.json#pi.mcp.servers[${index}].tools contains unknown field(s): ${toolsUnknown.join(", ")}`));
+                }
+            }
+        }
+    }
+    return findings;
+}
 function emptyMcpConfig() {
     return {
         manifests: [],
         servers: [],
     };
 }
-function emptyEvalsConfig() {
-    return {
-        suites: [],
-    };
-}
 function normalizeResourcePath(path) {
     return path.replace(/\\/g, "/").replace(/^\.\//, "");
 }
@@ -83,6 +187,32 @@ function assertPackageResourcePath(pkg, key, resource, resolved) {
         throw new RecipePackageError(`Recipe ${pkg.name} declares ${key} resource outside the package: ${resource}`);
     }
 }
+export function assertRecipePathContained(packageDir, path, label) {
+    const root = realpathSync(packageDir);
+    const target = realpathSync(path);
+    const relativePath = relative(root, target);
+    if (relativePath === ".." ||
+        relativePath.startsWith(`..${sep}`) ||
+        isAbsolute(relativePath)) {
+        throw new RecipePackageError(`Recipe ${label} resolves outside the package: ${path}`);
+    }
+}
+function assertResourceTreeContained(packageDir, path, label, seen = new Set()) {
+    assertRecipePathContained(packageDir, path, label);
+    const realPath = realpathSync(path);
+    if (seen.has(realPath))
+        return;
+    seen.add(realPath);
+    if (!statSync(path).isDirectory())
+        return;
+    for (const entry of readdirSync(path, { withFileTypes: true })) {
+        const child = join(path, entry.name);
+        assertRecipePathContained(packageDir, child, label);
+        if (statSync(child).isDirectory()) {
+            assertResourceTreeContained(packageDir, child, label, seen);
+        }
+    }
+}
 function hasGlob(value) {
     return /[*?[\]{}]/.test(value);
 }
@@ -119,23 +249,68 @@ function globToRegExp(glob) {
     pattern += "$";
     return new RegExp(pattern);
 }
-function listPackageEntries(root) {
+const UNSCANNED_PACKAGE_DIRS = new Set(["node_modules", ".git"]);
+function globScanRoot(glob) {
+    const segments = normalizeResourcePath(glob).split("/");
+    const staticSegments = [];
+    for (const segment of segments) {
+        if (hasGlob(segment))
+            break;
+        staticSegments.push(segment);
+    }
+    return staticSegments.join("/");
+}
+function listPackageEntries(root, globs) {
+    const scanRoots = new Set();
+    for (const glob of globs) {
+        if (!glob.trim() || !hasGlob(glob))
+            continue;
+        if (isAbsolute(glob) || hasTraversalSegment(glob)) {
+            throw new RecipePackageError(`Recipe resource glob resolves outside the package: ${glob}`);
+        }
+        scanRoots.add(globScanRoot(glob));
+    }
+    if (scanRoots.size === 0)
+        return [];
     const entries = [];
-    function visit(dir, relativeDir = "") {
-        for (const entry of readdirSync(dir, { withFileTypes: true })) {
-            const relative = relativeDir ? `${relativeDir}/${entry.name}` : entry.name;
+    const seen = new Set();
+    function visit(dir, relativeDir) {
+        let directoryEntries;
+        try {
+            directoryEntries = readdirSync(dir, { withFileTypes: true });
+        }
+        catch {
+            return;
+        }
+        for (const entry of directoryEntries) {
+            const relative = relativeDir
+                ? `${relativeDir}/${entry.name}`
+                : entry.name;
             const fullPath = join(dir, entry.name);
-            entries.push(relative);
+            if (entry.isDirectory() &&
+                UNSCANNED_PACKAGE_DIRS.has(entry.name)) {
+                continue;
+            }
+            if (!seen.has(relative)) {
+                seen.add(relative);
+                entries.push(relative);
+            }
             if (entry.isDirectory())
                 visit(fullPath, relative);
         }
     }
-    visit(root);
+    const roots = scanRoots.has("") ? [""] : [...scanRoots];
+    for (const scanRoot of roots) {
+        if (scanRoot && !seen.has(scanRoot)) {
+            seen.add(scanRoot);
+            entries.push(scanRoot);
+        }
+        visit(scanRoot ? join(root, scanRoot) : root, scanRoot);
+    }
     return entries;
 }
-function finding(severity, code, message, packageName) {
+function finding(code, message, packageName) {
     return {
-        severity,
         code,
         message,
         packageName,
@@ -167,19 +342,10 @@ function stringValue(value) {
     return typeof value === "string" && value.trim() ? value.trim() : undefined;
 }
 function parseMcpConfig(value) {
-    if (typeof value === "string") {
-        return { ...emptyMcpConfig(), manifests: stringArray([value]).map(normalizeResourcePath) };
-    }
-    if (Array.isArray(value)) {
-        return { ...emptyMcpConfig(), manifests: stringArray(value).map(normalizeResourcePath) };
-    }
     if (!value || typeof value !== "object" || Array.isArray(value))
         return emptyMcpConfig();
     const data = value;
-    const manifests = [
-        ...(stringValue(data.manifest) ? [stringValue(data.manifest)] : []),
-        ...stringArray(data.manifests),
-    ].map(normalizeResourcePath);
+    const manifests = stringArray(data.manifests).map(normalizeResourcePath);
     const seen = new Set();
     const servers = [];
     for (const raw of Array.isArray(data.servers) ? data.servers : []) {
@@ -199,142 +365,14 @@ function parseMcpConfig(value) {
     }
     return { manifests, servers };
 }
-function withRawEvalsConfig(config, raw) {
-    Object.defineProperty(config, "raw", {
-        value: raw,
-        enumerable: false,
-        configurable: false,
-    });
-    return config;
-}
-export function parseEvalsConfig(value, present = value !== undefined) {
-    if (!present)
-        return emptyEvalsConfig();
-    const data = asRecord(value);
-    const rawSuites = Array.isArray(data.suites) ? data.suites : [];
-    const suites = [];
-    for (const raw of rawSuites) {
-        if (!raw || typeof raw !== "object" || Array.isArray(raw))
-            continue;
-        const suite = raw;
-        const name = stringValue(suite.name);
-        const type = stringValue(suite.type);
-        if (!name)
-            continue;
-        if (type === "registry") {
-            const dataset = stringValue(suite.dataset);
-            const version = stringValue(suite.version);
-            if (!dataset || !version)
-                continue;
-            suites.push({ name, type, dataset, version });
-        }
-        else if (type === "git") {
-            const repo = stringValue(suite.repo);
-            const rev = stringValue(suite.rev);
-            const dataset = stringValue(suite.dataset);
-            if (!repo || !rev || !dataset)
-                continue;
-            suites.push({
-                name,
-                type,
-                repo,
-                rev,
-                dataset,
-            });
-        }
-    }
-    return withRawEvalsConfig({ suites }, value);
-}
-function fixedRegistryTag(value) {
-    const tag = value.trim();
-    if (!tag || tag.toLowerCase() === "latest")
-        return false;
-    if (/\s/.test(tag) || /[\^~<>=*|]/.test(tag))
-        return false;
-    return !/(^|[._-])x($|[._-])/i.test(tag);
-}
-function fixedGitRev(value) {
-    return /^[0-9a-fA-F]{7,40}$/.test(value);
-}
-export function validateRecipeEvalsConfig(evals, packageName) {
-    const findings = [];
-    const raw = evals.raw;
-    const data = raw === undefined ? { suites: evals.suites } : asRecord(raw);
-    const rawSuites = Array.isArray(data.suites) ? data.suites : [];
-    if (raw !== undefined && (!raw || typeof raw !== "object" || Array.isArray(raw))) {
-        findings.push(finding("error", "evals.suite_invalid", "pi.evals must be an object with a suites array", packageName));
-        return { valid: false, findings };
-    }
-    if (data.suites !== undefined && !Array.isArray(data.suites)) {
-        findings.push(finding("error", "evals.suite_invalid", "pi.evals.suites must be an array", packageName));
-        return { valid: false, findings };
-    }
-    const seenNames = new Map();
-    for (const [index, rawSuite] of rawSuites.entries()) {
-        const label = `pi.evals.suites[${index}]`;
-        if (!rawSuite || typeof rawSuite !== "object" || Array.isArray(rawSuite)) {
-            findings.push(finding("error", "evals.suite_invalid", `${label} must be an object`, packageName));
-            continue;
-        }
-        const suite = rawSuite;
-        const name = stringValue(suite.name);
-        const type = stringValue(suite.type);
-        if (!name) {
-            findings.push(finding("error", "evals.suite_invalid", `${label} must declare a non-empty name`, packageName));
-        }
-        else {
-            const firstIndex = seenNames.get(name);
-            if (firstIndex !== undefined) {
-                findings.push(finding("error", "evals.name_duplicate", `${label} reuses suite name "${name}" already declared at pi.evals.suites[${firstIndex}]`, packageName));
-            }
-            else {
-                seenNames.set(name, index);
-            }
-        }
-        if (type !== "registry" && type !== "git") {
-            findings.push(finding("error", "evals.suite_invalid", `${label} must use type "registry" or "git"`, packageName));
-            continue;
-        }
-        if (type === "registry") {
-            if (!stringValue(suite.dataset)) {
-                findings.push(finding("error", "evals.suite_invalid", `${label} registry suite must declare dataset`, packageName));
-            }
-            const version = stringValue(suite.version);
-            if (!version) {
-                findings.push(finding("error", "evals.suite_invalid", `${label} registry suite must declare version`, packageName));
-            }
-            else if (!fixedRegistryTag(version)) {
-                findings.push(finding("error", "evals.pin_mutable", `${label} registry version must be an explicit Harbor registry tag, not a mutable alias or range: ${version}`, packageName));
-            }
-        }
-        else {
-            if (!stringValue(suite.repo)) {
-                findings.push(finding("error", "evals.suite_invalid", `${label} git suite must declare repo`, packageName));
-            }
-            const rev = stringValue(suite.rev);
-            if (!rev) {
-                findings.push(finding("error", "evals.suite_invalid", `${label} git suite must declare rev`, packageName));
-            }
-            else if (!fixedGitRev(rev)) {
-                findings.push(finding("error", "evals.pin_mutable", `${label} git rev must be a 7-40 character hex commit SHA: ${rev}`, packageName));
-            }
-            if (!stringValue(suite.dataset)) {
-                findings.push(finding("error", "evals.suite_invalid", `${label} git suite must declare dataset`, packageName));
-            }
-        }
-    }
-    return {
-        valid: findings.every((item) => item.severity !== "error"),
-        findings,
-    };
-}
 function packageJsonPath(packageDir) {
     const packagePath = join(packageDir, "package.json");
     return existsSync(packagePath) ? packagePath : undefined;
 }
 function piPackageManifestBlock(raw) {
-    const pi = asRecord(raw.pi);
-    return Object.keys(pi).length > 0 ? pi : undefined;
+    return raw.pi && typeof raw.pi === "object" && !Array.isArray(raw.pi)
+        ? raw.pi
+        : undefined;
 }
 function piPackageManifestPath(packageDir) {
     const manifestPath = packageJsonPath(packageDir);
@@ -357,20 +395,32 @@ export function readPiPackageManifest(packageDir) {
     for (const key of RESOURCE_KEYS) {
         resources[key] = stringArray(pi[key]).map(normalizeResourcePath);
     }
-    return {
+    const manifest = {
         name: stringValue(raw.name) ?? "",
         version: stringValue(raw.version) ?? "0.0.0",
         ...(stringValue(raw.description) ? { description: stringValue(raw.description) } : {}),
         path: packageDir,
         resources,
+        resourceDeclarations: resourceDeclarations(pi),
         mcp: parseMcpConfig(pi.mcp),
-        evals: parseEvalsConfig(pi.evals, Object.prototype.hasOwnProperty.call(pi, "evals")),
     };
+    Object.defineProperty(manifest, SOURCE_FINDINGS, {
+        value: sourceShapeFindings(pi, manifest.name),
+        enumerable: false,
+    });
+    return manifest;
 }
-export function resolvePiPackageMcpManifestPaths(pkg, opts = {}) {
+export function resolvePiPackageMcpManifestPaths(pkg) {
     const globs = pkg.mcp.manifests;
-    const resolved = new Set();
-    const entries = globs.some(hasGlob) ? listPackageEntries(pkg.path) : [];
+    const resolved = [];
+    const seen = new Set();
+    const add = (path) => {
+        if (seen.has(path))
+            return;
+        seen.add(path);
+        resolved.push(path);
+    };
+    const entries = listPackageEntries(pkg.path, globs);
     for (const glob of globs) {
         if (!glob.trim())
             continue;
@@ -389,7 +439,8 @@ export function resolvePiPackageMcpManifestPaths(pkg, opts = {}) {
             if (!existsSync(target)) {
                 throw new RecipePackageError(`Recipe ${pkg.name} declares missing mcp manifest: ${glob}`);
             }
-            resolved.add(target);
+            assertResourceTreeContained(pkg.path, target, "mcp manifest");
+            add(target);
             continue;
         }
         const matcher = globToRegExp(glob);
@@ -397,19 +448,26 @@ export function resolvePiPackageMcpManifestPaths(pkg, opts = {}) {
             .filter((entry) => matcher.test(normalizeResourcePath(entry)))
             .map((entry) => resolve(pkg.path, entry));
         if (matches.length === 0) {
-            if (opts.allowEmptyGlobMatches)
-                continue;
             throw new RecipePackageError(`Recipe ${pkg.name} declares mcp manifest glob with no matches: ${glob}`);
         }
-        for (const match of matches)
-            resolved.add(match);
+        for (const match of matches.sort()) {
+            assertResourceTreeContained(pkg.path, match, "mcp manifest");
+            add(match);
+        }
     }
-    return [...resolved].sort();
+    return resolved;
 }
-export function resolvePiPackageResourcePaths(pkg, key, opts = {}) {
+export function resolvePiPackageResourcePaths(pkg, key) {
     const globs = pkg.resources[key];
-    const resolved = new Set();
-    const entries = globs.some(hasGlob) ? listPackageEntries(pkg.path) : [];
+    const resolved = [];
+    const seen = new Set();
+    const add = (path) => {
+        if (seen.has(path))
+            return;
+        seen.add(path);
+        resolved.push(path);
+    };
+    const entries = listPackageEntries(pkg.path, globs);
     for (const glob of globs) {
         if (!glob.trim())
             continue;
@@ -419,7 +477,8 @@ export function resolvePiPackageResourcePaths(pkg, key, opts = {}) {
             if (!existsSync(direct)) {
                 throw new RecipePackageError(`Recipe ${pkg.name} declares missing ${key} resource: ${glob}`);
             }
-            resolved.add(direct);
+            assertResourceTreeContained(pkg.path, direct, `${key} resource`);
+            add(direct);
             continue;
         }
         const matcher = globToRegExp(glob);
@@ -427,14 +486,14 @@ export function resolvePiPackageResourcePaths(pkg, key, opts = {}) {
             .filter((entry) => matcher.test(normalizeResourcePath(entry)))
             .map((entry) => resolve(pkg.path, entry));
         if (matches.length === 0) {
-            if (opts.allowEmptyGlobMatches)
-                continue;
             throw new RecipePackageError(`Recipe ${pkg.name} declares ${key} glob with no matches: ${glob}`);
         }
-        for (const match of matches)
-            resolved.add(match);
+        for (const match of matches.sort()) {
+            assertResourceTreeContained(pkg.path, match, `${key} resource`);
+            add(match);
+        }
     }
-    return [...resolved].sort();
+    return resolved;
 }
 export function defaultPiPackageResourcePaths(pkg, key) {
     const defaults = {
@@ -445,34 +504,32 @@ export function defaultPiPackageResourcePaths(pkg, key) {
     return (defaults[key] ?? []).filter((path) => existsSync(path));
 }
 export function packageResourcePaths(pkg, key) {
-    if (pkg.resources[key].length > 0) {
-        return resolvePiPackageResourcePaths(pkg, key, {
-            allowEmptyGlobMatches: key === "extensions" ||
-                key === "skills" ||
-                key === "prompts",
-        });
+    if (pkg.resourceDeclarations?.[key] || pkg.resources[key].length > 0) {
+        return resolvePiPackageResourcePaths(pkg, key);
     }
     return defaultPiPackageResourcePaths(pkg, key);
 }
 export function validatePiPackageManifest(pkg) {
-    const findings = [];
+    const findings = [
+        ...(pkg[SOURCE_FINDINGS] ?? []),
+    ];
     if (!pkg.name.trim()) {
-        findings.push(finding("error", "package.name_missing", "Package is missing name"));
+        findings.push(finding("package.name_missing", "Package is missing name"));
     }
     if (!piPackageManifestPath(pkg.path)) {
-        findings.push(finding("error", "package.manifest_missing", "Package is missing package.json with a pi manifest", pkg.name));
+        findings.push(finding("package.manifest_missing", "Package is missing package.json with a pi manifest", pkg.name));
     }
-    if (pkg.resources.agents.length === 0 &&
+    if (!pkg.resourceDeclarations?.agents &&
+        pkg.resources.agents.length === 0 &&
         !existsSync(join(pkg.path, "agents"))) {
-        findings.push(finding("warning", "package.no_agents", "Package declares no agents and has no agents directory", pkg.name));
+        findings.push(finding("package.no_agents", "Package declares no agents and has no agents directory", pkg.name));
     }
     const invalidMcpServer = pkg.mcp.servers.find((server) => !isValidRecipeMcpToolSelection(server.tools));
     if (invalidMcpServer) {
-        findings.push(finding("error", "pi.mcp_invalid", `MCP server "${invalidMcpServer.id}" has an invalid tool policy; run introspection check for details`, pkg.name));
+        findings.push(finding("pi.mcp_invalid", `MCP server "${invalidMcpServer.id}" has an invalid tool policy`, pkg.name));
     }
-    findings.push(...validateRecipeEvalsConfig(pkg.evals, pkg.name).findings);
     return {
-        valid: findings.every((item) => item.severity !== "error"),
+        valid: findings.length === 0,
         findings,
     };
 }