@lesliechan721/aw 0.1.0-beta.58 → 0.1.0-beta.60

package/dist/authoring/scripts/lib/plugin-version-check.mjs

@@ -10,7 +10,7 @@ import { fileURLToPath, pathToFileURL } from 'node:url';
 import { compareStrictSemVer, parseStrictSemVer } from './semver.mjs';
 import { assertAuthoringPluginPathFence, resolveAuthoringPluginRoot, } from './plugin-root.mjs';
 const execFileAsync = promisify(execFile);
-const EXPECTED_MANIFEST_CONTRACT_VERSION = 17;
+const EXPECTED_MANIFEST_CONTRACT_VERSION = 18;
 const PLUGIN_NAME_PATTERN = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
 const GIT_OBJECT_ID_PATTERN = /^(?:[0-9a-f]{40}|[0-9a-f]{64})$/u;
 const MAX_GIT_BLOB_BYTES = 50 * 1024 * 1024;

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

@@ -6,7 +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 { AW_RUNTIME_CONFIG_READER_PATH, createRuntimeConfigSnapshot, getPluginAuthoringAcceptedValues as getCorePluginAuthoringAcceptedValues, getSkillFrontmatterCapabilityRegistry, getManagedCommandArtifactTargets, normalizePluginConfigDefinition, parseManagedCommandPlaceholders, replaceManagedCommandPlaceholders, validateCommandEntryFiles, } from '@lesliechan721/aw-plugin-core/manifest';
+import { AW_RUNTIME_CONFIG_READER_PATH, createNativeToolReaderSource, createRuntimeConfigSnapshot, getPluginAuthoringAcceptedValues as getCorePluginAuthoringAcceptedValues, getSkillFrontmatterCapabilityRegistry, getManagedCommandArtifactTargets, normalizePluginConfigDefinition, parseManagedCommandPlaceholders, replaceManagedCommandPlaceholders, validateCommandEntryFiles, } 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';
@@ -18,7 +18,7 @@ const CLI_PACKAGE_ROOT = path.basename(authoringRuntimeRoot) === 'dist'
     : authoringRuntimeRoot;
 const errors = [];
 const warnings = [];
-const SOURCE_PLUGIN_MANIFEST_CONTRACT_VERSION = 17;
+const SOURCE_PLUGIN_MANIFEST_CONTRACT_VERSION = 18;
 let capabilityDiagnostic = null;
 const MAX_SKILL_NAME_LEN = 64;
 const MAX_SKILL_DESCRIPTION_LEN = 1024;
@@ -1645,6 +1645,8 @@ function scanNodeImportContract(pluginDir, entryPaths, options) {
                 }
                 if (!resolved.path) {
                     const requested = path.posix.normalize(path.posix.join(path.posix.dirname(relativePath), specifier));
+                    if (options.nativeToolReader && requested === options.nativeToolReader)
+                        continue;
                     if ((options.runtimeConfigSkillRoots ?? []).some((root) => (relativePath.startsWith(`${root}/`)
                         && requested === path.posix.join(root, AW_RUNTIME_CONFIG_READER_PATH))))
                         continue;
@@ -2918,8 +2920,20 @@ async function validateAuthorManagedCommands(pluginDir, manifest, rendered, cont
             const sets = (manifest.managedCommands?.sets ?? [])
                 .filter((set) => set.producer.kind === 'package' && set.producer.packageKey === commandPackage.key)
                 .map((set) => setOutputs(set, 'managed-commands', commandPackage.scope));
-            const files = rendered.find((entry) => entry.artifact.id === `command-package.${commandPackage.key}`)?.artifact.files ?? {};
-            const prepared = await tools.prepareManagedCommandPackageFiles({ sourceRoot: path.join(pluginDir, normalizeRelativePath(commandPackage.sourceDir)), files, entries: sets.flatMap((set) => set.entries) });
+            const sourceRoot = path.join(pluginDir, normalizeRelativePath(commandPackage.sourceDir));
+            const files = { ...(rendered.find((entry) => entry.artifact.id === `command-package.${commandPackage.key}`)?.artifact.files ?? {}) };
+            if (manifest.nativeTools) {
+                const readerPath = path.join(pluginDir, normalizeRelativePath(manifest.nativeTools.reader));
+                const relativeReader = path.relative(sourceRoot, readerPath);
+                if (relativeReader && relativeReader !== '..' && !relativeReader.startsWith(`..${path.sep}`) && !path.isAbsolute(relativeReader) && !fs.existsSync(readerPath)) {
+                    const readerFile = relativeReader.split(path.sep).join('/');
+                    const readerSource = createNativeToolReaderSource();
+                    if (Object.hasOwn(files, readerFile) && files[readerFile] !== readerSource)
+                        throw new Error('nativeToolReaderMismatch');
+                    files[readerFile] = readerSource;
+                }
+            }
+            const prepared = await tools.prepareManagedCommandPackageFiles({ sourceRoot, files, entries: sets.flatMap((set) => set.entries) });
             cleanups.push(prepared.cleanup);
             candidates.push({ producer: await tools.managedCommandProducerIdentity({ plugin, producer: { kind: 'package', packageKey: commandPackage.key }, scope: commandPackage.scope, cwd: pluginDir }), sets });
         }
@@ -2994,6 +3008,7 @@ function validateScriptsLightweight(pluginDir, manifest) {
     const runtimeNodeEntries = [];
     let artifactRenderEntry = null;
     let packageMeta = null;
+    const nativeToolReader = manifest.nativeTools ? normalizeRelativePath(manifest.nativeTools.reader ?? './.aw/native-tool-reader.mjs') : undefined;
     const runtimeConfigSkillRoots = (manifest.artifacts?.targets ?? [])
         .filter((target) => target.runtimeConfig !== undefined)
         .flatMap((target) => target.sourceDirs ?? [])
@@ -3046,6 +3061,7 @@ function validateScriptsLightweight(pluginDir, manifest) {
                         packageMeta,
                         allowDevDependencies: true,
                         runtimeConfigSkillRoots,
+                        nativeToolReader,
                     });
                 }
             }
@@ -3096,6 +3112,7 @@ function validateScriptsLightweight(pluginDir, manifest) {
                         packageMeta,
                         allowDevDependencies: true,
                         runtimeConfigSkillRoots,
+                        nativeToolReader,
                     });
                 }
             }
@@ -3106,6 +3123,7 @@ function validateScriptsLightweight(pluginDir, manifest) {
         packageMeta,
         allowDevDependencies: false,
         runtimeConfigSkillRoots,
+        nativeToolReader,
     });
     return artifactRenderEntry;
 }