@agentuity/cli 1.0.14 → 1.0.16

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('/')) {
@@ -69,6 +70,21 @@ function sanitizePathSegment(segment: string): string {
 	return toCamelCase(segment.replace(ROUTE_PARAM_CHARS, ''));
 }
 
+/**
+ * Valid unquoted TypeScript/JavaScript property name pattern.
+ * A property name can be unquoted if it starts with a letter, underscore, or dollar sign,
+ * and contains only letters, digits, underscores, or dollar signs.
+ */
+const VALID_UNQUOTED_PROPERTY = /^[a-zA-Z_$][a-zA-Z0-9_$]*$/;
+
+/**
+ * Quote a property name for TypeScript object type definitions if it contains
+ * characters that require quoting (e.g., dots, hyphens, spaces).
+ */
+function quotePropertyName(name: string): string {
+	return VALID_UNQUOTED_PROPERTY.test(name) ? name : JSON.stringify(name);
+}
+
 /**
  * Generate TypeScript type for path parameters.
  * Returns 'never' if no path params, or '{ param1: string; param2: string }' format.
@@ -136,7 +152,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 +181,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
@@ -478,11 +494,11 @@ function generateRPCRegistryType(
 				const pathParamsType = generatePathParamsType(routeInfo.pathParams);
 				const pathParamsTupleType = generatePathParamsTupleType(routeInfo.pathParams);
 				lines.push(
-					`${indent}${key}: { input: ${value.input}; output: ${value.output}; type: ${value.type}; params: ${pathParamsType}; paramsTuple: ${pathParamsTupleType} };`
+					`${indent}${quotePropertyName(key)}: { input: ${value.input}; output: ${value.output}; type: ${value.type}; params: ${pathParamsType}; paramsTuple: ${pathParamsTupleType} };`
 				);
 			} else {
 				// Nested node
-				lines.push(`${indent}${key}: {`);
+				lines.push(`${indent}${quotePropertyName(key)}: {`);
 				lines.push(treeToTypeString(value as NestedNode, indent + '\t'));
 				lines.push(`${indent}};`);
 			}
@@ -716,7 +732,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 +801,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 +836,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/build/vite/vite-asset-server-config.ts

@@ -92,7 +92,7 @@ export async function generateAssetServerConfig(
 		server: {
 			// Use the port we selected
 			port,
-			strictPort: false, // Allow fallback if port is taken
+			strictPort: true, // Port is pre-verified as available by findAvailablePort()
 			host: '127.0.0.1',
 
 			// CORS headers to allow Bun server on port 3500 to proxy requests

package/src/cmd/build/vite/vite-asset-server.ts

@@ -7,6 +7,7 @@
 
 import { join } from 'node:path';
 import { createRequire } from 'node:module';
+import { createServer as createNetServer } from 'node:net';
 import type { ViteDevServer } from 'vite';
 import type { Logger } from '../../../types';
 import { generateAssetServerConfig } from './vite-asset-server-config';
@@ -22,6 +23,44 @@ export interface StartViteAssetServerOptions {
 	workbenchPath?: string;
 }
 
+/**
+ * Check if a specific port is available on the given host.
+ */
+function isPortAvailable(port: number, host: string): Promise<boolean> {
+	return new Promise((resolve) => {
+		const server = createNetServer();
+		server.once('error', () => {
+			resolve(false);
+		});
+		server.listen(port, host, () => {
+			server.close(() => {
+				resolve(true);
+			});
+		});
+	});
+}
+
+/**
+ * Find an available port starting from the preferred port.
+ * Tries incrementing ports up to maxAttempts times.
+ */
+async function findAvailablePort(
+	preferredPort: number,
+	host: string = '127.0.0.1',
+	maxAttempts: number = 20
+): Promise<number> {
+	for (let attempt = 0; attempt < maxAttempts; attempt++) {
+		const port = preferredPort + attempt;
+		const available = await isPortAvailable(port, host);
+		if (available) {
+			return port;
+		}
+	}
+	throw new Error(
+		`Could not find an available port after ${maxAttempts} attempts starting from ${preferredPort}`
+	);
+}
+
 /**
  * Start Vite asset server on a dynamically-chosen port
  * Returns the server instance and the actual port number
@@ -33,16 +72,23 @@ export async function startViteAssetServer(
 
 	logger.debug('Starting Vite asset server (HMR only)...');
 
-	// Pick a port for Vite asset server (try 5173 first, Vite default)
-	// strictPort: false allows Vite to choose alternate if 5173 is taken
+	// Find an available port before starting Vite
+	// This avoids relying on Vite's strictPort:false fallback which can fail
 	const preferredPort = 5173;
+	const availablePort = await findAvailablePort(preferredPort, '127.0.0.1');
 
-	// Generate minimal config with preferred port
+	if (availablePort !== preferredPort) {
+		logger.info(
+			`Port ${preferredPort} is in use, using port ${availablePort} for Vite asset server`
+		);
+	}
+
+	// Generate minimal config with the available port
 	const config = await generateAssetServerConfig({
 		rootDir,
 		logger,
 		workbenchPath,
-		port: preferredPort,
+		port: availablePort,
 	});
 
 	// Dynamically import vite from the project's node_modules
@@ -54,7 +100,6 @@ export async function startViteAssetServer(
 	const server = await createServer(config);
 
 	// Start listening with timeout to prevent hangs
-	// Vite will choose alternate port if preferred is taken
 	const STARTUP_TIMEOUT_MS = 30000; // 30 seconds
 
 	try {
@@ -82,42 +127,10 @@ export async function startViteAssetServer(
 		throw error;
 	}
 
-	// Helper to get port from httpServer
-	const getPortFromHttpServer = (): number | null => {
-		const httpServer = server.httpServer;
-		if (httpServer) {
-			const address = httpServer.address();
-			if (address && typeof address === 'object' && 'port' in address) {
-				return address.port;
-			}
-		}
-		return null;
-	};
-
-	// Get the actual port Vite is using from the httpServer
-	// server.config.server.port is the requested port, not the actual one
-	let actualPort = preferredPort;
-
-	// The resolved URL contains the actual port being used
-	const resolvedUrls = server.resolvedUrls;
-	if (resolvedUrls?.local && resolvedUrls.local.length > 0) {
-		try {
-			const url = new URL(resolvedUrls.local[0]);
-			actualPort = parseInt(url.port, 10) || preferredPort;
-		} catch {
-			actualPort = getPortFromHttpServer() ?? preferredPort;
-		}
-	} else {
-		actualPort = getPortFromHttpServer() ?? preferredPort;
-	}
+	// Port was pre-verified and strictPort:true ensures Vite uses exactly this port
+	const actualPort = availablePort;
 
-	if (actualPort === preferredPort) {
-		logger.info(`Vite asset server running on port ${actualPort}`);
-	} else {
-		logger.warn(
-			`Vite asset server running on port ${actualPort} (preferred port ${preferredPort} was in use)`
-		);
-	}
+	logger.info(`Vite asset server running on port ${actualPort}`);
 	logger.debug(`Asset server will handle: HMR, React transformation, source maps`);
 	logger.debug(
 		`HMR WebSocket configured at /__vite_hmr (proxied through Bun server for tunnel support)`

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,
 			};

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

@@ -3,8 +3,6 @@ import { createSubcommand } from '../../../types';
 import * as tui from '../../../tui';
 import { projectEnvUpdate, orgEnvUpdate } from '@agentuity/server';
 import {
-	findExistingEnvFile,
-	writeEnvFile,
 	looksLikeSecret,
 	isReservedAgentuityKey,
 	isPublicVarKey,
@@ -75,10 +73,6 @@ function parseEnvArgs(rawArgs: string[]): ParsedEnvPair[] {
 const EnvSetResponseSchema = z.object({
 	success: z.boolean().describe('Whether the operation succeeded'),
 	keys: z.array(z.string()).describe('Environment variable keys that were set'),
-	path: z
-		.string()
-		.optional()
-		.describe('Local file path where env vars were saved (project scope only)'),
 	secretKeys: z.array(z.string()).describe('Keys that were stored as secrets'),
 	envKeys: z.array(z.string()).describe('Keys that were stored as env vars'),
 	scope: z.enum(['project', 'org']).describe('The scope where the variables were set'),
@@ -134,7 +128,7 @@ export const setSubcommand = createSubcommand({
 	},
 
 	async handler(ctx) {
-		const { args: cmdArgs, opts, apiClient, project, projectDir, config } = ctx;
+		const { args: cmdArgs, opts, apiClient, project, config } = ctx;
 		const useOrgScope = isOrgScope(opts?.org);
 		const forceSecret = opts?.secret ?? false;
 
@@ -262,26 +256,13 @@ export const setSubcommand = createSubcommand({
 				}
 			);
 
-			// Update local .env file only if we have a project directory
-			let envFilePath: string | undefined;
-			if (projectDir) {
-				envFilePath = await findExistingEnvFile(projectDir);
-				const allPairsForLocal: Record<string, string> = {
-					...envPairs,
-					...secretPairs,
-				};
-				await writeEnvFile(envFilePath, allPairsForLocal);
-			}
-
-			const locationMsg = envFilePath ? ` (cloud + ${envFilePath})` : ' (cloud only)';
 			tui.success(
-				`Variable${totalCount !== 1 ? 's' : ''} set successfully: ${allKeys.join(', ')}${secretSuffix}${locationMsg}`
+				`Variable${totalCount !== 1 ? 's' : ''} set successfully: ${allKeys.join(', ')}${secretSuffix}`
 			);
 
 			return {
 				success: true,
 				keys: allKeys,
-				path: envFilePath,
 				secretKeys: secretKeysList,
 				envKeys: envKeysList,
 				scope: 'project' as const,

package/src/cmd/cloud/sandbox/cp.ts

@@ -2,6 +2,7 @@ import { z } from 'zod';
 import { readFileSync, writeFileSync, mkdirSync, statSync, readdirSync } from 'node:fs';
 import { dirname, resolve, basename, join, relative } from 'node:path';
 import { createCommand } from '../../../types';
+import { toForwardSlash } from '../../../utils/normalize-path';
 import * as tui from '../../../tui';
 import { createSandboxClient } from './util';
 import { getCommand } from '../../../command-prefix';
@@ -265,7 +266,7 @@ async function uploadDirectory(
 		: effectiveRemotePath;
 
 	for (const filePath of allFiles) {
-		const relativePath = relative(localDir, filePath);
+		const relativePath = toForwardSlash(relative(localDir, filePath));
 		const targetPath = `${baseRemotePath}/${relativePath}`;
 		const buffer = readFileSync(filePath);
 		files.push({ path: targetPath, content: buffer });