@agentuity/cli 0.0.95 → 0.0.97

package/src/cmd/build/config-loader.ts

@@ -1,268 +0,0 @@
-import { join } from 'node:path';
-import { rmSync, writeFileSync } from 'node:fs';
-import { StructuredError } from '@agentuity/core';
-import type { BuildConfigFunction, BuildPhase, BuildContext, BuildConfig } from '../../types';
-
-const BuildConfigLoadError = StructuredError('BuildConfigLoadError');
-const BuildConfigValidationError = StructuredError('BuildConfigValidationError');
-
-/**
- * Reserved define keys that cannot be overridden by user config
- */
-const RESERVED_DEFINE_PREFIXES = ['process.env.AGENTUITY_', 'process.env.NODE_ENV'];
-
-/**
- * Load and validate agentuity.config.ts from the project root
- */
-export async function loadBuildConfig(rootDir: string): Promise<BuildConfigFunction | null> {
-	const configPath = join(rootDir, 'agentuity.config.ts');
-
-	// Check if config file exists
-	const configFile = Bun.file(configPath);
-	if (!(await configFile.exists())) {
-		return null; // No config file is OK - it's optional
-	}
-
-	try {
-		// Create wrapper script in project root so imports resolve correctly
-		// Using a hidden temp file to avoid conflicts with user files
-		const wrapperPath = join(rootDir, `.agentuity-config-loader-${Date.now()}.mts`);
-
-		try {
-			// Create a wrapper script that imports the config and outputs it as JSON
-			// Using relative import so Bun can resolve dependencies from project's node_modules
-			const wrapperCode = `
-import configFunction from './agentuity.config.ts';
-
-// Validate it's a function
-if (typeof configFunction !== 'function') {
-	console.error(JSON.stringify({
-		error: 'BuildConfigValidationError',
-		message: \`agentuity.config.ts must export a default function, got \${typeof configFunction}\`
-	}));
-	process.exit(1);
-}
-
-// Output success marker
-console.log('__CONFIG_LOADED__');
-`;
-
-			writeFileSync(wrapperPath, wrapperCode);
-
-			// Run the wrapper script with Bun
-			// Note: stdout/stderr are piped (not inherited) to suppress output from user's screen
-			const proc = Bun.spawn(['bun', wrapperPath], {
-				cwd: rootDir,
-				stdout: 'pipe', // Capture stdout to prevent output to user's terminal
-				stderr: 'pipe', // Capture stderr to prevent output to user's terminal
-			});
-
-			const output = await new Response(proc.stdout).text();
-			const errorOutput = await new Response(proc.stderr).text();
-			const exitCode = await proc.exited;
-
-			if (exitCode !== 0) {
-				// Try to parse error as JSON
-				let errorData = null;
-				try {
-					errorData = JSON.parse(errorOutput);
-				} catch (_parseError) {
-					// Not JSON, will treat as regular error below
-				}
-
-				// If we successfully parsed a BuildConfigValidationError, throw it
-				if (errorData?.error === 'BuildConfigValidationError') {
-					throw new BuildConfigValidationError({
-						message: errorData.message,
-					});
-				}
-
-				// Otherwise, throw a generic load error with the raw error output
-				throw new BuildConfigLoadError({
-					message: `Failed to load agentuity.config.ts:\n${errorOutput}`,
-				});
-			}
-
-			// Verify the success marker
-			if (!output.includes('__CONFIG_LOADED__')) {
-				throw new BuildConfigLoadError({
-					message: 'Config file loaded but did not output expected marker',
-				});
-			}
-
-			// Now import the config file directly - it's been validated
-			const configModule = await import(configPath);
-			const configFunction = configModule.default;
-
-			// Double-check it's a function (should always pass if wrapper succeeded)
-			if (typeof configFunction !== 'function') {
-				throw new BuildConfigValidationError({
-					message: `agentuity.config.ts must export a default function, got ${typeof configFunction}`,
-				});
-			}
-
-			return configFunction as BuildConfigFunction;
-		} finally {
-			// Clean up temp wrapper file
-			rmSync(wrapperPath, { force: true });
-		}
-	} catch (error) {
-		// If it's already our error, re-throw
-		if (error instanceof BuildConfigValidationError || error instanceof BuildConfigLoadError) {
-			throw error;
-		}
-
-		// Wrap other errors
-		throw new BuildConfigLoadError({
-			message: `Failed to load agentuity.config.ts: ${error instanceof Error ? error.message : String(error)}`,
-			cause: error instanceof Error ? error : undefined,
-		});
-	}
-}
-
-/**
- * Execute the build config function for a specific phase and validate the result
- */
-export async function executeBuildConfig(
-	configFunction: BuildConfigFunction,
-	phase: BuildPhase,
-	context: BuildContext
-): Promise<BuildConfig> {
-	try {
-		// Execute the config function (may be async)
-		const config = await configFunction(phase, context);
-
-		// Validate the result is an object
-		if (!config || typeof config !== 'object') {
-			throw new BuildConfigValidationError({
-				message: `Build config for phase "${phase}" must return an object, got ${typeof config}`,
-			});
-		}
-
-		// Validate plugins array if provided
-		if (config.plugins !== undefined) {
-			if (!Array.isArray(config.plugins)) {
-				throw new BuildConfigValidationError({
-					message: `Build config plugins for phase "${phase}" must be an array, got ${typeof config.plugins}`,
-				});
-			}
-			// Validate each plugin has a name property (basic BunPlugin check)
-			for (const plugin of config.plugins) {
-				if (!plugin || typeof plugin !== 'object' || !('name' in plugin)) {
-					throw new BuildConfigValidationError({
-						message: `Invalid plugin in phase "${phase}": plugins must be BunPlugin objects with a name property`,
-					});
-				}
-			}
-		}
-
-		// Validate external array if provided
-		if (config.external !== undefined) {
-			if (!Array.isArray(config.external)) {
-				throw new BuildConfigValidationError({
-					message: `Build config external for phase "${phase}" must be an array, got ${typeof config.external}`,
-				});
-			}
-			// Validate each external is a string
-			for (const ext of config.external) {
-				if (typeof ext !== 'string') {
-					throw new BuildConfigValidationError({
-						message: `Invalid external in phase "${phase}": all externals must be strings, got ${typeof ext}`,
-					});
-				}
-			}
-		}
-
-		// Validate and filter define object if provided
-		if (config.define !== undefined) {
-			if (typeof config.define !== 'object' || config.define === null) {
-				throw new BuildConfigValidationError({
-					message: `Build config define for phase "${phase}" must be an object, got ${typeof config.define}`,
-				});
-			}
-
-			// Check for reserved keys and filter them out
-			const filteredDefine: Record<string, string> = {};
-			const blockedKeys: string[] = [];
-
-			for (const [key, value] of Object.entries(config.define)) {
-				// Check if this key starts with any reserved prefix
-				const isReserved = RESERVED_DEFINE_PREFIXES.some((prefix) => key.startsWith(prefix));
-
-				if (isReserved) {
-					blockedKeys.push(key);
-					continue; // Skip reserved keys
-				}
-
-				// Validate value is a string
-				if (typeof value !== 'string') {
-					throw new BuildConfigValidationError({
-						message: `Build config define values for phase "${phase}" must be strings, got ${typeof value} for key "${key}"`,
-					});
-				}
-
-				filteredDefine[key] = value;
-			}
-
-			// Warn if we blocked any keys
-			if (blockedKeys.length > 0) {
-				context.logger.warn(
-					`Build config for phase "${phase}" attempted to override reserved define keys (ignored): ${blockedKeys.join(', ')}`
-				);
-			}
-
-			// Replace with filtered version
-			config.define = filteredDefine;
-		}
-
-		return config;
-	} catch (error) {
-		// If it's already our error, re-throw
-		if (error instanceof BuildConfigValidationError) {
-			throw error;
-		}
-
-		// Wrap other errors
-		throw new BuildConfigLoadError({
-			message: `Failed to execute build config for phase "${phase}": ${error instanceof Error ? error.message : String(error)}`,
-			cause: error instanceof Error ? error : undefined,
-		});
-	}
-}
-
-/**
- * Merge user build config with base Bun.BuildConfig
- * User config is applied AFTER base config with safeguards
- * Returns a complete Bun.BuildConfig with user overrides applied
- */
-export function mergeBuildConfig(
-	baseConfig: import('bun').BuildConfig,
-	userConfig: BuildConfig
-): import('bun').BuildConfig {
-	const merged = { ...baseConfig };
-
-	// Merge plugins (user plugins come AFTER Agentuity plugin)
-	if (userConfig.plugins && userConfig.plugins.length > 0) {
-		merged.plugins = [...(baseConfig.plugins ?? []), ...userConfig.plugins];
-	}
-
-	// Merge external (combine arrays, dedupe)
-	if (userConfig.external && userConfig.external.length > 0) {
-		const existingExternal = Array.isArray(baseConfig.external)
-			? baseConfig.external
-			: baseConfig.external
-				? [baseConfig.external]
-				: [];
-		merged.external = [...new Set([...existingExternal, ...userConfig.external])];
-	}
-
-	// Merge define (user defines come last, but reserved keys already filtered)
-	if (userConfig.define && Object.keys(userConfig.define).length > 0) {
-		merged.define = {
-			...baseConfig.define,
-			...userConfig.define,
-		};
-	}
-
-	return merged;
-}

