@agentuity/cli 0.0.64 → 0.0.66

package/src/cmd/cloud/db/sql.ts

@@ -1,23 +1,14 @@
 import { z } from 'zod';
-import { SQL } from 'bun';
-import { listResources, type ResourceList } from '@agentuity/server';
+import { dbQuery } from '@agentuity/server';
 import { createSubcommand } from '../../../types';
 import * as tui from '../../../tui';
 import { getCatalystAPIClient } from '../../../config';
 import { getCommand } from '../../../command-prefix';
-import { ErrorCode } from '../../../errors';
-
-interface DatabaseResource {
-	name: string;
-	username?: string | null;
-	password?: string | null;
-	url?: string | null;
-}
 
 const DBSQLResponseSchema = z.object({
 	rows: z.array(z.record(z.string(), z.unknown())).describe('Query results'),
 	rowCount: z.number().describe('Number of rows returned'),
-	executionTime: z.number().optional().describe('Query execution time in ms'),
+	truncated: z.boolean().describe('Whether results were truncated'),
 });
 
 export const sqlSubcommand = createSubcommand({
@@ -53,82 +44,41 @@ export const sqlSubcommand = createSubcommand({
 	async handler(ctx) {
 		const { logger, args, options, orgId, region, config, auth } = ctx;
 
-		const catalystClient = getCatalystAPIClient(config, logger, auth);
+		const catalystClient = getCatalystAPIClient(config, logger, auth, region);
 
-		const resources: ResourceList = await tui.spinner({
-			message: `Fetching database ${args.name}`,
+		const result = await tui.spinner({
+			message: `Executing query on ${args.name}`,
 			clearOnSuccess: true,
 			callback: async () => {
-				return listResources(catalystClient, orgId, region);
+				return dbQuery(catalystClient, {
+					database: args.name,
+					query: args.query,
+					orgId,
+					region,
+				});
 			},
 		});
 
-		const db: DatabaseResource | undefined = resources.db.find(
-			(d: DatabaseResource) => d.name === args.name
-		);
-
-		if (!db) {
-			tui.fatal(`Database '${args.name}' not found`, ErrorCode.RESOURCE_NOT_FOUND);
-		}
-
-		if (!db.url) {
-			tui.fatal(`Database '${args.name}' has no connection URL`, ErrorCode.RUNTIME_ERROR);
-		}
-
-		let database: SQL | undefined;
-		let rows: Record<string, unknown>[];
-		let executionTime: number | undefined;
-
-		try {
-			// Add sslmode=require if not already present in URL
-			let connectionUrl = db.url;
-			if (!connectionUrl.includes('sslmode=') && !connectionUrl.includes('ssl=')) {
-				const separator = connectionUrl.includes('?') ? '&' : '?';
-				connectionUrl = `${connectionUrl}${separator}sslmode=require`;
-			}
-
-			database = new SQL(connectionUrl);
-
-			const startTime = performance.now();
-			const result = await tui.spinner({
-				message: `Executing query on ${args.name}`,
-				clearOnSuccess: true,
-				callback: async () => {
-					return database!.unsafe(args.query);
-				},
-			});
-			executionTime = performance.now() - startTime;
-
-			rows = result;
-		} catch (error) {
-			const message = error instanceof Error ? error.message : String(error);
-			tui.fatal(`Query execution failed: ${message}`, ErrorCode.RUNTIME_ERROR);
-		} finally {
-			if (database) {
-				await database.close();
-			}
-		}
-
 		if (!options.json) {
-			if (rows.length === 0) {
+			if (result.rowCount === 0) {
 				tui.info('No rows returned');
 			} else {
 				if (process.stdout.isTTY) {
 					tui.newline();
 					tui.success(
-						`Query returned ${rows.length} row${rows.length !== 1 ? 's' : ''} (${executionTime?.toFixed(2)}ms):`
+						`Query returned ${result.rowCount} row${result.rowCount !== 1 ? 's' : ''}${result.truncated ? ' (truncated to 1000 rows)' : ''}:`
 					);
 					tui.newline();
 				}
 
-				tui.table(rows);
+				tui.table(result.rows);
 			}
 		}
 
 		return {
-			rows,
-			rowCount: rows.length,
-			executionTime,
+			rows: result.rows,
+			rowCount: result.rowCount,
+			truncated: result.truncated,
 		};
 	},
 });

package/src/cmd/cloud/deploy.ts

@@ -27,9 +27,9 @@ import {
 } from '../../env-util';
 import { zipDir } from '../../utils/zip';
 import { encryptFIPSKEMDEMStream } from '../../crypto/box';
-import { DeployOptionsSchema } from '../build/bundler';
 import { getCommand } from '../../command-prefix';
 import { checkCustomDomainForDNS } from './domain';
+import { DeployOptionsSchema } from '../../schemas/deploy';
 
 const DeployResponseSchema = z.object({
 	success: z.boolean().describe('Whether deployment succeeded'),
@@ -162,7 +162,8 @@ export const deploySubcommand = createSubcommand({
 								);
 								return stepSuccess();
 							} catch (ex) {
-								return stepError(ex instanceof Error ? ex.message : String(ex));
+								const _ex = ex as { message?: string };
+								return stepError(_ex.message ?? String(_ex), ex as Error);
 							}
 						},
 					},

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

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

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

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

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

@@ -69,7 +69,7 @@ export const removeSubcommand = createSubcommand({
 				deploymentId: args.deployment_id,
 			};
 		} catch (ex) {
-			tui.fatal(`Failed to remove deployment: ${ex instanceof Error ? ex.message : String(ex)}`);
+			tui.fatal(`Failed to remove deployment: ${ex}`);
 		}
 	},
 });

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

@@ -86,7 +86,7 @@ export const rollbackSubcommand = createSubcommand({
 				targetDeploymentId,
 			};
 		} catch (ex) {
-			tui.fatal(`Failed to rollback: ${ex instanceof Error ? ex.message : String(ex)}`);
+			tui.fatal(`Failed to rollback: ${ex}`);
 		}
 	},
 });

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

