@agentuity/cli 0.0.105 → 0.0.107

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

@@ -7,6 +7,7 @@ import { getCatalystAPIClient } from '../../../config';
 import { getCommand } from '../../../command-prefix';
 import { isDryRunMode, outputDryRun } from '../../../explain';
 import { ErrorCode } from '../../../errors';
+import { removeResourceEnvVars } from '../../../env-util';
 
 export const deleteSubcommand = createSubcommand({
 	name: 'delete',
@@ -109,10 +110,22 @@ export const deleteSubcommand = createSubcommand({
 			});
 
 			if (deleted.length > 0) {
-				tui.success(`Deleted database: ${tui.bold(deleted[0])}`);
+				const resource = deleted[0];
+
+				// 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);
+					if (!options.json) {
+						tui.info(`Removed ${resource.env_keys.join(', ')} from .env`);
+					}
+				}
+
+				if (!options.json) {
+					tui.success(`Deleted database: ${tui.bold(resource.name)}`);
+				}
 				return {
 					success: true,
-					name: deleted[0],
+					name: resource.name,
 				};
 			} else {
 				tui.error('Failed to delete database');

package/src/cmd/cloud/deploy.ts

@@ -5,7 +5,7 @@ import { createReadStream, createWriteStream, existsSync, mkdirSync, writeFileSy
 import { tmpdir } from 'node:os';
 import { StructuredError } from '@agentuity/core';
 import { isRunningFromExecutable } from '../upgrade';
-import { createSubcommand } from '../../types';
+import { createSubcommand, DeployOptionsSchema } from '../../types';
 import { getUserAgent } from '../../api';
 import * as tui from '../../tui';
 import { saveProjectDir, getDefaultConfigDir, loadProjectSDKKey } from '../../config';
@@ -34,7 +34,7 @@ import {
 	getAppBaseURL,
 } from '@agentuity/server';
 import {
-	findEnvFile,
+	findExistingEnvFile,
 	readEnvFile,
 	filterAgentuitySdkKeys,
 	splitEnvAndSecrets,
@@ -43,7 +43,6 @@ import { zipDir } from '../../utils/zip';
 import { encryptFIPSKEMDEMStream } from '../../crypto/box';
 import { getCommand } from '../../command-prefix';
 import * as domain from '../../domain';
-import { DeployOptionsSchema } from '../../schemas/deploy';
 import { ErrorCode } from '../../errors';
 
 const DeploymentCancelledError = StructuredError(
@@ -84,10 +83,6 @@ export const deploySubcommand = createSubcommand({
 			command: getCommand('cloud deploy --log-level=debug'),
 			description: 'Deploy with verbose output',
 		},
-		{
-			command: getCommand('cloud deploy --tag a --tag b'),
-			description: 'Deploy with specific tags',
-		},
 	],
 	toplevel: true,
 	idempotent: false,
@@ -99,7 +94,7 @@ export const deploySubcommand = createSubcommand({
 	},
 
 	async handler(ctx) {
-		const { project, apiClient, projectDir, config, options, logger } = ctx;
+		const { project, apiClient, projectDir, config, options, logger, opts } = ctx;
 
 		let deployment: Deployment | undefined;
 		let build: BuildMetadata | undefined;
@@ -108,35 +103,6 @@ export const deploySubcommand = createSubcommand({
 		let statusResult: DeploymentStatusResult | undefined;
 		const logs: string[] = [];
 
-		// Check for pre-created deployment from CI/Nova
-		const deploymentEnv = process.env.AGENTUITY_DEPLOYMENT;
-		let useExistingDeployment = false;
-		if (deploymentEnv) {
-			const ExistingDeploymentSchema = z.object({
-				id: z.string(),
-				orgId: z.string(),
-				publicKey: z.string(),
-			});
-			try {
-				const parsed = JSON.parse(deploymentEnv);
-				const result = ExistingDeploymentSchema.safeParse(parsed);
-				if (result.success) {
-					deployment = result.data;
-					useExistingDeployment = true;
-					logger.info(`Using existing deployment: ${result.data.id}`);
-				} else {
-					const errors = result.error.issues
-						.map((i) => `${i.path.join('.')}: ${i.message}`)
-						.join(', ');
-					logger.warn(`Invalid AGENTUITY_DEPLOYMENT schema: ${errors}`);
-				}
-			} catch (err) {
-				logger.warn(
-					`Failed to parse AGENTUITY_DEPLOYMENT: ${err instanceof Error ? err.message : String(err)}`
-				);
-			}
-		}
-
 		const sdkKey = await loadProjectSDKKey(ctx.logger, ctx.projectDir);
 
 		// Ensure SDK key is present before proceeding
@@ -176,8 +142,8 @@ export const deploySubcommand = createSubcommand({
 						label: 'Sync Env & Secrets',
 						run: async () => {
 							try {
-								// Read local env file (.env.production or .env)
-								const envFilePath = await findEnvFile(projectDir);
+								// Read env file
+								const envFilePath = await findExistingEnvFile(projectDir);
 								const localEnv = await readEnvFile(envFilePath);
 
 								// Filter out AGENTUITY_ keys
@@ -212,9 +178,6 @@ export const deploySubcommand = createSubcommand({
 					{
 						label: 'Create Deployment',
 						run: async () => {
-							if (useExistingDeployment && deployment) {
-								return stepSkipped('using existing deployment');
-							}
 							try {
 								deployment = await projectDeploymentCreate(
 									apiClient,
@@ -244,6 +207,7 @@ export const deploySubcommand = createSubcommand({
 									projectId: project.projectId,
 									region: project.region,
 									logger: ctx.logger,
+									deploymentOptions: opts,
 								});
 								capturedOutput = bundleResult.output;
 								build = await loadBuildMetadata(join(projectDir, '.agentuity'));
@@ -462,7 +426,7 @@ export const deploySubcommand = createSubcommand({
 						},
 					},
 				].filter(Boolean) as Step[],
-				useExistingDeployment ? 'debug' : options.logLevel
+				options.logLevel
 			);
 
 			if (!deployment) {

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

@@ -45,7 +45,7 @@ export const deleteSubcommand = createSubcommand({
 			});
 		});
 
-		// Update local .env file (prefer .env.production, fallback to .env)
+		// Update local .env file (prefer .env)
 		const envFilePath = await findExistingEnvFile(projectDir);
 		const currentEnv = await readEnvFile(envFilePath);
 		delete currentEnv[args.key];

package/src/cmd/cloud/env/import.ts

@@ -3,7 +3,7 @@ import { createSubcommand } from '../../../types';
 import * as tui from '../../../tui';
 import { projectEnvUpdate } from '@agentuity/server';
 import {
-	findEnvFile,
+	findExistingEnvFile,
 	readEnvFile,
 	writeEnvFile,
 	filterAgentuitySdkKeys,
@@ -23,7 +23,7 @@ const EnvImportResponseSchema = z.object({
 
 export const importSubcommand = createSubcommand({
 	name: 'import',
-	description: 'Import environment variables from a file to cloud and local .env.production',
+	description: 'Import environment variables from a file to cloud and local .env',
 	tags: [
 		'mutating',
 		'creates-resource',
@@ -131,8 +131,8 @@ export const importSubcommand = createSubcommand({
 			});
 		});
 
-		// Merge with local .env.production file
-		const localEnvPath = await findEnvFile(projectDir);
+		// Merge environment
+		const localEnvPath = await findExistingEnvFile(projectDir);
 		const localEnv = await readEnvFile(localEnvPath);
 		const mergedEnv = mergeEnvVars(localEnv, filteredEnv);
 

package/src/cmd/cloud/env/pull.ts

@@ -3,13 +3,7 @@ import { join } from 'node:path';
 import { createSubcommand } from '../../../types';
 import * as tui from '../../../tui';
 import { projectGet } from '@agentuity/server';
-import {
-	findEnvFile,
-	findExistingEnvFile,
-	readEnvFile,
-	writeEnvFile,
-	mergeEnvVars,
-} from '../../../env-util';
+import { findExistingEnvFile, readEnvFile, writeEnvFile, mergeEnvVars } from '../../../env-util';
 import { getCommand } from '../../../command-prefix';
 
 const EnvPullResponseSchema = z.object({
@@ -21,7 +15,7 @@ const EnvPullResponseSchema = z.object({
 
 export const pullSubcommand = createSubcommand({
 	name: 'pull',
-	description: 'Pull environment variables from cloud to local .env.production file',
+	description: 'Pull environment variables from cloud to local .env file',
 	tags: ['slow', 'requires-auth', 'requires-project'],
 	idempotent: true,
 	examples: [
@@ -45,14 +39,11 @@ export const pullSubcommand = createSubcommand({
 			return projectGet(apiClient, { id: project.projectId, mask: false });
 		});
 
-		const cloudEnv = projectData.env || {};
+		const cloudEnv = { ...projectData.env, ...projectData.secrets }; // env pull with actually do both secrets and env since thats likely what the user would want
 
-		// Read current local env from existing file (.env.production or .env)
-		const existingEnvPath = await findExistingEnvFile(projectDir);
-		const localEnv = await readEnvFile(existingEnvPath);
-
-		// Target file is always .env.production
-		const targetEnvPath = await findEnvFile(projectDir);
+		// Target file is always .env
+		const targetEnvPath = await findExistingEnvFile(projectDir);
+		const localEnv = await readEnvFile(targetEnvPath);
 
 		// Merge: cloud values override local if force=true, otherwise keep local
 		let mergedEnv: Record<string, string>;
@@ -64,7 +55,7 @@ export const pullSubcommand = createSubcommand({
 			mergedEnv = mergeEnvVars(cloudEnv, localEnv);
 		}
 
-		// Write to .env.production (skip AGENTUITY_ keys)
+		// Write to .env (skip AGENTUITY_ keys)
 		await writeEnvFile(targetEnvPath, mergedEnv, {
 			skipKeys: Object.keys(mergedEnv).filter((k) => k.startsWith('AGENTUITY_')),
 		});

package/src/cmd/cloud/env/push.ts

@@ -13,7 +13,7 @@ const EnvPushResponseSchema = z.object({
 
 export const pushSubcommand = createSubcommand({
 	name: 'push',
-	description: 'Push environment variables from local .env.production file to cloud',
+	description: 'Push environment variables from local .env file to cloud',
 	tags: [
 		'mutating',
 		'updates-resource',
@@ -33,7 +33,7 @@ export const pushSubcommand = createSubcommand({
 	async handler(ctx) {
 		const { apiClient, project, projectDir } = ctx;
 
-		// Read local env file (prefer .env.production, fallback to .env)
+		// Read local env file (prefer .env)
 		const envFilePath = await findExistingEnvFile(projectDir);
 		const localEnv = await readEnvFile(envFilePath);
 

package/src/cmd/cloud/env/set.ts

@@ -3,7 +3,7 @@ import { createSubcommand } from '../../../types';
 import * as tui from '../../../tui';
 import { projectEnvUpdate } from '@agentuity/server';
 import {
-	findEnvFile,
+	findExistingEnvFile,
 	readEnvFile,
 	writeEnvFile,
 	filterAgentuitySdkKeys,
@@ -75,8 +75,8 @@ export const setSubcommand = createSubcommand({
 			});
 		});
 
-		// Update local .env.production file
-		const envFilePath = await findEnvFile(projectDir);
+		// Update local .env file
+		const envFilePath = await findExistingEnvFile(projectDir);
 		const currentEnv = await readEnvFile(envFilePath);
 		currentEnv[args.key] = args.value;
 

package/src/cmd/cloud/index.ts

@@ -15,6 +15,7 @@ import secretCommand from './secret';
 import apikeyCommand from './apikey';
 import streamCommand from './stream';
 import vectorCommand from './vector';
+import sandboxCommand from './sandbox';
 import { getCommand } from '../../command-prefix';
 
 export const command = createCommand({
@@ -31,6 +32,7 @@ export const command = createCommand({
 		agentCommand,
 		streamCommand,
 		vectorCommand,
+		sandboxCommand,
 		envCommand,
 		secretCommand,
 		deploySubcommand,