@agentuity/cli 0.1.33 → 0.1.35

package/dist/utils/installation-type.js

@@ -1,7 +1,24 @@
 /**
  * Detects how the CLI was installed and is being run
  */
+import fs from 'node:fs';
 import os from 'node:os';
+/**
+ * Resolve a path to its real path (following symlinks) and normalize to POSIX separators.
+ * Returns the original path if resolution fails.
+ */
+function resolveRealPath(path) {
+    if (!path)
+        return '';
+    try {
+        // fs.realpathSync resolves symlinks (e.g., /tmp -> /private/tmp on macOS)
+        return fs.realpathSync(path).replace(/\\/g, '/');
+    }
+    catch {
+        // If the path doesn't exist or can't be resolved, return normalized original
+        return path.replace(/\\/g, '/');
+    }
+}
 /**
  * Determines the installation type based on how the CLI is being executed
  *
@@ -10,29 +27,50 @@ import os from 'node:os';
  * @returns 'source' - Running from source code (development)
  */
 export function getInstallationType() {
-    // Normalize paths to POSIX separators for cross-platform compatibility
+    // Bun.main already returns the resolved real path, just normalize separators
     const mainPath = Bun.main.replace(/\\/g, '/');
-    // Bun.argv[1] contains the original invocation path (before symlink resolution)
-    const invokedPath = (Bun.argv[1] ?? '').replace(/\\/g, '/');
-    // Get bun's global bin directory from BUN_INSTALL or default to ~/.bun/bin
-    // Use os.homedir() as primary fallback to avoid "undefined/.bun" paths
-    const home = os.homedir() ?? process.env.HOME ?? process.env.USERPROFILE ?? '';
-    const bunInstall = (process.env.BUN_INSTALL ?? (home ? `${home}/.bun` : '')).replace(/\\/g, '/');
-    const globalBinDir = bunInstall ? `${bunInstall}/bin/` : '';
-    // Global install: invoked from bun's global bin directory (e.g., ~/.bun/bin/agentuity)
-    // This handles symlinks created by `bun add -g @agentuity/cli`
-    if (globalBinDir && invokedPath.startsWith(globalBinDir)) {
-        return 'global';
+    // Get home directory reliably and resolve symlinks
+    // On macOS, os.homedir() returns /Users/xxx which is already real
+    const home = resolveRealPath(os.homedir() ?? process.env.HOME ?? process.env.USERPROFILE ?? '');
+    // Get bun install directory from BUN_INSTALL or default to ~/.bun
+    // Resolve symlinks to handle cases like BUN_INSTALL=/tmp/... on macOS where /tmp -> /private/tmp
+    const bunInstallRaw = process.env.BUN_INSTALL ?? (home ? `${home}/.bun` : '');
+    const bunInstall = resolveRealPath(bunInstallRaw);
+    // GLOBAL DETECTION: Check if running from bun's global install location
+    // When installed via `bun add -g`, the CLI lives at ~/.bun/node_modules/@agentuity/cli/
+    // or ~/.bun/install/global/node_modules/@agentuity/cli/
+    if (bunInstall) {
+        // Check for ~/.bun/node_modules/@agentuity/cli/ (common bun global layout)
+        if (mainPath.startsWith(`${bunInstall}/node_modules/@agentuity/cli/`)) {
+            return 'global';
+        }
+        // Check for ~/.bun/install/global/node_modules/@agentuity/cli/ (alternative layout)
+        if (mainPath.startsWith(`${bunInstall}/install/global/`)) {
+            return 'global';
+        }
+    }
+    // GLOBAL DETECTION: Check for legacy ~/.agentuity/ installation
+    // The install.sh script may install to ~/.agentuity/node_modules/@agentuity/cli/
+    // or create a shim at ~/.agentuity/bin/agentuity
+    if (home) {
+        const agentuityDir = resolveRealPath(`${home}/.agentuity`);
+        if (mainPath.startsWith(`${agentuityDir}/`)) {
+            return 'global';
+        }
     }
-    // Also check the resolved path for explicit global install locations
-    if (mainPath.includes('/.bun/install/global/')) {
+    // GLOBAL DETECTION: Fallback check for any path containing /.bun/ before node_modules
+    // This catches edge cases where BUN_INSTALL might not match the actual path
+    if (mainPath.includes('/.bun/') && mainPath.includes('/node_modules/@agentuity/cli/')) {
         return 'global';
     }
-    // Local project install: ./node_modules/@agentuity/cli/...
+    // LOCAL DETECTION: Running from a project's node_modules
+    // This is when someone runs `bunx agentuity` or has it as a project dependency
+    // At this point, we've ruled out global installs, so any node_modules path is local
     if (mainPath.includes('/node_modules/@agentuity/cli/')) {
         return 'local';
     }
-    // Source/development: packages/cli/bin/cli.ts or similar
+    // SOURCE DETECTION: Running from source code (development)
+    // This is when running directly from the monorepo: packages/cli/bin/cli.ts
     return 'source';
 }
 /**

package/dist/utils/installation-type.js.map

@@ -1 +1 @@
-{"version":3,"file":"installation-type.js","sourceRoot":"","sources":["../../src/utils/installation-type.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,MAAM,SAAS,CAAC;AAIzB;;;;;;GAMG;AACH,MAAM,UAAU,mBAAmB;IAClC,uEAAuE;IACvE,MAAM,QAAQ,GAAG,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAC9C,gFAAgF;IAChF,MAAM,WAAW,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAE5D,2EAA2E;IAC3E,uEAAuE;IACvE,MAAM,IAAI,GAAG,EAAE,CAAC,OAAO,EAAE,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,EAAE,CAAC;IAC/E,MAAM,UAAU,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IACjG,MAAM,YAAY,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,UAAU,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;IAE5D,uFAAuF;IACvF,+DAA+D;IAC/D,IAAI,YAAY,IAAI,WAAW,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QAC1D,OAAO,QAAQ,CAAC;IACjB,CAAC;IAED,qEAAqE;IACrE,IAAI,QAAQ,CAAC,QAAQ,CAAC,uBAAuB,CAAC,EAAE,CAAC;QAChD,OAAO,QAAQ,CAAC;IACjB,CAAC;IAED,2DAA2D;IAC3D,IAAI,QAAQ,CAAC,QAAQ,CAAC,+BAA+B,CAAC,EAAE,CAAC;QACxD,OAAO,OAAO,CAAC;IAChB,CAAC;IAED,yDAAyD;IACzD,OAAO,QAAQ,CAAC;AACjB,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,eAAe;IAC9B,OAAO,mBAAmB,EAAE,KAAK,QAAQ,CAAC;AAC3C,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,cAAc;IAC7B,OAAO,mBAAmB,EAAE,KAAK,OAAO,CAAC;AAC1C,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,eAAe;IAC9B,OAAO,mBAAmB,EAAE,KAAK,QAAQ,CAAC;AAC3C,CAAC"}
+{"version":3,"file":"installation-type.js","sourceRoot":"","sources":["../../src/utils/installation-type.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,MAAM,SAAS,CAAC;AAIzB;;;GAGG;AACH,SAAS,eAAe,CAAC,IAAY;IACpC,IAAI,CAAC,IAAI;QAAE,OAAO,EAAE,CAAC;IACrB,IAAI,CAAC;QACJ,0EAA0E;QAC1E,OAAO,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAClD,CAAC;IAAC,MAAM,CAAC;QACR,6EAA6E;QAC7E,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IACjC,CAAC;AACF,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,mBAAmB;IAClC,6EAA6E;IAC7E,MAAM,QAAQ,GAAG,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAE9C,mDAAmD;IACnD,kEAAkE;IAClE,MAAM,IAAI,GAAG,eAAe,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC;IAEhG,kEAAkE;IAClE,iGAAiG;IACjG,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAC9E,MAAM,UAAU,GAAG,eAAe,CAAC,aAAa,CAAC,CAAC;IAElD,wEAAwE;IACxE,wFAAwF;IACxF,wDAAwD;IACxD,IAAI,UAAU,EAAE,CAAC;QAChB,2EAA2E;QAC3E,IAAI,QAAQ,CAAC,UAAU,CAAC,GAAG,UAAU,+BAA+B,CAAC,EAAE,CAAC;YACvE,OAAO,QAAQ,CAAC;QACjB,CAAC;QACD,oFAAoF;QACpF,IAAI,QAAQ,CAAC,UAAU,CAAC,GAAG,UAAU,kBAAkB,CAAC,EAAE,CAAC;YAC1D,OAAO,QAAQ,CAAC;QACjB,CAAC;IACF,CAAC;IAED,gEAAgE;IAChE,iFAAiF;IACjF,iDAAiD;IACjD,IAAI,IAAI,EAAE,CAAC;QACV,MAAM,YAAY,GAAG,eAAe,CAAC,GAAG,IAAI,aAAa,CAAC,CAAC;QAC3D,IAAI,QAAQ,CAAC,UAAU,CAAC,GAAG,YAAY,GAAG,CAAC,EAAE,CAAC;YAC7C,OAAO,QAAQ,CAAC;QACjB,CAAC;IACF,CAAC;IAED,sFAAsF;IACtF,4EAA4E;IAC5E,IAAI,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,+BAA+B,CAAC,EAAE,CAAC;QACvF,OAAO,QAAQ,CAAC;IACjB,CAAC;IAED,yDAAyD;IACzD,+EAA+E;IAC/E,oFAAoF;IACpF,IAAI,QAAQ,CAAC,QAAQ,CAAC,+BAA+B,CAAC,EAAE,CAAC;QACxD,OAAO,OAAO,CAAC;IAChB,CAAC;IAED,2DAA2D;IAC3D,2EAA2E;IAC3E,OAAO,QAAQ,CAAC;AACjB,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,eAAe;IAC9B,OAAO,mBAAmB,EAAE,KAAK,QAAQ,CAAC;AAC3C,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,cAAc;IAC7B,OAAO,mBAAmB,EAAE,KAAK,OAAO,CAAC;AAC1C,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,eAAe;IAC9B,OAAO,mBAAmB,EAAE,KAAK,QAAQ,CAAC;AAC3C,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@agentuity/cli",
-	"version": "0.1.33",
+	"version": "0.1.35",
 	"license": "Apache-2.0",
 	"author": "Agentuity employees and contributors",
 	"type": "module",
@@ -40,9 +40,9 @@
 		"prepublishOnly": "bun run clean && bun run build"
 	},
 	"dependencies": {
-		"@agentuity/auth": "0.1.33",
-		"@agentuity/core": "0.1.33",
-		"@agentuity/server": "0.1.33",
+		"@agentuity/auth": "0.1.35",
+		"@agentuity/core": "0.1.35",
+		"@agentuity/server": "0.1.35",
 		"@datasert/cronjs-parser": "^1.4.0",
 		"@terascope/fetch-github-release": "^2.2.1",
 		"@vitejs/plugin-react": "^5.1.2",
@@ -60,10 +60,10 @@
 		"typescript": "^5.9.0",
 		"vite": "^7.2.7",
 		"zod": "^4.3.5",
-		"@agentuity/frontend": "0.1.33"
+		"@agentuity/frontend": "0.1.35"
 	},
 	"devDependencies": {
-		"@agentuity/test-utils": "0.1.33",
+		"@agentuity/test-utils": "0.1.35",
 		"@types/adm-zip": "^0.5.7",
 		"@types/bun": "latest",
 		"@types/tar-fs": "^2.0.4",

package/src/cmd/ai/index.ts

@@ -3,7 +3,6 @@ import cadenceCommand from './cadence';
 import capabilitiesCommand from './capabilities';
 import promptCommand from './prompt';
 import schemaCommand from './schema';
-import skillsCommand from './skills';
 import opencodeCommand from './opencode';
 import { getCommand } from '../../command-prefix';
 
@@ -25,10 +24,6 @@ export const command = createCommand({
 			command: getCommand('ai schema show'),
 			description: 'Output CLI schema for AI consumption',
 		},
-		{
-			command: getCommand('ai skills generate --output ./skills'),
-			description: 'Generate Agent Skills from CLI schema',
-		},
 	],
 	subcommands: [
 		opencodeCommand,
@@ -36,6 +31,5 @@ export const command = createCommand({
 		capabilitiesCommand,
 		promptCommand,
 		schemaCommand,
-		skillsCommand,
 	],
 });

package/src/cmd/ai/opencode/uninstall.ts

@@ -64,7 +64,7 @@ export const uninstallSubcommand = createSubcommand({
 				}
 			} catch (error) {
 				if (!jsonMode) {
-					tui.warn(`Failed to parse Open Code config: ${error}`);
+					tui.warning(`Failed to parse Open Code config: ${error}`);
 				}
 			}
 		}

package/src/cmd/build/vite/bun-dev-server.ts

@@ -15,6 +15,9 @@ export interface BunDevServerOptions {
 	deploymentId?: string;
 	logger: Logger;
 	vitePort: number; // Port of already-running Vite asset server
+	inspect?: boolean; // Enable bun debugger
+	inspectWait?: boolean; // Enable bun debugger and wait for connection
+	inspectBrk?: boolean; // Enable bun debugger with breakpoint at first line
 }
 
 export interface BunDevServerResult {
@@ -30,17 +33,15 @@ export interface BunDevServerResult {
  *
  * The bundle is loaded here to ensure AI Gateway routing patches are active.
  * Vite port is read from process.env.VITE_PORT at runtime.
+ *
+ * When debugger flags (inspect, inspectWait, inspectBrk) are passed, bun is spawned
+ * as a subprocess to enable passing the debugger CLI flags.
  */
 export async function startBunDevServer(options: BunDevServerOptions): Promise<BunDevServerResult> {
-	const { rootDir, port = 3500, logger, vitePort } = options;
+	const { rootDir, port = 3500, logger, vitePort, inspect, inspectWait, inspectBrk } = options;
 
 	logger.debug('Starting Bun dev server (Vite already running on port %d)...', vitePort);
 
-	// Load the bundled app - this will start Bun.serve() internally
-	// IMPORTANT: We must import the bundled .agentuity/app.js (NOT src/generated/app.ts)
-	// because the bundled version has LLM provider patches applied that enable AI Gateway routing.
-	// Importing the source file directly would bypass these patches.
-	logger.debug('📦 Loading bundled app (Bun server will start)...');
 	const appPath = `${rootDir}/.agentuity/app.js`;
 
 	// Verify bundle exists before attempting to load
@@ -54,29 +55,45 @@ export async function startBunDevServer(options: BunDevServerOptions): Promise<B
 	// Set PORT env var so the generated app uses the correct port
 	process.env.PORT = String(port);
 
-	// Import the generated app with cache-busting query parameter.
-	// Bun's module cache is keyed by the full specifier including query string,
-	// so adding a unique timestamp forces a fresh import on each reload.
-	const cacheBuster = `?t=${Date.now()}`;
-	try {
-		await import(appPath + cacheBuster);
-	} catch (err) {
-		const errorMessage = err instanceof Error ? err.message : String(err);
-		logger.error('Failed to import generated app from %s: %s', appPath, errorMessage);
-		throw new Error(`Failed to load generated app: ${errorMessage}`);
-	}
+	// Check if any debugger flag is enabled
+	const useDebugger = inspect || inspectWait || inspectBrk;
 
-	// Wait for server to actually start listening
-	// The generated app sets (globalThis as any).__AGENTUITY_SERVER__ when server starts
-	const maxRetries = 50; // Increased retries for slower systems
-	const retryDelay = 100; // ms
-	let serverReady = false;
+	if (useDebugger) {
+		// Spawn bun as subprocess with debugger flag
+		logger.debug('📦 Spawning bun with debugger enabled...');
+
+		// Determine which debugger flag to use (priority: inspectBrk > inspectWait > inspect)
+		let debugFlag: string;
+		if (inspectBrk) {
+			debugFlag = '--inspect-brk';
+		} else if (inspectWait) {
+			debugFlag = '--inspect-wait';
+		} else {
+			debugFlag = '--inspect';
+		}
 
-	for (let i = 0; i < maxRetries; i++) {
-		// Check if global server object exists
+		logger.debug('Using debugger flag: %s', debugFlag);
+
+		const bunProcess = Bun.spawn(['bun', debugFlag, 'run', appPath], {
+			cwd: rootDir,
+			stdout: 'inherit',
+			stderr: 'inherit',
+			env: {
+				...process.env,
+				PORT: String(port),
+			},
+		});
+
+		// Store the process globally so it can be killed on shutdown
 		// eslint-disable-next-line @typescript-eslint/no-explicit-any
-		if ((globalThis as any).__AGENTUITY_SERVER__) {
-			// Server object exists, now verify it's actually listening by making a request
+		(globalThis as any).__AGENTUITY_BUN_SUBPROCESS__ = bunProcess;
+
+		// Wait for server to actually start listening
+		const maxRetries = 50;
+		const retryDelay = 100;
+		let serverReady = false;
+
+		for (let i = 0; i < maxRetries; i++) {
 			try {
 				await fetch(`http://127.0.0.1:${port}/`, {
 					method: 'HEAD',
@@ -88,19 +105,79 @@ export async function startBunDevServer(options: BunDevServerOptions): Promise<B
 			} catch {
 				// Connection refused or timeout - server not ready yet
 			}
+			// Wait before next check
+			await new Promise((resolve) => setTimeout(resolve, retryDelay));
 		}
-		// Wait before next check
-		await new Promise((resolve) => setTimeout(resolve, retryDelay));
-	}
 
-	if (!serverReady) {
-		throw new Error(
-			`Bun server failed to start on port ${port} after ${maxRetries * retryDelay}ms`
-		);
-	}
+		if (!serverReady) {
+			// Kill the subprocess if server didn't start
+			try {
+				bunProcess.kill();
+			} catch (err) {
+				logger.debug('Error killing subprocess during startup failure: %s', err);
+			}
+			throw new Error(
+				`Bun server failed to start on port ${port} after ${maxRetries * retryDelay}ms`
+			);
+		}
+
+		logger.debug(`Bun dev server started on http://127.0.0.1:${port} with debugger enabled`);
+		logger.debug(`Asset requests (/@vite/*, /src/web/*, etc.) proxied to Vite:${vitePort}`);
+	} else {
+		// Load the bundled app - this will start Bun.serve() internally
+		// IMPORTANT: We must import the bundled .agentuity/app.js (NOT src/generated/app.ts)
+		// because the bundled version has LLM provider patches applied that enable AI Gateway routing.
+		// Importing the source file directly would bypass these patches.
+		logger.debug('📦 Loading bundled app (Bun server will start)...');
+
+		// Import the generated app with cache-busting query parameter.
+		// Bun's module cache is keyed by the full specifier including query string,
+		// so adding a unique timestamp forces a fresh import on each reload.
+		const cacheBuster = `?t=${Date.now()}`;
+		try {
+			await import(appPath + cacheBuster);
+		} catch (err) {
+			const errorMessage = err instanceof Error ? err.message : String(err);
+			logger.error('Failed to import generated app from %s: %s', appPath, errorMessage);
+			throw new Error(`Failed to load generated app: ${errorMessage}`);
+		}
+
+		// Wait for server to actually start listening
+		// The generated app sets (globalThis as any).__AGENTUITY_SERVER__ when server starts
+		const maxRetries = 50; // Increased retries for slower systems
+		const retryDelay = 100; // ms
+		let serverReady = false;
 
-	logger.debug(`Bun dev server started on http://127.0.0.1:${port}`);
-	logger.debug(`Asset requests (/@vite/*, /src/web/*, etc.) proxied to Vite:${vitePort}`);
+		for (let i = 0; i < maxRetries; i++) {
+			// Check if global server object exists
+			// eslint-disable-next-line @typescript-eslint/no-explicit-any
+			if ((globalThis as any).__AGENTUITY_SERVER__) {
+				// Server object exists, now verify it's actually listening by making a request
+				try {
+					await fetch(`http://127.0.0.1:${port}/`, {
+						method: 'HEAD',
+						signal: AbortSignal.timeout(1000),
+					});
+					// Any response (even 404) means server is listening
+					serverReady = true;
+					break;
+				} catch {
+					// Connection refused or timeout - server not ready yet
+				}
+			}
+			// Wait before next check
+			await new Promise((resolve) => setTimeout(resolve, retryDelay));
+		}
+
+		if (!serverReady) {
+			throw new Error(
+				`Bun server failed to start on port ${port} after ${maxRetries * retryDelay}ms`
+			);
+		}
+
+		logger.debug(`Bun dev server started on http://127.0.0.1:${port}`);
+		logger.debug(`Asset requests (/@vite/*, /src/web/*, etc.) proxied to Vite:${vitePort}`);
+	}
 
 	return {
 		bunServerPort: port,

package/src/cmd/cloud/apikey/create.ts

@@ -95,7 +95,9 @@ export const createSubcommand = createSubcommandHelper({
 			tui.newline();
 			tui.success('API key created successfully!');
 			tui.newline();
-			tui.warn('Make sure to copy the API key value now. You will not be able to see it again.');
+			tui.warning(
+				'Make sure to copy the API key value now. You will not be able to see it again.'
+			);
 			tui.newline();
 
 			const rows = [

package/src/cmd/cloud/deploy.ts

@@ -168,7 +168,10 @@ export const deploySubcommand = createSubcommand({
 		const hasTTY = process.stdin.isTTY && process.stdout.isTTY;
 		if (project.region) {
 			try {
-				const serverProject = await projectGet(apiClient, { id: project.projectId, keys: false });
+				const serverProject = await projectGet(apiClient, {
+					id: project.projectId,
+					keys: false,
+				});
 				const serverRegion = serverProject.cloudRegion;
 
 				if (serverRegion && serverRegion !== project.region) {

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

@@ -14,24 +14,30 @@ import { resolveOrgId, isOrgScope } from './org-util';
 
 const EnvDeleteResponseSchema = z.object({
 	success: z.boolean().describe('Whether the operation succeeded'),
-	key: z.string().describe('Variable key that was deleted'),
+	keys: z.array(z.string()).describe('Variable keys that were deleted'),
 	path: z
 		.string()
 		.optional()
-		.describe('Local file path where variable was removed (project scope only)'),
-	secret: z.boolean().describe('Whether a secret was deleted'),
-	scope: z.enum(['project', 'org']).describe('The scope from which the variable was deleted'),
+		.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'),
+	notFound: z.array(z.string()).optional().describe('Keys that were not found'),
 });
 
 export const deleteSubcommand = createSubcommand({
 	name: 'delete',
 	aliases: ['del', 'remove', 'rm'],
-	description: 'Delete an environment variable or secret',
+	description: 'Delete one or more environment variables or secrets',
 	tags: ['destructive', 'deletes-resource', 'slow', 'requires-auth'],
 	idempotent: true,
 	examples: [
-		{ command: getCommand('env delete OLD_FEATURE_FLAG'), description: 'Delete variable' },
+		{ command: getCommand('env delete OLD_FEATURE_FLAG'), description: 'Delete a variable' },
 		{ command: getCommand('env rm API_KEY'), description: 'Delete a secret' },
+		{
+			command: getCommand('env rm KEY1 KEY2 KEY3'),
+			description: 'Delete multiple variables at once',
+		},
 		{
 			command: getCommand('env rm OPENAI_API_KEY --org'),
 			description: 'Delete org-level secret',
@@ -41,7 +47,7 @@ export const deleteSubcommand = createSubcommand({
 	optional: { project: true },
 	schema: {
 		args: z.object({
-			key: z.string().describe('the variable or secret key to delete'),
+			key: z.array(z.string()).describe('the variable or secret key(s) to delete'),
 		}),
 		options: z.object({
 			org: z
@@ -57,6 +63,7 @@ export const deleteSubcommand = createSubcommand({
 	async handler(ctx) {
 		const { args, project, projectDir, apiClient, config, opts } = ctx;
 		const useOrgScope = isOrgScope(opts?.org);
+		const keys = args.key;
 
 		// Require project context if not using org scope
 		if (!useOrgScope && !project) {
@@ -65,10 +72,11 @@ export const deleteSubcommand = createSubcommand({
 			);
 		}
 
-		// Validate key doesn't start with reserved AGENTUITY_ prefix (except AGENTUITY_PUBLIC_)
-		if (isReservedAgentuityKey(args.key)) {
+		// Validate no keys start with reserved AGENTUITY_ prefix (except AGENTUITY_PUBLIC_)
+		const reservedKeys = keys.filter(isReservedAgentuityKey);
+		if (reservedKeys.length > 0) {
 			tui.fatal(
-				'Cannot delete AGENTUITY_ prefixed variables. These are reserved for system use.'
+				`Cannot delete AGENTUITY_ prefixed variables: ${reservedKeys.join(', ')}. These are reserved for system use.`
 			);
 		}
 
@@ -76,85 +84,132 @@ export const deleteSubcommand = createSubcommand({
 			// Organization scope
 			const orgId = await resolveOrgId(apiClient, config, opts!.org!);
 
-			// First, determine if this key exists in env or secrets
-			const orgData = await tui.spinner('Checking organization variable', () => {
+			// First, determine which keys exist in env or secrets
+			const orgData = await tui.spinner('Checking organization variables', () => {
 				return orgEnvGet(apiClient, { id: orgId, mask: true });
 			});
 
-			const isSecret = orgData.secrets?.[args.key] !== undefined;
-			const isEnv = orgData.env?.[args.key] !== undefined;
+			const secretKeys: string[] = [];
+			const envKeys: string[] = [];
+			const notFoundKeys: string[] = [];
+
+			for (const key of keys) {
+				if (orgData.secrets?.[key] !== undefined) {
+					secretKeys.push(key);
+				} else if (orgData.env?.[key] !== undefined) {
+					envKeys.push(key);
+				} else {
+					notFoundKeys.push(key);
+				}
+			}
 
-			if (!isSecret && !isEnv) {
+			// If all keys are not found, fail
+			if (secretKeys.length === 0 && envKeys.length === 0) {
 				tui.fatal(
-					`Variable '${args.key}' not found in organization`,
+					`No variables found in organization: ${keys.join(', ')}`,
 					ErrorCode.RESOURCE_NOT_FOUND
 				);
 			}
 
-			// Delete from cloud
-			const label = isSecret ? 'secret' : 'environment variable';
-			await tui.spinner(`Deleting organization ${label} from cloud`, () => {
+			// Delete from cloud (batch operation)
+			const totalToDelete = secretKeys.length + envKeys.length;
+			const label = totalToDelete === 1 ? 'variable' : 'variables';
+			await tui.spinner(`Deleting ${totalToDelete} organization ${label} from cloud`, () => {
 				return orgEnvDelete(apiClient, {
 					id: orgId,
-					...(isSecret ? { secrets: [args.key] } : { env: [args.key] }),
+					...(secretKeys.length > 0 ? { secrets: secretKeys } : {}),
+					...(envKeys.length > 0 ? { env: envKeys } : {}),
 				});
 			});
 
+			const deletedKeys = [...secretKeys, ...envKeys];
+			if (notFoundKeys.length > 0) {
+				tui.warning(`Variables not found (skipped): ${notFoundKeys.join(', ')}`);
+			}
 			tui.success(
-				`Organization ${isSecret ? 'secret' : 'environment variable'} '${args.key}' deleted successfully`
+				`Deleted ${deletedKeys.length} organization variable(s): ${deletedKeys.join(', ')}`
 			);
 
 			return {
 				success: true,
-				key: args.key,
-				secret: isSecret,
+				keys: deletedKeys,
+				secrets: secretKeys,
+				env: envKeys,
 				scope: 'org' as const,
+				...(notFoundKeys.length > 0 ? { notFound: notFoundKeys } : {}),
 			};
 		} else {
-			// Project scope (existing behavior)
-			const projectData = await tui.spinner('Checking variable', () => {
+			// Project scope
+			const projectData = await tui.spinner('Checking variables', () => {
 				return projectGet(apiClient, { id: project!.projectId, mask: true });
 			});
 
-			const isSecret = projectData.secrets?.[args.key] !== undefined;
-			const isEnv = projectData.env?.[args.key] !== undefined;
+			const secretKeys: string[] = [];
+			const envKeys: string[] = [];
+			const notFoundKeys: string[] = [];
+
+			for (const key of keys) {
+				if (projectData.secrets?.[key] !== undefined) {
+					secretKeys.push(key);
+				} else if (projectData.env?.[key] !== undefined) {
+					envKeys.push(key);
+				} else {
+					notFoundKeys.push(key);
+				}
+			}
 
-			if (!isSecret && !isEnv) {
-				tui.fatal(`Variable '${args.key}' not found`, ErrorCode.RESOURCE_NOT_FOUND);
+			// If all keys are not found, fail
+			if (secretKeys.length === 0 && envKeys.length === 0) {
+				tui.fatal(`No variables found: ${keys.join(', ')}`, ErrorCode.RESOURCE_NOT_FOUND);
 			}
 
-			// Delete from cloud using the correct field
-			const label = isSecret ? 'secret' : 'environment variable';
-			await tui.spinner(`Deleting ${label} from cloud`, () => {
+			// Delete from cloud (batch operation)
+			const totalToDelete = secretKeys.length + envKeys.length;
+			const label = totalToDelete === 1 ? 'variable' : 'variables';
+			await tui.spinner(`Deleting ${totalToDelete} ${label} from cloud`, () => {
 				return projectEnvDelete(apiClient, {
 					id: project!.projectId,
-					...(isSecret ? { secrets: [args.key] } : { env: [args.key] }),
+					...(secretKeys.length > 0 ? { secrets: secretKeys } : {}),
+					...(envKeys.length > 0 ? { env: envKeys } : {}),
 				});
 			});
 
-			// Update local .env file only if we have a project directory
-			// (not when using --project-id without being in a project folder)
+			// 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);
-				const currentEnv = await readEnvFile(envFilePath);
-				delete currentEnv[args.key];
+				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 });
+					}
+				}
+			}
 
-				// Write the updated env, preserveExisting: false since we already have the full state
-				await writeEnvFile(envFilePath, currentEnv, { preserveExisting: false });
+			const deletedKeys = [...secretKeys, ...envKeys];
+			if (notFoundKeys.length > 0) {
+				tui.warning(`Variables not found (skipped): ${notFoundKeys.join(', ')}`);
 			}
 
-			const successMsg = envFilePath
-				? `${isSecret ? 'Secret' : 'Environment variable'} '${args.key}' deleted successfully (cloud + ${envFilePath})`
-				: `${isSecret ? 'Secret' : 'Environment variable'} '${args.key}' deleted successfully (cloud only)`;
-			tui.success(successMsg);
+			const locationMsg = envFilePath ? ` (cloud + ${envFilePath})` : ' (cloud only)';
+			tui.success(
+				`Deleted ${deletedKeys.length} variable(s): ${deletedKeys.join(', ')}${locationMsg}`
+			);
 
 			return {
 				success: true,
-				key: args.key,
+				keys: deletedKeys,
 				path: envFilePath,
-				secret: isSecret,
+				secrets: secretKeys,
+				env: envKeys,
 				scope: 'project' as const,
+				...(notFoundKeys.length > 0 ? { notFound: notFoundKeys } : {}),
 			};
 		}
 	},

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

@@ -2,12 +2,7 @@ import { z } from 'zod';
 import { createSubcommand } from '../../../types';
 import * as tui from '../../../tui';
 import { projectGet, orgEnvGet } from '@agentuity/server';
-import {
-	findExistingEnvFile,
-	readEnvFile,
-	writeEnvFile,
-	mergeEnvVars,
-} from '../../../env-util';
+import { findExistingEnvFile, readEnvFile, writeEnvFile, mergeEnvVars } from '../../../env-util';
 import { getCommand } from '../../../command-prefix';
 import { resolveOrgId, isOrgScope } from './org-util';
 

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

@@ -49,7 +49,7 @@ export const deleteSubcommand = createSubcommand({
 			if (!opts.confirm) {
 				if (process.stdin.isTTY) {
 					tui.newline();
-					tui.warn(`You are about to delete machine ${tui.bold(machine.id)}`);
+					tui.warning(`You are about to delete machine ${tui.bold(machine.id)}`);
 					if (machine.orgName) {
 						tui.info(`Organization: ${machine.orgName}`);
 					}