@agentuity/cli 1.0.13 → 1.0.15

package/src/cmd/build/ast.ts

@@ -11,6 +11,7 @@ import type { LogLevel } from '../../types';
 import { existsSync, mkdirSync, statSync } from 'node:fs';
 import JSON5 from 'json5';
 import { formatSchemaCode } from './format-schema';
+import { toForwardSlash } from '../../utils/normalize-path';
 import {
 	computeApiMountPath,
 	joinMountAndRoute,
@@ -488,7 +489,7 @@ export async function parseEvalMetadata(
 		ecmaVersion: 'latest',
 		sourceType: 'module',
 	});
-	const rel = relative(rootDir, filename);
+	const rel = toForwardSlash(relative(rootDir, filename));
 	const version = hash(contents);
 	const evals: Array<{
 		filename: string;
@@ -706,7 +707,7 @@ export async function parseAgentMetadata(
 		sourceType: 'module',
 	});
 	let exportName: string | undefined;
-	const rel = relative(rootDir, filename);
+	const rel = toForwardSlash(relative(rootDir, filename));
 	let name: string | undefined; // Will be set from createAgent identifier
 	const version = hash(contents);
 	const id = getAgentId(projectId, deploymentId, rel, version);
@@ -910,7 +911,7 @@ export async function parseAgentMetadata(
 		| 'error';
 	const logger = createLogger(logLevel);
 	const agentDir = dirname(filename);
-	const evalsPath = `${agentDir}/eval.ts`;
+	const evalsPath = join(agentDir, 'eval.ts');
 	logger.trace(`Checking for evals file at ${evalsPath}`);
 	const evalsFile = Bun.file(evalsPath);
 	if (await evalsFile.exists()) {
@@ -1049,7 +1050,7 @@ function validateSchemaExports(
 }
 
 /**
- * Check if an AST node contains a validator() call
+ * Information extracted from validator middleware in route handler arguments.
  */
 interface ValidatorInfo {
 	hasValidator: boolean;
@@ -1059,9 +1060,66 @@ interface ValidatorInfo {
 	stream?: boolean;
 }
 
+/**
+ * Scan route handler arguments for validator middleware and extract schema information.
+ *
+ * Accumulates schema info across ALL validator arguments in the route handler,
+ * supporting common patterns like combining param + JSON body validation:
+ *
+ * ```ts
+ * router.patch('/:id',
+ *   zValidator('param', paramSchema),  // detected, no schema extracted (non-json)
+ *   zValidator('json', bodySchema),    // detected, inputSchemaVariable = 'bodySchema'
+ *   async (c) => { ... }
+ * );
+ * ```
+ *
+ * **Schema merge strategy — first match wins:**
+ * When multiple validators provide the same schema field (e.g., two `inputSchemaVariable`
+ * providers), the first one encountered is kept. This is intentional because:
+ *
+ * 1. Primary validators (e.g., `validator({ input, output })`, `agent.validator()`) are
+ *    conventionally listed before supplementary validators (param, query, header, cookie).
+ * 2. For `zValidator`, only `'json'` targets extract schemas — other targets (param, query,
+ *    header, cookie) return no schema variables, so ordering rarely matters in practice.
+ * 3. Duplicate json validators on the same route is uncommon; when it occurs, a warning
+ *    is logged to help developers catch unintentional conflicts.
+ *
+ * Supported validator patterns:
+ * - `validator({ input, output, stream })` — Agentuity object-style
+ * - `validator('json', callback)` — Hono callback-style
+ * - `zValidator('json', schema)` — Zod validator (only 'json' target extracts schemas)
+ * - `agent.validator()` / `agent.validator({ input, output })` — Agent validators
+ *
+ * @param args - The arguments array from a route handler call expression (e.g., `router.post(path, ...args)`)
+ * @returns Accumulated validator info with merged schemas from all validators found
+ */
 function hasValidatorCall(args: unknown[]): ValidatorInfo {
 	if (!args || args.length === 0) return { hasValidator: false };
 
+	const result: ValidatorInfo = { hasValidator: false };
+
+	// Helper: merge a schema field using first-match-wins strategy, warn on conflict.
+	// When a field is already set and a different value is encountered, the first value
+	// is kept and a warning is emitted to help developers catch unintentional duplicates.
+	const mergeField = <K extends 'inputSchemaVariable' | 'outputSchemaVariable'>(
+		field: K,
+		value: string | undefined
+	) => {
+		if (!value) return;
+		if (result[field] && result[field] !== value) {
+			const label = field === 'inputSchemaVariable' ? 'inputSchema' : 'outputSchema';
+			logger.warn(
+				'Multiple validators provide %s: using "%s", ignoring "%s"',
+				label,
+				result[field],
+				value
+			);
+		} else if (!result[field]) {
+			result[field] = value;
+		}
+	};
+
 	for (const arg of args) {
 		if (!arg || typeof arg !== 'object') continue;
 		const node = arg as ASTNode;
@@ -1070,28 +1128,38 @@ function hasValidatorCall(args: unknown[]): ValidatorInfo {
 		if (node.type === 'CallExpression') {
 			const callExpr = node as ASTCallExpression;
 
-			// Check for standalone validator({ input, output })
+			// Check for standalone validator({ input, output }) or Hono validator('json', callback)
 			if (callExpr.callee.type === 'Identifier') {
 				const identifier = callExpr.callee as ASTNodeIdentifier;
 				if (identifier.name === 'validator') {
 					// Try to extract schema variables from validator({ input, output, stream })
 					const schemas = extractValidatorSchemas(callExpr);
-					// Return if we found any schema variables OR a stream flag
+					// If we found schemas from object-style validator, merge them
 					if (
 						schemas.inputSchemaVariable ||
 						schemas.outputSchemaVariable ||
 						schemas.stream !== undefined
 					) {
-						return { hasValidator: true, ...schemas };
+						result.hasValidator = true;
+						mergeField('inputSchemaVariable', schemas.inputSchemaVariable);
+						mergeField('outputSchemaVariable', schemas.outputSchemaVariable);
+						if (schemas.stream !== undefined && result.stream === undefined) {
+							result.stream = schemas.stream;
+						}
+						continue;
 					}
 					// Try Hono validator('json', callback) pattern
 					const honoSchemas = extractHonoValidatorSchema(callExpr);
-					return { hasValidator: true, ...honoSchemas };
+					result.hasValidator = true;
+					mergeField('inputSchemaVariable', honoSchemas.inputSchemaVariable);
+					continue;
 				}
 				// Check for zValidator('json', schema)
 				if (identifier.name === 'zValidator') {
 					const schemas = extractZValidatorSchema(callExpr);
-					return { hasValidator: true, ...schemas };
+					result.hasValidator = true;
+					mergeField('inputSchemaVariable', schemas.inputSchemaVariable);
+					continue;
 				}
 			}
 
@@ -1106,13 +1174,22 @@ function hasValidatorCall(args: unknown[]): ValidatorInfo {
 							: undefined;
 					// Also check for schema overrides: agent.validator({ input, output })
 					const schemas = extractValidatorSchemas(callExpr);
-					return { hasValidator: true, agentVariable, ...schemas };
+					result.hasValidator = true;
+					if (agentVariable && !result.agentVariable) {
+						result.agentVariable = agentVariable;
+					}
+					mergeField('inputSchemaVariable', schemas.inputSchemaVariable);
+					mergeField('outputSchemaVariable', schemas.outputSchemaVariable);
+					if (schemas.stream !== undefined && result.stream === undefined) {
+						result.stream = schemas.stream;
+					}
+					continue;
 				}
 			}
 		}
 	}
 
-	return { hasValidator: false };
+	return result;
 }
 
 /**
@@ -1599,7 +1676,7 @@ export async function parseRoute(
 		});
 	}
 
-	const rel = relative(rootDir, filename);
+	const rel = toForwardSlash(relative(rootDir, filename));
 
 	// Compute the API mount path using the shared helper
 	// This ensures consistency between route type generation (here) and runtime mounting (entry-generator.ts)
@@ -1651,8 +1728,12 @@ export async function parseRoute(
 							SUPPORTED_HTTP_METHODS.includes(m.toLowerCase() as SupportedHttpMethod);
 
 						switch (method) {
-							case 'use': {
-								// Skip Hono middleware - they don't represent API routes
+							case 'use':
+							case 'onError':
+							case 'notFound':
+							case 'basePath':
+							case 'mount': {
+								// Skip Hono middleware, lifecycle handlers, and configuration methods - they don't represent API routes
 								continue;
 							}
 							case 'route': {
@@ -2703,7 +2784,7 @@ export async function generateLifecycleTypes(
 	// local dev (symlinked to packages/) and CI (actual node_modules)
 	if (existsSync(runtimePkgPath)) {
 		// Calculate relative path from src/generated/ to node_modules package
-		const relPath = relative(outDir, runtimePkgPath);
+		const relPath = toForwardSlash(relative(outDir, runtimePkgPath));
 		runtimeImportPath = relPath;
 		logger.debug(`Using relative path to runtime package: ${relPath}`);
 	} else {

package/src/cmd/build/vite/agent-discovery.ts

@@ -11,6 +11,7 @@ import { dirname, join, relative } from 'node:path';
 import { existsSync } from 'node:fs';
 import type { Logger } from '../../../types';
 import { formatSchemaCode } from '../format-schema';
+import { toForwardSlash } from '../../../utils/normalize-path';
 
 interface ASTNode {
 	type: string;
@@ -728,7 +729,7 @@ export async function discoverAgents(
 
 			// Use 'src/' prefix for consistency with bun bundler and registry imports
 			const rootDir = join(srcDir, '..');
-			const relativeFilename = relative(rootDir, filePath);
+			const relativeFilename = toForwardSlash(relative(rootDir, filePath));
 			const agentMetadata = extractAgentMetadata(
 				contents,
 				relativeFilename,
@@ -763,7 +764,7 @@ export async function discoverAgents(
 				// 2. Check for evals in separate eval.ts file in same directory
 				const agentDir = dirname(filePath);
 				const evalsPath = join(agentDir, 'eval.ts');
-				const relativeEvalsPath = relative(rootDir, evalsPath);
+				const relativeEvalsPath = toForwardSlash(relative(rootDir, evalsPath));
 				const evalsInSeparateFile = await extractEvalMetadata(
 					evalsPath,
 					relativeEvalsPath,

package/src/cmd/build/vite/metadata-generator.ts

@@ -11,6 +11,7 @@ import type { z } from 'zod';
 import type { AgentMetadata } from './agent-discovery';
 import type { RouteMetadata } from './route-discovery';
 import type { Logger, DeployOptions } from '../../../types';
+import { toForwardSlash } from '../../../utils/normalize-path';
 import { getVersion } from '../../../version';
 import { getGitInfo, buildGitTags } from '../../../utils/git';
 
@@ -174,7 +175,7 @@ export interface MetadataGeneratorOptions {
  */
 function normalizeImportKey(path: string): string {
 	// Strip leading './' or 'src/' or '@'
-	let p = path.replace(/^src\//, '');
+	let p = toForwardSlash(path).replace(/^src\//, '');
 	if (p.startsWith('./')) p = p.slice(2);
 	if (p.startsWith('@')) p = p.slice(1);
 

package/src/cmd/build/vite/registry-generator.ts

@@ -9,6 +9,7 @@ import { writeFileSync, mkdirSync, existsSync, unlinkSync, readFileSync } from '
 import { stat } from 'node:fs/promises';
 import { StructuredError } from '@agentuity/core';
 import { toCamelCase, toPascalCase } from '../../../utils/string';
+import { toForwardSlash } from '../../../utils/normalize-path';
 import type { AgentMetadata } from './agent-discovery';
 import type { RouteInfo } from './route-discovery';
 
@@ -27,7 +28,7 @@ function rebaseImportPath(routeFilename: string, schemaImportPath: string, srcDi
 
 	// Normalize route filename to get its directory relative to srcDir
 	let routeDir: string;
-	const cleanFilename = routeFilename.replace(/\\/g, '/');
+	const cleanFilename = toForwardSlash(routeFilename);
 	if (cleanFilename.startsWith('./')) {
 		routeDir = dirname(join(srcDir, cleanFilename.substring(2)));
 	} else if (cleanFilename.startsWith('src/')) {
@@ -41,7 +42,7 @@ function rebaseImportPath(routeFilename: string, schemaImportPath: string, srcDi
 
 	// Calculate the relative path from src/generated/ to the resolved schema path
 	const generatedDir = join(srcDir, 'generated');
-	let rebasedPath = relative(generatedDir, resolvedSchemaPath).replace(/\\/g, '/');
+	let rebasedPath = toForwardSlash(relative(generatedDir, resolvedSchemaPath));
 
 	// Ensure it starts with './' or '../'
 	if (!rebasedPath.startsWith('.') && !rebasedPath.startsWith('/')) {
@@ -136,7 +137,7 @@ export function generateAgentRegistry(srcDir: string, agents: AgentMetadata[]):
 				if (evalMeta.filename === agent.filename) continue;
 
 				// Build the relative path for the eval file
-				let evalRelativePath = evalMeta.filename;
+				let evalRelativePath = toForwardSlash(evalMeta.filename);
 				if (evalRelativePath.startsWith('./agent/')) {
 					evalRelativePath = evalRelativePath
 						.replace(/^\.\/agent\//, '../agent/')
@@ -165,7 +166,7 @@ export function generateAgentRegistry(srcDir: string, agents: AgentMetadata[]):
 		.map(({ name, filename }) => {
 			const camelName = toCamelCase(name);
 			// Handle both './agent/...' and 'src/agent/...' formats
-			let relativePath = filename;
+			let relativePath = toForwardSlash(filename);
 			if (relativePath.startsWith('./agent/')) {
 				// ./agent/foo.ts -> ../agent/foo.js (use .js extension for TypeScript)
 				relativePath = relativePath
@@ -716,7 +717,8 @@ export async function generateRouteRegistry(
 				resolvedPath = `../api/${finalPath}`;
 			} else if (resolvedPath.startsWith('./') || resolvedPath.startsWith('../')) {
 				// Resolve relative import from route file's directory
-				const routeDir = route.filename.substring(0, route.filename.lastIndexOf('/'));
+				const normalizedFilename = toForwardSlash(route.filename);
+				const routeDir = normalizedFilename.substring(0, normalizedFilename.lastIndexOf('/'));
 				// Join and normalize the path
 				const joined = `${routeDir}/${resolvedPath}`;
 				// Normalize by resolving .. and . segments
@@ -784,7 +786,7 @@ export async function generateRouteRegistry(
 						: (route.inputSchemaImportedName ?? route.inputSchemaVariable);
 			} else {
 				// Schema is locally defined - import from the route file
-				const filename = route.filename.replace(/\\/g, '/');
+				const filename = toForwardSlash(route.filename);
 				const withoutSrc = filename.startsWith('src/') ? filename.substring(4) : filename;
 				const withoutLeadingDot = withoutSrc.startsWith('./')
 					? withoutSrc.substring(2)
@@ -819,7 +821,7 @@ export async function generateRouteRegistry(
 						: (route.outputSchemaImportedName ?? route.outputSchemaVariable);
 			} else {
 				// Schema is locally defined - import from the route file
-				const filename = route.filename.replace(/\\/g, '/');
+				const filename = toForwardSlash(route.filename);
 				const withoutSrc = filename.startsWith('src/') ? filename.substring(4) : filename;
 				const withoutLeadingDot = withoutSrc.startsWith('./')
 					? withoutSrc.substring(2)

package/src/cmd/build/vite/route-discovery.ts

@@ -9,6 +9,7 @@ import { join, relative } from 'node:path';
 import { existsSync } from 'node:fs';
 import type { Logger } from '../../../types';
 import { parseRoute } from '../ast';
+import { toForwardSlash } from '../../../utils/normalize-path';
 
 export interface RouteMetadata {
 	id: string;
@@ -105,7 +106,7 @@ export async function discoverRoutes(
 			}
 
 			const rootDir = join(srcDir, '..');
-			const relativeFilename = './' + relative(srcDir, filePath);
+			const relativeFilename = './' + toForwardSlash(relative(srcDir, filePath));
 
 			try {
 				const parsedRoutes = await parseRoute(
@@ -183,7 +184,7 @@ export async function discoverRoutes(
 		const rootDir = join(srcDir, '..');
 		const subrouterRelPaths = new Set<string>();
 		for (const absPath of mountedSubrouters) {
-			subrouterRelPaths.add(relative(rootDir, absPath));
+			subrouterRelPaths.add(toForwardSlash(relative(rootDir, absPath)));
 		}
 
 		// Remove routes whose filename matches a sub-router file

package/src/cmd/cloud/deploy.ts

@@ -1,68 +1,69 @@
-import { z } from 'zod';
-import { join, resolve } from 'node:path';
 import { createPublicKey } from 'node:crypto';
 import { createReadStream, createWriteStream, existsSync, mkdirSync, writeFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
+import { join, resolve } from 'node:path';
 import { StructuredError } from '@agentuity/core';
-import { createSubcommand, DeployOptionsSchema } from '../../types';
-import { getUserAgent } from '../../api';
-import * as tui from '../../tui';
-import {
-	saveProjectDir,
-	getDefaultConfigDir,
-	loadProjectSDKKey,
-	updateProjectConfig,
-	getGlobalCatalystAPIClient,
-} from '../../config';
-import { getProjectGithubStatus } from '../git/api';
-import { runGitLink } from '../git/link';
 import {
-	runSteps,
-	stepSuccess,
-	stepSkipped,
-	stepError,
-	pauseStepUI,
-	StepInterruptError,
-	type Step,
-	type StepContext,
-} from '../../steps';
-import { viteBundle } from '../build/vite-bundler';
-import { loadBuildMetadata, getStreamURL } from '../../config';
-import {
-	projectEnvUpdate,
-	projectDeploymentCreate,
-	projectDeploymentUpdate,
-	projectDeploymentComplete,
-	projectDeploymentStatus,
-	projectDeploymentMalwareCheck,
-	validateResources,
-	projectGet,
-	projectUpdateRegion,
-	type Deployment,
 	type BuildMetadata,
-	type DeploymentInstructions,
+	type Deployment,
 	type DeploymentComplete,
+	type DeploymentInstructions,
 	type DeploymentStatusResult,
-	type MalwareCheckResult,
 	getAppBaseURL,
+	type MalwareCheckResult,
+	projectDeploymentComplete,
+	projectDeploymentCreate,
+	projectDeploymentMalwareCheck,
+	projectDeploymentStatus,
+	projectDeploymentUpdate,
+	projectEnvUpdate,
+	projectGet,
+	projectUpdateRegion,
+	validateResources,
 } from '@agentuity/server';
+import { z } from 'zod';
+import { getUserAgent } from '../../api';
+import { BuildReportCollector, clearGlobalCollector, setGlobalCollector } from '../../build-report';
+import { getCachedProject, setCachedProject } from '../../cache';
+import { getCommand } from '../../command-prefix';
 import {
+	getDefaultConfigDir,
+	getGlobalCatalystAPIClient,
+	getStreamURL,
+	loadBuildMetadata,
+	loadProjectSDKKey,
+	saveProjectDir,
+	updateProjectConfig,
+} from '../../config';
+import { encryptFIPSKEMDEMStream } from '../../crypto/box';
+import * as domain from '../../domain';
+import {
+	filterAgentuitySdkKeys,
 	findExistingEnvFile,
 	readEnvFile,
-	filterAgentuitySdkKeys,
 	splitEnvAndSecrets,
 } from '../../env-util';
-import { zipDir } from '../../utils/zip';
-import { encryptFIPSKEMDEMStream } from '../../crypto/box';
-import { getCommand } from '../../command-prefix';
-import * as domain from '../../domain';
 import { ErrorCode, getExitCode } from '../../errors';
-import { typecheck } from '../build/typecheck';
-import { BuildReportCollector, setGlobalCollector, clearGlobalCollector } from '../../build-report';
-import { runForkedDeploy } from './deploy-fork';
+import {
+	pauseStepUI,
+	runSteps,
+	type Step,
+	type StepContext,
+	StepInterruptError,
+	stepError,
+	stepSkipped,
+	stepSuccess,
+} from '../../steps';
+import * as tui from '../../tui';
+import { createSubcommand, DeployOptionsSchema } from '../../types';
 import { validateAptDependencies } from '../../utils/apt-validator';
 import { extractDependencies } from '../../utils/deps';
-import { getCachedProject, setCachedProject } from '../../cache';
+import { zipDir } from '../../utils/zip';
+import { typecheck } from '../build/typecheck';
+import { viteBundle } from '../build/vite-bundler';
+import { getProjectGithubStatus } from '../git/api';
+import { runGitLink } from '../git/link';
+import { runForkedDeploy } from './deploy-fork';
 
 const DeploymentCancelledError = StructuredError(
 	'DeploymentCancelled',
@@ -501,7 +502,6 @@ export const deploySubcommand = createSubcommand({
 							const result = await runGitLink({
 								apiClient,
 								projectId: project.projectId,
-								orgId: project.orgId,
 								logger,
 								skipAlreadyLinkedCheck: true,
 								config,
@@ -515,7 +515,8 @@ export const deploySubcommand = createSubcommand({
 								tui.info('Push a commit to trigger your first deployment.');
 								tui.newline();
 								throw new DeploymentCancelledError();
-							} else if (result.linked) {
+							}
+							if (result.linked) {
 								// Linked but auto-deploy disabled, continue with manual deploy
 								tui.newline();
 								tui.info('GitHub repository linked. Continuing with deployment...');
@@ -623,9 +624,7 @@ export const deploySubcommand = createSubcommand({
 
 							if (typeResult.success) {
 								capturedOutput.push(
-									tui.muted(
-										`✓ Typechecked in ${Math.floor(Date.now() - started).toFixed(0)}ms`
-									)
+									tui.muted(`✓ Typechecked in ${Date.now() - started}ms`)
 								);
 							} else {
 								// Errors already added to collector by typecheck()
@@ -1174,9 +1173,7 @@ export const deploySubcommand = createSubcommand({
 
 				const lines = [`${ex}`, ''];
 				lines.push(
-					`${tui.ICONS.arrow} ${
-						tui.bold(tui.padRight('Dashboard:', 12)) + tui.link(dashboard)
-					}`
+					`${tui.ICONS.arrow} ${tui.bold(tui.padRight('Dashboard:', 12)) + tui.link(dashboard)}`
 				);
 				tui.banner(tui.colorError(`Deployment: ${deployment.id} Failed`), lines.join('\n'), {
 					centerTitle: false,
@@ -1209,15 +1206,11 @@ export const deploySubcommand = createSubcommand({
 						}`
 					);
 					lines.push(
-						`${tui.ICONS.arrow} ${
-							tui.bold(tui.padRight('Project:', 12)) + tui.link(latestUrl)
-						}`
+						`${tui.ICONS.arrow} ${tui.bold(tui.padRight('Project:', 12)) + tui.link(latestUrl)}`
 					);
 				}
 				lines.push(
-					`${tui.ICONS.arrow} ${
-						tui.bold(tui.padRight('Dashboard:', 12)) + tui.link(dashboard)
-					}`
+					`${tui.ICONS.arrow} ${tui.bold(tui.padRight('Dashboard:', 12)) + tui.link(dashboard)}`
 				);
 				tui.banner(`Deployment: ${tui.colorPrimary(deployment.id)}`, lines.join('\n'), {
 					centerTitle: false,

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

@@ -2,12 +2,7 @@ import { z } from 'zod';
 import { createSubcommand } from '../../../types';
 import * as tui from '../../../tui';
 import { projectEnvDelete, projectGet, orgEnvDelete, orgEnvGet } from '@agentuity/server';
-import {
-	findExistingEnvFile,
-	readEnvFile,
-	writeEnvFile,
-	isReservedAgentuityKey,
-} from '../../../env-util';
+import { isReservedAgentuityKey } from '../../../env-util';
 import { getCommand } from '../../../command-prefix';
 import { ErrorCode } from '../../../errors';
 import { resolveOrgId, isOrgScope } from './org-util';
@@ -15,10 +10,6 @@ import { resolveOrgId, isOrgScope } from './org-util';
 const EnvDeleteResponseSchema = z.object({
 	success: z.boolean().describe('Whether the operation succeeded'),
 	keys: z.array(z.string()).describe('Variable keys that were deleted'),
-	path: z
-		.string()
-		.optional()
-		.describe('Local file path where variables were removed (project scope only)'),
 	secrets: z.array(z.string()).describe('Keys that were secrets'),
 	env: z.array(z.string()).describe('Keys that were environment variables'),
 	scope: z.enum(['project', 'org']).describe('The scope from which the variables were deleted'),
@@ -61,7 +52,7 @@ export const deleteSubcommand = createSubcommand({
 	},
 
 	async handler(ctx) {
-		const { args, project, projectDir, apiClient, config, opts } = ctx;
+		const { args, project, apiClient, config, opts } = ctx;
 		const useOrgScope = isOrgScope(opts?.org);
 		const keys = args.key;
 
@@ -174,38 +165,16 @@ export const deleteSubcommand = createSubcommand({
 				});
 			});
 
-			// Update local .env file only if we have a project directory and an existing .env file
-			let envFilePath: string | undefined;
-			if (projectDir) {
-				envFilePath = await findExistingEnvFile(projectDir);
-				if (envFilePath) {
-					const currentEnv = await readEnvFile(envFilePath);
-					const originalKeyCount = Object.keys(currentEnv).length;
-					for (const key of [...secretKeys, ...envKeys]) {
-						delete currentEnv[key];
-					}
-					// Only write if we actually removed keys (avoid creating empty file)
-					const keysRemoved = originalKeyCount > Object.keys(currentEnv).length;
-					if (keysRemoved) {
-						await writeEnvFile(envFilePath, currentEnv, { preserveExisting: false });
-					}
-				}
-			}
-
 			const deletedKeys = [...secretKeys, ...envKeys];
 			if (notFoundKeys.length > 0) {
 				tui.warning(`Variables not found (skipped): ${notFoundKeys.join(', ')}`);
 			}
 
-			const locationMsg = envFilePath ? ` (cloud + ${envFilePath})` : ' (cloud only)';
-			tui.success(
-				`Deleted ${deletedKeys.length} variable(s): ${deletedKeys.join(', ')}${locationMsg}`
-			);
+			tui.success(`Deleted ${deletedKeys.length} variable(s): ${deletedKeys.join(', ')}`);
 
 			return {
 				success: true,
 				keys: deletedKeys,
-				path: envFilePath,
 				secrets: secretKeys,
 				env: envKeys,
 				scope: 'project' as const,

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

@@ -3,9 +3,7 @@ import { createSubcommand } from '../../../types';
 import * as tui from '../../../tui';
 import { projectEnvUpdate, orgEnvUpdate } from '@agentuity/server';
 import {
-	findExistingEnvFile,
 	readEnvFile,
-	writeEnvFile,
 	filterAgentuitySdkKeys,
 	splitEnvAndSecrets,
 	validateNoPublicSecrets,
@@ -19,17 +17,13 @@ const EnvImportResponseSchema = z.object({
 	envCount: z.number().describe('Number of env vars imported'),
 	secretCount: z.number().describe('Number of secrets imported'),
 	skipped: z.number().describe('Number of items skipped'),
-	path: z
-		.string()
-		.optional()
-		.describe('Local file path where variables were saved (project scope only)'),
 	file: z.string().describe('Source file path'),
 	scope: z.enum(['project', 'org']).describe('The scope where variables were imported'),
 });
 
 export const importSubcommand = createSubcommand({
 	name: 'import',
-	description: 'Import environment variables and secrets from a file to cloud and local .env',
+	description: 'Import environment variables and secrets from a file to cloud',
 	tags: ['mutating', 'creates-resource', 'slow', 'api-intensive', 'requires-auth'],
 	examples: [
 		{
@@ -62,7 +56,7 @@ export const importSubcommand = createSubcommand({
 	},
 
 	async handler(ctx) {
-		const { args, apiClient, project, projectDir, config, opts } = ctx;
+		const { args, apiClient, project, config, opts } = ctx;
 		const useOrgScope = isOrgScope(opts?.org);
 
 		// Require project context if not using org scope
@@ -161,15 +155,6 @@ export const importSubcommand = createSubcommand({
 				});
 			});
 
-			// Merge with local .env file only if we have a project directory
-			let localEnvPath: string | undefined;
-			if (projectDir) {
-				localEnvPath = await findExistingEnvFile(projectDir);
-				// writeEnvFile preserves existing keys by default, so just write the filtered vars
-				// This will merge with existing .env content, preserving AGENTUITY_SDK_KEY and other keys
-				await writeEnvFile(localEnvPath, filteredVars);
-			}
-
 			tui.success(
 				`Imported ${totalCount} variable${totalCount !== 1 ? 's' : ''} from ${args.file} (${envCount} env, ${secretCount} secret${secretCount !== 1 ? 's' : ''})`
 			);
@@ -180,7 +165,6 @@ export const importSubcommand = createSubcommand({
 				envCount,
 				secretCount,
 				skipped: Object.keys(importedVars).length - totalCount,
-				path: localEnvPath,
 				file: args.file,
 				scope: 'project' as const,
 			};