@agentuity/cli 0.1.9 → 0.1.11

package/src/cmd/cloud/ssh.ts

@@ -3,6 +3,7 @@ import { createSubcommand } from '../../types';
 import * as tui from '../../tui';
 import { getIONHost } from '../../config';
 import { getCommand } from '../../command-prefix';
+import { getIdentifierRegion } from './region-lookup';
 const args = z.object({
 	identifier: z.string().optional().describe('The project, deployment, or sandbox id to use'),
 	command: z.string().optional().describe('The command to run'),
@@ -39,13 +40,13 @@ export const sshSubcommand = createSubcommand({
 		},
 	],
 	toplevel: true,
-	requires: { auth: true, apiClient: true, region: true },
+	requires: { auth: true, apiClient: true },
 	optional: { project: true },
 	prerequisites: ['cloud deploy'],
 	schema: { args, options },
 
 	async handler(ctx) {
-		const { apiClient, project, projectDir, args, config, opts, region } = ctx;
+		const { apiClient, project, projectDir, args, config, opts, logger, auth, orgId } = ctx;
 
 		let projectId = project?.projectId;
 		let identifier = args?.identifier;
@@ -66,6 +67,18 @@ export const sshSubcommand = createSubcommand({
 			projectId = await tui.showProjectList(apiClient, true);
 		}
 
+		// Look up region from identifier (project/deployment/sandbox)
+		const profileName = config?.name;
+		const targetIdentifier = identifier ?? projectId!;
+		const region = await getIdentifierRegion(
+			logger,
+			auth,
+			apiClient,
+			profileName,
+			targetIdentifier,
+			orgId
+		);
+
 		const hostname = getIONHost(config, region);
 
 		const cmd = ['ssh', `${identifier ?? projectId}@${hostname}`, command].filter(

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

@@ -1,14 +1,15 @@
 import { z } from 'zod';
-import { listResources, deleteResources } from '@agentuity/server';
+import { listOrgResources, deleteResources } from '@agentuity/server';
 import enquirer from 'enquirer';
 import { createSubcommand } from '../../../types';
 import * as tui from '../../../tui';
-import { getCatalystAPIClient } from '../../../config';
+import { getGlobalCatalystAPIClient, getCatalystAPIClient } from '../../../config';
 import { getCommand } from '../../../command-prefix';
 import { isDryRunMode, outputDryRun } from '../../../explain';
 import { ErrorCode } from '../../../errors';
 import { createS3Client } from './utils';
 import { removeResourceEnvVars } from '../../../env-util';
+import { getResourceInfo, setResourceInfo, deleteResourceRegion } from '../../../cache';
 
 export const deleteSubcommand = createSubcommand({
 	name: 'delete',
@@ -16,7 +17,8 @@ export const deleteSubcommand = createSubcommand({
 	description: 'Delete a storage resource or file',
 	tags: ['destructive', 'deletes-resource', 'slow', 'requires-auth', 'requires-deployment'],
 	idempotent: false,
-	requires: { auth: true, org: true, region: true },
+	requires: { auth: true },
+	optional: { org: true },
 	examples: [
 		{
 			command: getCommand('cloud storage delete my-bucket'),
@@ -50,19 +52,50 @@ export const deleteSubcommand = createSubcommand({
 	},
 
 	async handler(ctx) {
-		const { logger, args, opts, orgId, region, auth, options } = ctx;
+		const { logger, args, opts, auth, options, config } = ctx;
 
-		const catalystClient = getCatalystAPIClient(logger, auth, region);
+		const profileName = config?.name ?? 'production';
+		const catalystClient = await getGlobalCatalystAPIClient(logger, auth, profileName);
+
+		let bucketName = args.name;
+
+		// If bucket name provided, try cache first for orgId
+		let orgId = ctx.orgId;
+		if (bucketName && !orgId) {
+			const cachedInfo = await getResourceInfo('bucket', profileName, bucketName);
+			orgId = cachedInfo?.orgId;
+		}
+
+		// For interactive selection (no bucket name), we need orgId
+		if (!bucketName && !orgId) {
+			tui.fatal(
+				'Organization required for interactive bucket selection. Specify --org-id or provide bucket name.',
+				ErrorCode.INVALID_ARGUMENT
+			);
+		}
+
+		// If we still don't have orgId and have a bucket name, error out
+		if (!orgId) {
+			tui.fatal(
+				`Organization not found for bucket '${bucketName}'. Run 'agentuity cloud storage list' first or specify --org-id.`,
+				ErrorCode.INVALID_ARGUMENT
+			);
+		}
 
 		const resources = await tui.spinner({
-			message: `Fetching storage for ${orgId} in ${region}`,
+			message: `Fetching storage for ${orgId}`,
 			clearOnSuccess: true,
 			callback: async () => {
-				return listResources(catalystClient, orgId, region!);
+				return listOrgResources(catalystClient, { type: 's3', orgId });
 			},
 		});
 
-		let bucketName = args.name;
+		// Cache all fetched buckets
+		for (const s3 of resources.s3) {
+			if (s3.cloud_region) {
+				await setResourceInfo('bucket', profileName, s3.bucket_name, s3.cloud_region, orgId);
+			}
+		}
 
 		if (!bucketName) {
 			if (resources.s3.length === 0) {
@@ -155,9 +188,22 @@ export const deleteSubcommand = createSubcommand({
 		}
 
 		// Otherwise, delete the bucket
+		// Find the bucket to get its region
+		const bucketToDelete = resources.s3.find((s3) => s3.bucket_name === bucketName);
+		if (!bucketToDelete) {
+			tui.fatal(`Storage bucket '${bucketName}' not found`, ErrorCode.RESOURCE_NOT_FOUND);
+		}
+		if (!bucketToDelete.cloud_region) {
+			tui.fatal(
+				`Storage bucket '${bucketName}' is missing region information`,
+				ErrorCode.RESOURCE_NOT_FOUND
+			);
+		}
+		const region = bucketToDelete.cloud_region;
+
 		// Handle dry-run mode
 		if (isDryRunMode(options)) {
-			outputDryRun(`Would delete storage bucket: ${bucketName}`, options);
+			outputDryRun(`Would delete storage bucket: ${bucketName} (region: ${region})`, options);
 			if (!options.json) {
 				tui.newline();
 				tui.info('[DRY RUN] Storage bucket deletion skipped');
@@ -184,11 +230,13 @@ export const deleteSubcommand = createSubcommand({
 			}
 		}
 
+		// Use regional client for the delete operation
+		const regionalClient = getCatalystAPIClient(logger, auth, region);
 		const deleted = await tui.spinner({
 			message: `Deleting storage bucket ${bucketName}`,
 			clearOnSuccess: true,
 			callback: async () => {
-				return deleteResources(catalystClient, orgId, region!, [
+				return deleteResources(regionalClient, orgId, region, [
 					{ type: 's3', name: bucketName },
 				]);
 			},
@@ -197,6 +245,9 @@ export const deleteSubcommand = createSubcommand({
 		if (deleted.length > 0) {
 			const resource = deleted[0];
 
+			// Clear cache entry for deleted bucket
+			await deleteResourceRegion('bucket', profileName, resource.name);
+
 			// Remove env vars from .env if running inside a project
 			if (ctx.projectDir && resource.env_keys.length > 0) {
 				await removeResourceEnvVars(ctx.projectDir, resource.env_keys);

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

@@ -1,17 +1,19 @@
 import { z } from 'zod';
-import { listResources } from '@agentuity/server';
+import { listOrgResources } from '@agentuity/server';
 import { createSubcommand } from '../../../types';
 import * as tui from '../../../tui';
-import { getCatalystAPIClient } from '../../../config';
+import { getGlobalCatalystAPIClient } from '../../../config';
 import { getCommand } from '../../../command-prefix';
 import { ErrorCode } from '../../../errors';
 import { createS3Client } from './utils';
+import { getResourceInfo, setResourceInfo } from '../../../cache';
 
 export const downloadSubcommand = createSubcommand({
 	name: 'download',
 	description: 'Download a file from storage bucket',
 	tags: ['read-only', 'requires-auth'],
-	requires: { auth: true, org: true, region: true },
+	requires: { auth: true },
+	optional: { org: true },
 	idempotent: true,
 	examples: [
 		{
@@ -51,21 +53,44 @@ export const downloadSubcommand = createSubcommand({
 	},
 
 	async handler(ctx) {
-		const { logger, args, opts, options, orgId, region, auth } = ctx;
+		const { logger, args, opts, options, auth, config } = ctx;
 
-		const catalystClient = getCatalystAPIClient(logger, auth, region);
+		const profileName = config?.name ?? 'production';
+		const catalystClient = await getGlobalCatalystAPIClient(logger, auth, profileName);
+
+		// Check cache first for orgId
+		const cachedInfo = await getResourceInfo('bucket', profileName, args.name);
+		const orgId = ctx.orgId ?? cachedInfo?.orgId;
+
+		if (!orgId) {
+			tui.fatal(
+				`Organization not found for bucket '${args.name}'. Run 'agentuity cloud storage list' first or specify --org-id.`,
+				ErrorCode.INVALID_ARGUMENT
+			);
+		}
 
 		// Fetch bucket credentials
 		const resources = await tui.spinner({
 			message: `Fetching credentials for ${args.name}`,
 			clearOnSuccess: true,
 			callback: async () => {
-				return listResources(catalystClient, orgId, region);
+				return listOrgResources(catalystClient, { type: 's3', orgId });
 			},
 		});
 
 		const bucket = resources.s3.find((s3) => s3.bucket_name === args.name);
 
+		// Cache the bucket info for future lookups
+		if (bucket?.cloud_region) {
+			await setResourceInfo(
+				'bucket',
+				profileName,
+				bucket.bucket_name,
+				bucket.cloud_region,
+				orgId
+			);
+		}
+
 		if (!bucket) {
 			tui.fatal(`Storage bucket '${args.name}' not found`, ErrorCode.RESOURCE_NOT_FOUND);
 		}

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

@@ -1,10 +1,11 @@
 import { z } from 'zod';
-import { listResources } from '@agentuity/server';
+import { listOrgResources } from '@agentuity/server';
 import { createSubcommand } from '../../../types';
 import * as tui from '../../../tui';
-import { getCatalystAPIClient } from '../../../config';
+import { getGlobalCatalystAPIClient } from '../../../config';
 import { getCommand } from '../../../command-prefix';
 import { ErrorCode } from '../../../errors';
+import { getResourceInfo, setResourceInfo } from '../../../cache';
 
 const StorageGetResponseSchema = z.object({
 	bucket_name: z.string().describe('Storage bucket name'),
@@ -19,7 +20,8 @@ export const getSubcommand = createSubcommand({
 	aliases: ['show'],
 	description: 'Show details about a specific storage bucket',
 	tags: ['read-only', 'fast', 'requires-auth'],
-	requires: { auth: true, org: true, region: true },
+	requires: { auth: true },
+	optional: { org: true },
 	idempotent: true,
 	examples: [
 		{
@@ -52,20 +54,43 @@ export const getSubcommand = createSubcommand({
 	webUrl: (ctx) => `/services/storage/${encodeURIComponent(ctx.args.name)}`,
 
 	async handler(ctx) {
-		const { logger, args, opts, options, orgId, region, auth } = ctx;
+		const { logger, args, opts, options, auth, config } = ctx;
 
-		const catalystClient = getCatalystAPIClient(logger, auth, region);
+		const profileName = config?.name ?? 'production';
+		const catalystClient = await getGlobalCatalystAPIClient(logger, auth, profileName);
+
+		// Check cache first for orgId
+		const cachedInfo = await getResourceInfo('bucket', profileName, args.name);
+		const orgId = ctx.orgId ?? cachedInfo?.orgId;
+
+		if (!orgId) {
+			tui.fatal(
+				`Organization not found for bucket '${args.name}'. Run 'agentuity cloud storage list' first or specify --org-id.`,
+				ErrorCode.INVALID_ARGUMENT
+			);
+		}
 
 		const resources = await tui.spinner({
 			message: `Fetching storage bucket ${args.name}`,
 			clearOnSuccess: true,
 			callback: async () => {
-				return listResources(catalystClient, orgId, region);
+				return listOrgResources(catalystClient, { type: 's3', orgId });
 			},
 		});
 
 		const bucket = resources.s3.find((s3) => s3.bucket_name === args.name);
 
+		// Cache the bucket info for future lookups
+		if (bucket?.cloud_region) {
+			await setResourceInfo(
+				'bucket',
+				profileName,
+				bucket.bucket_name,
+				bucket.cloud_region,
+				orgId
+			);
+		}
+
 		if (!bucket) {
 			tui.fatal(`Storage bucket '${args.name}' not found`, ErrorCode.RESOURCE_NOT_FOUND);
 		}

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

@@ -1,11 +1,12 @@
 import { z } from 'zod';
-import { listResources } from '@agentuity/server';
+import { listOrgResources } from '@agentuity/server';
 import { createSubcommand } from '../../../types';
 import * as tui from '../../../tui';
-import { getCatalystAPIClient } from '../../../config';
+import { getGlobalCatalystAPIClient } from '../../../config';
 import { getCommand } from '../../../command-prefix';
 import { ErrorCode } from '../../../errors';
 import { createS3Client } from './utils';
+import { setResourceInfo } from '../../../cache';
 
 const StorageListResponseSchema = z.object({
 	buckets: z
@@ -16,6 +17,7 @@ const StorageListResponseSchema = z.object({
 				secret_key: z.string().optional().describe('S3 secret key'),
 				region: z.string().optional().describe('S3 region'),
 				endpoint: z.string().optional().describe('S3 endpoint URL'),
+				cloud_region: z.string().optional().describe('Cloud region where bucket is hosted'),
 			})
 		)
 		.optional()
@@ -37,7 +39,7 @@ export const listSubcommand = createSubcommand({
 	aliases: ['ls'],
 	description: 'List storage resources or files in a bucket',
 	tags: ['read-only', 'fast', 'requires-auth'],
-	requires: { auth: true, org: true, region: true },
+	requires: { auth: true, org: true },
 	idempotent: true,
 	examples: [
 		{ command: getCommand('cloud storage list'), description: 'List items' },
@@ -78,18 +80,26 @@ export const listSubcommand = createSubcommand({
 			: '/services/storage',
 
 	async handler(ctx) {
-		const { logger, args, opts, options, orgId, region, auth } = ctx;
+		const { logger, args, opts, options, orgId, auth, config } = ctx;
 
-		const catalystClient = getCatalystAPIClient(logger, auth, region);
+		const catalystClient = await getGlobalCatalystAPIClient(logger, auth, config?.name);
 
+		const profileName = config?.name ?? 'production';
 		const resources = await tui.spinner({
-			message: `Fetching storage for ${orgId} in ${region}`,
+			message: `Fetching storage for ${orgId}`,
 			clearOnSuccess: true,
 			callback: async () => {
-				return listResources(catalystClient, orgId, region);
+				return listOrgResources(catalystClient, { type: 's3', orgId });
 			},
 		});
 
+		// Cache each bucket with its region and orgId for future lookups
+		for (const s3 of resources.s3) {
+			if (s3.cloud_region) {
+				await setResourceInfo('bucket', profileName, s3.bucket_name, s3.cloud_region, orgId);
+			}
+		}
+
 		// If bucket name is provided, list files in the bucket
 		if (args.name) {
 			const bucket = resources.s3.find((s3) => s3.bucket_name === args.name);
@@ -219,6 +229,7 @@ export const listSubcommand = createSubcommand({
 				secret_key: s3.secret_key ?? undefined,
 				region: s3.region ?? undefined,
 				endpoint: s3.endpoint ?? undefined,
+				cloud_region: s3.cloud_region,
 			})),
 		};
 	},

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

@@ -1,19 +1,21 @@
 import { z } from 'zod';
 import { basename } from 'path';
-import { listResources } from '@agentuity/server';
+import { listOrgResources } from '@agentuity/server';
 import { createSubcommand } from '../../../types';
 import * as tui from '../../../tui';
-import { getCatalystAPIClient } from '../../../config';
+import { getGlobalCatalystAPIClient } from '../../../config';
 import { getCommand } from '../../../command-prefix';
 import { ErrorCode } from '../../../errors';
 import { createS3Client } from './utils';
+import { getResourceInfo, setResourceInfo } from '../../../cache';
 
 export const uploadSubcommand = createSubcommand({
 	name: 'upload',
 	aliases: ['put'],
 	description: 'Upload a file to storage bucket',
 	tags: ['write', 'requires-auth'],
-	requires: { auth: true, org: true, region: true },
+	requires: { auth: true },
+	optional: { org: true },
 	idempotent: false,
 	examples: [
 		{
@@ -61,21 +63,44 @@ export const uploadSubcommand = createSubcommand({
 	},
 
 	async handler(ctx) {
-		const { logger, args, opts, options, orgId, region, auth } = ctx;
+		const { logger, args, opts, options, auth, config } = ctx;
 
-		const catalystClient = getCatalystAPIClient(logger, auth, region);
+		const profileName = config?.name ?? 'production';
+		const catalystClient = await getGlobalCatalystAPIClient(logger, auth, profileName);
+
+		// Check cache first for orgId
+		const cachedInfo = await getResourceInfo('bucket', profileName, args.name);
+		const orgId = ctx.orgId ?? cachedInfo?.orgId;
+
+		if (!orgId) {
+			tui.fatal(
+				`Organization not found for bucket '${args.name}'. Run 'agentuity cloud storage list' first or specify --org-id.`,
+				ErrorCode.INVALID_ARGUMENT
+			);
+		}
 
 		// Fetch bucket credentials
 		const resources = await tui.spinner({
 			message: `Fetching credentials for ${args.name}`,
 			clearOnSuccess: true,
 			callback: async () => {
-				return listResources(catalystClient, orgId, region);
+				return listOrgResources(catalystClient, { type: 's3', orgId });
 			},
 		});
 
 		const bucket = resources.s3.find((s3) => s3.bucket_name === args.name);
 
+		// Cache the bucket info for future lookups
+		if (bucket?.cloud_region) {
+			await setResourceInfo(
+				'bucket',
+				profileName,
+				bucket.bucket_name,
+				bucket.cloud_region,
+				orgId
+			);
+		}
+
 		if (!bucket) {
 			tui.fatal(`Storage bucket '${args.name}' not found`, ErrorCode.RESOURCE_NOT_FOUND);
 		}

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

@@ -4,7 +4,7 @@ import * as tui from '../../../tui';
 import { threadDelete, APIError } from '@agentuity/server';
 import { getCommand } from '../../../command-prefix';
 import { ErrorCode } from '../../../errors';
-import { getCatalystAPIClient } from '../../../config';
+import { getGlobalCatalystAPIClient } from '../../../config';
 
 export const deleteSubcommand = createSubcommand({
 	name: 'delete',
@@ -17,15 +17,15 @@ export const deleteSubcommand = createSubcommand({
 		},
 	],
 	aliases: ['rm'],
-	requires: { auth: true, region: true },
+	requires: { auth: true },
 	schema: {
 		args: z.object({
 			thread_id: z.string().describe('Thread ID'),
 		}),
 	},
 	async handler(ctx) {
-		const { logger, auth, args, region } = ctx;
-		const catalystClient = getCatalystAPIClient(logger, auth, region);
+		const { logger, auth, args, config } = ctx;
+		const catalystClient = await getGlobalCatalystAPIClient(logger, auth, config?.name);
 
 		try {
 			await threadDelete(catalystClient, { id: args.thread_id });

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

@@ -4,7 +4,7 @@ import * as tui from '../../../tui';
 import { threadGet, APIError } from '@agentuity/server';
 import { getCommand } from '../../../command-prefix';
 import { ErrorCode } from '../../../errors';
-import { getCatalystAPIClient } from '../../../config';
+import { getGlobalCatalystAPIClient } from '../../../config';
 
 const ThreadGetResponseSchema = z.object({
 	id: z.string().describe('Thread ID'),
@@ -28,7 +28,7 @@ export const getSubcommand = createSubcommand({
 			description: 'Get a thread by ID',
 		},
 	],
-	requires: { auth: true, region: true },
+	requires: { auth: true },
 	idempotent: true,
 	schema: {
 		args: z.object({
@@ -37,8 +37,8 @@ export const getSubcommand = createSubcommand({
 		response: ThreadGetResponseSchema,
 	},
 	async handler(ctx) {
-		const { logger, auth, args, options, region } = ctx;
-		const catalystClient = getCatalystAPIClient(logger, auth, region);
+		const { logger, auth, args, options, config } = ctx;
+		const catalystClient = await getGlobalCatalystAPIClient(logger, auth, config?.name);
 
 		try {
 			const thread = await threadGet(catalystClient, { id: args.thread_id });

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

@@ -4,7 +4,7 @@ import * as tui from '../../../tui';
 import { threadList, type Thread } from '@agentuity/server';
 import { getCommand } from '../../../command-prefix';
 import { ErrorCode } from '../../../errors';
-import { getCatalystAPIClient } from '../../../config';
+import { getGlobalCatalystAPIClient } from '../../../config';
 
 const ThreadListResponseSchema = z.array(
 	z.object({
@@ -36,7 +36,7 @@ export const listSubcommand = createSubcommand({
 		},
 	],
 	aliases: ['ls'],
-	requires: { auth: true, region: true },
+	requires: { auth: true },
 	optional: { project: true },
 	idempotent: true,
 	pagination: {
@@ -62,8 +62,8 @@ export const listSubcommand = createSubcommand({
 		response: ThreadListResponseSchema,
 	},
 	async handler(ctx) {
-		const { logger, auth, project, opts, options, region } = ctx;
-		const catalystClient = getCatalystAPIClient(logger, auth, region);
+		const { logger, auth, project, opts, options, config } = ctx;
+		const catalystClient = await getGlobalCatalystAPIClient(logger, auth, config?.name);
 
 		const projectId = opts.projectId || project?.projectId;
 		const orgId = opts.orgId;

package/src/cmd/project/auth/init.ts

@@ -20,7 +20,7 @@ export const initSubcommand = createSubcommand({
 	name: 'init',
 	description: 'Set up Agentuity Auth for your project',
 	tags: ['mutating', 'slow', 'requires-auth'],
-	requires: { auth: true, org: true, region: true },
+	requires: { auth: true, org: true },
 	idempotent: false,
 	examples: [
 		{
@@ -46,7 +46,7 @@ export const initSubcommand = createSubcommand({
 	},
 
 	async handler(ctx) {
-		const { logger, opts, auth, orgId, region } = ctx;
+		const { logger, opts, auth, orgId, config } = ctx;
 
 		tui.newline();
 		tui.info(tui.bold('Agentuity Auth Setup'));
@@ -86,10 +86,14 @@ export const initSubcommand = createSubcommand({
 			logger,
 			auth,
 			orgId,
-			region,
+			config,
 			existingUrl: databaseUrl,
+			projectDir,
 		});
 
+		// Get the region from the selected database
+		const region = dbInfo.region;
+
 		const databaseName = dbInfo.name;
 
 		// Update .env with database URL