lua-cli 3.5.0-beta.1 → 3.6.0

package/dist/compiler/plugins/mcp-server.plugin.js

@@ -5,12 +5,8 @@
  * 1. Class-based (legacy): new LuaMCPServer({ ... })
  * 2. Function-based (new): const myServer = defineMCPServer({ ... })
  */
-import { Node } from 'ts-morph';
-import { build } from 'esbuild';
-import { PrimitiveKind, } from '../types.js';
-import { BasePlugin, validationError, validationWarning } from './base.js';
-import { extractStringProperty } from '../utils/ast-helpers.js';
-import { compressForPush } from '../../utils/artifact-loader.js';
+import { BasePlugin, validationError } from './base.js';
+import { extractStringProperty, extractSchemaProperty, isFunction, extractFunctionProperty } from '../utils/ast-helpers.js';
 /**
  * Plugin for compiling MCP server primitives.
  * Extends BasePlugin for common detection/entry point/postProcess logic.
@@ -33,10 +29,19 @@ export class MCPServerPlugin extends BasePlugin {
         const transport = extractStringProperty(config, 'transport') || 'streamable-http';
         const url = extractStringProperty(config, 'url');
         // Check for resolver functions and extract their source text
-        const hasUrlResolver = this.hasResolverFunction(config, 'url');
-        const hasHeadersResolver = this.hasResolverFunction(config, 'headers');
-        const urlResolverSource = hasUrlResolver ? this.getResolverSource(config, 'url') : undefined;
-        const headersResolverSource = hasHeadersResolver ? this.getResolverSource(config, 'headers') : undefined;
+        // Try both AST extraction (inline functions) and evaluation (variable references)
+        const urlProp = extractSchemaProperty(config, 'url');
+        const headersProp = extractSchemaProperty(config, 'headers');
+        const urlResolverEvaluated = extractFunctionProperty(config, 'url');
+        const headersResolverEvaluated = extractFunctionProperty(config, 'headers');
+        const hasUrlResolver = (urlProp && isFunction(urlProp)) || urlResolverEvaluated !== undefined;
+        const hasHeadersResolver = (headersProp && isFunction(headersProp)) || headersResolverEvaluated !== undefined;
+        const urlResolverSource = hasUrlResolver
+            ? (urlProp && isFunction(urlProp) ? urlProp.getText() : urlResolverEvaluated?.toString())
+            : undefined;
+        const headersResolverSource = hasHeadersResolver
+            ? (headersProp && isFunction(headersProp) ? headersProp.getText() : headersResolverEvaluated?.toString())
+            : undefined;
         return {
             kind: this.kind,
             ...common,
@@ -51,78 +56,8 @@ export class MCPServerPlugin extends BasePlugin {
             },
         };
     }
-    /**
-     * Extract the source text of a resolver function property.
-     */
-    getResolverSource(config, propName) {
-        const prop = config.getProperty(propName);
-        if (!prop || !Node.isPropertyAssignment(prop))
-            return undefined;
-        const value = prop.getInitializer();
-        if (!value)
-            return undefined;
-        if (Node.isArrowFunction(value) || Node.isFunctionExpression(value)) {
-            return value.getText();
-        }
-        return undefined;
-    }
-    /**
-     * Bundle a resolver function into a self-contained, compressed, VM-executable string.
-     * This is called during compilation for MCP servers with dynamic resolvers.
-     */
-    async bundleResolver(functionCode, resolverType, serverName, outDir) {
-        try {
-            const moduleCode = `const resolverFunc = ${functionCode};\nexport default resolverFunc;\n`;
-            const result = await build({
-                stdin: {
-                    contents: moduleCode,
-                    resolveDir: outDir,
-                    loader: 'ts',
-                },
-                bundle: true,
-                platform: 'node',
-                target: 'node18',
-                format: 'cjs',
-                minify: true,
-                write: false,
-                external: ['zod'],
-            });
-            const bundledCode = result.outputFiles?.[0]?.text ?? '';
-            if (!bundledCode) {
-                throw new Error(`esbuild produced empty output for MCP ${resolverType} resolver`);
-            }
-            // Wrap for VM execution and compress (gzip + base64)
-            const wrappedCode = `(async () => {\n  ${bundledCode}\n  const resolverFunc = module.exports.default || module.exports;\n  return resolverFunc();\n})()`;
-            return compressForPush(wrappedCode);
-        }
-        catch (error) {
-            console.warn(`Warning: Could not bundle MCP ${resolverType} resolver for ${serverName}: ${error.message}`);
-            try {
-                return compressForPush(`(${functionCode})()`);
-            }
-            catch {
-                return null;
-            }
-        }
-    }
-    /**
-     * Check if a property has a resolver function (arrow function or function expression).
-     */
-    hasResolverFunction(config, propName) {
-        const prop = config.getProperty(propName);
-        if (!prop || !Node.isPropertyAssignment(prop))
-            return false;
-        const value = prop.getInitializer();
-        if (!value)
-            return false;
-        return Node.isArrowFunction(value) || Node.isFunctionExpression(value);
-    }
     validate(metadata) {
-        const errors = [];
-        const warnings = [];
-        if (!metadata.name) {
-            errors.push(validationError('MCP Server must have a name', { line: metadata.line }));
-        }
+        const { errors, warnings } = this.baseValidation(metadata);
         const transport = metadata.metadata.transport;
         const validTransports = ['streamable-http', 'sse'];
         if (transport === 'stdio') {
@@ -138,14 +73,7 @@ export class MCPServerPlugin extends BasePlugin {
         if (!metadata.metadata.url && !metadata.metadata.hasUrlResolver) {
             errors.push(validationError('MCP Server must have a url or url resolver', { line: metadata.line }));
         }
-        if (!metadata.description) {
-            warnings.push(validationWarning('MCP Server should have a description', { line: metadata.line }));
-        }
-        return {
-            valid: errors.length === 0,
-            errors,
-            warnings,
-        };
+        return { valid: errors.length === 0, errors, warnings };
     }
     /**
      * Add transport field to the entry point.
@@ -155,32 +83,19 @@ export class MCPServerPlugin extends BasePlugin {
     }
     /**
      * Create the manifest entry for an MCP server.
-     * Bundles resolver functions (url/headers) if present.
+     * url/headers resolver functions are bundled inside the artifact (same as all primitives).
      */
-    async toManifestEntry(compiled, context) {
+    toManifestEntry(compiled, _allPrimitives) {
         const mcpMeta = compiled.metadata;
-        const outDir = context?.outDir || process.cwd();
-        // Bundle resolver functions if present
-        let urlResolver;
-        let headersResolver;
-        if (mcpMeta.urlResolverSource) {
-            urlResolver = await this.bundleResolver(mcpMeta.urlResolverSource, 'url', compiled.name, outDir) ?? undefined;
-        }
-        if (mcpMeta.headersResolverSource) {
-            headersResolver = await this.bundleResolver(mcpMeta.headersResolverSource, 'headers', compiled.name, outDir) ?? undefined;
-        }
-        const mcpServer = {
-            kind: PrimitiveKind.MCP_SERVER,
-            name: compiled.name,
-            description: compiled.description,
-            path: `artifacts/${compiled.kind}/${compiled.name}.js`,
-            sourcePath: compiled.sourcePath,
-            hash: compiled.artifact.hash,
-            config: mcpMeta.config,
-            urlResolver,
-            headersResolver,
+        return {
+            ...this.baseManifestFields(compiled),
+            config: {
+                transport: mcpMeta.transport,
+                url: mcpMeta.url,
+            },
+            hasUrlResolver: mcpMeta.hasUrlResolver || undefined,
+            hasHeadersResolver: mcpMeta.hasHeadersResolver || undefined,
         };
-        return mcpServer;
     }
 }
 //# sourceMappingURL=mcp-server.plugin.js.map

package/dist/compiler/plugins/mcp-server.plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-server.plugin.js","sourceRoot":"","sources":["../../../src/compiler/plugins/mcp-server.plugin.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mcp-server.plugin.js","sourceRoot":"","sources":["../../../src/compiler/plugins/mcp-server.plugin.ts"],"names":[],"mappings":"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"}

package/dist/compiler/plugins/postprocessor.plugin.d.ts

@@ -5,7 +5,7 @@
  * Minimal — just config fields and manifest entry.
  */
 import { ObjectLiteralExpression } from 'ts-morph';
-import { type PostProcessorMetadata, type PostProcessorMetadataFields, type ManifestContext, type CompiledPrimitive, type ManifestPrimitive } from '../types.js';
+import { type PostProcessorMetadata, type PostProcessorMetadataFields, type CompiledPrimitive, type ManifestPrimitive } from '../types.js';
 import { ProcessorPluginBase } from './processor-base.js';
 export declare class PostProcessorPlugin extends ProcessorPluginBase<PostProcessorMetadataFields> {
     readonly kind = "postprocessor";
@@ -16,5 +16,6 @@ export declare class PostProcessorPlugin extends ProcessorPluginBase<PostProcess
         line: number;
         column: number;
     }, pattern: 'function' | 'class'): PostProcessorMetadata | null;
-    toManifestEntry(compiled: CompiledPrimitive, _context?: ManifestContext): ManifestPrimitive;
+    toManifestEntry(compiled: CompiledPrimitive, _allPrimitives?: CompiledPrimitive[]): ManifestPrimitive;
 }
+//# sourceMappingURL=postprocessor.plugin.d.ts.map

package/dist/compiler/plugins/postprocessor.plugin.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"postprocessor.plugin.d.ts","sourceRoot":"","sources":["../../../src/compiler/plugins/postprocessor.plugin.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAC;AACnD,OAAO,EACL,KAAK,qBAAqB,EAC1B,KAAK,2BAA2B,EAChC,KAAK,iBAAiB,EACtB,KAAK,iBAAiB,EAEvB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAE1D,qBAAa,mBAAoB,SAAQ,mBAAmB,CAAC,2BAA2B,CAAC;IACvF,QAAQ,CAAC,IAAI,mBAAmB;IAChC,QAAQ,CAAC,WAAW,mBAAmB;IACvC,QAAQ,CAAC,cAAc,yBAAyB;IAChD,QAAQ,CAAC,gBAAgB,WAAyC;IAElE,SAAS,CAAC,iBAAiB,CACzB,MAAM,EAAE,uBAAuB,EAC/B,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,EAC1C,OAAO,EAAE,UAAU,GAAG,OAAO,GAC5B,qBAAqB,GAAG,IAAI;IAW/B,eAAe,CAAC,QAAQ,EAAE,iBAAiB,EAAE,cAAc,CAAC,EAAE,iBAAiB,EAAE,GAAG,iBAAiB;CAGtG"}

package/dist/compiler/plugins/postprocessor.plugin.js

@@ -4,7 +4,6 @@
  * Extends ProcessorPluginBase for shared validation and runtime checks.
  * Minimal — just config fields and manifest entry.
  */
-import { PrimitiveKind, } from '../types.js';
 import { ProcessorPluginBase } from './processor-base.js';
 export class PostProcessorPlugin extends ProcessorPluginBase {
     constructor() {
@@ -24,16 +23,8 @@ export class PostProcessorPlugin extends ProcessorPluginBase {
             metadata: { pattern, hasExecute: config.getProperty('execute') !== undefined },
         };
     }
-    toManifestEntry(compiled, _context) {
-        const postprocessor = {
-            kind: PrimitiveKind.POSTPROCESSOR,
-            name: compiled.name,
-            description: compiled.description,
-            path: `artifacts/${compiled.kind}/${compiled.name}.js`,
-            sourcePath: compiled.sourcePath,
-            hash: compiled.artifact.hash,
-        };
-        return postprocessor;
+    toManifestEntry(compiled, _allPrimitives) {
+        return { ...this.baseManifestFields(compiled) };
     }
 }
 //# sourceMappingURL=postprocessor.plugin.js.map

package/dist/compiler/plugins/postprocessor.plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"postprocessor.plugin.js","sourceRoot":"","sources":["../../../src/compiler/plugins/postprocessor.plugin.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EACL,aAAa,GAOd,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAE1D,MAAM,OAAO,mBAAoB,SAAQ,mBAAgD;IAAzF;;QACW,SAAI,GAAG,eAAe,CAAC;QACvB,gBAAW,GAAG,eAAe,CAAC;QAC9B,mBAAc,GAAG,qBAAqB,CAAC;QACvC,qBAAgB,GAAG,CAAC,eAAe,EAAE,kBAAkB,CAAC,CAAC;IA8BpE,CAAC;IA5BW,iBAAiB,CACzB,MAA+B,EAC/B,UAAkB,EAClB,UAAkB,EAClB,QAA0C,EAC1C,OAA6B;QAE7B,MAAM,MAAM,GAAG,IAAI,CAAC,mBAAmB,CAAC,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;QAClF,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC;QAEzB,OAAO;YACL,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,GAAG,MAAM;YACT,QAAQ,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,KAAK,SAAS,EAAE;SAC/E,CAAC;IACJ,CAAC;IAED,eAAe,CAAC,QAA2B,EAAE,QAA0B;QACrE,MAAM,aAAa,GAA0B;YAC3C,IAAI,EAAE,aAAa,CAAC,aAAa;YACjC,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,WAAW,EAAE,QAAQ,CAAC,WAAW;YACjC,IAAI,EAAE,aAAa,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC,IAAI,KAAK;YACtD,UAAU,EAAE,QAAQ,CAAC,UAAU;YAC/B,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,IAAI;SAC7B,CAAC;QACF,OAAO,aAAa,CAAC;IACvB,CAAC;CACF"}
+{"version":3,"file":"postprocessor.plugin.js","sourceRoot":"","sources":["../../../src/compiler/plugins/postprocessor.plugin.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAUH,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAE1D,MAAM,OAAO,mBAAoB,SAAQ,mBAAgD;IAAzF;;QACW,SAAI,GAAG,eAAe,CAAC;QACvB,gBAAW,GAAG,eAAe,CAAC;QAC9B,mBAAc,GAAG,qBAAqB,CAAC;QACvC,qBAAgB,GAAG,CAAC,eAAe,EAAE,kBAAkB,CAAC,CAAC;IAsBpE,CAAC;IApBW,iBAAiB,CACzB,MAA+B,EAC/B,UAAkB,EAClB,UAAkB,EAClB,QAA0C,EAC1C,OAA6B;QAE7B,MAAM,MAAM,GAAG,IAAI,CAAC,mBAAmB,CAAC,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;QAClF,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC;QAEzB,OAAO;YACL,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,GAAG,MAAM;YACT,QAAQ,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,KAAK,SAAS,EAAE;SAC/E,CAAC;IACJ,CAAC;IAED,eAAe,CAAC,QAA2B,EAAE,cAAoC;QAC/E,OAAO,EAAE,GAAG,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,EAA2B,CAAC;IAC3E,CAAC;CACF"}

package/dist/compiler/plugins/preprocessor.plugin.d.ts

@@ -5,7 +5,7 @@
  * Only adds: isAsync extraction + isAsync in manifest entry.
  */
 import { ObjectLiteralExpression } from 'ts-morph';
-import { type PreProcessorMetadata, type PreProcessorMetadataFields, type ManifestContext, type CompiledPrimitive, type ManifestPrimitive } from '../types.js';
+import { type PreProcessorMetadata, type PreProcessorMetadataFields, type CompiledPrimitive, type ManifestPrimitive } from '../types.js';
 import { ProcessorPluginBase } from './processor-base.js';
 export declare class PreProcessorPlugin extends ProcessorPluginBase<PreProcessorMetadataFields> {
     readonly kind = "preprocessor";
@@ -16,5 +16,6 @@ export declare class PreProcessorPlugin extends ProcessorPluginBase<PreProcessor
         line: number;
         column: number;
     }, pattern: 'function' | 'class'): PreProcessorMetadata | null;
-    toManifestEntry(compiled: CompiledPrimitive, _context?: ManifestContext): ManifestPrimitive;
+    toManifestEntry(compiled: CompiledPrimitive, _allPrimitives?: CompiledPrimitive[]): ManifestPrimitive;
 }
+//# sourceMappingURL=preprocessor.plugin.d.ts.map

package/dist/compiler/plugins/preprocessor.plugin.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"preprocessor.plugin.d.ts","sourceRoot":"","sources":["../../../src/compiler/plugins/preprocessor.plugin.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAC;AACnD,OAAO,EACL,KAAK,oBAAoB,EACzB,KAAK,0BAA0B,EAC/B,KAAK,iBAAiB,EACtB,KAAK,iBAAiB,EAEvB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAG1D,qBAAa,kBAAmB,SAAQ,mBAAmB,CAAC,0BAA0B,CAAC;IACrF,QAAQ,CAAC,IAAI,kBAAkB;IAC/B,QAAQ,CAAC,WAAW,kBAAkB;IACtC,QAAQ,CAAC,cAAc,wBAAwB;IAC/C,QAAQ,CAAC,gBAAgB,WAAuC;IAEhE,SAAS,CAAC,iBAAiB,CACzB,MAAM,EAAE,uBAAuB,EAC/B,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,EAC1C,OAAO,EAAE,UAAU,GAAG,OAAO,GAC5B,oBAAoB,GAAG,IAAI;IAa9B,eAAe,CAAC,QAAQ,EAAE,iBAAiB,EAAE,cAAc,CAAC,EAAE,iBAAiB,EAAE,GAAG,iBAAiB;CAMtG"}

package/dist/compiler/plugins/preprocessor.plugin.js

@@ -4,9 +4,8 @@
  * Extends ProcessorPluginBase for shared validation and runtime checks.
  * Only adds: isAsync extraction + isAsync in manifest entry.
  */
-import { Node, SyntaxKind } from 'ts-morph';
-import { PrimitiveKind, } from '../types.js';
 import { ProcessorPluginBase } from './processor-base.js';
+import { extractBooleanProperty } from '../utils/ast-helpers.js';
 export class PreProcessorPlugin extends ProcessorPluginBase {
     constructor() {
         super(...arguments);
@@ -19,30 +18,18 @@ export class PreProcessorPlugin extends ProcessorPluginBase {
         const common = this.extractCommonFields(config, exportName, sourcePath, position);
         if (!common)
             return null;
-        let isAsync = false;
-        const asyncProp = config.getProperty('async');
-        if (asyncProp && Node.isPropertyAssignment(asyncProp)) {
-            const init = asyncProp.getInitializer();
-            if (init)
-                isAsync = init.getKind() === SyntaxKind.TrueKeyword;
-        }
+        const isAsync = extractBooleanProperty(config, 'async') ?? false;
         return {
             kind: this.kind,
             ...common,
             metadata: { pattern, hasExecute: config.getProperty('execute') !== undefined, isAsync },
         };
     }
-    toManifestEntry(compiled, _context) {
-        const preprocessor = {
-            kind: PrimitiveKind.PREPROCESSOR,
-            name: compiled.name,
-            description: compiled.description,
-            path: `artifacts/${compiled.kind}/${compiled.name}.js`,
-            sourcePath: compiled.sourcePath,
-            hash: compiled.artifact.hash,
+    toManifestEntry(compiled, _allPrimitives) {
+        return {
+            ...this.baseManifestFields(compiled),
             isAsync: compiled.metadata?.isAsync ?? false,
         };
-        return preprocessor;
     }
 }
 //# sourceMappingURL=preprocessor.plugin.js.map

package/dist/compiler/plugins/preprocessor.plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"preprocessor.plugin.js","sourceRoot":"","sources":["../../../src/compiler/plugins/preprocessor.plugin.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAA2B,IAAI,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACrE,OAAO,EACL,aAAa,GAOd,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAE1D,MAAM,OAAO,kBAAmB,SAAQ,mBAA+C;IAAvF;;QACW,SAAI,GAAG,cAAc,CAAC;QACtB,gBAAW,GAAG,cAAc,CAAC;QAC7B,mBAAc,GAAG,oBAAoB,CAAC;QACtC,qBAAgB,GAAG,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAAC;IAsClE,CAAC;IApCW,iBAAiB,CACzB,MAA+B,EAC/B,UAAkB,EAClB,UAAkB,EAClB,QAA0C,EAC1C,OAA6B;QAE7B,MAAM,MAAM,GAAG,IAAI,CAAC,mBAAmB,CAAC,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;QAClF,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC;QAEzB,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,MAAM,SAAS,GAAG,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAC9C,IAAI,SAAS,IAAI,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC,EAAE,CAAC;YACtD,MAAM,IAAI,GAAG,SAAS,CAAC,cAAc,EAAE,CAAC;YACxC,IAAI,IAAI;gBAAE,OAAO,GAAG,IAAI,CAAC,OAAO,EAAE,KAAK,UAAU,CAAC,WAAW,CAAC;QAChE,CAAC;QAED,OAAO;YACL,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,GAAG,MAAM;YACT,QAAQ,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,KAAK,SAAS,EAAE,OAAO,EAAE;SACxF,CAAC;IACJ,CAAC;IAED,eAAe,CAAC,QAA2B,EAAE,QAA0B;QACrE,MAAM,YAAY,GAAyB;YACzC,IAAI,EAAE,aAAa,CAAC,YAAY;YAChC,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,WAAW,EAAE,QAAQ,CAAC,WAAW;YACjC,IAAI,EAAE,aAAa,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC,IAAI,KAAK;YACtD,UAAU,EAAE,QAAQ,CAAC,UAAU;YAC/B,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,IAAI;YAC5B,OAAO,EAAG,QAAQ,CAAC,QAAuC,EAAE,OAAO,IAAI,KAAK;SAC7E,CAAC;QACF,OAAO,YAAY,CAAC;IACtB,CAAC;CACF"}
+{"version":3,"file":"preprocessor.plugin.js","sourceRoot":"","sources":["../../../src/compiler/plugins/preprocessor.plugin.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAUH,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,MAAM,OAAO,kBAAmB,SAAQ,mBAA+C;IAAvF;;QACW,SAAI,GAAG,cAAc,CAAC;QACtB,gBAAW,GAAG,cAAc,CAAC;QAC7B,mBAAc,GAAG,oBAAoB,CAAC;QACtC,qBAAgB,GAAG,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAAC;IA2BlE,CAAC;IAzBW,iBAAiB,CACzB,MAA+B,EAC/B,UAAkB,EAClB,UAAkB,EAClB,QAA0C,EAC1C,OAA6B;QAE7B,MAAM,MAAM,GAAG,IAAI,CAAC,mBAAmB,CAAC,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;QAClF,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC;QAEzB,MAAM,OAAO,GAAG,sBAAsB,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,KAAK,CAAC;QAEjE,OAAO;YACL,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,GAAG,MAAM;YACT,QAAQ,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,KAAK,SAAS,EAAE,OAAO,EAAE;SACxF,CAAC;IACJ,CAAC;IAED,eAAe,CAAC,QAA2B,EAAE,cAAoC;QAC/E,OAAO;YACL,GAAG,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC;YACpC,OAAO,EAAG,QAAQ,CAAC,QAAuC,EAAE,OAAO,IAAI,KAAK;SACrD,CAAC;IAC5B,CAAC;CACF"}

package/dist/compiler/plugins/processor-base.d.ts

@@ -14,3 +14,4 @@ export declare abstract class ProcessorPluginBase<T extends ProcessorMetadataFie
     validate(metadata: PrimitiveMetadata<T>): ValidationResult;
     protected getRuntimeValidation(): string;
 }
+//# sourceMappingURL=processor-base.d.ts.map

package/dist/compiler/plugins/processor-base.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"processor-base.d.ts","sourceRoot":"","sources":["../../../src/compiler/plugins/processor-base.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAChG,OAAO,EAAE,UAAU,EAAmB,MAAM,WAAW,CAAC;AAExD,8BAAsB,mBAAmB,CAAC,CAAC,SAAS,uBAAuB,CAAE,SAAQ,UAAU,CAAC,CAAC,CAAC;IAChG,QAAQ,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC,CAAC,GAAG,gBAAgB;IAU1D,SAAS,CAAC,oBAAoB,IAAI,MAAM;CAMzC"}

package/dist/compiler/plugins/processor-base.js

@@ -8,20 +8,13 @@
  * - extractFromConfig() (preprocessor extracts isAsync, postprocessor doesn't)
  * - toManifestEntry() (preprocessor includes isAsync field)
  */
-import { BasePlugin, validationError, validationWarning } from './base.js';
+import { BasePlugin, validationError } from './base.js';
 export class ProcessorPluginBase extends BasePlugin {
     validate(metadata) {
-        const errors = [];
-        const warnings = [];
-        if (!metadata.name) {
-            errors.push(validationError(`${this.displayName} must have a name`, { line: metadata.line }));
-        }
+        const { errors, warnings } = this.baseValidation(metadata);
         if (!metadata.metadata?.hasExecute) {
             errors.push(validationError(`${this.displayName} must have an execute function`, { line: metadata.line }));
         }
-        if (!metadata.description) {
-            warnings.push(validationWarning(`${this.displayName} should have a description`, { line: metadata.line }));
-        }
         return { valid: errors.length === 0, errors, warnings };
     }
     getRuntimeValidation() {

package/dist/compiler/plugins/processor-base.js.map

@@ -1 +1 @@
-{"version":3,"file":"processor-base.js","sourceRoot":"","sources":["../../../src/compiler/plugins/processor-base.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAGH,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAE3E,MAAM,OAAgB,mBAAuD,SAAQ,UAAa;IAChG,QAAQ,CAAC,QAA8B;QACrC,MAAM,MAAM,GAA+B,EAAE,CAAC;QAC9C,MAAM,QAAQ,GAAiC,EAAE,CAAC;QAElD,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;YACnB,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,IAAI,CAAC,WAAW,mBAAmB,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QAChG,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,UAAU,EAAE,CAAC;YACnC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,IAAI,CAAC,WAAW,gCAAgC,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QAC7G,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC;YAC1B,QAAQ,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,IAAI,CAAC,WAAW,4BAA4B,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QAC7G,CAAC;QAED,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;IAC1D,CAAC;IAES,oBAAoB;QAC5B,OAAO;;qCAE0B,IAAI,CAAC,IAAI;IAC1C,CAAC;IACH,CAAC;CACF"}
+{"version":3,"file":"processor-base.js","sourceRoot":"","sources":["../../../src/compiler/plugins/processor-base.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAGH,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAExD,MAAM,OAAgB,mBAAuD,SAAQ,UAAa;IAChG,QAAQ,CAAC,QAA8B;QACrC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;QAE3D,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,UAAU,EAAE,CAAC;YACnC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,IAAI,CAAC,WAAW,gCAAgC,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QAC7G,CAAC;QAED,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;IAC1D,CAAC;IAES,oBAAoB;QAC5B,OAAO;;qCAE0B,IAAI,CAAC,IAAI;IAC1C,CAAC;IACH,CAAC;CACF"}

package/dist/compiler/plugins/registry.d.ts

@@ -59,3 +59,4 @@ export declare function getAllDefineFunctions(): string[];
  * Get plugin by define function name.
  */
 export declare function getPluginByDefineFunction(funcName: string): CompilationPlugin | undefined;
+//# sourceMappingURL=registry.d.ts.map

package/dist/compiler/plugins/registry.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../../src/compiler/plugins/registry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAUnD;;;;;GAKG;AACH,qBAAa,cAAc;IACzB,OAAO,CAAC,OAAO,CAA6C;;IAoB5D;;;OAGG;IACH,QAAQ,CAAC,MAAM,EAAE,iBAAiB,GAAG,IAAI;IAWzC;;OAEG;IACH,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,iBAAiB,GAAG,SAAS;IAIhD;;OAEG;IACH,MAAM,IAAI,iBAAiB,EAAE;IAI7B;;OAEG;IACH,WAAW,IAAI,MAAM,EAAE;IAIvB;;OAEG;IACH,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAI1B;;OAEG;IACH,IAAI,IAAI,IAAI,MAAM,CAEjB;CACF;AAMD;;;GAGG;AACH,eAAO,MAAM,cAAc,gBAAuB,CAAC;AAMnD;;;GAGG;AACH,wBAAgB,qBAAqB,IAAI,MAAM,EAAE,CAEhD;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,MAAM,GAAG,iBAAiB,GAAG,SAAS,CAEzF"}

package/dist/compiler/plugins/registry.js

@@ -16,6 +16,7 @@ import { PreProcessorPlugin } from './preprocessor.plugin.js';
 import { PostProcessorPlugin } from './postprocessor.plugin.js';
 import { MCPServerPlugin } from './mcp-server.plugin.js';
 import { SkillPlugin } from './skill.plugin.js';
+import { AgentPlugin } from './agent.plugin.js';
 /**
  * Registry of all compilation plugins.
  *
@@ -36,6 +37,7 @@ export class PluginRegistry {
         this.register(new PostProcessorPlugin());
         this.register(new MCPServerPlugin());
         this.register(new SkillPlugin());
+        this.register(new AgentPlugin());
         // =========================================================================
     }
     /**

package/dist/compiler/plugins/registry.js.map

@@ -1 +1 @@
-{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../../src/compiler/plugins/registry.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../../src/compiler/plugins/registry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAGH,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD;;;;;GAKG;AACH,MAAM,OAAO,cAAc;IAGzB;QACE,4EAA4E;QAC5E,4BAA4B;QAC5B,4EAA4E;QAC5E,qDAAqD;QAN/C,YAAO,GAAmC,IAAI,GAAG,EAAE,CAAC;QAQ1D,IAAI,CAAC,QAAQ,CAAC,IAAI,UAAU,EAAE,CAAC,CAAC;QAChC,IAAI,CAAC,QAAQ,CAAC,IAAI,SAAS,EAAE,CAAC,CAAC;QAC/B,IAAI,CAAC,QAAQ,CAAC,IAAI,aAAa,EAAE,CAAC,CAAC;QACnC,IAAI,CAAC,QAAQ,CAAC,IAAI,kBAAkB,EAAE,CAAC,CAAC;QACxC,IAAI,CAAC,QAAQ,CAAC,IAAI,mBAAmB,EAAE,CAAC,CAAC;QACzC,IAAI,CAAC,QAAQ,CAAC,IAAI,eAAe,EAAE,CAAC,CAAC;QACrC,IAAI,CAAC,QAAQ,CAAC,IAAI,WAAW,EAAE,CAAC,CAAC;QACjC,IAAI,CAAC,QAAQ,CAAC,IAAI,WAAW,EAAE,CAAC,CAAC;QAEjC,4EAA4E;IAC9E,CAAC;IAED;;;OAGG;IACH,QAAQ,CAAC,MAAyB;QAChC,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;YAClC,MAAM,IAAI,KAAK,CACb,uCAAuC,MAAM,CAAC,IAAI,2BAA2B;gBAC7E,+CAA+C,CAChD,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACxC,CAAC;IAED;;OAEG;IACH,GAAG,CAAC,IAAY;QACd,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC;IAED;;OAEG;IACH,MAAM;QACJ,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAC3C,CAAC;IAED;;OAEG;IACH,WAAW;QACT,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;IACzC,CAAC;IAED;;OAEG;IACH,GAAG,CAAC,IAAY;QACd,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC;IAED;;OAEG;IACH,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;IAC3B,CAAC;CACF;AAED,gFAAgF;AAChF,qBAAqB;AACrB,gFAAgF;AAEhF;;;GAGG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,cAAc,EAAE,CAAC;AAEnD,gFAAgF;AAChF,mBAAmB;AACnB,gFAAgF;AAEhF;;;GAGG;AACH,MAAM,UAAU,qBAAqB;IACnC,OAAO,cAAc,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC;AAC5D,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,yBAAyB,CAAC,QAAgB;IACxD,OAAO,cAAc,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,cAAc,KAAK,QAAQ,CAAC,CAAC;AAC1E,CAAC"}

package/dist/compiler/plugins/skill.plugin.d.ts

@@ -14,7 +14,7 @@
  * - tool references (names of tools belonging to this skill)
  */
 import { SourceFile, ObjectLiteralExpression } from 'ts-morph';
-import { type PrimitiveMetadata, type SkillMetadata, type SkillMetadataFields, type ValidationResult, type ManifestContext, type CompiledPrimitive, type ManifestPrimitive } from '../types.js';
+import { type PrimitiveMetadata, type SkillMetadata, type SkillMetadataFields, type ValidationResult, type CompiledPrimitive, type ManifestPrimitive } from '../types.js';
 import { BasePlugin, ReferenceResolverContext } from './base.js';
 /**
  * Plugin for compiling skill primitives.
@@ -65,7 +65,8 @@ export declare class SkillPlugin extends BasePlugin<SkillMetadataFields> {
     private resolveClassImport;
     /**
      * Create the manifest entry for a skill.
-     * Resolves tool class names to actual tool names using context.
+     * Resolves tool class/variable names to actual tool names using allPrimitives.
      */
-    toManifestEntry(compiled: CompiledPrimitive, context?: ManifestContext): ManifestPrimitive;
+    toManifestEntry(compiled: CompiledPrimitive, allPrimitives?: CompiledPrimitive[]): ManifestPrimitive;
 }
+//# sourceMappingURL=skill.plugin.d.ts.map

package/dist/compiler/plugins/skill.plugin.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"skill.plugin.d.ts","sourceRoot":"","sources":["../../../src/compiler/plugins/skill.plugin.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,UAAU,EAAQ,uBAAuB,EAAE,MAAM,UAAU,CAAC;AAErE,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,aAAa,EAClB,KAAK,mBAAmB,EAExB,KAAK,gBAAgB,EACrB,KAAK,iBAAiB,EACtB,KAAK,iBAAiB,EAEvB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,UAAU,EAAE,wBAAwB,EAAqB,MAAM,WAAW,CAAC;AAGpF;;;GAGG;AACH,qBAAa,WAAY,SAAQ,UAAU,CAAC,mBAAmB,CAAC;IAC9D,QAAQ,CAAC,IAAI,WAAW;IACxB,QAAQ,CAAC,WAAW,WAAW;IAC/B,QAAQ,CAAC,cAAc,iBAAiB;IACxC,QAAQ,CAAC,gBAAgB,WAAgB;IAEzC;;OAEG;IACH,SAAS,CAAC,iBAAiB,CACzB,MAAM,EAAE,uBAAuB,EAC/B,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,EAC1C,OAAO,EAAE,UAAU,GAAG,OAAO,GAC5B,aAAa,GAAG,IAAI;IAwBvB;;;;;;OAMG;IACH,OAAO,CAAC,eAAe;IAgDvB;;;OAGG;IACH,OAAO,CAAC,8BAA8B;IA2CtC,QAAQ,CAAC,QAAQ,EAAE,aAAa,GAAG,gBAAgB;IAanD;;OAEG;IACH,SAAS,CAAC,mBAAmB,CAAC,QAAQ,EAAE,aAAa,GAAG,MAAM;IAK9D;;;;;;;OAOG;IACH,iBAAiB,CACf,QAAQ,EAAE,iBAAiB,EAC3B,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,wBAAwB,GAChC,iBAAiB,EAAE;IA+CtB;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAY1B;;;OAGG;IACH,eAAe,CAAC,QAAQ,EAAE,iBAAiB,EAAE,aAAa,CAAC,EAAE,iBAAiB,EAAE,GAAG,iBAAiB;CAoBrG"}

package/dist/compiler/plugins/skill.plugin.js

@@ -15,9 +15,8 @@
  */
 import { Node } from 'ts-morph';
 import { findImportSource } from '../utils/ast-helpers.js';
-import { PrimitiveKind, } from '../types.js';
-import { BasePlugin, validationError, validationWarning } from './base.js';
-import { extractStringProperty } from '../utils/ast-helpers.js';
+import { BasePlugin, validationWarning } from './base.js';
+import { extractStringProperty, extractArrayProperty, extractNestedProperty, resolveIdentifierToArray } from '../utils/ast-helpers.js';
 /**
  * Plugin for compiling skill primitives.
  * Extends BasePlugin for common detection/entry point logic.
@@ -65,10 +64,31 @@ export class SkillPlugin extends BasePlugin {
         const toolsProp = config.getProperty('tools');
         if (!toolsProp || !Node.isPropertyAssignment(toolsProp))
             return refs;
+        // Try evaluation first (handles variable references)
+        const toolsArray = extractArrayProperty(config, 'tools');
+        if (toolsArray) {
+            toolsArray.forEach((tool, index) => {
+                if (typeof tool === 'string') {
+                    refs.push(tool);
+                }
+                else if (tool && typeof tool === 'object') {
+                    const name = extractNestedProperty(tool, 'name');
+                    refs.push(typeof name === 'string' ? name : `__evaluated_tool_${index}`);
+                }
+            });
+            return refs;
+        }
+        // Fallback to AST traversal for inline arrays and variable references
         const toolsValue = toolsProp.getInitializer();
-        if (!toolsValue || !Node.isArrayLiteralExpression(toolsValue))
+        if (!toolsValue)
+            return refs;
+        // Resolve: inline array or variable reference to array
+        const arrayExpr = Node.isArrayLiteralExpression(toolsValue)
+            ? toolsValue
+            : resolveIdentifierToArray(toolsValue);
+        if (!arrayExpr)
             return refs;
-        for (const element of toolsValue.getElements()) {
+        for (const element of arrayExpr.getElements()) {
             if (Node.isNewExpression(element)) {
                 // new ToolClass() → get class name
                 const className = element.getExpression().getText();
@@ -80,7 +100,6 @@ export class SkillPlugin extends BasePlugin {
             }
             else if (Node.isCallExpression(element)) {
                 // defineTool(...) or someFactory() → try to get the assigned name
-                // This is trickier - for now just note we have a tool
                 refs.push(`__inline_tool_${refs.length}`);
             }
         }
@@ -106,8 +125,11 @@ export class SkillPlugin extends BasePlugin {
                 return;
             if (property === 'addTools') {
                 const arrayArg = args[0];
-                if (Node.isArrayLiteralExpression(arrayArg)) {
-                    for (const element of arrayArg.getElements()) {
+                const arrayExpr = Node.isArrayLiteralExpression(arrayArg)
+                    ? arrayArg
+                    : resolveIdentifierToArray(arrayArg);
+                if (arrayExpr) {
+                    for (const element of arrayExpr.getElements()) {
                         if (Node.isNewExpression(element)) {
                             refs.push(element.getExpression().getText());
                         }
@@ -130,22 +152,11 @@ export class SkillPlugin extends BasePlugin {
         return refs;
     }
     validate(metadata) {
-        const errors = [];
-        const warnings = [];
-        if (!metadata.name) {
-            errors.push(validationError('Skill must have a name', { line: metadata.line }));
-        }
-        if (!metadata.description) {
-            warnings.push(validationWarning('Skill should have a description', { line: metadata.line }));
-        }
+        const { errors, warnings } = this.baseValidation(metadata);
         if (metadata.metadata.toolRefs.length === 0) {
             warnings.push(validationWarning('Skill has no tools - consider adding tools or removing the skill', { line: metadata.line }));
         }
-        return {
-            valid: errors.length === 0,
-            errors,
-            warnings,
-        };
+        return { valid: errors.length === 0, errors, warnings };
     }
     /**
      * Add context and tools fields to the entry point.
@@ -184,10 +195,10 @@ export class SkillPlugin extends BasePlugin {
             try {
                 const toolFile = context.project.addSourceFileAtPath(toolSourcePath);
                 const detected = toolPlugin.detect(toolFile);
-                // Find by class/export name
+                // Find by class/export name or tool name
                 const match = detected.find(d => {
                     const toolMeta = d.metadata;
-                    return d.exportName === className || toolMeta.className === className;
+                    return d.exportName === className || d.name === className || toolMeta.className === className;
                 }) || (detected.length === 1 ? detected[0] : null);
                 if (match) {
                     tools.push(match);
@@ -210,34 +221,26 @@ export class SkillPlugin extends BasePlugin {
     }
     /**
      * Create the manifest entry for a skill.
-     * Resolves tool class names to actual tool names using context.
+     * Resolves tool class/variable names to actual tool names using allPrimitives.
      */
-    toManifestEntry(compiled, context) {
-        // Cast to skill-specific metadata type
+    toManifestEntry(compiled, allPrimitives) {
         const skillMetadata = compiled.metadata;
-        // Get tool references from the compiled skill's metadata
-        const toolClassNames = skillMetadata.toolRefs || [];
-        // Resolve tool class names to actual tool names
-        const toolNames = toolClassNames.map((className) => {
-            const tool = context?.agentPrimitives?.find(p => {
+        const toolRefs = skillMetadata.toolRefs || [];
+        // Resolve tool class/variable names to actual tool names
+        const toolNames = toolRefs.map(ref => {
+            const tool = allPrimitives?.find(p => {
                 if (p.kind !== 'tool')
                     return false;
                 const toolMeta = p.metadata;
-                return toolMeta.className === className || p.name === className;
+                return p.exportName === ref || p.name === ref || toolMeta.className === ref;
             });
-            return tool?.name || className;
+            return tool?.name || ref;
         });
-        const skill = {
-            kind: PrimitiveKind.SKILL,
-            name: compiled.name,
-            description: compiled.description,
-            path: `artifacts/${compiled.kind}/${compiled.name}.js`,
-            sourcePath: compiled.sourcePath,
-            hash: compiled.artifact.hash,
+        return {
+            ...this.baseManifestFields(compiled),
             context: skillMetadata.context,
             tools: toolNames,
         };
-        return skill;
     }
 }
 //# sourceMappingURL=skill.plugin.js.map