@@ -155,7 +155,7 @@ export const showSubcommand = createSubcommand({
 				metadata: deployment.metadata ?? undefined,
 			};
 		} catch (ex) {
-			tui.fatal(`Failed to show deployment: ${ex instanceof Error ? ex.message : String(ex)}`);
+			tui.fatal(`Failed to show deployment: ${ex}`);
 		}
 	},
 });

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

@@ -1,5 +1,5 @@
 import { KeyValueStorageService, Logger } from '@agentuity/core';
-import { createServerFetchAdapter } from '@agentuity/server';
+import { createServerFetchAdapter, getServiceUrls } from '@agentuity/server';
 import { loadProjectSDKKey } from '../../../config';
 import { ErrorCode } from '../../../errors';
 import type { Config } from '../../../types';
@@ -9,8 +9,9 @@ export async function createStorageAdapter(ctx: {
 	logger: Logger;
 	projectDir: string;
 	config: Config | null;
+	project: { region: string };
 }) {
-	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`,
@@ -27,6 +28,7 @@ export async function createStorageAdapter(ctx: {
 		ctx.logger
 	);
 
-	const baseUrl = ctx.config?.overrides?.catalyst_url ?? 'https://catalyst.agentuity.cloud';
+	const urls = getServiceUrls(ctx.project.region);
+	const baseUrl = urls.catalyst;
 	return new KeyValueStorageService(baseUrl, adapter);
 }

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

@@ -1,5 +1,5 @@
 import { Logger, ObjectStorageService } from '@agentuity/core';
-import { createServerFetchAdapter } from '@agentuity/server';
+import { createServerFetchAdapter, getServiceUrls } from '@agentuity/server';
 import { loadProjectSDKKey } from '../../../config';
 import type { Config } from '../../../types';
 import * as tui from '../../../tui';
@@ -8,8 +8,9 @@ export async function createStorageAdapter(ctx: {
 	logger: Logger;
 	projectDir: string;
 	config: Config | null;
+	project: { region: string };
 }) {
-	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`);
 	}
@@ -23,6 +24,6 @@ export async function createStorageAdapter(ctx: {
 		ctx.logger
 	);
 
-	const baseUrl = ctx.config?.overrides?.object_url ?? 'https://catalyst.agentuity.cloud';
+	const baseUrl = getServiceUrls(ctx.project.region).catalyst;
 	return new ObjectStorageService(baseUrl, adapter);
 }

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

@@ -116,7 +116,7 @@ export const getSubcommand = createSubcommand({
 			description: 'Get a session by ID',
 		},
 	],
