@agentuity/cli 1.0.59 → 2.0.0-beta.1

package/src/cmd/build/app-config-extractor.ts

@@ -0,0 +1,186 @@
+/**
+ * App Config Extractor
+ *
+ * Extracts analytics and workbench config from the user's createApp() call
+ * in app.ts. This is the v2 approach where createApp() is the single source
+ * of truth for runtime configuration (replacing agentuity.config.ts).
+ *
+ * Uses TypeScript's compiler API to reliably detect and extract values.
+ */
+
+import ts from 'typescript';
+import { join } from 'node:path';
+import type { Logger } from '../../types';
+
+/**
+ * Extracted runtime config from createApp() call.
+ */
+export interface ExtractedAppConfig {
+	/** analytics option value: boolean, object, or undefined if not set */
+	analytics?: boolean | Record<string, unknown>;
+	/** workbench option value: boolean, string, object, or undefined if not set */
+	workbench?: boolean | string | Record<string, unknown>;
+}
+
+/**
+ * Extract analytics and workbench config from a createApp() call.
+ *
+ * Uses TypeScript AST to find `createApp({ ... })` and extract the values
+ * of the `analytics` and `workbench` properties.
+ */
+function extractCreateAppConfig(sourceFile: ts.SourceFile): ExtractedAppConfig {
+	const result: ExtractedAppConfig = {};
+
+	// Walk the AST looking for createApp({ ... }) calls
+	function visit(node: ts.Node): void {
+		// Check for createApp(...) call
+		if (
+			ts.isCallExpression(node) &&
+			ts.isIdentifier(node.expression) &&
+			node.expression.text === 'createApp' &&
+			node.arguments.length > 0
+		) {
+			const firstArg = node.arguments[0];
+			if (!firstArg) return;
+			if (ts.isObjectLiteralExpression(firstArg)) {
+				// Found createApp({ ... }) — extract properties
+				for (const prop of firstArg.properties) {
+					if (!ts.isPropertyAssignment(prop)) continue;
+
+					const name = ts.isIdentifier(prop.name) ? prop.name.text : undefined;
+					if (!name) continue;
+
+					// prop.initializer should always exist for PropertyAssignment, but check to satisfy TS
+					if (!('initializer' in prop)) continue;
+					const initializer = (prop as { initializer: ts.Expression }).initializer;
+
+					if (name === 'analytics') {
+						const value = extractValue(initializer);
+						if (value !== undefined) {
+							if (typeof value === 'boolean') {
+								result.analytics = value;
+							} else if (typeof value === 'object') {
+								result.analytics = value as Record<string, unknown>;
+							}
+							// Ignore string/number for analytics
+						}
+					} else if (name === 'workbench') {
+						const value = extractValue(initializer);
+						if (value !== undefined) {
+							if (typeof value === 'boolean' || typeof value === 'string') {
+								result.workbench = value;
+							} else if (typeof value === 'object') {
+								result.workbench = value as Record<string, unknown>;
+							}
+							// Ignore number for workbench
+						}
+					}
+				}
+			}
+		}
+
+		ts.forEachChild(node, visit);
+	}
+
+	visit(sourceFile);
+	return result;
+}
+
+/**
+ * Extract a JavaScript value from a TypeScript AST expression node.
+ * Handles: boolean literals, string literals, numeric literals,
+ * object literals (as Record), and identifier references (by name).
+ */
+function extractValue(
+	node: ts.Node
+): boolean | string | number | Record<string, unknown> | undefined {
+	if (ts.isLiteralExpression(node)) {
+		// String literal or numeric literal
+		if (ts.isStringLiteral(node)) {
+			return node.text;
+		}
+		if (ts.isNumericLiteral(node)) {
+			return Number(node.text);
+		}
+	}
+
+	if (node.kind === ts.SyntaxKind.TrueKeyword) {
+		return true;
+	}
+	if (node.kind === ts.SyntaxKind.FalseKeyword) {
+		return false;
+	}
+
+	if (ts.isIdentifier(node)) {
+		// Return the identifier name (e.g., a variable reference)
+		return node.text;
+	}
+
+	if (ts.isObjectLiteralExpression(node)) {
+		const obj: Record<string, unknown> = {};
+		for (const prop of node.properties) {
+			if (!ts.isPropertyAssignment(prop)) continue;
+			if (!ts.isIdentifier(prop.name)) continue;
+
+			const key = prop.name.text;
+			obj[key] = extractValue(prop.initializer);
+		}
+		return obj;
+	}
+
+	return undefined;
+}
+
+/**
+ * Detect and extract analytics/workbench config from app.ts.
+ *
+ * This is the v2 approach: runtime config lives in createApp() only.
+ * The CLI reads these values at build time via AST parsing.
+ */
+export async function extractAppConfig(
+	rootDir: string,
+	logger: Logger
+): Promise<ExtractedAppConfig> {
+	// Look for app.ts in root first, then src/
+	let appFile = join(rootDir, 'app.ts');
+	if (!(await Bun.file(appFile).exists())) {
+		appFile = join(rootDir, 'src', 'app.ts');
+		if (!(await Bun.file(appFile).exists())) {
+			logger.trace('[config-extract] No app.ts found');
+			return {};
+		}
+	}
+
+	try {
+		const source = await Bun.file(appFile).text();
+
+		// Quick bail-out before parsing
+		if (!source.includes('createApp')) {
+			logger.trace('[config-extract] No createApp call in %s', appFile);
+			return {};
+		}
+
+		// Parse with TypeScript
+		const sourceFile = ts.createSourceFile(
+			appFile,
+			source,
+			ts.ScriptTarget.Latest,
+			true,
+			ts.ScriptKind.TS
+		);
+
+		const config = extractCreateAppConfig(sourceFile);
+
+		if (config.analytics !== undefined) {
+			logger.debug('[config-extract] Found analytics in createApp(): %o', config.analytics);
+		}
+		if (config.workbench !== undefined) {
+			logger.debug('[config-extract] Found workbench in createApp(): %o', config.workbench);
+		}
+
+		return config;
+	} catch (error) {
+		logger.warn('[config-extract] Failed to parse app.ts:', error);
+		return {};
+	}
+}

