@lesliechan721/aw 0.1.0-beta.3 → 0.1.0-beta.31

package/dist/authoring/scripts/validate-plugin.mjs

@@ -6,6 +6,7 @@ import { createRequire } from 'node:module';
 import * as os from 'node:os';
 import * as path from 'node:path';
 import { fileURLToPath, pathToFileURL } from 'node:url';
+import { getPluginAuthoringAcceptedValues as getCorePluginAuthoringAcceptedValues, getSkillFrontmatterCapabilityRegistry, normalizePluginConfigDefinition, } from '@lesliechan721/aw-plugin-core/manifest';
 import { checkPluginVersions } from './lib/plugin-version-check.mjs';
 import { scanJavaScriptImportSpecifiers } from './lib/javascript-import-scanner.mjs';
 import { assertAuthoringPluginPathFence, assertCanonicalAuthoringPluginRoot, } from './lib/plugin-root.mjs';
@@ -17,8 +18,8 @@ const CLI_PACKAGE_ROOT = path.basename(authoringRuntimeRoot) === 'dist'
     : authoringRuntimeRoot;
 const errors = [];
 const warnings = [];
-let pluginAuthoringCapabilityRegistry = null;
-const SOURCE_PLUGIN_MANIFEST_CONTRACT_VERSION = 7;
+const SOURCE_PLUGIN_MANIFEST_CONTRACT_VERSION = 12;
+let capabilityDiagnostic = null;
 const MAX_SKILL_NAME_LEN = 64;
 const MAX_SKILL_DESCRIPTION_LEN = 1024;
 const MAX_SKILL_COMPATIBILITY_LEN = 500;
@@ -50,9 +51,9 @@ const CODEX_POLICY_PRODUCTS = new Set([
     'codex',
     'CODEX',
 ]);
-const MANIFEST_POLICY_PRODUCTS = new Set(getPluginAuthoringAcceptedValues('plugin-manifest', 'marketplace.policy.products'));
-const MARKETPLACE_AUTHENTICATION_POLICIES = new Set(getPluginAuthoringAcceptedValues('plugin-manifest', 'marketplace.policy.authentication'));
-const MARKETPLACE_INSTALLATION_POLICIES = new Set(getPluginAuthoringAcceptedValues('plugin-manifest', 'marketplace.policy.installation'));
+const MANIFEST_POLICY_PRODUCTS = new Set(getPluginAuthoringAcceptedValues('manifest', 'marketplace.policy.products'));
+const MARKETPLACE_AUTHENTICATION_POLICIES = new Set(getPluginAuthoringAcceptedValues('manifest', 'marketplace.policy.authentication'));
+const MARKETPLACE_INSTALLATION_POLICIES = new Set(getPluginAuthoringAcceptedValues('manifest', 'marketplace.policy.installation'));
 const PUBLIC_HOOK_EVENTS = new Set(['before_tool', 'after_tool', 'session_start']);
 const PUBLIC_SESSION_START_SOURCES = new Set(['startup', 'resume', 'clear']);
 const PUBLIC_SESSION_START_DEFAULT_MATCHER = 'startup|resume|clear';
