@agentuity/cli 0.0.64 → 0.0.65

package/src/cmd/cloud/deployment/undeploy.ts

@@ -50,7 +50,7 @@ export const undeploySubcommand = createSubcommand({
 			await projectDeploymentUndeploy(apiClient, projectId);
 			tui.success('Undeployed successfully.');
 		} catch (ex) {
-			tui.fatal(`Failed to undeploy: ${ex instanceof Error ? ex.message : String(ex)}`);
+			tui.fatal(`Failed to undeploy: ${ex}`);
 		}
 	},
 });

package/src/cmd/cloud/keyvalue/util.ts

@@ -10,7 +10,7 @@ export async function createStorageAdapter(ctx: {
 	projectDir: string;
 	config: Config | null;
 }) {
-	const sdkKey = await loadProjectSDKKey(ctx.projectDir);
+	const sdkKey = await loadProjectSDKKey(ctx.logger, ctx.projectDir);
 	if (!sdkKey) {
 		tui.fatal(
 			`Couldn't find the AGENTUITY_SDK_KEY in ${ctx.projectDir} .env file`,

package/src/cmd/cloud/objectstore/util.ts

@@ -9,7 +9,7 @@ export async function createStorageAdapter(ctx: {
 	projectDir: string;
 	config: Config | null;
 }) {
-	const sdkKey = await loadProjectSDKKey(ctx.projectDir);
+	const sdkKey = await loadProjectSDKKey(ctx.logger, ctx.projectDir);
 	if (!sdkKey) {
 		tui.fatal(`Couldn't find the AGENTUITY_SDK_KEY in ${ctx.projectDir} .env file`);
 	}

package/src/cmd/cloud/session/get.ts

@@ -247,10 +247,7 @@ export const getSubcommand = createSubcommand({
 			if (ex instanceof APIError && ex.status === 404) {
 				tui.fatal(`Session ${args.session_id} not found`, ErrorCode.RESOURCE_NOT_FOUND);
 			}
-			tui.fatal(
-				`Failed to get session: ${ex instanceof Error ? ex.message : String(ex)}`,
-				ErrorCode.API_ERROR
-			);
+			tui.fatal(`Failed to get session: ${ex}`, ErrorCode.API_ERROR);
 		}
 	},
 });

package/src/cmd/cloud/session/list.ts

@@ -157,10 +157,7 @@ export const listSubcommand = createSubcommand({
 
 			return result;
 		} catch (ex) {
-			tui.fatal(
-				`Failed to list sessions: ${ex instanceof Error ? ex.message : String(ex)}`,
-				ErrorCode.API_ERROR
-			);
+			tui.fatal(`Failed to list sessions: ${ex}`, ErrorCode.API_ERROR);
 		}
 	},
 });

package/src/cmd/cloud/session/logs.ts

@@ -67,10 +67,7 @@ export const logsSubcommand = createSubcommand({
 
 			return logs;
 		} catch (ex) {
-			tui.fatal(
-				`Failed to get session logs: ${ex instanceof Error ? ex.message : String(ex)}`,
-				ErrorCode.API_ERROR
-			);
+			tui.fatal(`Failed to get session logs: ${ex}`, ErrorCode.API_ERROR);
 		}
 	},
 });

package/src/cmd/cloud/stream/util.ts

@@ -10,7 +10,7 @@ export async function createStorageAdapter(ctx: {
 	projectDir: string;
 	config: Config | null;
 }) {
-	const sdkKey = await loadProjectSDKKey(ctx.projectDir);
+	const sdkKey = await loadProjectSDKKey(ctx.logger, ctx.projectDir);
 	if (!sdkKey) {
 		tui.fatal(
 			`Couldn't find the AGENTUITY_SDK_KEY in ${ctx.projectDir} .env file`,
@@ -28,5 +28,8 @@ export async function createStorageAdapter(ctx: {
 	);
 
 	const baseUrl = ctx.config?.overrides?.stream_url ?? 'https://stream.agentuity.cloud';
+
+	ctx.logger.trace('using stream url: %s', baseUrl);
+
 	return new StreamStorageService(baseUrl, adapter);
 }

package/src/cmd/cloud/thread/delete.ts

@@ -35,10 +35,7 @@ export const deleteSubcommand = createSubcommand({
 				tui.fatal(`Thread ${args.thread_id} not found`, ErrorCode.RESOURCE_NOT_FOUND);
 				return;
 			}
-			tui.fatal(
-				`Failed to delete thread: ${ex instanceof Error ? ex.message : String(ex)}`,
-				ErrorCode.API_ERROR
-			);
+			tui.fatal(`Failed to delete thread: ${ex}`, ErrorCode.API_ERROR);
 		}
 	},
 });

package/src/cmd/cloud/thread/get.ts

@@ -79,10 +79,7 @@ export const getSubcommand = createSubcommand({
 			if (ex instanceof APIError && ex.status === 404) {
 				tui.fatal(`Thread ${args.thread_id} not found`, ErrorCode.RESOURCE_NOT_FOUND);
 			}
-			tui.fatal(
-				`Failed to get thread: ${ex instanceof Error ? ex.message : String(ex)}`,
-				ErrorCode.API_ERROR
-			);
+			tui.fatal(`Failed to get thread: ${ex}`, ErrorCode.API_ERROR);
 		}
 	},
 });