package/src/cmd/build/app-router-detector.ts

@@ -5,23 +5,15 @@
  * to `createApp()`. If detected, resolves the router variable(s) to their import
  * sources and mount paths.
  *
- * This allows the build tooling to derive route metadata from the actual code-based
- * route tree instead of relying on filesystem-based discovery.
+ * Uses TypeScript's compiler API to reliably detect the pattern, consistent with
+ * the lifecycle generator approach.
  */
 
-import * as acornLoose from 'acorn-loose';
+import ts from 'typescript';
 import { join, dirname, resolve } from 'node:path';
-import { existsSync, statSync } from 'node:fs';
+import { statSync } from 'node:fs';
 import type { Logger } from '../../types';
 
-interface ASTNode {
-	type: string;
-	start?: number;
-	end?: number;
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any
-	[key: string]: any;
-}
-
 /**
  * A resolved mount point from `createApp({ router })`.
  */
@@ -46,7 +38,7 @@ export interface AppRouterDetection {
  * Resolve an import path to an actual file on disk.
  * Tries the path as-is, then with common extensions.
  */
-function resolveImportFile(fromDir: string, importPath: string): string | null {
+async function resolveImportFile(fromDir: string, importPath: string): Promise<string | null> {
 	if (!importPath.startsWith('.') && !importPath.startsWith('/')) {
 		return null; // Package import — can't resolve
 	}
@@ -54,7 +46,8 @@ function resolveImportFile(fromDir: string, importPath: string): string | null {
 	const basePath = resolve(fromDir, importPath);
 	const extensions = ['.ts', '.tsx', '/index.ts', '/index.tsx'];
 
-	if (existsSync(basePath)) {
+	const baseFile = Bun.file(basePath);
+	if (await baseFile.exists()) {
 		try {
 			if (statSync(basePath).isFile()) return basePath;
 		} catch {
@@ -64,7 +57,7 @@ function resolveImportFile(fromDir: string, importPath: string): string | null {
 
 	for (const ext of extensions) {
 		const candidate = basePath + ext;
-		if (existsSync(candidate)) {
+		if (await Bun.file(candidate).exists()) {
 			return candidate;
 		}
 	}
@@ -73,91 +66,158 @@ function resolveImportFile(fromDir: string, importPath: string): string | null {
 }
 
 /**
- * Extract the `router` property value from a `createApp()` call's argument object.
- *
- * Handles three forms:
- * - `createApp({ router: myVar })` → plain Hono, default /api mount
- * - `createApp({ router: { path: '/v1', router: myVar } })` → single RouteMount
- * - `createApp({ router: [{ path: '/v1', router: v1 }, ...] })` → array of RouteMounts
+ * A router mount extracted from the AST before file resolution.
  */
-function extractRouterFromCreateApp(
-	callNode: ASTNode
-): Array<{ path: string; varName: string }> | null {
-	// createApp() must have at least one argument (the config object)
-	if (!callNode.arguments || callNode.arguments.length === 0) {
-		return null;
-	}
+interface RawMount {
+	path: string;
+	varName: string;
+}
 
-	const configArg = callNode.arguments[0] as ASTNode;
-	if (configArg.type !== 'ObjectExpression') {
+/**
+ * Extract router mounts from a createApp() call using TypeScript's AST.
+ * Returns null if no router property found.
+ */
+function extractRouterMounts(sourceFile: ts.SourceFile): RawMount[] | null {
+	let result: RawMount[] | null = null;
+
+	function getStringLiteral(node: ts.Expression): string | null {
+		if (ts.isStringLiteral(node) || ts.isNoSubstitutionTemplateLiteral(node)) {
+			return node.text;
+		}
 		return null;
 	}
 
-	// Find the `router` property
-	const routerProp = configArg.properties?.find(
-		(p: ASTNode) =>
-			p.type === 'Property' && p.key?.type === 'Identifier' && p.key?.name === 'router'
-	);
+	function extractMountFromObject(obj: ts.ObjectLiteralExpression): RawMount | null {
+		let path: string | undefined;
+		let varName: string | undefined;
 
-	if (!routerProp) {
-		return null; // No router property — file-based routing
-	}
+		for (const prop of obj.properties) {
+			if (!ts.isPropertyAssignment(prop) || !ts.isIdentifier(prop.name)) continue;
+
+			if (prop.name.text === 'path') {
+				path = getStringLiteral(prop.initializer) ?? undefined;
+			}
+			if (prop.name.text === 'router') {
+				if (ts.isIdentifier(prop.initializer)) {
+					varName = prop.initializer.text;
+				}
+			}
+		}
 
-	const routerValue = routerProp.value as ASTNode;
+		// Also handle shorthand: { path: '/v1', router } where router is shorthand
+		for (const prop of obj.properties) {
+			if (ts.isShorthandPropertyAssignment(prop) && prop.name.text === 'router') {
+				varName = prop.name.text;
+			}
+		}
 
-	// Form 1: Plain Hono variable → createApp({ router: myRouter })
-	if (routerValue.type === 'Identifier') {
-		return [{ path: '/api', varName: routerValue.name }];
+		return path && varName ? { path, varName } : null;
 	}
 
-	// Form 2: Single RouteMount → createApp({ router: { path: '/v1', router: myRouter } })
-	if (routerValue.type === 'ObjectExpression') {
-		const mount = extractRouteMountFromObject(routerValue);
-		return mount ? [mount] : null;
+	function processRouterValue(value: ts.Expression): RawMount[] | null {
+		// Form 1: Identifier → createApp({ router: myRouter })
+		if (ts.isIdentifier(value)) {
+			return [{ path: '/api', varName: value.text }];
+		}
+
+		// Form 2: Object → createApp({ router: { path: '/v1', router: myRouter } })
+		if (ts.isObjectLiteralExpression(value)) {
+			const mount = extractMountFromObject(value);
+			return mount ? [mount] : null;
+		}
+
+		// Form 3: Array → createApp({ router: [...] })
+		if (ts.isArrayLiteralExpression(value)) {
+			const mounts: RawMount[] = [];
+			for (const element of value.elements) {
+				if (ts.isObjectLiteralExpression(element)) {
+					const mount = extractMountFromObject(element);
+					if (mount) mounts.push(mount);
+				}
+			}
+			return mounts.length > 0 ? mounts : null;
+		}
+
+		return null;
 	}
 
-	// Form 3: Array of RouteMounts → createApp({ router: [{ path: '/v1', router: v1 }, ...] })
-	if (routerValue.type === 'ArrayExpression') {
-		const mounts: Array<{ path: string; varName: string }> = [];
-		for (const element of routerValue.elements || []) {
-			if (element?.type === 'ObjectExpression') {
-				const mount = extractRouteMountFromObject(element);
-				if (mount) mounts.push(mount);
+	function visit(node: ts.Node): void {
+		if (result) return;
+
+		// Find createApp(...) — with or without await
+		let callExpr: ts.CallExpression | undefined;
+
+		if (ts.isCallExpression(node) && ts.isIdentifier(node.expression)) {
+			if (node.expression.text === 'createApp') callExpr = node;
+		} else if (ts.isAwaitExpression(node) && ts.isCallExpression(node.expression)) {
+			const call = node.expression;
+			if (ts.isIdentifier(call.expression) && call.expression.text === 'createApp') {
+				callExpr = call;
+			}
+		}
+
+		if (callExpr && callExpr.arguments.length > 0) {
+			const configArg = callExpr.arguments[0];
+			if (configArg && ts.isObjectLiteralExpression(configArg)) {
+				for (const prop of configArg.properties) {
+					// Handle: router: value
+					if (
+						ts.isPropertyAssignment(prop) &&
+						ts.isIdentifier(prop.name) &&
+						prop.name.text === 'router'
+					) {
+						result = processRouterValue(prop.initializer);
+						return;
+					}
+
+					// Handle shorthand: createApp({ router })
+					if (ts.isShorthandPropertyAssignment(prop) && prop.name.text === 'router') {
+						result = [{ path: '/api', varName: 'router' }];
+						return;
+					}
+				}
 			}
 		}
-		return mounts.length > 0 ? mounts : null;
+
+		ts.forEachChild(node, visit);
 	}
 
-	return null;
+	visit(sourceFile);
+	return result;
 }
 
 /**
- * Extract { path, router } from an object literal AST node.
+ * Build import map from the source file: variable name → import path
  */
-function extractRouteMountFromObject(objNode: ASTNode): { path: string; varName: string } | null {
-	let path: string | undefined;
-	let varName: string | undefined;
+function buildImportMap(sourceFile: ts.SourceFile): Map<string, string> {
+	const importMap = new Map<string, string>();
 
-	for (const prop of objNode.properties || []) {
-		if (prop.type !== 'Property' || prop.key?.type !== 'Identifier') continue;
+	for (const stmt of sourceFile.statements) {
+		if (!ts.isImportDeclaration(stmt) || !ts.isStringLiteral(stmt.moduleSpecifier)) continue;
 
-		if (prop.key.name === 'path' && prop.value?.type === 'Literal') {
-			path = String(prop.value.value);
+		const importPath = stmt.moduleSpecifier.text;
+		const clause = stmt.importClause;
+		if (!clause) continue;
+
+		// Default import: import router from './api'
+		if (clause.name) {
+			importMap.set(clause.name.text, importPath);
 		}
-		if (prop.key.name === 'router' && prop.value?.type === 'Identifier') {
-			varName = prop.value.name;
+
+		// Named imports: import { v1, v2 } from './routers'
+		if (clause.namedBindings && ts.isNamedImports(clause.namedBindings)) {
+			for (const spec of clause.namedBindings.elements) {
+				importMap.set(spec.name.text, importPath);
+			}
 		}
 	}
 
-	return path && varName ? { path, varName } : null;
+	return importMap;
 }
 
 /**
  * Detect whether `src/app.ts` uses `createApp({ router })`.
  *
- * Parses the file with acorn-loose, finds `createApp()` calls,
- * and resolves router variables to their import source files.
- *
  * Returns `{ detected: false, mounts: [] }` when:
  * - `src/app.ts` doesn't exist
  * - `createApp()` is called without a `router` property
@@ -169,76 +229,57 @@ export async function detectExplicitRouter(
 ): Promise<AppRouterDetection> {
 	const noDetection: AppRouterDetection = { detected: false, mounts: [] };
 
-	// Look for app.ts in src/ (standard location)
-	const appFile = join(rootDir, 'src', 'app.ts');
-	if (!existsSync(appFile)) {
-		// Also try root-level app.ts
-		const rootAppFile = join(rootDir, 'app.ts');
-		if (!existsSync(rootAppFile)) {
+	// Look for app.ts in src/ (standard location), then root
+	let appFile = join(rootDir, 'src', 'app.ts');
+	if (!(await Bun.file(appFile).exists())) {
+		appFile = join(rootDir, 'app.ts');
+		if (!(await Bun.file(appFile).exists())) {
 			logger.trace('[router-detect] No app.ts found');
 			return noDetection;
 		}
-		return detectInFile(rootAppFile, logger);
 	}
 
-	return detectInFile(appFile, logger);
-}
-
-async function detectInFile(appFile: string, logger: Logger): Promise<AppRouterDetection> {
-	const noDetection: AppRouterDetection = { detected: false, mounts: [] };
-	const appDir = dirname(appFile);
-
 	try {
 		const source = await Bun.file(appFile).text();
-		const transpiler = new Bun.Transpiler({ loader: 'ts', target: 'bun' });
-		const contents = transpiler.transformSync(source);
+		const appDir = dirname(appFile);
 
-		// Quick check: skip AST parsing if createApp is not called with router
-		if (!contents.includes('createApp') || !contents.includes('router')) {
+		// Quick bail-out before parsing
+		if (!source.includes('createApp') || !source.includes('router')) {
 			logger.trace('[router-detect] No createApp + router pattern found in %s', appFile);
 			return noDetection;
 		}
 
-		const ast = acornLoose.parse(contents, {
-			locations: true,
-			ecmaVersion: 'latest',
-			sourceType: 'module',
-		}) as ASTNode;
-
-		// Build import map: variable name → import path
-		const importMap = new Map<string, string>();
-		for (const node of ast.body || []) {
-			if (node.type === 'ImportDeclaration' && node.source?.value) {
-				for (const spec of node.specifiers || []) {
-					if (spec.local?.name) {
-						importMap.set(spec.local.name, String(node.source.value));
-					}
-				}
-			}
-		}
-
-		// Walk all statements looking for createApp() calls
-		const routerMounts = findCreateAppRouterCalls(ast, importMap);
+		// Parse with TypeScript
+		const sourceFile = ts.createSourceFile(
+			appFile,
+			source,
+			ts.ScriptTarget.Latest,
+			true,
+			ts.ScriptKind.TS
+		);
 
-		if (!routerMounts || routerMounts.length === 0) {
+		const rawMounts = extractRouterMounts(sourceFile);
+		if (!rawMounts || rawMounts.length === 0) {
 			logger.trace('[router-detect] createApp() found but no router property');
 			return noDetection;
 		}
 
+		// Build import map to resolve variable names to file paths
+		const importMap = buildImportMap(sourceFile);
+
 		// Resolve each router variable to its file
 		const mounts: DetectedRouteMount[] = [];
-		for (const { path, varName } of routerMounts) {
+		for (const { path, varName } of rawMounts) {
 			const importPath = importMap.get(varName);
 			if (!importPath) {
 				logger.debug(
 					'[router-detect] Router variable %s is not imported — may be defined locally',
 					varName
 				);
-				// Could be defined in the same file — skip for now
 				continue;
 			}
 
-			const resolvedFile = resolveImportFile(appDir, importPath);
+			const resolvedFile = await resolveImportFile(appDir, importPath);
 			if (!resolvedFile) {
 				logger.warn(
 					'[router-detect] Could not resolve import %s for router variable %s',
@@ -277,74 +318,3 @@ async function detectInFile(appFile: string, logger: Logger): Promise<AppRouterD
 		return noDetection;
 	}
 }
-
-/**
- * Walk the AST looking for `createApp({ router: ... })` calls.
- * Handles:
- * - `createApp({ router })` (top-level expression)
- * - `const app = await createApp({ router })` (variable declaration)
- * - `export const app = await createApp({ router })` (exported)
- */
-function findCreateAppRouterCalls(
-	ast: ASTNode,
-	importMap: Map<string, string>
-): Array<{ path: string; varName: string }> | null {
-	for (const node of ast.body || []) {
-		// Check expression statements: createApp({ router })
-		if (node.type === 'ExpressionStatement') {
-			const result = checkForCreateAppCall(node.expression, importMap);
-			if (result) return result;
-		}
-
-		// Check variable declarations: const app = await createApp({ router })
-		if (node.type === 'VariableDeclaration') {
-			for (const decl of node.declarations || []) {
-				if (decl.init) {
-					const result = checkForCreateAppCall(decl.init, importMap);
-					if (result) return result;
-				}
-			}
-		}
-
-		// Check exports: export const app = await createApp({ router })
-		if (node.type === 'ExportNamedDeclaration' && node.declaration) {
-			if (node.declaration.type === 'VariableDeclaration') {
-				for (const decl of node.declaration.declarations || []) {
-					if (decl.init) {
-						const result = checkForCreateAppCall(decl.init, importMap);
-						if (result) return result;
-					}
-				}
-			}
-		}
-	}
-
-	return null;
-}
-
-/**
- * Check if an expression node is a `createApp({ router })` call.
- * Unwraps `await` expressions.
- */
-function checkForCreateAppCall(
-	expr: ASTNode,
-	importMap: Map<string, string>
-): Array<{ path: string; varName: string }> | null {
-	if (!expr) return null;
-
-	// Unwrap AwaitExpression: await createApp(...)
-	if (expr.type === 'AwaitExpression' && expr.argument) {
-		return checkForCreateAppCall(expr.argument, importMap);
-	}
-
-	// Check for createApp({ router })
-	if (
-		expr.type === 'CallExpression' &&
-		expr.callee?.type === 'Identifier' &&
-		expr.callee?.name === 'createApp'
-	) {
-		return extractRouterFromCreateApp(expr);
-	}
-
-	return null;
-}