-	requires: { auth: true },
+	requires: { auth: true, region: true },
 	idempotent: true,
 	schema: {
 		args: z.object({
@@ -125,8 +125,8 @@ export const getSubcommand = createSubcommand({
 		response: SessionGetResponseSchema,
 	},
 	async handler(ctx) {
-		const { config, logger, auth, args, options } = ctx;
-		const catalystClient = getCatalystAPIClient(config, logger, auth);
+		const { config, logger, auth, args, options, region } = ctx;
+		const catalystClient = getCatalystAPIClient(config, logger, auth, region);
 
 		try {
 			const enriched = await sessionGet(catalystClient, { id: args.session_id });
@@ -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

@@ -55,7 +55,7 @@ export const listSubcommand = createSubcommand({
 		},
 	],
 	aliases: ['ls'],
-	requires: { auth: true },
+	requires: { auth: true, region: true },
 	optional: { project: true },
 	idempotent: true,
 	pagination: {
@@ -89,8 +89,8 @@ export const listSubcommand = createSubcommand({
 		response: SessionListResponseSchema,
 	},
 	async handler(ctx) {
-		const { config, logger, auth, project, opts, options } = ctx;
-		const catalystClient = getCatalystAPIClient(config, logger, auth);
+		const { config, logger, auth, project, opts, options, region } = ctx;
+		const catalystClient = getCatalystAPIClient(config, logger, auth, region);
 
 		const projectId = opts.projectId || project?.projectId;
 
@@ -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/storage/create.ts

@@ -51,7 +51,7 @@ export const createSubcommand = defineSubcommand({
 			};
 		}
 
-		const catalystClient = getCatalystAPIClient(config, logger, auth);
+		const catalystClient = getCatalystAPIClient(config, logger, auth, region);
 
 		const created = await tui.spinner({
 			message: `Creating storage in ${region}`,

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

@@ -51,7 +51,7 @@ export const deleteSubcommand = createSubcommand({
 	async handler(ctx) {
 		const { logger, args, opts, config, orgId, region, auth, options } = ctx;
 
-		const catalystClient = getCatalystAPIClient(config, logger, auth);
+		const catalystClient = getCatalystAPIClient(config, logger, auth, region);
 
 		const resources = await tui.spinner({
 			message: `Fetching storage for ${orgId} in ${region}`,

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

@@ -53,7 +53,7 @@ export const downloadSubcommand = createSubcommand({
 	async handler(ctx) {
 		const { logger, args, opts, options, orgId, region, config, auth } = ctx;
 
-		const catalystClient = getCatalystAPIClient(config, logger, auth);
+		const catalystClient = getCatalystAPIClient(config, logger, auth, region);
 
 		// Fetch bucket credentials
 		const resources = await tui.spinner({

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

@@ -53,7 +53,7 @@ export const getSubcommand = createSubcommand({
 	async handler(ctx) {
 		const { logger, args, opts, options, orgId, region, config, auth } = ctx;
 
-		const catalystClient = getCatalystAPIClient(config, logger, auth);
+		const catalystClient = getCatalystAPIClient(config, logger, auth, region);
 
 		const resources = await tui.spinner({
 			message: `Fetching storage bucket ${args.name}`,

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

@@ -76,7 +76,7 @@ export const listSubcommand = createSubcommand({
 	async handler(ctx) {
 		const { logger, args, opts, options, orgId, region, config, auth } = ctx;
 
-		const catalystClient = getCatalystAPIClient(config, logger, auth);
+		const catalystClient = getCatalystAPIClient(config, logger, auth, region);
 
 		const resources = await tui.spinner({
 			message: `Fetching storage for ${orgId} in ${region}`,

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

@@ -51,7 +51,7 @@ export const uploadSubcommand = createSubcommand({
 	async handler(ctx) {
 		const { logger, args, opts, options, orgId, region, config, auth } = ctx;
 
-		const catalystClient = getCatalystAPIClient(config, logger, auth);
+		const catalystClient = getCatalystAPIClient(config, logger, auth, region);
 
 		// Fetch bucket credentials
 		const resources = await tui.spinner({

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

@@ -1,5 +1,5 @@
 import { StreamStorageService, Logger } from '@agentuity/core';
-import { createServerFetchAdapter } from '@agentuity/server';
+import { createServerFetchAdapter, getServiceUrls } from '@agentuity/server';
 import { loadProjectSDKKey } from '../../../config';
 import { ErrorCode } from '../../../errors';
 import type { Config } from '../../../types';
@@ -9,8 +9,9 @@ export async function createStorageAdapter(ctx: {
 	logger: Logger;
 	projectDir: string;
 	config: Config | null;
+	project: { region: string };
 }) {
-	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`,
@@ -27,6 +28,9 @@ export async function createStorageAdapter(ctx: {
 		ctx.logger
 	);
 
-	const baseUrl = ctx.config?.overrides?.stream_url ?? 'https://stream.agentuity.cloud';
+	const baseUrl = getServiceUrls(ctx.project.region).stream;
+
+	ctx.logger.trace('using stream url: %s', baseUrl);
+
 	return new StreamStorageService(baseUrl, adapter);
 }

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

@@ -17,15 +17,15 @@ export const deleteSubcommand = createSubcommand({
 		},
 	],
 	aliases: ['rm'],
-	requires: { auth: true },
+	requires: { auth: true, region: true },
 	schema: {
 		args: z.object({
 			thread_id: z.string().describe('Thread ID'),
 		}),
 	},
 	async handler(ctx) {
-		const { config, logger, auth, args } = ctx;
-		const catalystClient = getCatalystAPIClient(config, logger, auth);
+		const { config, logger, auth, args, region } = ctx;
+		const catalystClient = getCatalystAPIClient(config, logger, auth, region);
 
 		try {
 			await threadDelete(catalystClient, { id: args.thread_id });
@@ -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

@@ -28,7 +28,7 @@ export const getSubcommand = createSubcommand({
 			description: 'Get a thread by ID',
 		},
 	],
-	requires: { auth: true },
+	requires: { auth: true, region: true },
 	idempotent: true,
 	schema: {
 		args: z.object({
@@ -37,8 +37,8 @@ export const getSubcommand = createSubcommand({
 		response: ThreadGetResponseSchema,
 	},
 	async handler(ctx) {
-		const { config, logger, auth, args, options } = ctx;
-		const catalystClient = getCatalystAPIClient(config, logger, auth);
+		const { config, logger, auth, args, options, region } = ctx;
+		const catalystClient = getCatalystAPIClient(config, logger, auth, region);
 
 		try {
 			const thread = await threadGet(catalystClient, { id: args.thread_id });
@@ -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

@@ -36,7 +36,7 @@ export const listSubcommand = createSubcommand({
 		},
 	],
 	aliases: ['ls'],
-	requires: { auth: true },
+	requires: { auth: true, region: true },
 	optional: { project: true },
 	idempotent: true,
 	pagination: {
@@ -62,8 +62,8 @@ export const listSubcommand = createSubcommand({
 		response: ThreadListResponseSchema,
 	},
 	async handler(ctx) {
-		const { config, logger, auth, project, opts, options } = ctx;
-		const catalystClient = getCatalystAPIClient(config, logger, auth);
+		const { config, logger, auth, project, opts, options, region } = ctx;
+		const catalystClient = getCatalystAPIClient(config, logger, auth, region);
 
 		const projectId = opts.projectId || project?.projectId;
 		const orgId = opts.orgId;
@@ -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

@@ -1,5 +1,5 @@
 import { Logger, VectorStorageService } from '@agentuity/core';
-import { createServerFetchAdapter } from '@agentuity/server';
+import { createServerFetchAdapter, getServiceUrls } from '@agentuity/server';
 import { loadProjectSDKKey } from '../../../config';
 import type { Config } from '../../../types';
 import * as tui from '../../../tui';
@@ -8,8 +8,9 @@ export async function createStorageAdapter(ctx: {
 	logger: Logger;
 	projectDir: string;
 	config: Config | null;
+	project: { region: string };
 }) {
-	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`);
 	}
@@ -23,6 +24,7 @@ export async function createStorageAdapter(ctx: {
 		ctx.logger
 	);
 
-	const baseUrl = ctx.config?.overrides?.catalyst_url ?? 'https://catalyst.agentuity.cloud';
+	const urls = getServiceUrls(ctx.project.region);
+	const baseUrl = urls.catalyst;
 	return new VectorStorageService(baseUrl, adapter);
 }