package/src/cmd/build/file.ts

@@ -1,10 +0,0 @@
-import { resolve } from 'node:path';
-
-export async function getFilesRecursively(dir: string): Promise<string[]> {
-	const glob = new Bun.Glob('**/*');
-	const files: string[] = [];
-	for await (const file of glob.scan({ cwd: dir, onlyFiles: true, absolute: false, dot: true })) {
-		files.push(resolve(dir, file));
-	}
-	return files;
-}

package/src/cmd/build/fix-duplicate-exports.ts

@@ -1,207 +0,0 @@
-import path from 'node:path';
-
-export async function fixDuplicateExportsInDirectory(dir: string, verbose = false) {
-	if (verbose) {
-		console.log(`Scanning for .js files in: ${dir}`);
-	}
-
-	const jsFiles = await getAllJsFiles(dir);
-	if (verbose) {
-		console.log(`Found ${jsFiles.length} .js files`);
-		for (const js of jsFiles) {
-			console.log(` + Processing ${js}`);
-		}
-	}
-
-	if (jsFiles.length === 0) {
-		if (verbose) {
-			console.log('No .js files found');
-		}
-		return;
-	}
-
-	// Process all files in parallel
-	const results = await Promise.all(
-		jsFiles.map(async (filePath) => {
-			try {
-				const wasFixed = await fixDuplicateExportsInFile(filePath, verbose);
-				return { filePath, wasFixed, error: null };
-			} catch (error) {
-				return { filePath, wasFixed: false, error };
-			}
-		})
-	);
-
-	// Report results
-	const fixed = results.filter((r) => r.wasFixed);
-	const errors = results.filter((r) => r.error);
-
-	if (verbose) {
-		console.log(`\nResults:`);
-		console.log(`- Total files: ${jsFiles.length}`);
-		console.log(`- Files fixed: ${fixed.length}`);
-		console.log(`- Errors: ${errors.length}`);
-
-		if (fixed.length > 0) {
-			console.log('\nFixed files:');
-			fixed.forEach(({ filePath }) => {
-				console.log(`  - ${filePath}`);
-			});
-		}
-
-		if (errors.length > 0) {
-			console.log('\nErrors:');
-			errors.forEach(({ filePath, error }) => {
-				console.log(`  - ${filePath}: ${error}`);
-			});
-		}
-	}
-}
-
-async function fixDuplicateExportsInFile(filePath: string, verbose = false): Promise<boolean> {
-	const originalCode = await Bun.file(filePath).text();
-
-	// Only fix __INVALID__REF__ - remove it from imports and exports
-	let code = originalCode;
-
-	// Pattern 1: __INVALID__REF__ at start with comma after: "__INVALID__REF__, foo" -> "foo"
-	code = code.replace(/\b__INVALID__REF__\s*,\s*/g, '');
-
-	// Pattern 2: __INVALID__REF__ at end with comma before: "foo, __INVALID__REF__" -> "foo"
-	code = code.replace(/,\s*__INVALID__REF__\b/g, '');
-
-	// Pattern 3: __INVALID__REF__ alone (shouldn't happen but handle it)
-	code = code.replace(/\b__INVALID__REF__\b/g, '');
-
-	// Remove duplicate export statements
-	// Find all export { ... } statements (allow leading whitespace)
-	const exportPattern = /^\s*export\s*\{([^}]+)\}\s*;?\s*$/gm;
-	const exports: Array<{
-		match: string;
-		names: Set<string>;
-		nameToSyntax: Map<string, string>;
-		start: number;
-		end: number;
-	}> = [];
-	let match;
-
-	while ((match = exportPattern.exec(code)) !== null) {
-		const nameToSyntax = new Map<string, string>();
-		const names: string[] = [];
-
-		match[1].split(',').forEach((n) => {
-			const fullSyntax = n.trim();
-			const parts = fullSyntax.split(/\s+as\s+/);
-			const exportedName = parts.length > 1 ? parts[1].trim() : parts[0].trim();
-			if (exportedName) {
-				names.push(exportedName);
-				nameToSyntax.set(exportedName, fullSyntax);
-			}
-		});
-
-		exports.push({
-			match: match[0],
-			names: new Set(names),
-			nameToSyntax,
-			start: match.index,
-			end: match.index + match[0].length,
-		});
-	}
-
-	// Track which names we've seen and which export statements to remove/modify
-	const seenNames = new Set<string>();
-	const indicesToRemove: number[] = [];
-	const modificationsNeeded = new Map<number, Set<string>>(); // index -> names to keep
-
-	for (let i = 0; i < exports.length; i++) {
-		const exp = exports[i];
-		const duplicateNames = [...exp.names].filter((name) => seenNames.has(name));
-		const newNames = [...exp.names].filter((name) => !seenNames.has(name));
-		const allDuplicates = duplicateNames.length === exp.names.size;
-
-		if (verbose && duplicateNames.length > 0) {
-			console.log(`  Duplicate exports found in statement ${i}: ${duplicateNames.join(', ')}`);
-		}
-
-		if (allDuplicates && exp.names.size > 0) {
-			// This entire export statement is a duplicate - remove it
-			indicesToRemove.push(i);
-			if (verbose) {
-				console.log(`    -> Will remove entire statement`);
-			}
-		} else if (duplicateNames.length > 0) {
-			// Partial duplicates - need to remove just the duplicate names
-			modificationsNeeded.set(i, new Set(newNames));
-			if (verbose) {
-				console.log(`    -> Will keep only: ${newNames.join(', ')}`);
-			}
-			// Mark the new names as seen
-			newNames.forEach((name) => seenNames.add(name));
-		} else {
-			// No duplicates - mark these names as seen
-			exp.names.forEach((name) => seenNames.add(name));
-		}
-	}
-
-	// Build patches for modifications and removals, then apply from end to preserve indices
-	const patches: Array<{ start: number; end: number; replacement: string }> = [];
-
-	// Partial duplicates: replace the export statement with only the kept names
-	for (const [i, namesToKeep] of modificationsNeeded.entries()) {
-		const exp = exports[i];
-		const syntaxToKeep = [...namesToKeep].map((name) => exp.nameToSyntax.get(name)!);
-		const newExport = `export { ${syntaxToKeep.join(', ')} };`;
-		patches.push({ start: exp.start, end: exp.end, replacement: newExport });
-	}
-
-	// Full duplicates: remove the entire export statement
-	for (const idx of indicesToRemove) {
-		const exp = exports[idx];
-		patches.push({ start: exp.start, end: exp.end, replacement: '' });
-	}
-
-	// Apply all patches from right to left so earlier indices remain valid
-	patches.sort((a, b) => b.start - a.start);
-	for (const { start, end, replacement } of patches) {
-		code = code.slice(0, start) + replacement + code.slice(end);
-	}
-	// Nothing changed
-	if (code === originalCode) {
-		return false;
-	}
-
-	// Write the fixed content back to the file
-	await Bun.write(filePath, code);
-
-	if (verbose) {
-		console.log(`\n🔧 Fixed exports in: ${filePath}`);
-	}
-
-	return true;
-}
-
-async function getAllJsFiles(dir: string): Promise<string[]> {
-	const glob = new Bun.Glob('**/*.js');
-	const files = await Array.fromAsync(glob.scan({ cwd: dir, dot: true }));
-	return files.map((file) => path.join(dir, file));
-}
-
-async function main() {
-	const dir = process.argv[2];
-	if (!dir) {
-		console.error('Usage: bun fix-duplicate-exports.ts <directory>');
-		process.exit(1);
-	}
-
-	const { existsSync } = await import('node:fs');
-	if (!existsSync(dir)) {
-		console.error(`Error: Directory does not exist: ${dir}`);
-		process.exit(1);
-	}
-
-	await fixDuplicateExportsInDirectory(dir, true);
-}
-
-if (import.meta.main) {
-	await main();
-}