@agentuity/cli 0.0.85 → 0.0.87

package/src/cmd/build/bundler.ts

@@ -14,6 +14,7 @@ import type { Logger } from '../../types';
 import { generateWorkbenchMainTsx, generateWorkbenchIndexHtml } from './workbench';
 import { analyzeWorkbench, type WorkbenchAnalysis } from './ast';
 import { type DeployOptions } from '../../schemas/deploy';
+import { checkAndUpgradeDependencies } from '../../utils/dependency-checker';
 
 const minBunVersion = '>=1.3.3';
 
@@ -102,7 +103,6 @@ export async function bundle({
 	dev = false,
 	rootDir,
 	project,
-	port,
 	outDir: customOutDir,
 	tag,
 	logsUrl,
@@ -131,6 +131,14 @@ export async function bundle({
 	const versionOutput = await checkBunVersion();
 	output.push(...versionOutput);
 
+	// Check and upgrade @agentuity/* dependencies if needed
+	const upgradeResult = await checkAndUpgradeDependencies(rootDir, logger);
+	if (upgradeResult.failed.length > 0 && process.stdin.isTTY) {
+		throw new BuildFailedError({
+			message: `Failed to upgrade dependencies: ${upgradeResult.failed.join(', ')}`,
+		});
+	}
+
 	const outDir = customOutDir ?? join(rootDir, '.agentuity');
 	const srcDir = join(rootDir, 'src');
 
@@ -377,6 +385,26 @@ export async function bundle({
 		}
 	}
 
+	// must always set for the template always
+	define['process.env.AGENTUITY_PUBLIC_WORKBENCH_PATH'] = JSON.stringify('');
+
+	// Analyze workbench config early to set environment variables for web build
+	if (existsSync(appFile)) {
+		if (!workbench) {
+			const appContent = await Bun.file(appFile).text();
+			workbench = analyzeWorkbench(appContent);
+		}
+
+		if (workbench.hasWorkbench) {
+			// Create workbench config with proper defaults
+			const defaultConfig = { route: '/workbench', headers: {} };
+			const config = { ...defaultConfig, ...workbench.config };
+
+			// Add to define so process.env.AGENTUITY_PUBLIC_WORKBENCH_PATH gets replaced at build time
+			define['process.env.AGENTUITY_PUBLIC_WORKBENCH_PATH'] = JSON.stringify(config.route);
+		}
+	}
+
 	// web folder is optional
 	const webDir = join(srcDir, 'web');
 	if (existsSync(webDir)) {
@@ -468,106 +496,99 @@ export async function bundle({
 	}
 
 	// Bundle workbench app if detected via setupWorkbench
-	if (existsSync(appFile)) {
-		if (!workbench) {
-			const appContent = await Bun.file(appFile).text();
-			workbench = analyzeWorkbench(appContent);
-		}
-
-		if (workbench.hasWorkbench) {
-			// Create workbench config with proper defaults
-			const defaultConfig = { route: '/workbench', headers: {}, port: port || 3500 };
-			const config = { ...defaultConfig, ...workbench.config };
-			try {
-				// Generate workbench files on the fly instead of using files from package
-				const tempWorkbenchDir = join(outDir, 'temp-workbench');
-				mkdirSync(tempWorkbenchDir, { recursive: true });
-
-				// Generate files using templates
-				await Bun.write(join(tempWorkbenchDir, 'main.tsx'), generateWorkbenchMainTsx(config));
-				const workbenchIndexFile = join(tempWorkbenchDir, 'index.html');
-				await Bun.write(workbenchIndexFile, generateWorkbenchIndexHtml());
-
-				// Bundle workbench using generated files
-				// Disable splitting to avoid CommonJS/ESM module resolution conflicts
-				const workbenchBuildConfig: Bun.BuildConfig = {
-					entrypoints: [workbenchIndexFile],
-					outdir: join(outDir, 'workbench'),
-					sourcemap: dev ? 'inline' : 'linked',
-					target: 'browser',
-					format: 'esm',
-					banner: `// Generated file. DO NOT EDIT`,
-					minify: !dev,
-					drop: isProd ? ['debugger'] : undefined,
-					splitting: false,
-					packages: 'bundle',
-					conditions: ['browser', 'import', 'default'],
-					naming: {
-						entry: '[dir]/[name].[ext]',
-						chunk: 'workbench/chunk/[name]-[hash].[ext]',
-						asset: 'workbench/asset/[name]-[hash].[ext]',
-					},
-				};
+	if (existsSync(appFile) && workbench && workbench.hasWorkbench) {
+		// Create workbench config with proper defaults
+		const defaultConfig = { route: '/workbench', headers: {} };
+		const config = { ...defaultConfig, ...workbench.config };
+		try {
+			// Generate workbench files on the fly instead of using files from package
+			const tempWorkbenchDir = join(outDir, 'temp-workbench');
+			mkdirSync(tempWorkbenchDir, { recursive: true });
+
+			// Generate files using templates
+			await Bun.write(join(tempWorkbenchDir, 'main.tsx'), generateWorkbenchMainTsx(config));
+			const workbenchIndexFile = join(tempWorkbenchDir, 'index.html');
+			await Bun.write(workbenchIndexFile, generateWorkbenchIndexHtml());
+
+			// Bundle workbench using generated files
+			// Disable splitting to avoid CommonJS/ESM module resolution conflicts
+			const workbenchBuildConfig: Bun.BuildConfig = {
+				entrypoints: [workbenchIndexFile],
+				outdir: join(outDir, 'workbench'),
+				sourcemap: dev ? 'inline' : 'linked',
+				target: 'browser',
+				format: 'esm',
+				banner: `// Generated file. DO NOT EDIT`,
+				minify: !dev,
+				drop: isProd ? ['debugger'] : undefined,
+				splitting: false,
+				packages: 'bundle',
+				conditions: ['browser', 'import', 'default'],
+				naming: {
+					entry: '[dir]/[name].[ext]',
+					chunk: 'workbench/chunk/[name]-[hash].[ext]',
+					asset: 'workbench/asset/[name]-[hash].[ext]',
+				},
+			};
 
-				const workbenchResult = await Bun.build(workbenchBuildConfig);
-				if (workbenchResult.success) {
-					logger.debug('Workbench bundled successfully');
-					// Clean up temp directory
-					rmSync(tempWorkbenchDir, { recursive: true, force: true });
-				} else {
-					logger.error('Workbench bundling failed. Logs:', workbenchResult.logs);
-					if (workbenchResult.logs.length === 0) {
-						logger.error('No build logs available. Checking generated files...');
-						logger.error('Temp dir exists:', await Bun.file(tempWorkbenchDir).exists());
-						logger.error('Index file exists:', await Bun.file(workbenchIndexFile).exists());
-						logger.error(
-							'Main.tsx exists:',
-							await Bun.file(join(tempWorkbenchDir, 'main.tsx')).exists()
-						);
-					}
-					// Clean up temp directory even on failure
-					rmSync(tempWorkbenchDir, { recursive: true, force: true });
-					logger.fatal('Workbench bundling failed');
+			const workbenchResult = await Bun.build(workbenchBuildConfig);
+			if (workbenchResult.success) {
+				logger.debug('Workbench bundled successfully');
+				// Clean up temp directory
+				rmSync(tempWorkbenchDir, { recursive: true, force: true });
+			} else {
+				logger.error('Workbench bundling failed. Logs:', workbenchResult.logs);
+				if (workbenchResult.logs.length === 0) {
+					logger.error('No build logs available. Checking generated files...');
+					logger.error('Temp dir exists:', await Bun.file(tempWorkbenchDir).exists());
+					logger.error('Index file exists:', await Bun.file(workbenchIndexFile).exists());
+					logger.error(
+						'Main.tsx exists:',
+						await Bun.file(join(tempWorkbenchDir, 'main.tsx')).exists()
+					);
 				}
-			} catch (error) {
-				logger.error('Failed to bundle workbench:', error);
-				// Collect all error messages
-				const errorMessages: string[] = [];
-				if (error instanceof AggregateError && Array.isArray(error.errors)) {
-					for (const err of error.errors) {
-						// Extract useful info from Bun's ResolveMessage errors
-						if (err && typeof err === 'object') {
-							const errObj = err as Record<string, unknown>;
-							if (typeof errObj.message === 'string') {
-								errorMessages.push(`  ${errObj.message}`);
-							}
-							const position = errObj.position as Record<string, unknown> | undefined;
-							if (position?.file && position?.line && position?.column) {
-								errorMessages.push(
-									`  at ${position.file}:${position.line}:${position.column}`
-								);
-							}
+				// Clean up temp directory even on failure
+				rmSync(tempWorkbenchDir, { recursive: true, force: true });
+				logger.fatal('Workbench bundling failed');
+			}
+		} catch (error) {
+			logger.error('Failed to bundle workbench:', error);
+			// Collect all error messages
+			const errorMessages: string[] = [];
+			if (error instanceof AggregateError && Array.isArray(error.errors)) {
+				for (const err of error.errors) {
+					// Extract useful info from Bun's ResolveMessage errors
+					if (err && typeof err === 'object') {
+						const errObj = err as Record<string, unknown>;
+						if (typeof errObj.message === 'string') {
+							errorMessages.push(`  ${errObj.message}`);
+						}
+						const position = errObj.position as Record<string, unknown> | undefined;
+						if (position?.file && position?.line && position?.column) {
+							errorMessages.push(
+								`  at ${position.file}:${position.line}:${position.column}`
+							);
 						}
 					}
 				}
+			}
 
-				// Show different tips based on whether we're in a monorepo or published package
-				const isMonorepo = await Bun.file(join(rootDir, '../../packages')).exists();
-				if (isMonorepo) {
-					errorMessages.push(
-						'\nTip: Make sure all @agentuity/* packages are built by',
-						'running "bun run build" from the monorepo root.'
-					);
-				} else {
-					errorMessages.push(
-						'\nTip: If you see module resolution errors, try running',
-						'"bun install" to ensure all dependencies are installed.'
-					);
-				}
-
-				// Don't continue if workbench bundling fails
-				logger.fatal(errorMessages.join('\n'));
+			// Show different tips based on whether we're in a monorepo or published package
+			const isMonorepo = await Bun.file(join(rootDir, '../../packages')).exists();
+			if (isMonorepo) {
+				errorMessages.push(
+					'\nTip: Make sure all @agentuity/* packages are built by',
+					'running "bun run build" from the monorepo root.'
+				);
+			} else {
+				errorMessages.push(
+					'\nTip: If you see module resolution errors, try running',
+					'"bun install" to ensure all dependencies are installed.'
+				);
 			}
+
+			// Don't continue if workbench bundling fails
+			logger.fatal(errorMessages.join('\n'));
 		}
 	}
 

package/src/cmd/build/patch/_util.ts

@@ -44,13 +44,13 @@ export function generateGatewayEnvGuard(
 	provider: string
 ): string {
 	return `{
-    const apikey = process.env.AGENTUITY_SDK_KEY;
-    const url = process.env.AGENTUITY_AIGATEWAY_URL || process.env.AGENTUITY_TRANSPORT_URL || (apikey ? 'https://agentuity.ai' : '');
-    if (url && apikey) {
-        process.env.${apikey} = ${apikeyval};
-        process.env.${apibase} = url + '/gateway/${provider}';
+    const _agentuity_sdk_key = process.env.AGENTUITY_SDK_KEY;
+    const _agentuity_url = process.env.AGENTUITY_AIGATEWAY_URL || process.env.AGENTUITY_TRANSPORT_URL || (_agentuity_sdk_key ? 'https://agentuity.ai' : '');
+    if (_agentuity_url && _agentuity_sdk_key) {
+        process.env.${apikey} = _agentuity_sdk_key;
+        process.env.${apibase} = _agentuity_url + '/gateway/${provider}';
         console.debug('Enabled Agentuity AI Gateway for ${provider}');
-    } else {
+    } else if (!process.env.${apikey}) {
      ${generateEnvWarning(apikey)}
     }
 }

package/src/cmd/build/patch/llm.ts

@@ -24,7 +24,7 @@ export function generatePatches(): Map<string, PatchModule> {
 	const patches = new Map<string, PatchModule>();
 	registerLLMPatch(
 		patches,
-		'@anthropic-ai',
+		'@anthropic-ai/sdk',
 		'index',
 		'ANTHROPIC_API_KEY',
 		'ANTHROPIC_BASE_URL',

package/src/cmd/build/plugin.ts

@@ -375,6 +375,8 @@ import { readFileSync, existsSync } from 'node:fs';
 			index += html;
 		}
 	}
+	// make paths absolute
+	index = index.replaceAll('./web/', '/web/');
 	const webstatic = serveStatic({ root: import.meta.dir + '/web' });
 	// In dev mode, serve from source; in prod, serve from build output
 	const publicRoot = ${isDevMode} ? ${JSON.stringify(join(srcDir, 'web', 'public'))} : import.meta.dir + '/web/public';
@@ -389,16 +391,8 @@ import { readFileSync, existsSync } from 'node:fs';
 		if (path.includes('..') || path.includes('%2e%2e')) {
 			return c.notFound();
 		}
-		// Only serve from public folder at root (skip /web/* routes and /)
-		if (path !== '/' && !path.startsWith('/web/')) {
-			try {
-				// serveStatic calls next() internally if file not found
-				return await publicstatic(c, next);
-			} catch (err) {
-				return next();
-			}
-		}
-		return next();
+		// serve default for any path not explicitly matched
+		return c.html(index);
 	});
 })();`);
 				}
@@ -495,6 +489,14 @@ import { readFileSync, existsSync } from 'node:fs';
 					}
 
 					for (const apiFile of apiFiles) {
+						// Quick check: skip files that don't contain createRouter or Hono
+						// This avoids expensive AST parsing for utility files
+						const fileContent = await Bun.file(apiFile).text();
+						if (!fileContent.includes('createRouter') && !fileContent.includes('new Hono')) {
+							logger.trace(`Skipping ${apiFile}: no createRouter or Hono found`);
+							continue;
+						}
+
 						try {
 							const routes = await parseRoute(rootDir, apiFile, projectId, deploymentId);
 
@@ -574,12 +576,17 @@ import { readFileSync, existsSync } from 'node:fs';
 								});
 							}
 						} catch (error) {
-							// Skip files that don't have createRouter (they might be utilities)
-							if (
-								error instanceof Error &&
-								error.message.includes('could not find an proper createRouter')
-							) {
-								logger.trace(`Skipping ${apiFile}: no createRouter found`);
+							// Skip files that don't have proper router setup despite containing createRouter/Hono
+							// (e.g., files that import but don't use them, or have syntax errors)
+							if (error instanceof Error) {
+								if (
+									error.message.includes('could not find default export') ||
+									error.message.includes('could not find an proper createRouter')
+								) {
+									logger.trace(`Skipping ${apiFile}: ${error.message}`);
+								} else {
+									throw error;
+								}
 							} else {
 								throw error;
 							}

package/src/cmd/build/route-discovery.ts

@@ -19,17 +19,21 @@ export interface DiscoveredRouteFile {
 }
 
 /**
- * Recursively discover all TypeScript route files in an API directory
+ * Recursively discover all TypeScript files in an API directory.
+ * Any .ts file CAN be a route if it exports a router, but not all files MUST be routes.
+ * Files without router exports (utility files, types, helpers) are discovered but gracefully skipped during processing.
+ *
  * Supports nested structures like:
- * - src/api/index.ts (root API router)
+ * - src/api/index.ts (root API router - handled separately)
  * - src/api/auth/route.ts -> mounted at /api/auth
+ * - src/api/auth/login.ts -> mounted at /api/auth
  * - src/api/v1/users/route.ts -> mounted at /api/v1/users
- * - src/api/admin/users/login.ts -> mounted at /api/admin/users (any .ts file works)
+ * - src/api/auth/helpers.ts -> discovered but skipped if no router export
  *
  * @param apiDir - Absolute path to the src/api directory
  * @param currentDir - Current directory being scanned (used for recursion)
  * @param results - Accumulated results (used for recursion)
- * @returns Array of discovered route files with mount information
+ * @returns Array of discovered TypeScript files with mount information
  */
 export function discoverRouteFiles(
 	apiDir: string,
@@ -63,8 +67,9 @@ export function discoverRouteFiles(
 
 			// For subdirectory files, determine mount path
 			// src/api/auth/route.ts -> /api/auth
+			// src/api/auth/login.ts -> /api/auth
 			// src/api/v1/users/route.ts -> /api/v1/users
-			// src/api/admin/login.ts -> /api/admin
+			// src/api/admin/helpers.ts -> /api/admin (discovered but may be skipped during processing)
 			const pathParts = relativePath.split('/');
 			pathParts.pop(); // Remove filename
 

package/src/cmd/cloud/scp/download.ts

@@ -36,7 +36,7 @@ export const downloadCommand = createSubcommand({
 			description: 'Download multiple files',
 		},
 	],
-	requires: { apiClient: true, auth: true },
+	requires: { apiClient: true, auth: true, region: true },
 	optional: { project: true },
 	prerequisites: ['cloud deploy'],
 	schema: {
@@ -51,7 +51,7 @@ export const downloadCommand = createSubcommand({
 	},
 
 	async handler(ctx) {
-		const { apiClient, args, opts, project, projectDir, config } = ctx;
+		const { apiClient, args, opts, project, projectDir, config, region } = ctx;
 
 		let identifier = opts?.identifier ?? project?.projectId;
 
@@ -59,7 +59,7 @@ export const downloadCommand = createSubcommand({
 			identifier = await tui.showProjectList(apiClient, true);
 		}
 
-		const hostname = getIONHost(config);
+		const hostname = getIONHost(config, region);
 		const destination = args.destination ?? projectDir;
 
 		try {

package/src/cmd/cloud/scp/upload.ts

@@ -39,7 +39,7 @@ export const uploadCommand = createSubcommand({
 			description: 'Upload multiple files',
 		},
 	],
-	requires: { apiClient: true, auth: true },
+	requires: { apiClient: true, auth: true, region: true },
 	schema: {
 		args,
 		options,
@@ -54,7 +54,7 @@ export const uploadCommand = createSubcommand({
 	prerequisites: ['cloud deploy'],
 
 	async handler(ctx) {
-		const { apiClient, args, opts, project, projectDir, config } = ctx;
+		const { apiClient, args, opts, project, projectDir, config, region } = ctx;
 
 		let identifier = opts?.identifier ?? project?.projectId;
 
@@ -62,7 +62,7 @@ export const uploadCommand = createSubcommand({
 			identifier = await tui.showProjectList(apiClient, true);
 		}
 
-		const hostname = getIONHost(config);
+		const hostname = getIONHost(config, region);
 		const destination = args.destination ?? '.';
 
 		try {

package/src/cmd/cloud/ssh.ts

@@ -35,13 +35,13 @@ export const sshSubcommand = createSubcommand({
 		},
 	],
 	toplevel: true,
-	requires: { auth: true, apiClient: true },
+	requires: { auth: true, apiClient: true, region: true },
 	optional: { project: true },
 	prerequisites: ['cloud deploy'],
 	schema: { args, options },
 
 	async handler(ctx) {
-		const { apiClient, project, projectDir, args, config, opts } = ctx;
+		const { apiClient, project, projectDir, args, config, opts, region } = ctx;
 
 		let projectId = project?.projectId;
 		let identifier = args?.identifier;
@@ -56,7 +56,7 @@ export const sshSubcommand = createSubcommand({
 			projectId = await tui.showProjectList(apiClient, true);
 		}
 
-		const hostname = getIONHost(config);
+		const hostname = getIONHost(config, region);
 
 		const cmd = ['ssh', `${identifier ?? projectId}@${hostname}`, command].filter(
 			Boolean

package/src/cmd/dev/index.ts

@@ -16,7 +16,7 @@ import { type Config, createCommand } from '../../types';
 import * as tui from '../../tui';
 import { createAgentTemplates, createAPITemplates } from './templates';
 import { generateEndpoint, type DevmodeResponse } from './api';
-import { APIClient, getAPIBaseURL, getGravityDevModeURL } from '../../api';
+import { APIClient, getAppBaseURL, getAPIBaseURL, getGravityDevModeURL } from '../../api';
 import { download } from './download';
 import { createDevmodeSyncService } from './sync';
 import { getDevmodeDeploymentId } from '../build/ast';
@@ -105,6 +105,7 @@ export const command = createCommand({
 		let devmode: DevmodeResponse | undefined;
 		let gravityBin: string | undefined;
 		let gravityURL: string | undefined;
+		let appURL: string | undefined;
 
 		if (auth && project && opts.public) {
 			// Generate devmode endpoint only when using --public
@@ -123,6 +124,7 @@ export const command = createCommand({
 			config = _config;
 			devmode = endpoint;
 			gravityURL = getGravityDevModeURL(project.region, config);
+			appURL = `${getAppBaseURL(config)}/r/${project.projectId}`;
 			logger.trace('gravity url: %s', gravityURL);
 		}
 
@@ -179,6 +181,9 @@ export const command = createCommand({
 				? tui.link(`http://127.0.0.1:${opts.port}${workbench.config?.route ?? '/workbench'}`)
 				: tui.warn('Disabled')) +
 			'\n' +
+			tui.muted(tui.padRight('Dashboard:', padding)) +
+			(appURL ? tui.link(appURL) : tui.warn('Disabled')) +
+			'\n' +
 			(canDoInput
 				? '\n' + tui.muted('Press ') + tui.bold('h') + tui.muted(' for keyboard shortcuts')
 				: '');
@@ -933,6 +938,17 @@ export const command = createCommand({
 						return;
 					}
 
+					// Ignore .git folder
+					if (changedFile && (changedFile === '.git' || changedFile.startsWith('.git/'))) {
+						logger.trace(
+							'File change ignored (.git folder): %s (event: %s, file: %s)',
+							watchDir,
+							eventType,
+							changedFile
+						);
+						return;
+					}
+
 					// Ignore changes in .agentuity directory (build output)
 					// Check both relative path and normalized absolute path
 					const isInAgentuityDir =

package/src/cmd/index.ts

@@ -1,4 +1,5 @@
 import type { CommandDefinition } from '../types';
+import { isRunningFromExecutable } from './upgrade';
 
 // Use dynamic imports for bundler compatibility while maintaining lazy loading
 export async function discoverCommands(): Promise<CommandDefinition[]> {
@@ -12,12 +13,19 @@ export async function discoverCommands(): Promise<CommandDefinition[]> {
 		import('./profile').then((m) => m.command),
 		import('./project').then((m) => m.command),
 		import('./repl').then((m) => m.command),
+		import('./upgrade').then((m) => m.command),
 		import('./version').then((m) => m.command),
 	]);
 
 	const commands: CommandDefinition[] = [];
+	const isExecutable = isRunningFromExecutable();
 
 	for (const cmd of commandModules) {
+		// Skip commands that require running from an executable when not in one
+		if (cmd.executable && !isExecutable) {
+			continue;
+		}
+
 		commands.push(cmd);
 
 		// Auto-create hidden top-level aliases for subcommands with toplevel: true

package/src/cmd/profile/create.ts

@@ -73,6 +73,7 @@ export const createCommand = createSubcommand({
 			if (name === 'local') {
 				// if we're creating a local profile, go ahead and fill it out for the dev to make it easier to get started
 				const localConfig = (await loadConfig(filename)) as Config;
+				localConfig.name = name;
 				localConfig.overrides = {
 					api_url: 'https://api.agentuity.io',
 					app_url: 'https://app.agentuity.io',

package/src/cmd/project/download.ts

@@ -228,21 +228,13 @@ export async function setupProject(options: SetupOptions): Promise<void> {
 	}
 
 	// Initialize git repository if git is available
-	const gitPath = Bun.which('git');
-	if (gitPath) {
+	// Check for real git (not macOS stub that triggers Xcode CLT popup)
+	const { isGitAvailable, getDefaultBranch } = await import('../../git-helper');
+	const gitAvailable = await isGitAvailable();
+
+	if (gitAvailable) {
 		// Get default branch from git config, fallback to 'main'
-		let defaultBranch = 'main';
-		try {
-			const result = Bun.spawnSync(['git', 'config', '--global', 'init.defaultBranch']);
-			if (result.exitCode === 0) {
-				const branch = result.stdout.toString().trim();
-				if (branch) {
-					defaultBranch = branch;
-				}
-			}
-		} catch {
-			// Ignore errors, use fallback
-		}
+		const defaultBranch = (await getDefaultBranch()) || 'main';
 
 		// Git is available, initialize repository
 		await tui.runCommand({