package/src/cmd/cloud/thread/list.ts

@@ -116,10 +116,7 @@ export const listSubcommand = createSubcommand({
 
 			return result;
 		} catch (ex) {
-			tui.fatal(
-				`Failed to list threads: ${ex instanceof Error ? ex.message : String(ex)}`,
-				ErrorCode.API_ERROR
-			);
+			tui.fatal(`Failed to list threads: ${ex}`, ErrorCode.API_ERROR);
 		}
 	},
 });

package/src/cmd/cloud/vector/util.ts

@@ -9,7 +9,7 @@ export async function createStorageAdapter(ctx: {
 	projectDir: string;
 	config: Config | null;
 }) {
-	const sdkKey = await loadProjectSDKKey(ctx.projectDir);
+	const sdkKey = await loadProjectSDKKey(ctx.logger, ctx.projectDir);
 	if (!sdkKey) {
 		tui.fatal(`Couldn't find the AGENTUITY_SDK_KEY in ${ctx.projectDir} .env file`);
 	}

package/src/cmd/dev/index.ts

@@ -21,6 +21,7 @@ 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 +56,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 },
@@ -230,6 +237,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 +269,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`);
 		}
@@ -450,6 +470,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 +654,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/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

@@ -631,28 +631,43 @@ 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) {

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}`,
 		});
 	}
 

package/src/env-util.ts

@@ -70,6 +70,7 @@ export async function readEnvFile(path: string): Promise<EnvVars> {
 	const file = Bun.file(path);
 
 	if (!(await file.exists())) {
+		console.log(`[ENV] File does not exist: ${path}`);
 		return {};
 	}
 
@@ -84,6 +85,8 @@ export async function readEnvFile(path: string): Promise<EnvVars> {
 		}
 	}
 
+	console.log(`[ENV] Read ${Object.keys(env).length} variables from: ${path}`);
+	console.log(`[ENV] Variables: ${Object.keys(env).join(', ')}`);
 	return env;
 }
 

package/src/schemas/deploy.ts

@@ -0,0 +1,28 @@
+import { z } from 'zod';
+
+export const DeployOptionsSchema = z.object({
+	tag: z
+		.array(z.string())
+		.default(['latest'])
+		.optional()
+		.describe('One or more tags to add to the deployment'),
+	logsUrl: z.url().optional().describe('The url to the CI build logs'),
+	trigger: z
+		.enum(['cli', 'workflow', 'webhook'])
+		.default('cli')
+		.optional()
+		.describe('The trigger that caused the build'),
+	commitUrl: z.url().optional().describe('The url to the CI commit'),
+	message: z.string().optional().describe('The message to associate with this deployment'),
+	provider: z.string().optional().describe('The CI provider name (attempts to autodetect)'),
+	event: z
+		.enum(['pull_request', 'push', 'manual', 'workflow'])
+		.default('manual')
+		.optional()
+		.describe('The event that triggered the deployment'),
+	pullRequestNumber: z.number().optional().describe('the pull request number'),
+	pullRequestCommentId: z.string().optional().describe('the pull request comment id'),
+	pullRequestURL: z.url().optional().describe('the pull request url'),
+});
+
+export type DeployOptions = z.infer<typeof DeployOptionsSchema>;

package/src/utils/workbench-notify.ts

@@ -0,0 +1,67 @@
+/**
+ * Utility to send notifications directly to workbench clients via WebSocket
+ */
+
+export interface WorkbenchNotifyOptions {
+	port?: number;
+	message: 'restarting' | 'alive';
+}
+
+/**
+ * Send a notification directly to workbench clients via WebSocket
+ *
+ * @param options - Configuration for the notification
+ * @returns Promise that resolves when notification is sent
+ *
+ * @example
+ * ```typescript
+ * // Notify clients that server is restarting
+ * await notifyWorkbenchClients({
+ *   baseUrl: 'ws://localhost:3500',
+ *   message: 'restarting'
+ * });
+ *
+ * // Notify clients that server is alive
+ * await notifyWorkbenchClients({
+ *   message: 'alive'
+ * });
+ * ```
+ */
+export async function notifyWorkbenchClients(options: WorkbenchNotifyOptions): Promise<void> {
+	const { port = 3500, message } = options;
+
+	const wsUrl = new URL(`ws://localhost:${port}`);
+
+	return new Promise((resolve) => {
+		try {
+			wsUrl.pathname = '/_agentuity/workbench/ws';
+
+			const ws = new WebSocket(wsUrl.toString());
+
+			// Set a timeout to avoid hanging
+			const timeout = setTimeout(() => {
+				ws.close();
+				resolve();
+			}, 2000);
+
+			ws.onopen = () => {
+				ws.send(message);
+				ws.close();
+			};
+
+			ws.onclose = () => {
+				clearTimeout(timeout);
+				resolve();
+			};
+
+			ws.onerror = () => {
+				clearTimeout(timeout);
+				ws.close();
+				resolve();
+			};
+		} catch (_error) {
+			// Silently fail - this ensures the CLI doesn't fail if the app server isn't running
+			resolve();
+		}
+	});
+}