@agentuity/cli 1.0.59 → 2.0.0-beta.1

package/bin/cli.ts

@@ -153,6 +153,7 @@ if (!hasHelp) {
 	parsedOperands = parsed.operands;
 }
 const earlyOpts = program.opts();
+
 // Normalize --org alias → orgId (agents prefer --org over --org-id)
 if (earlyOpts.org !== undefined && earlyOpts.orgId === undefined) {
 	earlyOpts.orgId = earlyOpts.org;
@@ -325,9 +326,7 @@ async function main() {
 	closeDatabase();
 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	const exit = (globalThis as any).AGENTUITY_PROCESS_EXIT || process.exit;
-	// Preserve process.exitCode set by command handlers (e.g., sandbox run/exec
-	// propagate the sandbox process's exit code). Default to 0 for success.
-	exit(process.exitCode ?? 0);
+	exit(0);
 }
 
 try {

package/dist/cmd/build/app-config-extractor.d.ts

@@ -0,0 +1,27 @@
+/**
+ * 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 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>;
+}
+/**
+ * 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 declare function extractAppConfig(rootDir: string, logger: Logger): Promise<ExtractedAppConfig>;
+//# sourceMappingURL=app-config-extractor.d.ts.map

package/dist/cmd/build/app-config-extractor.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"app-config-extractor.d.ts","sourceRoot":"","sources":["../../../src/cmd/build/app-config-extractor.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAE1C;;GAEG;AACH,MAAM,WAAW,kBAAkB;IAClC,uEAAuE;IACvE,SAAS,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9C,+EAA+E;IAC/E,SAAS,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACvD;AA+GD;;;;;GAKG;AACH,wBAAsB,gBAAgB,CACrC,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,GACZ,OAAO,CAAC,kBAAkB,CAAC,CA2C7B"}

package/dist/cmd/build/app-config-extractor.js

@@ -0,0 +1,152 @@
+/**
+ * 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';
+/**
+ * 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) {
+    const result = {};
+    // Walk the AST looking for createApp({ ... }) calls
+    function visit(node) {
+        // 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.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;
+                            }
+                            // 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;
+                            }
+                            // 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) {
+    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 = {};
+        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, logger) {
+    // 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 {};
+    }
+}
+//# sourceMappingURL=app-config-extractor.js.map

package/dist/cmd/build/app-config-extractor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"app-config-extractor.js","sourceRoot":"","sources":["../../../src/cmd/build/app-config-extractor.ts"],"names":[],"mappings":"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"}

package/dist/cmd/build/app-router-detector.d.ts

@@ -5,8 +5,8 @@
  * 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 type { Logger } from '../../types';
 /**
@@ -30,9 +30,6 @@ export interface AppRouterDetection {
 /**
  * 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

package/dist/cmd/build/app-router-detector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app-router-detector.d.ts","sourceRoot":"","sources":["../../../src/cmd/build/app-router-detector.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAKH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAU1C;;GAEG;AACH,MAAM,WAAW,kBAAkB;IAClC,2CAA2C;IAC3C,IAAI,EAAE,MAAM,CAAC;IACb,8CAA8C;IAC9C,UAAU,EAAE,MAAM,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IAClC,gDAAgD;IAChD,QAAQ,EAAE,OAAO,CAAC;IAClB,oDAAoD;IACpD,MAAM,EAAE,kBAAkB,EAAE,CAAC;CAC7B;AAgHD;;;;;;;;;;GAUG;AACH,wBAAsB,oBAAoB,CACzC,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,GACZ,OAAO,CAAC,kBAAkB,CAAC,CAgB7B"}
+{"version":3,"file":"app-router-detector.d.ts","sourceRoot":"","sources":["../../../src/cmd/build/app-router-detector.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAKH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAE1C;;GAEG;AACH,MAAM,WAAW,kBAAkB;IAClC,2CAA2C;IAC3C,IAAI,EAAE,MAAM,CAAC;IACb,8CAA8C;IAC9C,UAAU,EAAE,MAAM,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IAClC,gDAAgD;IAChD,QAAQ,EAAE,OAAO,CAAC;IAClB,oDAAoD;IACpD,MAAM,EAAE,kBAAkB,EAAE,CAAC;CAC7B;AAuLD;;;;;;;GAOG;AACH,wBAAsB,oBAAoB,CACzC,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,GACZ,OAAO,CAAC,kBAAkB,CAAC,CA2F7B"}

package/dist/cmd/build/app-router-detector.js

@@ -5,23 +5,24 @@
  * 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';
 /**
  * Resolve an import path to an actual file on disk.
  * Tries the path as-is, then with common extensions.
  */
-function resolveImportFile(fromDir, importPath) {
+async function resolveImportFile(fromDir, importPath) {
     if (!importPath.startsWith('.') && !importPath.startsWith('/')) {
         return null; // Package import — can't resolve
     }
     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;
@@ -32,82 +33,138 @@ function resolveImportFile(fromDir, importPath) {
     }
     for (const ext of extensions) {
         const candidate = basePath + ext;
-        if (existsSync(candidate)) {
+        if (await Bun.file(candidate).exists()) {
             return candidate;
         }
     }
     return 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
+ * Extract router mounts from a createApp() call using TypeScript's AST.
+ * Returns null if no router property found.
  */
-function extractRouterFromCreateApp(callNode) {
-    // createApp() must have at least one argument (the config object)
-    if (!callNode.arguments || callNode.arguments.length === 0) {
-        return null;
-    }
-    const configArg = callNode.arguments[0];
-    if (configArg.type !== 'ObjectExpression') {
+function extractRouterMounts(sourceFile) {
+    let result = null;
+    function getStringLiteral(node) {
+        if (ts.isStringLiteral(node) || ts.isNoSubstitutionTemplateLiteral(node)) {
+            return node.text;
+        }
         return null;
     }
-    // Find the `router` property
-    const routerProp = configArg.properties?.find((p) => p.type === 'Property' && p.key?.type === 'Identifier' && p.key?.name === 'router');
-    if (!routerProp) {
-        return null; // No router property — file-based routing
-    }
-    const routerValue = routerProp.value;
-    // Form 1: Plain Hono variable → createApp({ router: myRouter })
-    if (routerValue.type === 'Identifier') {
-        return [{ path: '/api', varName: routerValue.name }];
+    function extractMountFromObject(obj) {
+        let path;
+        let varName;
+        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;
+                }
+            }
+        }
+        // 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;
+            }
+        }
+        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) {
+        // 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 = [];
+            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 = [];
-        for (const element of routerValue.elements || []) {
-            if (element?.type === 'ObjectExpression') {
-                const mount = extractRouteMountFromObject(element);
-                if (mount)
-                    mounts.push(mount);
+    function visit(node) {
+        if (result)
+            return;
+        // Find createApp(...) — with or without await
+        let callExpr;
+        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;
             }
         }
-        return mounts.length > 0 ? mounts : null;
+        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;
+                    }
+                }
+            }
+        }
+        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) {
-    let path;
-    let varName;
-    for (const prop of objNode.properties || []) {
-        if (prop.type !== 'Property' || prop.key?.type !== 'Identifier')
+function buildImportMap(sourceFile) {
+    const importMap = new Map();
+    for (const stmt of sourceFile.statements) {
+        if (!ts.isImportDeclaration(stmt) || !ts.isStringLiteral(stmt.moduleSpecifier))
+            continue;
+        const importPath = stmt.moduleSpecifier.text;
+        const clause = stmt.importClause;
+        if (!clause)
             continue;
-        if (prop.key.name === 'path' && prop.value?.type === 'Literal') {
-            path = String(prop.value.value);
+        // 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
@@ -115,63 +172,41 @@ function extractRouteMountFromObject(objNode) {
  */
 export async function detectExplicitRouter(rootDir, logger) {
     const noDetection = { 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, logger) {
-    const noDetection = { 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);
-        // Quick check: skip AST parsing if createApp is not called with router
-        if (!contents.includes('createApp') || !contents.includes('router')) {
+        const appDir = dirname(appFile);
+        // 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',
-        });
-        // Build import map: variable name → import path
-        const importMap = new Map();
-        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);
-        if (!routerMounts || routerMounts.length === 0) {
+        // Parse with TypeScript
+        const sourceFile = ts.createSourceFile(appFile, source, ts.ScriptTarget.Latest, true, ts.ScriptKind.TS);
+        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 = [];
-        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', importPath, varName);
                 continue;
@@ -191,63 +226,4 @@ async function detectInFile(appFile, logger) {
         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, importMap) {
-    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, importMap) {
-    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;
-}
 //# sourceMappingURL=app-router-detector.js.map