@agentuity/cli 0.1.8 → 0.1.10

package/README.md

@@ -32,7 +32,7 @@ agentuity dev
 agentuity cloud keyvalue set mykey myvalue
 agentuity cloud agents
 agentuity cloud env list
-agentuity cloud secret set MY_SECRET value
+agentuity cloud env set MY_SECRET value --secret
 
 # AI commands
 agentuity ai capabilities show
@@ -82,7 +82,7 @@ agentuity --log-level=error example list
 Commands are organized into groups:
 
 - **Top-level**: `auth`, `project`, `version`, `build` (alias: `bundle`), `dev`
-- **Cloud** (`cloud`): `keyvalue`, `agents`, `env`, `secret`, and deployment-related commands
+- **Cloud** (`cloud`): `keyvalue`, `agents`, `env`, and deployment-related commands
 - **AI** (`ai`): `capabilities`, `prompt`, `schema`
 - **Hidden**: `profile` (internal use only)
 

package/bin/cli.ts

@@ -15,6 +15,7 @@ import { setOutputOptions } from '../src/output';
 import type { GlobalOptions } from '../src/types';
 import { ensureBunOnPath } from '../src/bun-path';
 import { checkForUpdates } from '../src/version-check';
+import { closeDatabase } from '../src/cache';
 
 // Cleanup TTY state before exit
 function cleanupTTY() {
@@ -37,10 +38,12 @@ function cleanupTTY() {
 process.on('SIGINT', () => {
 	process.stdout.write('\b \b'); // erase the ctrl+c display
 	cleanupTTY();
+	closeDatabase();
 });
 
 process.on('SIGTERM', () => {
 	cleanupTTY();
+	closeDatabase();
 });
 
 validateRuntime();
@@ -75,6 +78,7 @@ if (
 	console.log(JSON.stringify(cliSchema, null, 2));
 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	const exit = (globalThis as any).AGENTUITY_PROCESS_EXIT || process.exit;
+	closeDatabase();
 	exit(0);
 }
 
@@ -171,14 +175,17 @@ try {
 			msg.includes('canceled') || // US
 			msg === ''
 		) {
+			closeDatabase();
 			exit(0);
 		}
 		if ('name' in error && error.name === 'AbortError') {
+			closeDatabase();
 			exit(0);
 		}
 	}
 	// Also exit cleanly if error is empty/undefined (user cancellation)
 	if (!error) {
+		closeDatabase();
 		exit(0);
 	}
 	const errorWithMessage = error as { message?: string };
@@ -191,5 +198,6 @@ try {
 			error
 		);
 	}
+	closeDatabase();
 	exit(1);
 }

package/dist/cache/index.d.ts

@@ -0,0 +1,2 @@
+export { getResourceInfo, getResourceRegion, setResourceInfo, setResourceRegion, deleteResourceRegion, clearProfileCache, closeDatabase, type ResourceType, type ResourceInfo, } from './resource-region';
+//# sourceMappingURL=index.d.ts.map

package/dist/cache/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cache/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,eAAe,EACf,iBAAiB,EACjB,eAAe,EACf,iBAAiB,EACjB,oBAAoB,EACpB,iBAAiB,EACjB,aAAa,EACb,KAAK,YAAY,EACjB,KAAK,YAAY,GACjB,MAAM,mBAAmB,CAAC"}

package/dist/cache/index.js

@@ -0,0 +1,2 @@
+export { getResourceInfo, getResourceRegion, setResourceInfo, setResourceRegion, deleteResourceRegion, clearProfileCache, closeDatabase, } from './resource-region';
+//# sourceMappingURL=index.js.map

package/dist/cache/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cache/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,eAAe,EACf,iBAAiB,EACjB,eAAe,EACf,iBAAiB,EACjB,oBAAoB,EACpB,iBAAiB,EACjB,aAAa,GAGb,MAAM,mBAAmB,CAAC"}

package/dist/cache/resource-region.d.ts