@@ -124,15 +125,10 @@ const TEMPLATE_TEXT_FILE_EXTENSIONS = /\.(md|markdown|txt|json|yaml|yml|toml|rul
 const SLASH_COMMAND_NAME_PATTERN = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
 const DEFAULT_SLASH_COMMANDS_DIR = 'slash-commands';
 const SCRIPT_NODE_EXTENSIONS = new Set(['.js', '.mjs', '.cjs']);
-const SCRIPT_AUTO_EXTENSIONS = new Set(['.js', '.mjs', '.cjs', '.sh', '.ps1', '.cmd', '.bat']);
-const SCRIPT_RUNNERS = new Set(['node', 'sh', 'bash', 'pwsh', 'powershell', 'cmd', 'auto']);
-const SCRIPT_OS_SELECTORS = new Set(['default', 'unix', 'windows', 'linux', 'darwin', 'win32']);
-const SCRIPT_LIFECYCLE_EVENTS = new Set(['install', 'upgrade', 'uninstall']);
 const SCRIPT_TIMEOUT_MIN_MS = 1000;
-const SCRIPT_TIMEOUT_MAX_MS = 300000;
-const CONFIG_FIELD_TYPES = new Set(getPluginAuthoringAcceptedValues('config-lifecycle-artifact', 'config.schema.<key>.type'));
-const ARTIFACT_TARGETS = new Set(getPluginAuthoringAcceptedValues('config-lifecycle-artifact', 'artifacts.targets[].target'));
-const ARTIFACT_STATES = new Set(getPluginAuthoringAcceptedValues('config-lifecycle-artifact', 'ArtifactPlan.artifacts[].state'));
+const SCRIPT_TIMEOUT_MAX_MS = 1800000;
+const ARTIFACT_TARGETS = new Set(getPluginAuthoringAcceptedValues('artifacts', 'artifacts.targets[].target'));
+const ARTIFACT_STATES = new Set(getPluginAuthoringAcceptedValues('artifacts', 'artifacts.targets[].states'));
 const ARTIFACT_SCOPES = new Set(['user', 'project']);
 const ARTIFACT_KINDS = new Set(['instruction', 'codexRole', 'skill']);
 const ARTIFACT_PROJECT_MANAGED_KINDS = new Set(['instruction', 'agent', 'skill']);
@@ -149,23 +145,9 @@ const ARTIFACT_PROJECT_MANAGED_KIND_BY_TARGET = {
     'codex.skill': 'skill',
 };
 const PLUGIN_NAME_PATTERN = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
-const PLUGIN_EVAL_SCHEMA_VERSION = 2;
-const PLUGIN_EVAL_CASE_SCHEMA_VERSION = 1;
-const PLUGIN_EVAL_SCOPES = new Set(['user', 'project']);
-const PLUGIN_EVAL_SPLITS = new Set(['train', 'validation', 'sanity', 'all']);
-const PLUGIN_EVAL_TRIGGER_CASE_SPLITS = new Set(['train', 'validation', 'sanity']);
-const PLUGIN_EVAL_COMMAND_SUPPORTS = new Set([
-    'split',
-    'runs',
-    'case',
-    'model',
-    'codexBin',
-    'timeout',
-    'allowEnvironmentSkips',
-]);
 let yamlParser = null;
-let skillFrontmatterCapabilityRegistry = null;
 let pluginVersionCheckResult = null;
+let skillEvalManifestTools = null;
 function error(msg) {
     errors.push(msg);
 }
@@ -323,57 +305,25 @@ function parseFrontmatter(content, sourceName) {
         return null;
     return parseYaml(match[1], sourceName);
 }
-function loadPluginAuthoringCapabilityRegistry() {
-    if (pluginAuthoringCapabilityRegistry)
-        return pluginAuthoringCapabilityRegistry;
-    const registryPath = [
-        path.join(CLI_PACKAGE_ROOT, 'dist', 'src', 'utils', 'plugin-authoring-capabilities.json'),
-        path.resolve(__dirname, '..', '..', 'dist', 'src', 'utils', 'plugin-authoring-capabilities.json'),
-    ].find((candidate) => fs.existsSync(candidate));
-    if (!registryPath) {
-        throw new Error('Plugin authoring capability registry not found in the built CLI.');
-    }
-    const registry = JSON.parse(fs.readFileSync(registryPath, 'utf8'));
-    if (!registry || registry.schemaVersion !== 1 || !registry.surfaces) {
-        throw new Error(`Invalid plugin authoring capability registry: ${registryPath}`);
-    }
-    pluginAuthoringCapabilityRegistry = registry;
-    return registry;
-}
 function getPluginAuthoringAcceptedValues(surface, field) {
-    const entry = loadPluginAuthoringCapabilityRegistry().surfaces[surface]?.entries
-        ?.find((candidate) => candidate.field === field);
-    if (!entry || !Array.isArray(entry.acceptedValues)) {
-        throw new Error(`Plugin authoring capability ${surface}.${field} has no accepted values.`);
-    }
-    return entry.acceptedValues;
+    return getCorePluginAuthoringAcceptedValues(surface, field);
 }
 function loadSkillFrontmatterCapabilityRegistry() {
-    if (skillFrontmatterCapabilityRegistry)
-        return skillFrontmatterCapabilityRegistry;
-    const registryPath = path.join(CLI_PACKAGE_ROOT, 'dist', 'src', 'utils', 'skill-frontmatter-capabilities.json');
-    if (!fs.existsSync(registryPath)) {
-        throw new Error(`Skill frontmatter capability registry not found: ${registryPath}`);
-    }
-    const registry = JSON.parse(fs.readFileSync(registryPath, 'utf8'));
-    if (!registry ||
-        registry.schemaVersion !== 1 ||
-        !registry.profiles ||
-        !registry.fields) {
-        throw new Error(`Invalid Skill frontmatter capability registry: ${registryPath}`);
-    }
-    skillFrontmatterCapabilityRegistry = registry;
-    return registry;
+    return getSkillFrontmatterCapabilityRegistry();
 }
 async function tryLoadCliManifestTools() {
     const manifestModulePath = path.join(CLI_PACKAGE_ROOT, 'dist', 'src', 'utils', 'manifest.js');
     const runtimeProjectionModulePath = path.join(CLI_PACKAGE_ROOT, 'dist', 'src', 'utils', 'catalog-runtime-projection.js');
-    if (!fs.existsSync(manifestModulePath) || !fs.existsSync(runtimeProjectionModulePath))
+    const capabilityModulePath = path.join(CLI_PACKAGE_ROOT, 'dist', 'src', 'commands', 'aw-capabilities.js');
+    if (!fs.existsSync(manifestModulePath)
+        || !fs.existsSync(runtimeProjectionModulePath)
+        || !fs.existsSync(capabilityModulePath))
         return null;
     try {
-        const [manifestModule, runtimeProjectionModule] = await Promise.all([
+        const [manifestModule, runtimeProjectionModule, capabilityModule] = await Promise.all([
             import(pathToFileURL(manifestModulePath).href),
             import(pathToFileURL(runtimeProjectionModulePath).href),
+            import(pathToFileURL(capabilityModulePath).href),
         ]);
         if (manifestModule.SOURCE_PLUGIN_MANIFEST_CONTRACT_VERSION
             !== SOURCE_PLUGIN_MANIFEST_CONTRACT_VERSION) {
@@ -384,6 +334,8 @@ async function tryLoadCliManifestTools() {
             validateSourcePluginManifest: manifestModule.validateSourcePluginManifest ?? null,
             readPluginManifest: manifestModule.readPluginManifest ?? null,
             discoverPlugins: manifestModule.discoverPlugins ?? null,
+            resolvePluginRequirements: manifestModule.resolvePluginRequirements ?? null,
+            implementedCapabilities: capabilityModule.IMPLEMENTED_AW_CAPABILITIES ?? null,
             createRuntimeResolver: runtimeProjectionModule.createCatalogRuntimeImportResolver ?? null,
         };
     }
@@ -535,11 +487,12 @@ function validateManifestLightweight(manifest) {
         error('top-level "commands" has been removed; use "slashCommands" instead');
     }
     validateAllowedKeys(input, 'plugin manifest', [
+        'schemaVersion',
         'name',
         'version',
         'description',
         'dependencies',
-        'compatibility',
+        'requires',
         'skills',
         'slashCommands',
         'mcpServers',
@@ -650,7 +603,7 @@ function validatePortableNativeArtifactCapabilityLightweight(manifest) {
         && Array.isArray(target.states)
         && target.states.includes('present'));
     if (!hasOtherNativeDeclaration && !hasPresentNativeArtifact) {
-        const message = 'Invalid plugin manifest: portable-only plugins are not supported in V1. Declare at least one non-empty native capability.';
+        const message = 'Invalid plugin manifest: portable-only plugins are not supported. Declare at least one non-empty native capability.';
         if (!errors.includes(message))
             error(message);
     }
@@ -987,703 +940,19 @@ function validateNonEmptyString(value, fieldName, maxLength) {
     }
     return trimmed;
 }
-function isPathInsideOrEqual(root, candidate) {
-    const relative = path.relative(root, candidate);
-    return relative === '' || (relative !== '..' &&
-        !relative.startsWith(`..${path.sep}`) &&
-        !path.isAbsolute(relative));
-}
-function validateRealPathBoundary(boundary, candidate, fieldName, boundaryName) {
-    const canonicalBoundary = fs.realpathSync(boundary);
-    const canonicalCandidate = fs.realpathSync(candidate);
-    if (!isPathInsideOrEqual(canonicalBoundary, canonicalCandidate)) {
-        error(`${fieldName} must stay inside the ${boundaryName}`);
-        return false;
-    }
-    return true;
-}
-function validateEvalRelativeFile(evalDir, value, fieldName) {
-    const relativePath = validateNonEmptyString(value, fieldName);
-    if (!relativePath)
-        return null;
-    const normalized = stripDotSlash(relativePath).split('\\').join('/');
-    if (path.isAbsolute(normalized) || normalized.split('/').includes('..')) {
-        error(`${fieldName} must stay inside the Skill eval directory`);
-        return null;
-    }
-    const absolutePath = path.resolve(evalDir, normalized);
-    const relativeToRoot = path.relative(evalDir, absolutePath);
-    if (relativeToRoot.startsWith('..') || path.isAbsolute(relativeToRoot)) {
-        error(`${fieldName} must stay inside the Skill eval directory`);
-        return null;
-    }
-    if (!fs.existsSync(absolutePath) || !fs.statSync(absolutePath).isFile()) {
-        error(`${fieldName} does not exist: ${normalized}`);
-        return null;
-    }
-    if (!validateRealPathBoundary(evalDir, absolutePath, fieldName, 'Skill eval directory')) {
-        return null;
-    }
-    return absolutePath;
-}
-function validateEvalWorkspacePath(value, fieldName, options = {}) {
-    const raw = validateNonEmptyString(value, fieldName);
-    if (!raw)
-        return null;
-    const treePattern = options.allowTreePattern === true && raw.endsWith('/**');
-    const candidate = treePattern ? raw.slice(0, -3) : raw;
-    if (candidate === '' ||
-        candidate.includes('\0') ||
-        candidate.includes('\\') ||
-        candidate.includes('*') ||
-        candidate.includes('?') ||
-        candidate.includes('[') ||
-        candidate.includes(']') ||
-        path.isAbsolute(candidate) ||
-        path.posix.normalize(candidate) !== candidate ||
-        candidate.split('/').includes('..')) {
-        error(`${fieldName} must be a normalized POSIX path inside the eval workspace`);
-        return null;
-    }
-    const firstSegment = candidate.split('/')[0];
-    if (firstSegment === '.git' || firstSegment === '.agents' || firstSegment === '.codex') {
-        error(`${fieldName} must not target an eval control directory`);
-        return null;
-    }
-    return raw;
-}
-function evalWorkspacePathMatchesPattern(relativePath, pattern) {
-    if (pattern.endsWith('/**')) {
-        const prefix = pattern.slice(0, -3);
-        return relativePath === prefix || relativePath.startsWith(`${prefix}/`);
-    }
-    return relativePath === pattern;
-}
-function validateConversationCaseCorpus(evalDir, suite, fieldName) {
-    const casesPath = validateEvalRelativeFile(evalDir, suite.cases, `${fieldName}.cases`);
-    if (!casesPath)
-        return;
-    let document;
+async function loadSkillEvalManifestTools() {
+    if (skillEvalManifestTools)
+        return skillEvalManifestTools;
+    const modulePath = path.join(CLI_PACKAGE_ROOT, 'dist', 'src', 'eval', 'manifest-v1.js');
     try {
-        document = JSON.parse(fs.readFileSync(casesPath, 'utf8'));
+        skillEvalManifestTools = await import(pathToFileURL(modulePath).href);
+        return skillEvalManifestTools;
     }
-    catch (e) {
-        error(`${fieldName}.cases is not valid JSON: ${e.message}`);
-        return;
-    }
-    const corpus = expectRecord(document, `${fieldName}.cases document`);
-    if (!corpus)
-        return;
-    const skillName = validateNonEmptyString(corpus.skill_name, `${fieldName}.cases.skill_name`);
-    if (skillName && skillName !== suite.skill) {
-        error(`${fieldName}.cases.skill_name must match ${JSON.stringify(suite.skill)}`);
-    }
-    if (!Array.isArray(corpus.evals) || corpus.evals.length === 0) {
-        error(`${fieldName}.cases.evals must be a non-empty array`);
-        return;
-    }
-    const ids = new Set();
-    corpus.evals.forEach((value, caseIndex) => {
-        const caseField = `${fieldName}.cases.evals[${caseIndex}]`;
-        const entry = expectRecord(value, caseField);
-        if (!entry)
-            return;
-        const id = validateNonEmptyString(entry.id, `${caseField}.id`);
-        if (id && ids.has(id)) {
-            error(`${fieldName}.cases has duplicate case id ${JSON.stringify(id)}`);
-        }
-        else if (id) {
-            ids.add(id);
-        }
-        validateNonEmptyString(entry.prompt, `${caseField}.prompt`);
-        const sandbox = entry.sandbox === undefined
-            ? 'read-only'
-            : validateNonEmptyString(entry.sandbox, `${caseField}.sandbox`);
-        if (sandbox && sandbox !== 'read-only' && sandbox !== 'workspace-write') {
-            error(`${caseField}.sandbox must be "read-only" or "workspace-write"`);
-        }
-        if (!Array.isArray(entry.scripted_replies)) {
-            error(`${caseField}.scripted_replies must be an array`);
-        }
-        else {
-            entry.scripted_replies.forEach((reply, replyIndex) => {
-                const replyField = `${caseField}.scripted_replies[${replyIndex}]`;
-                if (typeof reply === 'string')
-                    return;
-                const replyEntry = expectRecord(reply, replyField);
-                if (!replyEntry)
-                    return;
-                if (!Array.isArray(replyEntry.answers_by_index) || replyEntry.answers_by_index.some((answer) => typeof answer !== 'string')) {
-                    error(`${replyField}.answers_by_index must be an array of strings`);
-                }
-                if (replyEntry.expected_question_count !== undefined &&
-                    (!Number.isInteger(replyEntry.expected_question_count) ||
-                        replyEntry.expected_question_count < 0)) {
-                    error(`${replyField}.expected_question_count must be a non-negative integer`);
-                }
-                validateNonEmptyString(replyEntry.unexpected_question_answer, `${replyField}.unexpected_question_answer`);
-            });
-        }
-        validateNonEmptyString(entry.expected_output, `${caseField}.expected_output`);
-        if (entry.workspace_files !== undefined) {
-            const workspaceFiles = expectRecord(entry.workspace_files, `${caseField}.workspace_files`);
-            if (workspaceFiles) {
-                const workspaceFileEntries = Object.entries(workspaceFiles);
-                if (workspaceFileEntries.length === 0) {
-                    error(`${caseField}.workspace_files must contain at least one file`);
-                }
-                workspaceFileEntries.forEach(([relativePath, content]) => {
-                    validateEvalWorkspacePath(relativePath, `${caseField}.workspace_files.${relativePath}`, { allowTreePattern: false });
-                    validateNonEmptyString(content, `${caseField}.workspace_files.${relativePath}`);
-                });
-            }
-        }
-        const review = expectRecord(entry.review, `${caseField}.review`);
-        if (review) {
-            if (!Array.isArray(review.checks) || review.checks.length === 0 || review.checks.some((check) => typeof check !== 'string' || check.trim() === '')) {
-                error(`${caseField}.review.checks must be a non-empty array of strings`);
-            }
-            if (review.workspace_unchanged !== undefined &&
-                typeof review.workspace_unchanged !== 'boolean') {
-                error(`${caseField}.review.workspace_unchanged must be boolean`);
-            }
-            const allowedWorkspaceChanges = [];
-            if (review.allowed_workspace_changes !== undefined) {
-                if (!Array.isArray(review.allowed_workspace_changes) ||
-                    review.allowed_workspace_changes.length === 0) {
-                    error(`${caseField}.review.allowed_workspace_changes must be a non-empty array`);
-                }
-                else {
-                    review.allowed_workspace_changes.forEach((pathValue, pathIndex) => {
-                        const normalized = validateEvalWorkspacePath(pathValue, `${caseField}.review.allowed_workspace_changes[${pathIndex}]`, { allowTreePattern: true });
-                        if (normalized)
-                            allowedWorkspaceChanges.push(normalized);
-                    });
-                }
-            }
-            const artifactPaths = [];
-            if (review.artifacts !== undefined) {
-                if (!Array.isArray(review.artifacts) || review.artifacts.length === 0) {
-                    error(`${caseField}.review.artifacts must be a non-empty array`);
-                }
-                else {
-                    review.artifacts.forEach((artifactValue, artifactIndex) => {
-                        const artifactField = `${caseField}.review.artifacts[${artifactIndex}]`;
-                        const artifact = expectRecord(artifactValue, artifactField);
-                        if (!artifact)
-                            return;
-                        validateAllowedKeys(artifact, artifactField, ['path', 'exists', 'contains', 'not_contains', 'json']);
-                        const artifactPath = validateEvalWorkspacePath(artifact.path, `${artifactField}.path`);
-                        if (artifactPath)
-                            artifactPaths.push(artifactPath);
-                        if (artifact.exists !== undefined && typeof artifact.exists !== 'boolean') {
-                            error(`${artifactField}.exists must be boolean`);
-                        }
-                        for (const key of ['contains', 'not_contains']) {
-                            if (artifact[key] !== undefined &&
-                                (!Array.isArray(artifact[key]) || artifact[key].length === 0 || artifact[key].some((fragment) => typeof fragment !== 'string' || fragment.length === 0))) {
-                                error(`${artifactField}.${key} must be a non-empty array of strings`);
-                            }
-                        }
-                        if (artifact.json !== undefined && !isRecord(artifact.json)) {
-                            error(`${artifactField}.json must be an object`);
-                        }
-                    });
-                }
-            }
-            if (new Set(artifactPaths).size !== artifactPaths.length) {
-                error(`${caseField}.review.artifacts contains duplicate paths`);
-            }
-            if (sandbox === 'workspace-write') {
-                if (review.workspace_unchanged !== false) {
-                    error(`${caseField} workspace-write requires review.workspace_unchanged=false`);
-                }
-                if (allowedWorkspaceChanges.length === 0 || artifactPaths.length === 0) {
-                    error(`${caseField} workspace-write requires allowed changes and artifacts`);
-                }
-                const unmatchedArtifact = artifactPaths.find((artifactPath) => !allowedWorkspaceChanges.some((pattern) => evalWorkspacePathMatchesPattern(artifactPath, pattern)));
-                if (unmatchedArtifact) {
-                    error(`${caseField} artifact ${JSON.stringify(unmatchedArtifact)} is outside allowed changes`);
-                }
-            }
-        }
-    });
-}
-function validateTriggerCaseCorpus(evalDir, suite, fieldName) {
-    const casesPath = validateEvalRelativeFile(evalDir, suite.cases, `${fieldName}.cases`);
-    if (!casesPath)
-        return;
-    let document;
-    try {
-        document = JSON.parse(fs.readFileSync(casesPath, 'utf8'));
-    }
-    catch (e) {
-        error(`${fieldName}.cases is not valid JSON: ${e.message}`);
-        return;
-    }
-    const corpus = expectRecord(document, `${fieldName}.cases document`);
-    if (!corpus)
-        return;
-    if (corpus.schemaVersion !== PLUGIN_EVAL_CASE_SCHEMA_VERSION) {
-        error(`${fieldName}.cases.schemaVersion must be ${PLUGIN_EVAL_CASE_SCHEMA_VERSION}`);
-    }
-    if (corpus.skill !== suite.skill) {
-        error(`${fieldName}.cases.skill must match ${JSON.stringify(suite.skill)}`);
-    }
-    if (!Array.isArray(corpus.cases) || corpus.cases.length === 0) {
-        error(`${fieldName}.cases.cases must be a non-empty array`);
-        return;
-    }
-    const ids = new Set();
-    const seenSplits = new Set();
-    let hasWorkspaceFixture = false;
-    corpus.cases.forEach((value, caseIndex) => {
-        const caseField = `${fieldName}.cases.cases[${caseIndex}]`;
-        const entry = expectRecord(value, caseField);
-        if (!entry)
-            return;
-        const id = validateNonEmptyString(entry.id, `${caseField}.id`);
-        if (id && !/^[a-z0-9][a-z0-9_]*$/.test(id)) {
-            error(`${caseField}.id must use lowercase snake_case`);
-        }
-        else if (id && ids.has(id)) {
-            error(`${fieldName}.cases has duplicate case id ${JSON.stringify(id)}`);
-        }
-        else if (id) {
-            ids.add(id);
-        }
-        if (!PLUGIN_EVAL_TRIGGER_CASE_SPLITS.has(entry.split)) {
-            error(`${caseField}.split must be train, validation, or sanity`);
-        }
-        else {
-            seenSplits.add(entry.split);
-        }
-        validateNonEmptyString(entry.query, `${caseField}.query`);
-        const usesLegacyExpectation = entry.should_load_skill !== undefined;
-        const usesRouteExpectation = entry.expected_loaded_skills !== undefined;
-        if (usesLegacyExpectation === usesRouteExpectation) {
-            error(`${caseField} must declare exactly one of should_load_skill or expected_loaded_skills`);
-        }
-        else if (usesLegacyExpectation && typeof entry.should_load_skill !== 'boolean') {
-            error(`${caseField}.should_load_skill must be boolean`);
-        }
-        else if (usesRouteExpectation) {
-            if (!Array.isArray(entry.expected_loaded_skills)) {
-                error(`${caseField}.expected_loaded_skills must be an array`);
-            }
-            else {
-                const expectedSkills = entry.expected_loaded_skills;
-                expectedSkills.forEach((skillName, skillIndex) => {
-                    if (typeof skillName !== 'string' || skillName.trim() === '') {
-                        error(`${caseField}.expected_loaded_skills[${skillIndex}] must be a non-empty string`);
-                    }
-                    else if (!suite.skills.includes(skillName)) {
-                        error(`${caseField}.expected_loaded_skills[${skillIndex}] must name a participant Skill`);
-                    }
-                });
-                if (new Set(expectedSkills).size !== expectedSkills.length) {
-                    error(`${caseField}.expected_loaded_skills must not contain duplicates`);
-                }
-                if (suite.forbidMultipleSkillLoads === true && expectedSkills.length > 1) {
-                    error(`${caseField} expects multiple Skills but the suite forbids multiple Skill loads`);
-                }
-            }
-        }
-        if (suite.observeSpawnAgent === true) {
-            if (typeof entry.should_spawn_agent !== 'boolean') {
-                error(`${caseField}.should_spawn_agent is required when observeSpawnAgent=true`);
-            }
-        }
-        else if (entry.should_spawn_agent !== undefined) {
-            error(`${caseField}.should_spawn_agent requires observeSpawnAgent=true`);
-        }
-        if (entry.workspace_fixture !== undefined) {
-            hasWorkspaceFixture = true;
-            validateNonEmptyString(entry.workspace_fixture, `${caseField}.workspace_fixture`);
-        }
-        if (entry.use_project_rules !== undefined &&
-            typeof entry.use_project_rules !== 'boolean') {
-            error(`${caseField}.use_project_rules must be boolean`);
-        }
-        if (entry.tags !== undefined) {
-            if (!Array.isArray(entry.tags) || entry.tags.length === 0) {
-                error(`${caseField}.tags must be a non-empty array`);
-            }
-            else {
-                entry.tags.forEach((tag, tagIndex) => {
-                    validateNonEmptyString(tag, `${caseField}.tags[${tagIndex}]`);
-                });
-            }
-        }
-    });
-    if (hasWorkspaceFixture && suite.fixtureModule === undefined) {
-        error(`${fieldName}.fixtureModule is required when cases declare workspace_fixture`);
-    }
-    if (Array.isArray(suite.releaseSplits)) {
-        suite.releaseSplits.forEach((split) => {
-            if (split !== 'all' && !seenSplits.has(split)) {
-                error(`${fieldName}.cases has no cases for release split ${JSON.stringify(split)}`);
-            }
-        });
-    }
-}
-function resolveEvalProfilePlugin(pluginDir, ownerManifest, pluginName, fieldName) {
-    if (pluginName === ownerManifest.name) {
-        return { pluginDir, manifest: ownerManifest };
-    }
-    const companionDir = path.join(path.dirname(pluginDir), pluginName);
-    const manifestPath = path.join(companionDir, '.agents-plugin', 'plugin.json');
-    if (!fs.existsSync(manifestPath)) {
-        error(`${fieldName} must reference repo-local plugin "${pluginName}"`);
-        return null;
-    }
-    let manifest;
-    try {
-        manifest = JSON.parse(fs.readFileSync(manifestPath, 'utf8'));
-    }
-    catch (e) {
-        error(`${fieldName} companion manifest is not valid JSON: ${e.message}`);
-        return null;
-    }
-    if (!isRecord(manifest) || manifest.name !== pluginName) {
-        error(`${fieldName} companion source must declare plugin name "${pluginName}"`);
+    catch {
         return null;
     }
-    return { pluginDir: companionDir, manifest };
 }
-function validateOnePluginEvalManifest(pluginDir, pluginManifest, evalDir, expectedSkill) {
-    const evalManifestPath = path.join(evalDir, 'manifest.json');
-    const manifestField = path.relative(pluginDir, evalManifestPath).split(path.sep).join('/');
-    let document;
-    try {
-        document = JSON.parse(fs.readFileSync(evalManifestPath, 'utf8'));
-    }
-    catch (e) {
-        error(`${manifestField} is not valid JSON: ${e.message}`);
-        return;
-    }
-    const manifest = expectRecord(document, manifestField);
-    if (!manifest)
-        return;
-    validateAllowedKeys(manifest, manifestField, ['schemaVersion', 'plugin', 'skill', 'profiles', 'suites']);
-    if (manifest.schemaVersion !== PLUGIN_EVAL_SCHEMA_VERSION) {
-        error(`${manifestField}.schemaVersion must be ${PLUGIN_EVAL_SCHEMA_VERSION}`);
-    }
-    if (manifest.plugin !== pluginManifest.name) {
-        error(`${manifestField}.plugin must match plugin name ${JSON.stringify(pluginManifest.name)}`);
-    }
-    const skill = validateNonEmptyString(manifest.skill, `${manifestField}.skill`);
-    if (skill && skill !== expectedSkill) {
-        error(`${manifestField}.skill must match owning Skill ${JSON.stringify(expectedSkill)}`);
-    }
-    if (skill && !collectDeclaredSkillNames(pluginDir, pluginManifest).all.has(skill)) {
-        error(`${manifestField}.skill must reference a declared static or dynamic skill`);
-    }
-    if (!Array.isArray(manifest.profiles) || manifest.profiles.length === 0) {
-        error(`${manifestField}.profiles must be a non-empty array`);
-        return;
-    }
-    const profilesById = new Map();
-    manifest.profiles.forEach((value, index) => {
-        const fieldName = `${manifestField}.profiles[${index}]`;
-        const profile = expectRecord(value, fieldName);
-        if (!profile)
-            return;
-        validateAllowedKeys(profile, fieldName, ['id', 'scope', 'plugins', 'runModel', 'requiredForRelease']);
-        const id = validateNonEmptyString(profile.id, `${fieldName}.id`);
-        if (id && !PLUGIN_NAME_PATTERN.test(id)) {
-            error(`${fieldName}.id must use lowercase kebab-case`);
-        }
-        else if (id && profilesById.has(id)) {
-            error(`${manifestField} has duplicate profile id ${JSON.stringify(id)}`);
-        }
-        if (!PLUGIN_EVAL_SCOPES.has(profile.scope)) {
-            error(`${fieldName}.scope must be user or project`);
-        }
-        const skillOwners = new Map();
-        const installedPlugins = new Set();
-        if (!Array.isArray(profile.plugins) || profile.plugins.length === 0) {
-            error(`${fieldName}.plugins must be a non-empty array`);
-        }
-        else {
-            profile.plugins.forEach((value, pluginIndex) => {
-                const pluginField = `${fieldName}.plugins[${pluginIndex}]`;
-                const installation = expectRecord(value, pluginField);
-                if (!installation)
-                    return;
-                validateAllowedKeys(installation, pluginField, ['name', 'config']);
-                const pluginName = validateNonEmptyString(installation.name, `${pluginField}.name`);
-                if (!pluginName)
-                    return;
-                if (!PLUGIN_NAME_PATTERN.test(pluginName)) {
-                    error(`${pluginField}.name must use lowercase kebab-case`);
-                }
-                if (installedPlugins.has(pluginName)) {
-                    error(`${fieldName}.plugins has duplicate plugin ${JSON.stringify(pluginName)}`);
-                    return;
-                }
-                installedPlugins.add(pluginName);
-                if (installation.config !== undefined && !isRecord(installation.config)) {
-                    error(`${pluginField}.config must be an object`);
-                }
-                const source = resolveEvalProfilePlugin(pluginDir, pluginManifest, pluginName, `${pluginField}.name`);
-                if (!source)
-                    return;
-                for (const skillName of collectDeclaredSkillNames(source.pluginDir, source.manifest).all) {
-                    const existing = skillOwners.get(skillName);
-                    if (existing && existing !== pluginName) {
-                        error(`${fieldName} installs duplicate Skill key ${JSON.stringify(skillName)} ` +
-                            `from plugins ${JSON.stringify(existing)} and ${JSON.stringify(pluginName)}`);
-                    }
-                    else {
-                        skillOwners.set(skillName, pluginName);
-                    }
-                }
-            });
-        }
-        if (!installedPlugins.has(pluginManifest.name)) {
-            error(`${fieldName}.plugins must include owner plugin ${JSON.stringify(pluginManifest.name)}`);
-        }
-        if (typeof profile.runModel !== 'boolean') {
-            error(`${fieldName}.runModel must be boolean`);
-        }
-        if (typeof profile.requiredForRelease !== 'boolean') {
-            error(`${fieldName}.requiredForRelease must be boolean`);
-        }
-        if (profile.scope === 'user' && profile.runModel === true) {
-            error(`${fieldName}: eval schema v2 does not allow real model execution for user scope`);
-        }
-        if (id && PLUGIN_NAME_PATTERN.test(id) && !profilesById.has(id)) {
-            profilesById.set(id, { ...profile, skillOwners });
-        }
-    });
-    if (!manifest.profiles.some((profile) => isRecord(profile) && profile.scope === 'project' && profile.runModel === true)) {
-        error(`${manifestField} must define at least one project profile with runModel=true`);
-    }
-    if (!Array.isArray(manifest.suites) || manifest.suites.length === 0) {
-        error(`${manifestField}.suites must be a non-empty array`);
-        return;
-    }
-    const suiteIds = new Set();
-    manifest.suites.forEach((value, index) => {
-        const fieldName = `${manifestField}.suites[${index}]`;
-        const suite = expectRecord(value, fieldName);
-        if (!suite)
-            return;
-        const id = validateNonEmptyString(suite.id, `${fieldName}.id`);
-        if (id && !PLUGIN_NAME_PATTERN.test(id)) {
-            error(`${fieldName}.id must use lowercase kebab-case`);
-        }
-        else if (id && suiteIds.has(id)) {
-            error(`${manifestField} has duplicate suite id ${JSON.stringify(id)}`);
-        }
-        else if (id) {
-            suiteIds.add(id);
-        }
-        if (suite.kind !== 'command' && suite.kind !== 'conversation' && suite.kind !== 'trigger') {
-            error(`${fieldName}.kind must be command, conversation, or trigger`);
-        }
-        const suiteSkills = new Set();
-        if (!Array.isArray(suite.skills) || suite.skills.length === 0) {
-            error(`${fieldName}.skills must be a non-empty array`);
-        }
-        else {
-            suite.skills.forEach((skillName, skillIndex) => {
-                const skillField = `${fieldName}.skills[${skillIndex}]`;
-                const normalized = validateNonEmptyString(skillName, skillField);
-                if (!normalized)
-                    return;
-                if (!PLUGIN_NAME_PATTERN.test(normalized)) {
-                    error(`${skillField} must use lowercase kebab-case`);
-                }
-                else if (suiteSkills.has(normalized)) {
-                    error(`${fieldName}.skills has duplicate Skill ${JSON.stringify(normalized)}`);
-                }
-                else {
-                    suiteSkills.add(normalized);
-                }
-            });
-        }
-        if (skill && !suiteSkills.has(skill)) {
-            error(`${fieldName}.skills must include owner Skill ${JSON.stringify(skill)}`);
-        }
-        if (!Array.isArray(suite.profiles) || suite.profiles.length === 0) {
-            error(`${fieldName}.profiles must be a non-empty array`);
-        }
-        else {
-            suite.profiles.forEach((profileId, profileIndex) => {
-                const profileField = `${fieldName}.profiles[${profileIndex}]`;
-                if (typeof profileId !== 'string' || profileId.trim() === '') {
-                    error(`${profileField} must be a non-empty string`);
-                    return;
-                }
-                const profile = profilesById.get(profileId);
-                if (!profile) {
-                    error(`${fieldName} references unknown profile ${JSON.stringify(profileId)}`);
-                }
-                else if (profile.runModel !== true) {
-                    error(`${fieldName} cannot execute materialize-only profile ${JSON.stringify(profileId)}`);
-                }
-                if (profile) {
-                    for (const skillName of suiteSkills) {
-                        if (!profile.skillOwners.has(skillName)) {
-                            error(`${fieldName} requires Skill ${JSON.stringify(skillName)}, but profile ` +
-                                `${JSON.stringify(profileId)} does not install a plugin that declares it`);
-                        }
-                    }
-                }
-            });
-        }
-        if (!Number.isInteger(suite.defaultRuns) || suite.defaultRuns <= 0) {
-            error(`${fieldName}.defaultRuns must be a positive integer`);
-        }
-        if (!Number.isInteger(suite.perRunTimeoutMs) || suite.perRunTimeoutMs <= 0) {
-            error(`${fieldName}.perRunTimeoutMs must be a positive integer`);
-        }
-        if (typeof suite.requiredForRelease !== 'boolean') {
-            error(`${fieldName}.requiredForRelease must be boolean`);
-        }
-        if (!Array.isArray(suite.releaseSplits)) {
-            error(`${fieldName}.releaseSplits must be an array`);
-        }
-        else {
-            suite.releaseSplits.forEach((split, splitIndex) => {
-                if (!PLUGIN_EVAL_SPLITS.has(split)) {
-                    error(`${fieldName}.releaseSplits[${splitIndex}] is unsupported`);
-                }
-            });
-        }
-        if (suite.kind === 'command') {
-            validateAllowedKeys(suite, fieldName, [
-                'id', 'kind', 'skills', 'entry', 'cases', 'profiles', 'defaultRuns', 'releaseSplits',
-                'requiredForRelease', 'perRunTimeoutMs', 'suiteTimeoutMs', 'supports',
-            ]);
-            validateEvalRelativeFile(evalDir, suite.entry, `${fieldName}.entry`);
-            if (!Number.isInteger(suite.suiteTimeoutMs) || suite.suiteTimeoutMs <= 0) {
-                error(`${fieldName}.suiteTimeoutMs must be a positive integer`);
-            }
-            else if (suite.suiteTimeoutMs < suite.perRunTimeoutMs) {
-                error(`${fieldName}.suiteTimeoutMs must be greater than or equal to perRunTimeoutMs`);
-            }
-            if (!Array.isArray(suite.supports)) {
-                error(`${fieldName}.supports must be an array`);
-            }
-            else {
-                suite.supports.forEach((support, supportIndex) => {
-                    if (!PLUGIN_EVAL_COMMAND_SUPPORTS.has(support)) {
-                        error(`${fieldName}.supports[${supportIndex}] is unsupported`);
-                    }
-                });
-                if (Array.isArray(suite.releaseSplits) &&
-                    suite.releaseSplits.length > 0 &&
-                    !suite.supports.includes('split')) {
-                    error(`${fieldName} declares releaseSplits but does not support split`);
-                }
-                const supportsCase = suite.supports.includes('case');
-                if (supportsCase && suite.cases === undefined) {
-                    error(`${fieldName}.cases is required when supports includes case`);
-                }
-                else if (!supportsCase && suite.cases !== undefined) {
-                    error(`${fieldName}.cases requires supports to include case`);
-                }
-                if (supportsCase && suite.cases !== undefined) {
-                    const casesPath = validateEvalRelativeFile(evalDir, suite.cases, `${fieldName}.cases`);
-                    if (casesPath) {
-                        try {
-                            const casesDocument = JSON.parse(fs.readFileSync(casesPath, 'utf8'));
-                            if (!isRecord(casesDocument) || casesDocument.skill_name !== skill) {
-                                error(`${fieldName}.cases.skill_name must match ${JSON.stringify(skill)}`);
-                            }
-                            else if (!Array.isArray(casesDocument.evals) || casesDocument.evals.length === 0) {
-                                error(`${fieldName}.cases.evals must be a non-empty array`);
-                            }
-                            else {
-                                const caseIds = new Set();
-                                casesDocument.evals.forEach((entry, caseIndex) => {
-                                    const caseField = `${fieldName}.cases.evals[${caseIndex}]`;
-                                    if (!isRecord(entry) || typeof entry.id !== 'string' || !/^[a-z0-9_]+$/.test(entry.id)) {
-                                        error(`${caseField}.id must use lowercase snake_case`);
-                                    }
-                                    else if (caseIds.has(entry.id)) {
-                                        error(`${fieldName}.cases has duplicate case id ${JSON.stringify(entry.id)}`);
-                                    }
-                                    else {
-                                        caseIds.add(entry.id);
-                                    }
-                                });
-                            }
-                        }
-                        catch (cause) {
-                            error(`${fieldName}.cases is not valid JSON: ${cause.message}`);
-                        }
-                    }
-                }
-            }
-        }
-        else if (suite.kind === 'conversation' || suite.kind === 'trigger') {
-            const normalizedSuite = { ...suite, skill };
-            const isolation = suite.isolation ?? 'standard';
-            if (isolation !== 'standard' && isolation !== 'strict') {
-                error(`${fieldName}.isolation must be standard or strict`);
-            }
-            if (suite.kind === 'conversation') {
-                validateAllowedKeys(suite, fieldName, [
-                    'id', 'kind', 'skills', 'cases', 'profiles', 'defaultRuns', 'releaseSplits',
-                    'requiredForRelease', 'perRunTimeoutMs', 'isolation',
-                ]);
-                if (Array.isArray(suite.releaseSplits) && suite.releaseSplits.length > 0) {
-                    error(`${fieldName} cannot declare releaseSplits because conversation cases do not support split filtering`);
-                }
-                validateConversationCaseCorpus(evalDir, normalizedSuite, fieldName);
-            }
-            else {
-                validateAllowedKeys(suite, fieldName, [
-                    'id', 'kind', 'skills', 'cases', 'fixtureModule', 'observeSpawnAgent', 'isolation',
-                    'strictNegativeSplits', 'minimumPassRate', 'forbidMultipleSkillLoads',
-                    'profiles', 'defaultRuns', 'releaseSplits',
-                    'requiredForRelease', 'perRunTimeoutMs',
-                ]);
-                if (typeof suite.observeSpawnAgent !== 'boolean') {
-                    error(`${fieldName}.observeSpawnAgent must be boolean`);
-                }
-                if (!Array.isArray(suite.strictNegativeSplits)) {
-                    error(`${fieldName}.strictNegativeSplits must be an array`);
-                }
-                else {
-                    suite.strictNegativeSplits.forEach((split, splitIndex) => {
-                        if (!PLUGIN_EVAL_TRIGGER_CASE_SPLITS.has(split)) {
-                            error(`${fieldName}.strictNegativeSplits[${splitIndex}] is unsupported`);
-                        }
-                    });
-                }
-                if (suite.minimumPassRate !== undefined &&
-                    (typeof suite.minimumPassRate !== 'number' ||
-                        !Number.isFinite(suite.minimumPassRate) ||
-                        suite.minimumPassRate <= 0 ||
-                        suite.minimumPassRate > 1)) {
-                    error(`${fieldName}.minimumPassRate must be greater than 0 and at most 1`);
-                }
-                if (suite.forbidMultipleSkillLoads !== undefined &&
-                    typeof suite.forbidMultipleSkillLoads !== 'boolean') {
-                    error(`${fieldName}.forbidMultipleSkillLoads must be boolean`);
-                }
-                if (suite.fixtureModule !== undefined) {
-                    const fixturePath = validateEvalRelativeFile(evalDir, suite.fixtureModule, `${fieldName}.fixtureModule`);
-                    if (fixturePath && path.extname(fixturePath) !== '.mjs') {
-                        error(`${fieldName}.fixtureModule must reference an .mjs file`);
-                    }
-                }
-                validateTriggerCaseCorpus(evalDir, normalizedSuite, fieldName);
-            }
-        }
-    });
-    if (skill
-        && collectDeclaredSkillNames(pluginDir, pluginManifest).dynamic.has(skill)
-        && !manifest.suites.some((suite) => isRecord(suite) && suite.requiredForRelease === true)) {
-        error(`${manifestField}.suites must include at least one release-required suite for dynamic Skill ${JSON.stringify(skill)}`);
-    }
-}
-function validatePluginEvalManifest(pluginDir, pluginManifest) {
+async function validatePluginEvalManifest(pluginDir, pluginManifest) {
     const legacyRoot = path.join(pluginDir, 'evals');
     if (fs.existsSync(legacyRoot)) {
         error('Plugin-root evals/ is legacy; put evals/ inside its owning static or dynamic Skill directory.');
@@ -1692,17 +961,33 @@ function validatePluginEvalManifest(pluginDir, pluginManifest) {
         .sort()
         .map((skill) => ({ skill, root: path.join(pluginDir, 'skills', skill) }));
     const seenSkills = new Set();
+    let manifestTools = null;
     for (const owner of skillRoots) {
         const evalDir = path.join(owner.root, 'evals');
         const manifestPath = path.join(evalDir, 'manifest.json');
         if (!fs.existsSync(manifestPath))
             continue;
+        const manifestField = path.relative(pluginDir, manifestPath).split(path.sep).join('/');
         if (seenSkills.has(owner.skill)) {
             error(`Skill ${JSON.stringify(owner.skill)} has more than one evals/manifest.json owner`);
             continue;
         }
         seenSkills.add(owner.skill);
-        validateOnePluginEvalManifest(pluginDir, pluginManifest, evalDir, owner.skill);
+        manifestTools ??= await loadSkillEvalManifestTools();
+        if (typeof manifestTools?.validateAwSkillEvalManifest !== 'function') {
+            error('Canonical AwSkillEvalManifest v1 validator is unavailable; run the current built aw CLI.');
+            continue;
+        }
+        const validation = await manifestTools.validateAwSkillEvalManifest({
+            plugin: {
+                rootDir: pluginDir,
+                manifestPath: path.join(pluginDir, '.agents-plugin', 'plugin.json'),
+                manifest: pluginManifest,
+            },
+            skill: owner.skill,
+        });
+        for (const message of validation.errors)
+            error(`${manifestField}: ${message}`);
     }
 }
 function countCharacters(value) {
@@ -2095,33 +1380,6 @@ function validateDeclaredNativeAssets(pluginDir, manifest) {
         }
     }
 }
-function validatePluginVersionContracts(manifest, options) {
-    if (manifest.compatibility === undefined) {
-        error('Invalid compatibility.aw.minVersion: expected a strict SemVer 2.0.0 string. Received undefined.');
-        return;
-    }
-    const compatibility = expectRecord(manifest.compatibility, 'compatibility');
-    if (!compatibility) {
-        return;
-    }
-    validateAllowedKeys(compatibility, 'compatibility', ['aw']);
-    if (compatibility.aw === undefined) {
-        error('Invalid compatibility.aw.minVersion: expected a strict SemVer 2.0.0 string. Received undefined.');
-        return;
-    }
-    const aw = expectRecord(compatibility.aw, 'compatibility.aw');
-    if (!aw) {
-        return;
-    }
-    validateAllowedKeys(aw, 'compatibility.aw', ['minVersion']);
-    const pluginMinVersion = validateStrictSemVerString(aw.minVersion, 'compatibility.aw.minVersion');
-    if (!pluginMinVersion || !options.catalogMinVersion) {
-        return;
-    }
-    if (compareStrictSemVer(pluginMinVersion, options.catalogMinVersion) > 0) {
-        error(`Invalid compatibility.aw.minVersion for plugin "${pluginNameForError(manifest)}": received ${JSON.stringify(pluginMinVersion)}, which is higher than target catalog minimum ${JSON.stringify(options.catalogMinVersion)}.`);
-    }
-}
 function collectDeclaredSkillNames(pluginDir, manifest) {
     const skillsRoot = typeof manifest.skills === 'string'
         ? path.join(pluginDir, manifest.skills)
@@ -2166,9 +1424,6 @@ function collectDeclaredSkillNames(pluginDir, manifest) {
 function isNodeRunnablePath(relativePath) {
     return SCRIPT_NODE_EXTENSIONS.has(path.posix.extname(normalizeRelativePath(relativePath)));
 }
-function isAutoRunnablePath(relativePath) {
-    return SCRIPT_AUTO_EXTENSIONS.has(path.posix.extname(normalizeRelativePath(relativePath)).toLowerCase());
-}
 function normalizePluginScriptPath(pluginDir, value, fieldName) {
     if (typeof value !== 'string' || value.trim() === '') {
         error(`${fieldName} must be a non-empty string`);
@@ -2217,17 +1472,11 @@ function validateScriptEntry(pluginDir, value, fieldName, options = {}) {
     }
     validateAllowedKeys(entry, fieldName, ['runner', 'path', 'args']);
     const runner = validateManifestString(entry.runner, `${fieldName}.runner`);
-    if (runner && !SCRIPT_RUNNERS.has(runner)) {
-        error(`${fieldName}.runner has unsupported runner "${runner}"`);
-    }
-    if (options.requireNodeRunner && runner !== 'node') {
+    if (runner !== 'node') {
         error(`${fieldName}.runner must be "node"`);
     }
     const relativePath = normalizePluginScriptPath(pluginDir, entry.path, `${fieldName}.path`);
     validateDeclaredScriptFile(pluginDir, relativePath, `${fieldName}.path`);
-    if (runner === 'auto' && relativePath && !isAutoRunnablePath(relativePath)) {
-        error(`${fieldName}.path uses runner "auto" but has no supported extension (${[...SCRIPT_AUTO_EXTENSIONS].join(', ')})`);
-    }
     if (options.requireNodePath && relativePath && !isNodeRunnablePath(relativePath)) {
         error(`${fieldName}.path must use a Node runnable extension (.js, .mjs, or .cjs)`);
     }
@@ -2245,51 +1494,6 @@ function validateScriptEntry(pluginDir, value, fieldName, options = {}) {
     }
     return runner && relativePath ? { runner, path: relativePath } : null;
 }
-function validateLifecycleDefinition(pluginDir, value, fieldName, runtimeEntries) {
-    if (typeof value === 'string') {
-        const relativePath = normalizePluginScriptPath(pluginDir, value, fieldName);
-        validateDeclaredScriptFile(pluginDir, relativePath, fieldName);
-        if (relativePath && !isAutoRunnablePath(relativePath)) {
-            error(`${fieldName} uses runner "auto" but has no supported extension (${[...SCRIPT_AUTO_EXTENSIONS].join(', ')})`);
-        }
-        if (relativePath && isNodeRunnablePath(relativePath)) {
-            runtimeEntries.push({ path: relativePath, fieldName });
-        }
-        return { default: relativePath ? { runner: 'auto', path: relativePath } : null };
-    }
-    const selector = expectRecord(value, fieldName);
-    if (!selector)
-        return {};
-    if ('runner' in selector || 'path' in selector || 'command' in selector) {
-        error(`${fieldName} must declare lifecycle scripts under OS selectors`);
-    }
-    for (const selectorName of Object.keys(selector)) {
-        if (!SCRIPT_OS_SELECTORS.has(selectorName)) {
-            error(`${fieldName} has unknown OS selector "${selectorName}"`);
-        }
-    }
-    const normalized = {};
-    for (const [selectorName, entryValue] of Object.entries(selector)) {
-        const entry = validateScriptEntry(pluginDir, entryValue, `${fieldName}.${selectorName}`);
-        if (entry) {
-            normalized[selectorName] = entry;
-            if (entry.runner === 'node' || (entry.runner === 'auto' && isNodeRunnablePath(entry.path))) {
-                runtimeEntries.push({ path: entry.path, fieldName: `${fieldName}.${selectorName}.path` });
-            }
-        }
-    }
-    const orders = {
-        linux: ['linux', 'unix', 'default'],
-        darwin: ['darwin', 'unix', 'default'],
-        win32: ['win32', 'windows', 'default'],
-    };
-    for (const [osName, order] of Object.entries(orders)) {
-        if (!order.some((selectorName) => normalized[selectorName])) {
-            error(`${fieldName} must include an entry that resolves on ${osName}`);
-        }
-    }
-    return normalized;
-}
 function isNonRegistryDependencySpecifier(specifier) {
     const trimmed = String(specifier).trim();
     return (/^(?:workspace|file|link|portal):/i.test(trimmed) ||
@@ -2476,261 +1680,22 @@ function listFilesRecursive(rootDir) {
     walk(rootDir);
     return output;
 }
-function validateConfigValueLightweight(field, value, fieldName) {
-    if (!isRecord(field) || !CONFIG_FIELD_TYPES.has(field.type))
-        return;
-    if (field.type === 'string' || field.type === 'file' || field.type === 'directory') {
-        validateManifestString(value, fieldName);
-        return;
-    }
-    if (field.type === 'boolean') {
-        if (typeof value !== 'boolean') {
-            error(`${fieldName} must be a boolean`);
-        }
-        return;
-    }
-    if (field.type === 'number') {
-        if (typeof value !== 'number' || !Number.isFinite(value)) {
-            error(`${fieldName} must be a finite number`);
-            return;
-        }
-        if (typeof field.min === 'number' && value < field.min) {
-            error(`${fieldName} must be greater than or equal to ${field.min}`);
-        }
-        if (typeof field.max === 'number' && value > field.max) {
-            error(`${fieldName} must be less than or equal to ${field.max}`);
-        }
-        return;
-    }
-    if (field.type === 'enum') {
-        if (typeof value !== 'string' || !Array.isArray(field.values) || !field.values.includes(value)) {
-            error(`${fieldName} must be one of config schema values`);
-        }
-    }
-}
-function validateConfigPresentationLightweight(presentation, schema) {
-    if (presentation === undefined)
-        return;
-    const root = expectRecord(presentation, 'config.presentation');
-    if (!root)
-        return;
-    validateAllowedKeys(root, 'config.presentation', ['groups', 'fields', 'presets']);
-    const schemaKeys = new Set(Object.keys(schema));
-    if (root.groups !== undefined) {
-        if (!Array.isArray(root.groups)) {
-            error('config.presentation.groups must be an array');
-        }
-        else {
-            const groupIds = new Set();
-            const groupedFields = new Set();
-            root.groups.forEach((rawGroup, index) => {
-                const fieldName = `config.presentation.groups[${index}]`;
-                const group = expectRecord(rawGroup, fieldName);
-                if (!group)
-                    return;
-                validateAllowedKeys(group, fieldName, ['id', 'title', 'description', 'fields', 'advanced']);
-                const validId = validateManifestString(group.id, `${fieldName}.id`);
-                const id = validId ? group.id : null;
-                if (id && groupIds.has(id)) {
-                    error(`${fieldName}.id has duplicate group id "${id}"`);
-                }
-                else if (id) {
-                    groupIds.add(id);
-                }
-                validateManifestString(group.title, `${fieldName}.title`);
-                if (group.description !== undefined) {
-                    validateManifestString(group.description, `${fieldName}.description`);
-                }
-                if (group.advanced !== undefined && typeof group.advanced !== 'boolean') {
-                    error(`${fieldName}.advanced must be a boolean`);
-                }
-                if (!Array.isArray(group.fields)) {
-                    error(`${fieldName}.fields must be an array`);
-                    return;
-                }
-                group.fields.forEach((key, fieldIndex) => {
-                    const keyFieldName = `${fieldName}.fields[${fieldIndex}]`;
-                    const validKey = validateManifestString(key, keyFieldName);
-                    if (!validKey)
-                        return;
-                    if (!schemaKeys.has(key)) {
-                        error(`${keyFieldName} references unknown config key "${key}"`);
-                    }
-                    if (groupedFields.has(key)) {
-                        error(`${keyFieldName} assigns config key "${key}" to more than one group`);
-                    }
-                    else {
-                        groupedFields.add(key);
-                    }
-                });
-            });
-        }
-    }
-    if (root.fields !== undefined) {
-        const fields = expectRecord(root.fields, 'config.presentation.fields');
-        if (fields) {
-            for (const [key, rawField] of Object.entries(fields)) {
-                const fieldName = `config.presentation.fields.${key}`;
-                const schemaField = schema[key];
-                if (!schemaKeys.has(key)) {
-                    error(`config.presentation.fields references unknown config key "${key}"`);
-                }
-                const field = expectRecord(rawField, fieldName);
-                if (!field)
-                    continue;
-                validateAllowedKeys(field, fieldName, [
-                    'valueLabels',
-                    'recommendedValue',
-                    'placeholder',
-                    'unit',
-                    'advanced',
-                ]);
-                if (field.placeholder !== undefined) {
-                    validateManifestString(field.placeholder, `${fieldName}.placeholder`);
-                }
-                if (field.unit !== undefined) {
-                    validateManifestString(field.unit, `${fieldName}.unit`);
-                }
-                if (field.advanced !== undefined && typeof field.advanced !== 'boolean') {
-                    error(`${fieldName}.advanced must be a boolean`);
-                }
-                if (field.valueLabels !== undefined) {
-                    const labels = expectRecord(field.valueLabels, `${fieldName}.valueLabels`);
-                    if (isRecord(schemaField) && schemaField.type !== 'enum') {
-                        error(`${fieldName}.valueLabels is only supported for enum config`);
-                    }
-                    if (labels) {
-                        for (const [token, label] of Object.entries(labels)) {
-                            if (!isRecord(schemaField) || !Array.isArray(schemaField.values) || !schemaField.values.includes(token)) {
-                                error(`${fieldName}.valueLabels references unknown enum token "${token}"`);
-                            }
-                            validateManifestString(label, `${fieldName}.valueLabels.${token}`);
-                        }
-                    }
-                }
-                if (field.recommendedValue !== undefined) {
-                    validateConfigValueLightweight(schemaField, field.recommendedValue, `${fieldName}.recommendedValue`);
-                }
-            }
-        }
-    }
-    if (root.presets !== undefined) {
-        if (!Array.isArray(root.presets)) {
-            error('config.presentation.presets must be an array');
-        }
-        else {
-            const presetIds = new Set();
-            root.presets.forEach((rawPreset, index) => {
-                const fieldName = `config.presentation.presets[${index}]`;
-                const preset = expectRecord(rawPreset, fieldName);
-                if (!preset)
-                    return;
-                validateAllowedKeys(preset, fieldName, ['id', 'title', 'description', 'values']);
-                const validId = validateManifestString(preset.id, `${fieldName}.id`);
-                const id = validId ? preset.id : null;
-                if (id && presetIds.has(id)) {
-                    error(`${fieldName}.id has duplicate preset id "${id}"`);
-                }
-                else if (id) {
-                    presetIds.add(id);
-                }
-                validateManifestString(preset.title, `${fieldName}.title`);
-                if (preset.description !== undefined) {
-                    validateManifestString(preset.description, `${fieldName}.description`);
-                }
-                const values = expectRecord(preset.values, `${fieldName}.values`);
-                if (!values)
-                    return;
-                for (const [key, value] of Object.entries(values)) {
-                    if (!schemaKeys.has(key)) {
-                        error(`${fieldName}.values references unknown config key "${key}"`);
-                        continue;
-                    }
-                    const schemaField = schema[key];
-                    if (isRecord(schemaField)
-                        && (schemaField.sensitive === true
-                            || schemaField.type === 'file'
-                            || schemaField.type === 'directory')) {
-                        error(`${fieldName}.values.${key} cannot contain sensitive, file, or directory config values`);
-                        continue;
-                    }
-                    validateConfigValueLightweight(schemaField, value, `${fieldName}.values.${key}`);
-                }
-            });
-        }
-    }
-}
 function validateConfigSchemaLightweight(config) {
     if (config === undefined)
         return;
-    const configRoot = expectRecord(config, 'config');
-    if (!configRoot)
-        return;
-    validateAllowedKeys(configRoot, 'config', ['schema', 'presentation']);
-    const schema = expectRecord(configRoot.schema, 'config.schema');
-    if (!schema)
-        return;
-    for (const [key, rawField] of Object.entries(schema)) {
-        if (!/^[A-Za-z][A-Za-z0-9_]*$/.test(key)) {
-            error(`config.schema has invalid key "${key}"`);
-        }
-        const fieldName = `config.schema.${key}`;
-        const field = expectRecord(rawField, fieldName);
-        if (!field)
-            continue;
-        validateAllowedKeys(field, fieldName, [
-            'type',
-            'title',
-            'description',
-            'default',
-            'required',
-            'sensitive',
-            'values',
-            'min',
-            'max',
-        ]);
-        if (typeof field.type !== 'string' || !CONFIG_FIELD_TYPES.has(field.type)) {
-            error(`${fieldName}.type must be string, number, boolean, enum, file, or directory`);
-        }
-        if (field.required !== undefined && typeof field.required !== 'boolean') {
-            error(`${fieldName}.required must be a boolean`);
-        }
-        if (field.sensitive !== undefined && typeof field.sensitive !== 'boolean') {
-            error(`${fieldName}.sensitive must be a boolean`);
-        }
-        if (field.values !== undefined) {
-            if (field.type !== 'enum' || !Array.isArray(field.values) || field.values.length === 0) {
-                error(`${fieldName}.values is only supported for enum config and must be non-empty`);
-            }
-        }
-        else if (field.type === 'enum') {
-            error(`${fieldName}.values is required for enum config`);
-        }
-        if (field.type !== 'number' && (field.min !== undefined || field.max !== undefined)) {
-            error(`${fieldName}.min/max are only supported for number config`);
-        }
-        if (field.min !== undefined && typeof field.min !== 'number') {
-            error(`${fieldName}.min must be a number`);
-        }
-        if (field.max !== undefined && typeof field.max !== 'number') {
-            error(`${fieldName}.max must be a number`);
-        }
-        if (typeof field.min === 'number' && typeof field.max === 'number' && field.min > field.max) {
-            error(`${fieldName}.min must be less than or equal to max`);
-        }
+    try {
+        normalizePluginConfigDefinition(config);
+    }
+    catch (validationError) {
+        error(validationError instanceof Error ? validationError.message : String(validationError));
     }
-    validateConfigPresentationLightweight(configRoot.presentation, schema);
 }
 function configSchemaKeys(manifest) {
-    const schema = manifest.config?.schema;
+    const schema = manifest.config?.fields;
     return isRecord(schema) ? new Set(Object.keys(schema)) : new Set();
 }
-function configSchemaField(manifest, key) {
-    const field = manifest.config?.schema?.[key];
-    return isRecord(field) ? field : null;
-}
 function defaultConfigValues(manifest) {
-    const schema = manifest.config?.schema;
+    const schema = manifest.config?.fields;
     const values = {};
     if (!isRecord(schema))
         return values;
@@ -2741,6 +1706,35 @@ function defaultConfigValues(manifest) {
     }
     return values;
 }
+function configFieldContainsSensitiveValue(field) {
+    if (!isRecord(field))
+        return false;
+    if (field.sensitive === true)
+        return true;
+    if (field.type !== 'object')
+        return false;
+    return ((isRecord(field.properties)
+        && Object.values(field.properties).some((child) => isRecord(child) && child.sensitive === true))
+        || (isRecord(field.additionalProperties)
+            && field.additionalProperties.sensitive === true));
+}
+function codexStaticNativeComponentKeys(manifest) {
+    if (!isCodexTargeted(manifest))
+        return [];
+    const keys = [];
+    if (manifest.skills)
+        keys.push('skills');
+    if (manifest.mcpServers)
+        keys.push('mcpServers');
+    if ((Array.isArray(manifest.extensions?.hooks)
+        && manifest.extensions.hooks.some((hook) => hook?.agentOverrides?.codex !== null))
+        || (Array.isArray(manifest.extensions?.nativeHooks?.codex)
+            && manifest.extensions.nativeHooks.codex.length > 0))
+        keys.push('hooks');
+    if (manifest.apps)
+        keys.push('apps');
+    return keys;
+}
 function validateArtifactId(value, fieldName) {
     const id = validateManifestString(value, fieldName);
     if (!id)
@@ -2801,7 +1795,7 @@ function validateStringArray(value, fieldName, options = {}) {
     }
     return output;
 }
-function validateArtifactTargetEntry(entry, index, manifest, seen, pluginDir) {
+function validateArtifactTargetEntry(entry, index, manifest, pluginDir) {
     const fieldName = `artifacts.targets[${index}]`;
     const target = expectRecord(entry, fieldName);
     if (!target)
@@ -2816,6 +1810,7 @@ function validateArtifactTargetEntry(entry, index, manifest, seen, pluginDir) {
         'projectManagedKind',
         'states',
         'refreshKeys',
+        'delivery',
         'requiresCodexProjectConfig',
         'roleKey',
         'skillKey',
@@ -2828,6 +1823,30 @@ function validateArtifactTargetEntry(entry, index, manifest, seen, pluginDir) {
         error(`${fieldName}.target: unsupported artifact target "${artifactTarget}"`);
     }
     const portable = artifactTarget === 'agent-skills.skill';
+    let delivery;
+    if (artifactTarget === 'codex.skill') {
+        delivery = expectRecord(target.delivery, `${fieldName}.delivery`);
+        if (delivery) {
+            if (delivery.mode === 'aw-extension') {
+                validateAllowedKeys(delivery, `${fieldName}.delivery`, ['mode']);
+            }
+            else if (delivery.mode === 'codex-native') {
+                validateAllowedKeys(delivery, `${fieldName}.delivery`, ['mode', 'identity', 'renderProfile']);
+                if (delivery.identity !== 'shared') {
+                    error(`${fieldName}.delivery.identity: expected "shared"`);
+                }
+                if (delivery.renderProfile !== 'user') {
+                    error(`${fieldName}.delivery.renderProfile: expected "user"`);
+                }
+            }
+            else {
+                error(`${fieldName}.delivery.mode: expected "codex-native" or "aw-extension"`);
+            }
+        }
+    }
+    else if (target.delivery !== undefined) {
+        error(`${fieldName}.delivery: delivery is only supported for codex.skill targets`);
+    }
     const platform = portable || target.platform === undefined
         ? undefined
         : validateManifestString(target.platform, `${fieldName}.platform`);
@@ -2851,13 +1870,6 @@ function validateArtifactTargetEntry(entry, index, manifest, seen, pluginDir) {
             error(`${fieldName}.distribution: platform targets do not support distribution`);
         }
     }
-    const key = id && artifactTarget ? `${id}:${artifactTarget}` : null;
-    if (key) {
-        if (seen.has(key)) {
-            error(`${fieldName}: duplicate artifact id + target "${key}"`);
-        }
-        seen.add(key);
-    }
     const expectedKind = ARTIFACT_KIND_BY_TARGET[artifactTarget];
     const kind = target.kind === undefined
         ? expectedKind
@@ -2900,10 +1912,15 @@ function validateArtifactTargetEntry(entry, index, manifest, seen, pluginDir) {
             error(`${fieldName}.refreshKeys[${refreshIndex}]: unknown config key "${refreshKey}"`);
             continue;
         }
-        const field = configSchemaField(manifest, refreshKey);
-        if (scopes.includes('project') &&
-            (field?.type === 'file' || field?.type === 'directory')) {
-            error(`${fieldName}.refreshKeys[${refreshIndex}]: project-scope repo-visible artifacts cannot depend on "${field.type}" config key "${refreshKey}"; use a portable string key or keep the path in user/project local config for lifecycle/helper code.`);
+        const sensitiveRefreshKey = configFieldContainsSensitiveValue(manifest.config?.fields?.[refreshKey]);
+        const skillTarget = artifactTarget === 'codex.skill'
+            || artifactTarget === 'claude.skill'
+            || artifactTarget === 'agent-skills.skill';
+        if (skillTarget && sensitiveRefreshKey) {
+            const native = delivery?.mode === 'codex-native';
+            error(`${native ? 'codexNativeRenderSensitiveRefreshKey' : 'skillRenderSensitiveRefreshKey'}: ` +
+                `${fieldName}.refreshKeys[${refreshIndex}]: ` +
+                `${native ? 'codex-native renderers' : 'Skill renderers'} cannot read sensitive config field "${refreshKey}"`);
         }
     }
     if (target.requiresCodexProjectConfig !== undefined &&
@@ -2992,6 +2009,7 @@ function validateArtifactTargetEntry(entry, index, manifest, seen, pluginDir) {
         projectManagedKind,
         states,
         refreshKeys,
+        delivery,
         roleKey,
         skillKey,
         sourceDirs,
@@ -3011,10 +2029,69 @@ function validateArtifactsConfigLightweight(pluginDir, manifest) {
         error('artifacts.targets must be an array');
         return [];
     }
-    const seen = new Set();
     const declarations = artifacts.targets
-        .map((entry, index) => validateArtifactTargetEntry(entry, index, manifest, seen, pluginDir))
+        .map((entry, index) => validateArtifactTargetEntry(entry, index, manifest, pluginDir))
         .filter(Boolean);
+    const idsBySurfaceScope = new Map();
+    const nativeIds = new Map();
+    const nativeSkillKeys = new Map();
+    for (const [declarationIndex, declaration] of declarations.entries()) {
+        for (const scope of declaration.scopes) {
+            const surface = declaration.platform ?? declaration.distribution;
+            const key = `${surface}:${scope}:${declaration.id}`;
+            const existing = idsBySurfaceScope.get(key);
+            if (existing !== undefined) {
+                error(`artifacts.targets has duplicate artifact id "${declaration.id}" for surface/scope "${surface}:${scope}" in targets[${existing}] and targets[${declarationIndex}]`);
+            }
+            else {
+                idsBySurfaceScope.set(key, declarationIndex);
+            }
+        }
+        if (declaration.delivery?.mode === 'codex-native') {
+            const existingId = nativeIds.get(declaration.id);
+            if (existingId !== undefined) {
+                error(`artifacts.targets has duplicate codex-native artifact id "${declaration.id}" in the shared projection at targets[${existingId}] and targets[${declarationIndex}]`);
+            }
+            else {
+                nativeIds.set(declaration.id, declarationIndex);
+            }
+            const existingSkillKey = nativeSkillKeys.get(declaration.skillKey);
+            if (existingSkillKey !== undefined) {
+                error(`artifacts.targets has duplicate codex-native skillKey "${declaration.skillKey}" in the shared projection at targets[${existingSkillKey}] and targets[${declarationIndex}]`);
+            }
+            else {
+                nativeSkillKeys.set(declaration.skillKey, declarationIndex);
+            }
+        }
+    }
+    const nativeComponents = codexStaticNativeComponentKeys(manifest).map((key) => ({
+        key,
+        scopes: ['project', 'user'],
+    }));
+    declarations.forEach((declaration, index) => {
+        if (declaration.delivery?.mode === 'codex-native') {
+            nativeComponents.push({ key: `artifacts.targets[${index}]`, scopes: declaration.scopes });
+        }
+    });
+    const expectedNativeComponent = nativeComponents[0];
+    if (expectedNativeComponent) {
+        const canonicalScopes = (component) => [...component.scopes].sort().join(',');
+        const expectedScopes = canonicalScopes(expectedNativeComponent);
+        const mismatch = nativeComponents.find((component) => canonicalScopes(component) !== expectedScopes);
+        if (mismatch) {
+            error(`codexSharedNativeScopeMismatch: Codex native component scope sets must match exactly; ` +
+                `${expectedNativeComponent.key} has {${expectedScopes}} but ${mismatch.key} has ` +
+                `{${canonicalScopes(mismatch)}}`);
+        }
+    }
+    const staticSkillNames = new Set(collectDeclaredSkillNames(pluginDir, manifest).static);
+    for (const [index, declaration] of declarations.entries()) {
+        if (declaration.target === 'codex.skill'
+            && declaration.delivery?.mode === 'codex-native'
+            && staticSkillNames.has(declaration.skillKey)) {
+            error(`artifacts.targets[${index}].skillKey: native dynamic Skill "${declaration.skillKey}" conflicts with a static Skill of the same name`);
+        }
+    }
     const owners = new Map();
     for (const declaration of declarations) {
         if ((declaration.target !== 'codex.skill' && declaration.target !== 'claude.skill' && declaration.target !== 'agent-skills.skill') ||
@@ -3281,20 +2358,11 @@ function validateRenderedSkillTree(options) {
     if (!readme || readme.toString('utf8').trim() === '') {
         error(`${fieldName} final file tree must contain a non-empty README.md`);
     }
-    const sensitiveValues = Object.entries(manifest.config?.schema ?? {})
-        .filter(([, field]) => isRecord(field) && field.sensitive === true)
-        .map(([key, field]) => Object.prototype.hasOwnProperty.call(field, 'default')
-        ? String(field.default)
-        : String(defaultConfigValues(manifest)[key] ?? ''))
-        .filter(Boolean);
     for (const [relativePath, content] of files) {
         const text = content.toString('utf8');
         if (/\{\{[^{}]+\}\}/u.test(text)) {
             error(`${fieldName} final file tree contains an unresolved template in "${relativePath}"`);
         }
-        if (sensitiveValues.some((value) => text.includes(value))) {
-            error(`${fieldName} final file tree exposes sensitive config in "${relativePath}"`);
-        }
     }
     if (declaration.target === 'codex.skill') {
         const openAiYaml = files.get('agents/openai.yaml');
@@ -3490,26 +2558,83 @@ function validateRenderedArtifactPlan(plan, declarations, scopeLabel, options) {
         }
     }
 }
+function resolveArtifactRendererFixtureRequests(declarations, manifest) {
+    const awOwned = new Map();
+    const codexNative = new Map();
+    for (const declaration of declarations) {
+        if (declaration.delivery?.mode === 'codex-native') {
+            const scope = declaration.scopes.includes('user') ? 'user' : 'project';
+            const request = codexNative.get(scope) ?? {
+                kind: 'codex-native',
+                surface: 'codex',
+                scope,
+                configScope: 'user',
+                declarations: [],
+            };
+            request.declarations.push(declaration);
+            codexNative.set(scope, request);
+            continue;
+        }
+        const surface = declaration.platform ?? declaration.distribution;
+        if (!surface)
+            continue;
+        for (const scope of declaration.scopes) {
+            const key = `${surface}:${scope}`;
+            const request = awOwned.get(key) ?? {
+                kind: 'aw-owned',
+                surface,
+                scope,
+                configScope: scope,
+                declarations: [],
+            };
+            request.declarations.push(declaration);
+            awOwned.set(key, request);
+        }
+    }
+    const partitionedAwOwned = [...awOwned.values()].flatMap((request) => {
+        const hasSkill = request.declarations.some((declaration) => declaration.target === 'codex.skill'
+            || declaration.target === 'claude.skill'
+            || declaration.target === 'agent-skills.skill');
+        const hasSensitiveNonSkill = request.declarations.some((declaration) => declaration.target !== 'codex.skill'
+            && declaration.target !== 'claude.skill'
+            && declaration.target !== 'agent-skills.skill'
+            && declaration.refreshKeys.some((key) => configFieldContainsSensitiveValue(manifest.config?.fields?.[key])));
+        if (!hasSkill || !hasSensitiveNonSkill)
+            return [request];
+        const skillDeclarations = request.declarations.filter((declaration) => declaration.target === 'codex.skill'
+            || declaration.target === 'claude.skill'
+            || declaration.target === 'agent-skills.skill');
+        const nonSkillDeclarations = request.declarations.filter((declaration) => !skillDeclarations.includes(declaration));
+        return [
+            { ...request, declarations: skillDeclarations },
+            { ...request, declarations: nonSkillDeclarations },
+        ];
+    });
+    return [...partitionedAwOwned, ...codexNative.values()];
+}
 function runArtifactRendererFixture(pluginDir, manifest, renderEntry, declarations, resolvedRuntimeImports, skillValidationTools) {
     if (!renderEntry || declarations.length === 0)
         return;
-    const surfaceScopes = [...new Set(declarations.flatMap((target) => target.scopes.map((scope) => `${target.platform ?? target.distribution}:${scope}`)))];
+    const requests = resolveArtifactRendererFixtureRequests(declarations, manifest);
     const values = defaultConfigValues(manifest);
     const tempRoot = fs.mkdtempSync(path.join(os.tmpdir(), 'aw-artifact-render-'));
     try {
-        for (const surfaceScope of surfaceScopes) {
-            const [surface, scope] = surfaceScope.split(':');
+        for (const [requestIndex, request] of requests.entries()) {
+            const { kind, surface, scope, configScope, declarations: scopedDeclarations, } = request;
             const distribution = surface === 'agent-skills' ? surface : undefined;
             const platform = distribution ? undefined : surface;
             const event = distribution ? 'materialize' : 'install';
-            const scopedDeclarations = declarations.filter((target) => (distribution ? target.distribution === distribution : target.platform === platform)
-                && target.scopes.includes(scope));
-            const contextPath = path.join(tempRoot, `context-${surface}-${scope}.json`);
+            const requestRoot = path.join(tempRoot, `${requestIndex}-${kind}-${surface}-${scope}`);
+            const rendererAwHome = path.join(requestRoot, 'aw-home');
+            const rendererCodexHome = path.join(requestRoot, 'codex-home');
+            const rendererClaudeHome = path.join(requestRoot, 'claude-home');
+            fs.mkdirSync(requestRoot, { recursive: true });
+            const contextPath = path.join(requestRoot, 'context.json');
             const runtimeImports = scopedDeclarations.flatMap((target) => target.runtimeImports.map((runtimeImport, importIndex) => {
                 const resolved = resolvedRuntimeImports?.artifactImports.get(authorRuntimeImportKey(target.id, importIndex));
                 if (!resolved)
                     return null;
-                const importPath = path.join(tempRoot, `runtime-${target.id}-${importIndex}`);
+                const importPath = path.join(requestRoot, `runtime-${target.id}-${importIndex}`);
                 fs.writeFileSync(importPath, resolved.bytes);
                 return {
                     artifactId: target.id,
@@ -3520,6 +2645,11 @@ function runArtifactRendererFixture(pluginDir, manifest, renderEntry, declaratio
                     digest: resolved.digest,
                 };
             }).filter(Boolean));
+            const refreshKeys = [...new Set(scopedDeclarations.flatMap((target) => target.refreshKeys))];
+            const scopedSchema = Object.fromEntries(refreshKeys.flatMap((key) => manifest.config?.fields?.[key] === undefined
+                ? []
+                : [[key, manifest.config.fields[key]]]));
+            const scopedValues = Object.fromEntries(refreshKeys.flatMap((key) => Object.prototype.hasOwnProperty.call(values, key) ? [[key, values[key]]] : []));
             fs.writeFileSync(contextPath, JSON.stringify({
                 event,
                 surface: distribution
@@ -3535,13 +2665,14 @@ function runArtifactRendererFixture(pluginDir, manifest, renderEntry, declaratio
                 },
                 config: {
                     mode: 'artifact-render',
-                    targetScope: scope,
-                    schema: manifest.config?.schema ?? {},
-                    values,
-                    sources: Object.fromEntries(Object.keys(values).map((key) => [key, 'default'])),
+                    targetScope: configScope,
+                    ...(manifest.config?.fields === undefined ? {} : { schema: scopedSchema }),
+                    values: scopedValues,
+                    sources: Object.fromEntries(Object.keys(scopedValues).map((key) => [key, 'default'])),
                     issues: [],
                 },
                 changedConfigKeys: [],
+                requestedArtifactIds: scopedDeclarations.map((target) => target.id),
                 previousArtifacts: [],
                 artifactSources: scopedDeclarations.map((target) => ({
                     id: target.id,
@@ -3550,14 +2681,10 @@ function runArtifactRendererFixture(pluginDir, manifest, renderEntry, declaratio
                 })),
                 runtimeImports,
                 paths: {
-                    awHome: path.join(tempRoot, 'aw-home'),
-                    codexHome: path.join(tempRoot, 'codex-home'),
-                    claudeHome: path.join(tempRoot, 'claude-home'),
+                    awHome: rendererAwHome,
+                    codexHome: rendererCodexHome,
+                    claudeHome: rendererClaudeHome,
                     manifestPath: path.join(pluginDir, '.agents-plugin', 'plugin.json'),
-                    configStores: {
-                        user: path.join(tempRoot, 'config-user.json'),
-                        project: path.join(tempRoot, 'config-project.json'),
-                    },
                 },
                 renderer: {
                     runner: renderEntry.runner,
@@ -3567,14 +2694,17 @@ function runArtifactRendererFixture(pluginDir, manifest, renderEntry, declaratio
                     rendererDigest: 'author-validator-fixture',
                 },
             }), 'utf8');
-            const rendererHome = path.join(tempRoot, 'home');
-            const rendererTemp = path.join(tempRoot, 'tmp');
+            const rendererHome = path.join(requestRoot, 'home');
+            const rendererTemp = path.join(requestRoot, 'tmp');
+            for (const rendererStateHome of [rendererAwHome, rendererCodexHome, rendererClaudeHome]) {
+                fs.mkdirSync(rendererStateHome, { recursive: true });
+            }
             fs.mkdirSync(rendererHome, { recursive: true });
             fs.mkdirSync(rendererTemp, { recursive: true });
             const rendererEnv = {
-                AW_HOME: path.join(tempRoot, 'aw-home'),
-                AW_CODEX_HOME: path.join(tempRoot, 'codex-home'),
-                AW_CLAUDE_HOME: path.join(tempRoot, 'claude-home'),
+                AW_HOME: rendererAwHome,
+                AW_CODEX_HOME: rendererCodexHome,
+                AW_CLAUDE_HOME: rendererClaudeHome,
                 PATH: process.env.PATH ?? process.env.Path ?? '',
                 AW_PLUGIN_CONTEXT: contextPath,
                 AW_PLUGIN_ROOT: pluginDir,
@@ -3655,13 +2785,7 @@ function validateScriptsLightweight(pluginDir, manifest) {
     const scripts = expectRecord(manifest.scripts, 'scripts');
     if (!scripts)
         return null;
-    validateAllowedKeys(scripts, 'scripts', ['timeoutMs', 'lifecycle', 'helpers', 'node', 'artifacts', 'tests']);
-    if (scripts.timeoutMs !== undefined &&
-        (!Number.isInteger(scripts.timeoutMs) ||
-            scripts.timeoutMs < SCRIPT_TIMEOUT_MIN_MS ||
-            scripts.timeoutMs > SCRIPT_TIMEOUT_MAX_MS)) {
-        error(`scripts.timeoutMs must be an integer between ${SCRIPT_TIMEOUT_MIN_MS} and ${SCRIPT_TIMEOUT_MAX_MS}`);
-    }
+    validateAllowedKeys(scripts, 'scripts', ['preApply', 'helpers', 'node', 'artifacts', 'tests']);
     const runtimeNodeEntries = [];
     let artifactRenderEntry = null;
     let packageMeta = null;
@@ -3678,17 +2802,21 @@ function validateScriptsLightweight(pluginDir, manifest) {
                 runtimeNodeEntries.push({ path: helperPath, fieldName: 'scripts.helpers.config' });
         }
     }
-    if (scripts.lifecycle !== undefined) {
-        const lifecycle = expectRecord(scripts.lifecycle, 'scripts.lifecycle');
-        if (lifecycle) {
-            validateAllowedKeys(lifecycle, 'scripts.lifecycle', [...SCRIPT_LIFECYCLE_EVENTS]);
-            for (const [eventName, definition] of Object.entries(lifecycle)) {
-                if (!SCRIPT_LIFECYCLE_EVENTS.has(eventName)) {
-                    error(`scripts.lifecycle has unsupported event "${eventName}"`);
-                    continue;
-                }
-                validateLifecycleDefinition(pluginDir, definition, `scripts.lifecycle.${eventName}`, runtimeNodeEntries);
+    if (scripts.preApply !== undefined) {
+        const preApply = expectRecord(scripts.preApply, 'scripts.preApply');
+        if (preApply) {
+            validateAllowedKeys(preApply, 'scripts.preApply', ['path', 'timeoutMs']);
+            const preApplyPath = normalizePluginScriptPath(pluginDir, preApply.path, 'scripts.preApply.path');
+            validateDeclaredScriptFile(pluginDir, preApplyPath, 'scripts.preApply.path');
+            if (preApplyPath && !isNodeRunnablePath(preApplyPath)) {
+                error('scripts.preApply.path must use a Node runnable extension (.js, .mjs, or .cjs)');
             }
+            if (preApply.timeoutMs !== undefined && (!Number.isInteger(preApply.timeoutMs)
+                || preApply.timeoutMs < SCRIPT_TIMEOUT_MIN_MS || preApply.timeoutMs > SCRIPT_TIMEOUT_MAX_MS)) {
+                error(`scripts.preApply.timeoutMs must be an integer between ${SCRIPT_TIMEOUT_MIN_MS} and ${SCRIPT_TIMEOUT_MAX_MS}`);
+            }
+            if (preApplyPath)
+                runtimeNodeEntries.push({ path: preApplyPath, fieldName: 'scripts.preApply.path' });
         }
     }
     if (scripts.node !== undefined) {
@@ -4167,8 +3295,6 @@ function printUsage() {
   aw plugin validate <plugin-directory> [options]
 
 Options:
-  --catalog-min-version <semver>
-                               Validate compatibility.aw.minVersion against a target catalog.
   --strict-agent-skills        Allow only Agent Skills portable core frontmatter.
   --claude-skill-profile <minimum|current>
                                Validate Claude fields at AW minimum 2.1.88 (default) or current docs.
@@ -4238,7 +3364,27 @@ async function validatePluginDir(pluginDir, options) {
     }
     const skillValidationTools = await tryLoadCliSkillValidationTools();
     try {
-        await cliManifestTools.validateSourcePluginManifest(pluginDir, manifest);
+        const normalizedManifest = await cliManifestTools.validateSourcePluginManifest(pluginDir, manifest);
+        const requirements = await cliManifestTools.resolvePluginRequirements({
+            pluginRoot: pluginDir,
+            manifest: normalizedManifest,
+            implementedCapabilities: cliManifestTools.implementedCapabilities,
+        });
+        if (requirements.unsupportedByCurrentAw.length > 0) {
+            capabilityDiagnostic = {
+                errorCode: 'awCapabilityUnsupported',
+                missingCapabilities: requirements.unsupportedByCurrentAw,
+                availableCapabilities: [...cliManifestTools.implementedCapabilities].sort(),
+            };
+            error(`[awCapabilityUnsupported] missingCapabilities=${JSON.stringify(requirements.unsupportedByCurrentAw)}`);
+        }
+        const satisfiedCapabilities = new Set([...requirements.declared, ...requirements.derived]);
+        const advisoryObservations = requirements.observations.filter((observation) => (observation.code !== 'aw-command-detected'
+            || observation.capability === undefined
+            || !satisfiedCapabilities.has(observation.capability)));
+        for (const observation of advisoryObservations) {
+            warn(`[awCapabilityObservation] ${observation.path}: ${observation.message}`);
+        }
     }
     catch (e) {
         error(e.message);
@@ -4249,8 +3395,7 @@ async function validatePluginDir(pluginDir, options) {
     validateNoBuildOutputDirs(pluginDir);
     validateDeclaredNativeAssets(pluginDir, manifest);
     validateCanonicalSkillLayout(pluginDir, manifest);
-    validatePluginVersionContracts(manifest, options);
-    validatePluginEvalManifest(pluginDir, manifest);
+    await validatePluginEvalManifest(pluginDir, manifest);
     const artifactRenderEntry = validateScriptsLightweight(pluginDir, manifest);
     const runtimeImports = await resolveAuthorRuntimeImports({
         pluginDir,
@@ -4300,7 +3445,6 @@ function parseArgs(argv) {
     const args = argv.slice(2);
     const options = {
         pluginDir: null,
-        catalogMinVersion: null,
         strictAgentSkills: false,
         claudeSkillProfile: 'minimum',
         versionBase: 'HEAD',
@@ -4357,18 +3501,6 @@ function parseArgs(argv) {
             }
             exitCliError(`Unknown argument: ${arg}`, options.json);
         }
-        if (arg === '--catalog-min-version') {
-            const value = args[index + 1];
-            if (!value || value.startsWith('--')) {
-                exitCliError('--catalog-min-version requires a value.', options.json);
-            }
-            index += 1;
-            if (!STRICT_SEMVER_PATTERN.test(value)) {
-                exitCliError(`Invalid --catalog-min-version: expected a strict SemVer 2.0.0 string. Received ${JSON.stringify(value)}.`, options.json);
-            }
-            options.catalogMinVersion = value;
-            continue;
-        }
         exitCliError(`Unknown option: ${arg}`, options.json);
     }
     return options;
@@ -4400,7 +3532,6 @@ async function main() {
     const repoRoot = requestedWorkspaceRoot ?? discoverCanonicalRepoRoot(repoRootCandidate);
     const gitRoot = discoverCanonicalRepoRoot(findRepoRootCandidate(resolved));
     await validatePluginDir(resolved, {
-        catalogMinVersion: args.catalogMinVersion,
         strictAgentSkills: args.strictAgentSkills,
         claudeSkillProfile: args.claudeSkillProfile,
         versionBase: args.versionBase,
@@ -4414,9 +3545,12 @@ async function main() {
             profile: args.strictAgentSkills ? 'agent-skills-portable-core' : 'aw-source',
             claudeSkillProfile: args.claudeSkillProfile,
             pluginDirectory: resolved,
+            workspaceRoot: process.env.AW_AUTHORING_WORKSPACE_ROOT ?? repoRoot,
+            workspaceRootResolvedFrom: process.env.AW_AUTHORING_WORKSPACE_ROOT_RESOLVED_FROM ?? 'explicit',
             versionCheck: pluginVersionCheckResult,
             warnings,
             errors,
+            ...(capabilityDiagnostic ?? {}),
         }, null, 2));
         if (errors.length > 0) {
             process.exit(1);