@agentuity/cli 0.0.64 → 0.0.66

package/src/cmd/dev/index.ts

@@ -2,6 +2,7 @@
 import { z } from 'zod';
 import { resolve, join } from 'node:path';
 import { bundle } from '../build/bundler';
+import { getServiceUrls } from '@agentuity/server';
 import { getBuildMetadata } from '../build/plugin';
 import { existsSync, type FSWatcher, watch, statSync, readdirSync } from 'node:fs';
 import {
@@ -15,12 +16,13 @@ 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 } from '../../api';
+import { APIClient, getAPIBaseURL, getGravityDevModeURL } from '../../api';
 import { download } from './download';
 import { createDevmodeSyncService } from './sync';
 import { getDevmodeDeploymentId } from '../build/ast';
 import { BuildMetadata } from '@agentuity/server';
 import { getCommand } from '../../command-prefix';
+import { notifyWorkbenchClients } from '../../utils/workbench-notify';
 
 const shouldDisableInteractive = (interactive?: boolean) => {
 	if (!interactive) {
@@ -55,6 +57,12 @@ export const command = createCommand({
 				.max(65535)
 				.default(3500)
 				.describe('The TCP port to start the dev start'),
+			watch: z
+				.array(z.string())
+				.optional()
+				.describe(
+					'Additional paths to watch for changes (e.g., --watch ../packages/workbench/dist)'
+				),
 		}),
 	},
 	optional: { auth: 'Continue without an account (local only)', project: true },
@@ -94,6 +102,7 @@ export const command = createCommand({
 
 		let devmode: DevmodeResponse | undefined;
 		let gravityBin: string | undefined;
+		let gravityURL: string | undefined;
 
 		if (auth && project && opts.public) {
 			// Generate devmode endpoint only when using --public
@@ -111,6 +120,8 @@ export const command = createCommand({
 			await saveConfig(_config);
 			config = _config;
 			devmode = endpoint;
+			gravityURL = getGravityDevModeURL(project.region, config);
+			logger.error('gravity url: %s', gravityURL);
 		}
 
 		logger.debug(
@@ -176,33 +187,23 @@ export const command = createCommand({
 		env.AGENTUITY_SDK_DEV_MODE = 'true';
 		env.AGENTUITY_ENV = 'development';
 		env.NODE_ENV = 'development';
+		env.AGENTUITY_REGION = project?.region;
 		env.PORT = Number(opts.port).toFixed();
 		env.AGENTUITY_PORT = env.PORT;
+		const serviceUrls = getServiceUrls(project?.region);
 		if (options.logLevel !== undefined) env.AGENTUITY_LOG_LEVEL = options.logLevel;
 		// Pass through AGENTUITY_SDK_LOG_LEVEL for internal SDK logger
 		if (process.env.AGENTUITY_SDK_LOG_LEVEL) {
 			env.AGENTUITY_SDK_LOG_LEVEL = process.env.AGENTUITY_SDK_LOG_LEVEL;
 		}
 		env.AGENTUITY_FORCE_LOCAL_SERVICES = opts.local === true ? 'true' : 'false';
-		if (config?.overrides?.transport_url) {
-			env.AGENTUITY_TRANSPORT_URL = config.overrides.transport_url;
-		}
-		if (config?.overrides?.catalyst_url) {
-			env.AGENTUITY_CATALYST_URL = config.overrides.catalyst_url;
-		}
-		if (config?.overrides?.vector_url) {
-			env.AGENTUITY_VECTOR_URL = config.overrides.vector_url;
-		}
-		if (config?.overrides?.object_url) {
-			env.AGENTUITY_OBJECTSTORE_URL = config.overrides.object_url;
-		}
-		if (config?.overrides?.kv_url) {
-			env.AGENTUITY_KEYVALUE_URL = config.overrides.kv_url;
-		}
-		if (config?.overrides?.stream_url) {
-			env.AGENTUITY_STREAM_URL = config.overrides.stream_url;
-		}
 		if (project) {
+			env.AGENTUITY_TRANSPORT_URL = serviceUrls.catalyst;
+			env.AGENTUITY_CATALYST_URL = serviceUrls.catalyst;
+			env.AGENTUITY_VECTOR_URL = serviceUrls.vector;
+			env.AGENTUITY_OBJECTSTORE_URL = serviceUrls.objectstore;
+			env.AGENTUITY_KEYVALUE_URL = serviceUrls.keyvalue;
+			env.AGENTUITY_STREAM_URL = serviceUrls.stream;
 			env.AGENTUITY_CLOUD_ORG_ID = project.orgId;
 			env.AGENTUITY_CLOUD_PROJECT_ID = project.projectId;
 		}
@@ -230,6 +231,19 @@ export const command = createCommand({
 
 		// Watch directories instead of files to survive atomic replacements (sed -i, cp)
 		const watches = [rootDir];
+
+		// Add additional watch paths from options
+		if (opts.watch) {
+			for (const watchPath of opts.watch) {
+				const resolvedPath = resolve(rootDir, watchPath);
+				if (existsSync(resolvedPath)) {
+					watches.push(resolvedPath);
+					logger.debug('Added additional watch path: %s', resolvedPath);
+				} else {
+					logger.warn('Watch path does not exist: %s', resolvedPath);
+				}
+			}
+		}
 		const watchers: FSWatcher[] = [];
 		let failures = 0;
 		let running = false;
@@ -249,7 +263,7 @@ export const command = createCommand({
 		let gravityClient: Bun.Subprocess | undefined;
 		let initialStartupComplete = false;
 
-		const sdkKey = await loadProjectSDKKey(rootDir);
+		const sdkKey = await loadProjectSDKKey(logger, rootDir);
 		if (!sdkKey) {
 			tui.warning(`Couldn't find the AGENTUITY_SDK_KEY in ${rootDir} .env file`);
 		}
@@ -275,7 +289,7 @@ export const command = createCommand({
 						'--port',
 						env.PORT!,
 						'--url',
-						config?.overrides?.gravity_url ?? 'grpc://devmode.agentuity.com',
+						gravityURL!,
 						'--log-level',
 						process.env.AGENTUITY_GRAVITY_LOG_LEVEL ?? 'error',
 					],
@@ -450,6 +464,16 @@ export const command = createCommand({
 					checkRestartThrottle();
 					tui.info('Restarting on file change');
 					showedRestartMessage = true;
+
+					// Notify workbench clients before killing the server
+					await notifyWorkbenchClients({
+						port: opts.port,
+						message: 'restarting',
+					});
+
+					// Small delay to ensure the restart message is processed before killing server
+					await new Promise((resolve) => setTimeout(resolve, 200));
+
 					await kill();
 					logger.trace('Server killed, continuing with restart');
 					// Continue with restart after kill completes
@@ -624,6 +648,15 @@ export const command = createCommand({
 					logger.trace('Initial startup complete, file watcher restarts now enabled');
 				}
 
+				// Notify workbench clients that the server is alive and ready
+				// Use setTimeout to ensure server is fully ready before notifying
+				setTimeout(async () => {
+					await notifyWorkbenchClients({
+						port: opts.port,
+						message: 'alive',
+					});
+				}, 500);
+
 				logger.trace('Attaching exit handler to dev server process...');
 				// Attach non-blocking exit handler
 				exitPromise

package/src/cmd/profile/current.ts

@@ -0,0 +1,31 @@
+import { z } from 'zod';
+import { createSubcommand } from '../../types';
+import { getCommand } from '../../command-prefix';
+
+export const currentCommand = createSubcommand({
+	name: 'current',
+	description: 'Show the name of the currently active profile',
+	tags: ['read-only', 'fast'],
+	idempotent: true,
+	aliases: [],
+	examples: [
+		{ command: getCommand('profile current'), description: 'Show current profile' },
+		{ command: getCommand('profile current --json'), description: 'Show output in JSON format' },
+	],
+	schema: {
+		response: z.string().describe('The name of the current profile'),
+	},
+
+	async handler(ctx) {
+		const { options } = ctx;
+		const profileName = ctx.config?.name || 'production';
+
+		if (!options.json) {
+			console.log(profileName);
+		}
+
+		return profileName;
+	},
+});
+
+export default currentCommand;

package/src/cmd/profile/index.ts

@@ -4,6 +4,7 @@ import { useCommand } from './use';
 import { listCommand } from './list';
 import { showCommand } from './show';
 import { deleteCommand } from './delete';
+import { currentCommand } from './current';
 import { getCommand } from '../../command-prefix';
 
 export const command = createCommand({
@@ -18,5 +19,12 @@ export const command = createCommand({
 			description: 'Switch to production profile',
 		},
 	],
-	subcommands: [createProfileCmd, useCommand, listCommand, showCommand, deleteCommand],
+	subcommands: [
+		createProfileCmd,
+		useCommand,
+		listCommand,
+		showCommand,
+		deleteCommand,
+		currentCommand,
+	],
 });

package/src/cmd/profile/show.ts

@@ -12,7 +12,6 @@ export const showCommand = createSubcommand({
 	name: 'show',
 	description: 'Show the configuration of a profile',
 	tags: ['read-only', 'fast'],
-	aliases: ['current'],
 	examples: [
 		{ command: getCommand('profile show'), description: 'Show details' },
 		{ command: getCommand('profile show production'), description: 'Show details' },

package/src/cmd/project/download.ts

@@ -22,7 +22,6 @@ import { generateLLMPrompt as generateWebPrompt } from '../ai/prompt/web';
 import { generateLLMPrompt as generateAPIPrompt } from '../ai/prompt/api';
 import type { TemplateInfo } from './templates';
 
-const GITHUB_REPO = 'agentuity/sdk';
 const GITHUB_BRANCH = 'main';
 
 interface DownloadOptions {
@@ -91,14 +90,14 @@ export async function downloadTemplate(options: DownloadOptions): Promise<void>
 	// Download from GitHub
 	const branch = templateBranch || GITHUB_BRANCH;
 	const templatePath = `templates/${template.directory}`;
-	const url = `https://codeload.github.com/${GITHUB_REPO}/tar.gz/${branch}`;
+	const url = `https://agentuity.sh/template/sdk/${branch}/tar.gz`;
 	const tempDir = mkdtempSync(join(tmpdir(), 'agentuity-'));
 	const tarballPath = join(tempDir, 'download.tar.gz');
 
-	logger.debug('[download] URL:', url);
-	logger.debug('[download] Branch:', branch);
-	logger.debug('[download] Template path:', templatePath);
-	logger.debug('[download] Temp dir:', tempDir);
+	logger.debug('[download] URL: %s', url);
+	logger.debug('[download] Branch: %s', branch);
+	logger.debug('[download] Template path: %s', templatePath);
+	logger.debug('[download] Temp dir: %s', tempDir);
 
 	try {
 		// Step 1: Download tarball to temp file
@@ -120,8 +119,8 @@ export async function downloadTemplate(options: DownloadOptions): Promise<void>
 				const buffer = Buffer.concat(chunks);
 				await Bun.write(tarballPath, buffer);
 
-				logger.debug('[download] Downloaded bytes:', buffer.length);
-				logger.debug('[download] Tarball path:', tarballPath);
+				logger.debug('[download] Downloaded bytes: %dbytes', buffer.length);
+				logger.debug('[download] Tarball path: %s', tarballPath);
 			}
 		);
 
@@ -132,8 +131,8 @@ export async function downloadTemplate(options: DownloadOptions): Promise<void>
 		mkdirSync(extractDir, { recursive: true });
 
 		const prefix = `sdk-${branch}/${templatePath}/`;
-		logger.debug('[extract] Extract dir:', extractDir);
-		logger.debug('[extract] Filter prefix:', prefix);
+		logger.debug('[extract] Extract dir: %s', extractDir);
+		logger.debug('[extract] Filter prefix: %s', prefix);
 
 		// Track extraction stats for debugging
 		let ignoredCount = 0;
@@ -152,8 +151,8 @@ export async function downloadTemplate(options: DownloadOptions): Promise<void>
 					// This is a file/dir we want to extract - strip the prefix
 					header.name = header.name.substring(prefix.length);
 					mappedEntries.add(header.name); // Track that we mapped this
-					logger.debug('[extract] MAP:', originalName, '->', header.name);
-					logger.debug('[extract] EXTRACT:', originalName);
+					logger.debug('[extract] MAP: %s -> %s', originalName, header.name);
+					logger.debug('[extract] EXTRACT: %s', originalName);
 					extractedCount++;
 				}
 				return header;
@@ -172,7 +171,7 @@ export async function downloadTemplate(options: DownloadOptions): Promise<void>
 				}
 
 				// Otherwise, ignore it
-				logger.debug('[extract] IGNORE:', header.name);
+				logger.debug('[extract] IGNORE: %s', header.name);
 				ignoredCount++;
 				return true;
 			},
@@ -183,14 +182,14 @@ export async function downloadTemplate(options: DownloadOptions): Promise<void>
 		await finished(extractor);
 
 		logger.debug('[extract] Extraction complete');
-		logger.debug('[extract] Ignored entries:', ignoredCount);
-		logger.debug('[extract] Extracted entries:', extractedCount);
+		logger.debug('[extract] Ignored entries: %d', ignoredCount);
+		logger.debug('[extract] Extracted entries: %d', extractedCount);
 
 		// Step 3: Copy extracted files to destination
 		await cleanup(extractDir, dest);
 	} finally {
 		// Clean up temp directory
-		logger.debug('[cleanup] Removing temp dir:', tempDir);
+		logger.debug('[cleanup] Removing temp dir: %s', tempDir);
 		rmSync(tempDir, { recursive: true, force: true });
 	}
 }

package/src/cmd/project/template-flow.ts

@@ -74,7 +74,7 @@ export async function runCreateFlow(options: CreateFlowOptions): Promise<void> {
 		message: 'Fetching templates',
 		clearOnSuccess: true,
 		callback: async () => {
-			return fetchTemplates(templateDir, templateBranch);
+			return fetchTemplates(logger, templateDir, templateBranch);
 		},
 	});
 
@@ -90,7 +90,7 @@ export async function runCreateFlow(options: CreateFlowOptions): Promise<void> {
 	let catalystClient: ServerAPIClient | undefined;
 
 	if (auth) {
-		const serviceUrls = getServiceUrls();
+		const serviceUrls = getServiceUrls(region!);
 		const catalystUrl = config?.overrides?.catalyst_url ?? serviceUrls.catalyst;
 		catalystClient = new ServerAPIClient(catalystUrl, logger, auth.apiKey);
 	}
@@ -308,6 +308,8 @@ export async function runCreateFlow(options: CreateFlowOptions): Promise<void> {
 	if (auth && apiClient && orgId) {
 		let projectId: string | undefined;
 
+		const cloudRegion = region ?? process.env.AGENTUITY_REGION ?? 'usc';
+
 		await tui.spinner({
 			message: 'Registering your project',
 			clearOnSuccess: true,
@@ -315,7 +317,7 @@ export async function runCreateFlow(options: CreateFlowOptions): Promise<void> {
 				const project = await projectCreate(apiClient, {
 					name: projectName,
 					orgId,
-					cloudRegion: region ?? 'usc',
+					cloudRegion,
 				});
 				projectId = project.id;
 				return createProjectConfig(dest, {
@@ -325,7 +327,7 @@ export async function runCreateFlow(options: CreateFlowOptions): Promise<void> {
 					deployment: {
 						resources: resourceConfig,
 					},
-					region: region ?? 'usc',
+					region: cloudRegion,
 				});
 			},
 		});

package/src/cmd/project/templates.ts

@@ -1,8 +1,6 @@
-import { StructuredError } from '@agentuity/core';
+import { StructuredError, Logger } from '@agentuity/core';
 
-const GITHUB_REPO = 'agentuity/sdk';
 const GITHUB_BRANCH = 'main';
-const TEMPLATES_JSON_PATH = 'templates/templates.json';
 
 export interface TemplateInfo {
 	id: string;
@@ -18,7 +16,11 @@ interface TemplatesManifest {
 const TemplateMissingConfigurationError = StructuredError('TemplateMissingConfigurationError');
 const TemplateDownloadError = StructuredError('TemplateDownloadError')<{ status: number }>();
 
-export async function fetchTemplates(localDir?: string, branch?: string): Promise<TemplateInfo[]> {
+export async function fetchTemplates(
+	logger: Logger,
+	localDir?: string,
+	branch?: string
+): Promise<TemplateInfo[]> {
 	// Load from local directory if provided
 	if (localDir) {
 		const { join } = await import('node:path');
@@ -38,15 +40,11 @@ export async function fetchTemplates(localDir?: string, branch?: string): Promis
 
 	// Fetch from GitHub
 	const branchToUse = branch || GITHUB_BRANCH;
-	const url = `https://raw.githubusercontent.com/${GITHUB_REPO}/${branchToUse}/${TEMPLATES_JSON_PATH}`;
+	const url = `https://agentuity.sh/template/sdk/${branchToUse}`;
 
-	const headers: Record<string, string> = {};
-	if (process.env.GITHUB_TOKEN) {
-		headers['Authorization'] = `token ${process.env.GITHUB_TOKEN}`;
-	}
-
-	const response = await fetch(url, { headers });
+	const response = await fetch(url);
 	if (!response.ok) {
+		logger.trace('error fetching template from %s. %s', url, await response.text());
 		throw new TemplateDownloadError({
 			status: response.status,
 			message: `Failed to fetch templates: ${response.statusText}`,

package/src/command-prefix.ts

@@ -17,10 +17,13 @@ export function getCommandPrefix(): string {
 	const scriptPath = process.argv[1] || '';
 	const normalized = path.normalize(scriptPath);
 
+	const isCompiledBinary =
+		process.argv[0] === 'bun' && scriptPath.startsWith('/$bunfs/root/agentuity-');
+
 	// If we have AGENTUITY_CLI_VERSION set we are running from compiled binary OR
 	// If the script is in node_modules/.bin or a global bin directory, it's likely global
 	const isGlobal =
-		process.env.AGENTUITY_CLI_VERSION ||
+		isCompiledBinary ||
 		(normalized.includes(`${path.sep}bin${path.sep}`) &&
 			!normalized.includes(`${path.sep}node_modules${path.sep}`) &&
 			!normalized.includes(path.join('packages', 'cli', 'bin')));

package/src/config.ts

@@ -233,7 +233,11 @@ export async function saveConfig(config: Config, customPath?: string): Promise<v
 	const configPath = customPath || (await getProfile());
 	await ensureConfigDir();
 
-	const content = formatYAML(config);
+	// Strip auth from config before saving (never store auth in config file)
+	const configToSave = { ...config };
+	delete configToSave.auth;
+
+	const content = formatYAML(configToSave);
 	await writeFile(configPath, content + '\n', { mode: 0o600 });
 	// Ensure existing files get correct permissions on upgrade
 	await chmod(configPath, 0o600);
@@ -252,26 +256,61 @@ async function getOrInitConfig(): Promise<Config> {
 
 export async function saveAuth(auth: AuthData): Promise<void> {
 	const config = await getOrInitConfig();
-	config.auth = {
+	const profileName = config.name || defaultProfileName;
+
+	const authData = {
 		api_key: auth.apiKey,
 		user_id: auth.userId,
 		expires: auth.expires.getTime(),
 	};
-	config.preferences = config.preferences || {};
-	(config.preferences as Record<string, unknown>).orgId = '';
-	await saveConfig(config);
+
+	// Try to store in Bun secrets API
+	try {
+		await Bun.secrets.set({
+			service: `agentuity.cli.${profileName}`,
+			name: 'auth',
+			value: JSON.stringify(authData),
+		});
+
+		// Successfully stored in secrets, ensure auth is removed from config file
+		if (config.auth) {
+			delete config.auth;
+			await saveConfig(config);
+		}
+	} catch {
+		// Bun.secrets API not available or failed, fallback to config file
+		config.auth = authData;
+		config.preferences = config.preferences || {};
+		(config.preferences as Record<string, unknown>).orgId = '';
+
+		// Save with auth in config as fallback (saveConfig will try to strip it but we're setting it here)
+		const configPath = await getProfile();
+		await ensureConfigDir();
+		const content = formatYAML(config);
+		await writeFile(configPath, content + '\n', { mode: 0o600 });
+		await chmod(configPath, 0o600);
+		cachedConfig = config;
+	}
 }
 
 export async function clearAuth(): Promise<void> {
 	const config = await getOrInitConfig();
-	config.auth = {
-		api_key: '',
-		user_id: '',
-		expires: Date.now(),
-	};
-	config.preferences = config.preferences || {};
-	(config.preferences as Record<string, unknown>).orgId = '';
-	await saveConfig(config);
+	const profileName = config.name || defaultProfileName;
+
+	// Try to delete from Bun secrets API
+	try {
+		await Bun.secrets.delete({ service: `agentuity.cli.${profileName}`, name: 'auth' });
+	} catch {
+		// Bun.secrets API not available or failed
+	}
+
+	// Clear auth from config file (for backwards compatibility)
+	if (config.auth) {
+		delete config.auth;
+		config.preferences = config.preferences || {};
+		(config.preferences as Record<string, unknown>).orgId = '';
+		await saveConfig(config);
+	}
 }
 
 export async function saveProjectDir(projectDir: string): Promise<void> {
@@ -289,8 +328,59 @@ export async function saveOrgId(orgId: string): Promise<void> {
 	await saveConfig(config);
 }
 
+async function migrateAuthToSecrets(
+	config: Config,
+	profileName: string,
+	auth: { api_key: string; user_id: string; expires: number }
+): Promise<boolean> {
+	try {
+		const authData = {
+			api_key: auth.api_key,
+			user_id: auth.user_id,
+			expires: auth.expires,
+		};
+
+		await Bun.secrets.set({
+			service: `agentuity.cli.${profileName}`,
+			name: 'auth',
+			value: JSON.stringify(authData),
+		});
+
+		// Successfully migrated, remove from config file
+		delete config.auth;
+		await saveConfig(config);
+
+		return true;
+	} catch {
+		// Migration failed, leave in config file
+		return false;
+	}
+}
+
 export async function getAuth(): Promise<AuthData | null> {
-	// allow automated login from environment variables if present
+	const config = await loadConfig();
+	const profileName = config?.name || defaultProfileName;
+
+	// Priority 1: Try Bun secrets API first (most secure)
+	try {
+		const authJson = await Bun.secrets.get({
+			service: `agentuity.cli.${profileName}`,
+			name: 'auth',
+		});
+
+		if (authJson) {
+			const auth = JSON.parse(authJson) as { api_key: string; user_id: string; expires: number };
+			return {
+				apiKey: auth.api_key,
+				userId: auth.user_id,
+				expires: new Date(auth.expires),
+			};
+		}
+	} catch {
+		// Bun.secrets API not available or failed, fallback to other methods
+	}
+
+	// Priority 2: Allow automated login from environment variables
 	if (process.env.AGENTUITY_CLI_API_KEY && process.env.AGENTUITY_USER_ID) {
 		return {
 			apiKey: process.env.AGENTUITY_CLI_API_KEY,
@@ -299,7 +389,7 @@ export async function getAuth(): Promise<AuthData | null> {
 		};
 	}
 
-	const config = await loadConfig();
+	// Priority 3: Fallback to config file (backwards compatibility + migration)
 	if (!config) return null;
 	const auth = config.auth as { api_key?: string; user_id?: string; expires?: number } | undefined;
 
@@ -307,10 +397,23 @@ export async function getAuth(): Promise<AuthData | null> {
 		return null;
 	}
 
+	// Check if token is unexpired
+	const expiresDate = new Date(auth.expires || 0);
+	const isExpired = expiresDate.getTime() <= Date.now();
+
+	// If unexpired, attempt to migrate to Bun.secrets
+	if (!isExpired) {
+		await migrateAuthToSecrets(config, profileName, {
+			api_key: auth.api_key,
+			user_id: auth.user_id,
+			expires: auth.expires || 0,
+		});
+	}
+
 	return {
 		apiKey: auth.api_key,
 		userId: auth.user_id,
-		expires: new Date(auth.expires || 0),
+		expires: expiresDate,
 	};
 }
 
@@ -631,37 +734,60 @@ export async function loadBuildMetadata(dir: string): Promise<BuildMetadata> {
 	return result.data;
 }
 
-export async function loadProjectSDKKey(projectDir: string): Promise<string | undefined> {
+export async function loadProjectSDKKey(
+	logger: Logger,
+	projectDir: string
+): Promise<string | undefined> {
+	const c = await getOrInitConfig();
 	const files: string[] =
-		process.env.NODE_ENV === 'production'
+		process.env.NODE_ENV === 'production' || c?.name !== 'local'
 			? ['.env', '.env.production']
-			: ['.env.development', '.env.local', '.env'];
-	const c = await getOrInitConfig();
+			: ['.env.development', '.env'];
 	if (c) {
 		files.unshift(`.env.${c.name}`);
 	}
+	logger.trace(`[SDK_KEY] Searching for AGENTUITY_SDK_KEY in files: ${files.join(', ')}`);
+	logger.trace(`[SDK_KEY] Project directory: ${projectDir}`);
+	logger.trace(`[SDK_KEY] NODE_ENV: ${process.env.NODE_ENV}`);
 	for (const filename of files) {
 		const fn = join(projectDir, filename);
+		logger.trace(`[SDK_KEY] Checking file: ${fn}`);
 		if (existsSync(fn)) {
+			logger.trace(`[SDK_KEY] File exists: ${fn}`);
 			const buf = await Bun.file(fn).text();
 			const tok = buf.split(/\n/);
 			for (const t of tok) {
 				if (t.charAt(0) !== '#' && t.startsWith('AGENTUITY_SDK_KEY=')) {
 					const i = t.indexOf('=');
-					return t.substring(i + 1).trim();
+					const key = t.substring(i + 1).trim();
+					logger.trace(`[SDK_KEY] Found AGENTUITY_SDK_KEY in: ${fn}`);
+					logger.trace(`[SDK_KEY] Key value: ${key.substring(0, 10)}...`);
+					return key;
 				}
 			}
+			logger.trace(`[SDK_KEY] No AGENTUITY_SDK_KEY found in: ${fn}`);
+		} else {
+			logger.trace(`[SDK_KEY] File does not exist: ${fn}`);
 		}
 	}
+	logger.trace(`[SDK_KEY] AGENTUITY_SDK_KEY not found in any file`);
 }
 
-export function getCatalystAPIClient(config: Config | null, logger: Logger, auth: AuthData) {
-	const serviceUrls = getServiceUrls();
-	const catalystUrl = config?.overrides?.catalyst_url ?? serviceUrls.catalyst;
+export function getCatalystAPIClient(
+	config: Config | null,
+	logger: Logger,
+	auth: AuthData,
+	region: string
+) {
+	const serviceUrls = getServiceUrls(region);
+	const catalystUrl = serviceUrls.catalyst;
 	return new ServerAPIClient(catalystUrl, logger, auth.apiKey);
 }
 
 export function getIONHost(config: Config | null) {
+	if (config?.name === 'local') {
+		return 'ion.agentuity.io';
+	}
 	const url = new URL(config?.overrides?.ion_url ?? 'https://ion.agentuity.cloud');
 	return url.hostname;
 }

package/src/download.ts

@@ -30,7 +30,7 @@ export async function downloadWithProgress(
 			url,
 			status: response.status,
 			sessionId: response.headers.get('x-session-id'),
-			error: `Download failed: ${response.statusText}`,
+			message: `Download failed: ${response.statusText}`,
 		});
 	}