@@ -0,0 +1,46 @@
+export type ResourceType = 'sandbox' | 'bucket' | 'db' | 'project' | 'deployment';
+/**
+ * Resource info returned from cache lookup
+ */
+export interface ResourceInfo {
+    region: string;
+    orgId?: string;
+}
+/**
+ * Get the cached info (region and orgId) for a resource.
+ * Returns null if not found or expired.
+ */
+export declare function getResourceInfo(type: ResourceType, profile: string, id: string): Promise<ResourceInfo | null>;
+/**
+ * Get the cached region for a resource.
+ * Returns null if not found or expired.
+ * @deprecated Use getResourceInfo() to get both region and orgId
+ */
+export declare function getResourceRegion(type: ResourceType, profile: string, id: string): Promise<string | null>;
+/**
+ * Set the cached info for a resource.
+ * Uses INSERT OR REPLACE to upsert.
+ */
+export declare function setResourceInfo(type: ResourceType, profile: string, id: string, region: string, orgId?: string): Promise<void>;
+/**
+ * Set the cached region for a resource.
+ * Uses INSERT OR REPLACE to upsert.
+ * @deprecated Use setResourceInfo() to set both region and orgId
+ */
+export declare function setResourceRegion(type: ResourceType, profile: string, id: string, region: string): Promise<void>;
+/**
+ * Delete the cached info for a resource.
+ * Called when a resource is deleted.
+ */
+export declare function deleteResourceRegion(type: ResourceType, profile: string, id: string): Promise<void>;
+/**
+ * Clear all cached entries for a specific profile.
+ * Useful when switching profiles or logging out.
+ */
+export declare function clearProfileCache(profile: string): Promise<void>;
+/**
+ * Close the database connection.
+ * Should be called on CLI exit for clean shutdown.
+ */
+export declare function closeDatabase(): void;
+//# sourceMappingURL=resource-region.d.ts.map

package/dist/cache/resource-region.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"resource-region.d.ts","sourceRoot":"","sources":["../../src/cache/resource-region.ts"],"names":[],"mappings":"AA8CA,MAAM,MAAM,YAAY,GAAG,SAAS,GAAG,QAAQ,GAAG,IAAI,GAAG,SAAS,GAAG,YAAY,CAAC;AAElF;;GAEG;AACH,MAAM,WAAW,YAAY;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;;GAGG;AACH,wBAAsB,eAAe,CACpC,IAAI,EAAE,YAAY,EAClB,OAAO,EAAE,MAAM,EACf,EAAE,EAAE,MAAM,GACR,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CA6B9B;AAED;;;;GAIG;AACH,wBAAsB,iBAAiB,CACtC,IAAI,EAAE,YAAY,EAClB,OAAO,EAAE,MAAM,EACf,EAAE,EAAE,MAAM,GACR,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAGxB;AAED;;;GAGG;AACH,wBAAsB,eAAe,CACpC,IAAI,EAAE,YAAY,EAClB,OAAO,EAAE,MAAM,EACf,EAAE,EAAE,MAAM,EACV,MAAM,EAAE,MAAM,EACd,KAAK,CAAC,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,CAAC,CAWf;AAED;;;;GAIG;AACH,wBAAsB,iBAAiB,CACtC,IAAI,EAAE,YAAY,EAClB,OAAO,EAAE,MAAM,EACf,EAAE,EAAE,MAAM,EACV,MAAM,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,CAAC,CAEf;AAED;;;GAGG;AACH,wBAAsB,oBAAoB,CACzC,IAAI,EAAE,YAAY,EAClB,OAAO,EAAE,MAAM,EACf,EAAE,EAAE,MAAM,GACR,OAAO,CAAC,IAAI,CAAC,CAOf;AAED;;;GAGG;AACH,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAItE;AAED;;;GAGG;AACH,wBAAgB,aAAa,IAAI,IAAI,CAKpC"}

package/dist/cache/resource-region.js

@@ -0,0 +1,115 @@
+import { Database } from 'bun:sqlite';
+import { join } from 'node:path';
+import { mkdir } from 'node:fs/promises';
+import { getDefaultConfigDir } from '../config';
+const TTL_DAYS = 7;
+const TTL_MS = TTL_DAYS * 24 * 60 * 60 * 1000;
+let db = null;
+async function getDatabase() {
+    if (db) {
+        return db;
+    }
+    const configDir = getDefaultConfigDir();
+    await mkdir(configDir, { recursive: true });
+    const dbPath = join(configDir, 'resource.db');
+    db = new Database(dbPath);
+    db.run(`
+		CREATE TABLE IF NOT EXISTS resource_region_cache (
+			resource_type TEXT NOT NULL,
+			profile TEXT NOT NULL,
+			id TEXT NOT NULL,
+			region TEXT NOT NULL,
+			org_id TEXT,
+			last_updated INTEGER NOT NULL,
+			PRIMARY KEY (resource_type, profile, id)
+		)
+	`);
+    db.run(`
+		CREATE INDEX IF NOT EXISTS idx_last_updated 
+		ON resource_region_cache(last_updated)
+	`);
+    return db;
+}
+function pruneOldEntries(database) {
+    const cutoff = Date.now() - TTL_MS;
+    database.run('DELETE FROM resource_region_cache WHERE last_updated < ?', [cutoff]);
+}
+/**
+ * Get the cached info (region and orgId) for a resource.
+ * Returns null if not found or expired.
+ */
+export async function getResourceInfo(type, profile, id) {
+    const database = await getDatabase();
+    const cutoff = Date.now() - TTL_MS;
+    const row = database
+        .query('SELECT region, org_id, last_updated FROM resource_region_cache WHERE resource_type = ? AND profile = ? AND id = ?')
+        .get(type, profile, id);
+    if (!row) {
+        return null;
+    }
+    // Check if entry is expired
+    if (row.last_updated < cutoff) {
+        // Remove stale entry
+        database.run('DELETE FROM resource_region_cache WHERE resource_type = ? AND profile = ? AND id = ?', [type, profile, id]);
+        return null;
+    }
+    return {
+        region: row.region,
+        orgId: row.org_id ?? undefined,
+    };
+}
+/**
+ * Get the cached region for a resource.
+ * Returns null if not found or expired.
+ * @deprecated Use getResourceInfo() to get both region and orgId
+ */
+export async function getResourceRegion(type, profile, id) {
+    const info = await getResourceInfo(type, profile, id);
+    return info?.region ?? null;
+}
+/**
+ * Set the cached info for a resource.
+ * Uses INSERT OR REPLACE to upsert.
+ */
+export async function setResourceInfo(type, profile, id, region, orgId) {
+    const database = await getDatabase();
+    pruneOldEntries(database);
+    database.run(`INSERT OR REPLACE INTO resource_region_cache 
+		 (resource_type, profile, id, region, org_id, last_updated)
+		 VALUES (?, ?, ?, ?, ?, ?)`, [type, profile, id, region, orgId ?? null, Date.now()]);
+}
+/**
+ * Set the cached region for a resource.
+ * Uses INSERT OR REPLACE to upsert.
+ * @deprecated Use setResourceInfo() to set both region and orgId
+ */
+export async function setResourceRegion(type, profile, id, region) {
+    await setResourceInfo(type, profile, id, region);
+}
+/**
+ * Delete the cached info for a resource.
+ * Called when a resource is deleted.
+ */
+export async function deleteResourceRegion(type, profile, id) {
+    const database = await getDatabase();
+    database.run('DELETE FROM resource_region_cache WHERE resource_type = ? AND profile = ? AND id = ?', [type, profile, id]);
+}
+/**
+ * Clear all cached entries for a specific profile.
+ * Useful when switching profiles or logging out.
+ */
+export async function clearProfileCache(profile) {
+    const database = await getDatabase();
+    database.run('DELETE FROM resource_region_cache WHERE profile = ?', [profile]);
+}
+/**
+ * Close the database connection.
+ * Should be called on CLI exit for clean shutdown.
+ */
+export function closeDatabase() {
+    if (db) {
+        db.close();
+        db = null;
+    }
+}
+//# sourceMappingURL=resource-region.js.map

package/dist/cache/resource-region.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resource-region.js","sourceRoot":"","sources":["../../src/cache/resource-region.ts"],"names":[],"mappings":"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"}

package/dist/cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,KAAK,EACX,iBAAiB,EAEjB,cAAc,EAQd,MAAM,SAAS,CAAC;AA8bjB,wBAAsB,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CA2MjE;AA27BD,wBAAsB,gBAAgB,CACrC,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,iBAAiB,EAAE,EAC7B,OAAO,EAAE,cAAc,GACrB,OAAO,CAAC,IAAI,CAAC,CAgMf"}
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,KAAK,EACX,iBAAiB,EAEjB,cAAc,EAQd,MAAM,SAAS,CAAC;AA8bjB,wBAAsB,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CA2MjE;AA09BD,wBAAsB,gBAAgB,CACrC,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,iBAAiB,EAAE,EAC7B,OAAO,EAAE,cAAc,GACrB,OAAO,CAAC,IAAI,CAAC,CAmMf"}

package/dist/cli.js

@@ -1,4 +1,4 @@
-import { mkdir } from 'node:fs/promises';
+import { mkdir, unlink } from 'node:fs/promises';
 import { homedir } from 'node:os';
 import { resolve, join } from 'node:path';
 import { Command } from 'commander';
@@ -283,7 +283,7 @@ function handleProjectConfigError(error, requiresProject, logger, errorFormat) {
         error &&
         typeof error === 'object' &&
         'name' in error &&
-        error.name === 'ProjectConfigNotFoundExpection') {
+        error.name === 'ProjectConfigNotFoundException') {
         exitWithError(createError(ErrorCode.PROJECT_NOT_FOUND, 'Invalid project folder', undefined, [
             'Use --dir to specify a different directory',
             'Change to a directory containing agentuity.json',
@@ -550,11 +550,29 @@ async function getRegion(regions) {
         return response.region;
     }
 }
-const REGIONS_CACHE_FILE = 'regions.json';
 const REGIONS_CACHE_MAX_AGE_MS = 5 * 24 * 60 * 60 * 1000; // 5 days
-async function getCachedRegions(logger) {
+const LEGACY_REGIONS_CACHE_FILE = 'regions.json';
+function getRegionsCacheFile(profileName) {
+    return `regions-${profileName}.json`;
+}
+async function removeLegacyRegionsCache(logger) {
+    try {
+        const legacyPath = join(getDefaultConfigDir(), LEGACY_REGIONS_CACHE_FILE);
+        const file = Bun.file(legacyPath);
+        if (await file.exists()) {
+            await unlink(legacyPath);
+            logger.trace('removed legacy regions cache file');
+        }
+    }
+    catch {
+        // Ignore errors when removing legacy file
+    }
+}
+async function getCachedRegions(profileName, logger) {
     try {
-        const cachePath = join(getDefaultConfigDir(), REGIONS_CACHE_FILE);
+        // Clean up legacy single-file cache from older versions
+        await removeLegacyRegionsCache(logger);
+        const cachePath = join(getDefaultConfigDir(), getRegionsCacheFile(profileName));
         const file = Bun.file(cachePath);
         if (!(await file.exists())) {
             return null;
@@ -562,46 +580,46 @@ async function getCachedRegions(logger) {
         const data = await file.json();
         const age = Date.now() - data.timestamp;
         if (age > REGIONS_CACHE_MAX_AGE_MS) {
-            logger.trace('regions cache expired (age: %dms)', age);
+            logger.trace('regions cache expired for profile %s (age: %dms)', profileName, age);
             return null;
         }
-        logger.trace('using cached regions (age: %dms)', age);
+        logger.trace('using cached regions for profile %s (age: %dms)', profileName, age);
         return data.regions;
     }
     catch (error) {
-        logger.trace('failed to read regions cache: %s', error);
+        logger.trace('failed to read regions cache for profile %s: %s', profileName, error);
         return null;
     }
 }
-async function saveRegionsCache(regions, logger) {
+async function saveRegionsCache(profileName, regions, logger) {
     try {
         const cacheDir = getDefaultConfigDir();
         await mkdir(cacheDir, { recursive: true });
-        const cachePath = join(cacheDir, REGIONS_CACHE_FILE);
+        const cachePath = join(cacheDir, getRegionsCacheFile(profileName));
         const data = {
             timestamp: Date.now(),
             regions,
         };
         await Bun.write(cachePath, JSON.stringify(data));
-        logger.trace('saved regions cache');
+        logger.trace('saved regions cache for profile %s', profileName);
     }
     catch (error) {
-        logger.trace('failed to save regions cache: %s', error);
+        logger.trace('failed to save regions cache for profile %s: %s', profileName, error);
     }
 }
-async function fetchRegionsWithCache(apiClient, logger) {
-    const cached = await getCachedRegions(logger);
+async function fetchRegionsWithCache(profileName, apiClient, logger) {
+    const cached = await getCachedRegions(profileName, logger);
     if (cached) {
         return cached;
     }
     const regions = await listRegions(apiClient);
-    await saveRegionsCache(regions, logger);
+    await saveRegionsCache(profileName, regions, logger);
     return regions;
 }
 async function resolveRegion(opts) {
-    const { options, apiClient, logger, required } = opts;
+    const { options, apiClient, profileName, logger, required } = opts;
     // Fetch regions (with caching)
-    const regions = await fetchRegionsWithCache(apiClient, logger);
+    const regions = await fetchRegionsWithCache(profileName, apiClient, logger);
     // No regions available
     if (regions.length === 0) {
         if (required) {
@@ -876,7 +894,7 @@ async function registerSubcommand(parent, subcommand, baseCtx, hidden) {
                         if (error &&
                             typeof error === 'object' &&
                             'name' in error &&
-                            error.name === 'ProjectConfigNotFoundExpection') {
+                            error.name === 'ProjectConfigNotFoundException') {
                             // If TTY is available, prompt user to select a project
                             const hasTTY = process.stdin.isTTY && process.stdout.isTTY;
                             if (hasTTY) {
@@ -964,6 +982,7 @@ async function registerSubcommand(parent, subcommand, baseCtx, hidden) {
                                 return resolveRegion({
                                     options: options,
                                     apiClient,
+                                    profileName: baseCtx.config?.name ?? defaultProfileName,
                                     logger: baseCtx.logger,
                                     required: !!normalized.requiresRegion,
                                     region: project?.region,
@@ -1021,6 +1040,7 @@ async function registerSubcommand(parent, subcommand, baseCtx, hidden) {
                         return resolveRegion({
                             options: options,
                             apiClient,
+                            profileName: baseCtx.config?.name ?? defaultProfileName,
                             logger: baseCtx.logger,
                             required: !!normalized.requiresRegion,
                             region: project?.region,
@@ -1106,6 +1126,7 @@ async function registerSubcommand(parent, subcommand, baseCtx, hidden) {
                         const region = await resolveRegion({
                             options: options,
                             apiClient,
+                            profileName: baseCtx.config?.name ?? defaultProfileName,
                             logger: baseCtx.logger,
                             required: !!normalized.requiresRegion,
                             region: project?.region,
@@ -1159,6 +1180,7 @@ async function registerSubcommand(parent, subcommand, baseCtx, hidden) {
                     const region = await resolveRegion({
                         options: options,
                         apiClient,
+                        profileName: baseCtx.config?.name ?? defaultProfileName,
                         logger: baseCtx.logger,
                         required: !!normalized.requiresRegion,
                     });
@@ -1248,6 +1270,7 @@ async function registerSubcommand(parent, subcommand, baseCtx, hidden) {
                     const region = await resolveRegion({
                         options: options,
                         apiClient,
+                        profileName: baseCtx.config?.name ?? defaultProfileName,
                         logger: baseCtx.logger,
                         required: !!normalized.requiresRegion,
                         region: project?.region,
@@ -1348,6 +1371,7 @@ export async function registerCommands(program, commands, baseCtx) {
                             const region = await resolveRegion({
                                 options: baseCtx.options,
                                 apiClient,
+                                profileName: baseCtx.config?.name ?? defaultProfileName,
                                 logger: baseCtx.logger,
                                 required: !!normalized.requiresRegion,
                             });
@@ -1397,6 +1421,7 @@ export async function registerCommands(program, commands, baseCtx) {
                             const region = await resolveRegion({
                                 options: baseCtx.options,
                                 apiClient,
+                                profileName: baseCtx.config?.name ?? defaultProfileName,
                                 logger: baseCtx.logger,
                                 required: !!normalized.requiresRegion,
                             });
@@ -1418,6 +1443,7 @@ export async function registerCommands(program, commands, baseCtx) {
                             const region = await resolveRegion({
                                 options: baseCtx.options,
                                 apiClient,
+                                profileName: baseCtx.config?.name ?? defaultProfileName,
                                 logger: baseCtx.logger,
                                 required: !!normalized.requiresRegion,
                             });