@agentuity/cli 2.0.0-beta.0 → 2.0.0-beta.1

package/dist/utils/version-mismatch.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"version-mismatch.d.ts","sourceRoot":"","sources":["../../src/utils/version-mismatch.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,MAAM,WAAW,WAAW;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,qBAAqB;IACrC,wBAAwB;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,sCAAsC;IACtC,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,2CAA2C;IAC3C,UAAU,EAAE,WAAW,EAAE,CAAC;IAC1B,2CAA2C;IAC3C,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,yCAAyC;IACzC,aAAa,EAAE,OAAO,CAAC;IACvB,iEAAiE;IACjE,kBAAkB,EAAE,OAAO,CAAC;CAC5B;AAkCD;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,qBAAqB,CAkG/F;AAED;;GAEG;AACH,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,qBAAqB,GAAG,MAAM,CA4BlF"}

package/dist/utils/version-mismatch.js

@@ -0,0 +1,161 @@
+/**
+ * Version mismatch detection for @agentuity/* packages.
+ *
+ * Detects when a project uses outdated v1 SDK packages while the CLI is v2,
+ * and recommends running the migration tool.
+ */
+import { existsSync, readFileSync } from 'node:fs';
+import { join } from 'node:path';
+import { getVersion } from '../version';
+/**
+ * Extract major version from semver string
+ */
+function extractMajor(version) {
+    // Handle ranges like ^1.0.0, ~2.0.0, >=1.0.0
+    const match = version.match(/(\d+)\.\d+\.\d+/);
+    if (match?.[1]) {
+        return parseInt(match[1], 10);
+    }
+    // Handle "latest" or "*"
+    if (version === 'latest' || version === '*') {
+        return 0; // Unknown major
+    }
+    return 0;
+}
+/**
+ * Get installed version from node_modules
+ */
+function getInstalledVersion(projectDir, packageName) {
+    try {
+        const pkgPath = join(projectDir, 'node_modules', packageName, 'package.json');
+        if (!existsSync(pkgPath)) {
+            return null;
+        }
+        const pkg = JSON.parse(readFileSync(pkgPath, 'utf-8'));
+        return pkg.version || null;
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * Detect version mismatches in @agentuity/* packages.
+ *
+ * @param projectDir - Root directory of the user's project
+ * @param logger - Logger instance
+ * @returns Version mismatch detection result
+ */
+export function detectVersionMismatch(projectDir, logger) {
+    const cliVersion = getVersion();
+    const cliMajor = extractMajor(cliVersion);
+    const result = {
+        cliMajor,
+        packages: [],
+        mismatched: [],
+        outdated: [],
+        hasV1Packages: false,
+        hasMajorMismatches: false,
+    };
+    // Skip check for canary versions
+    if (cliVersion.includes('-')) {
+        logger.debug('Skipping version mismatch check for canary version: %s', cliVersion);
+        return result;
+    }
+    // Read package.json
+    const packageJsonPath = join(projectDir, 'package.json');
+    if (!existsSync(packageJsonPath)) {
+        logger.debug('No package.json found, skipping version mismatch check');
+        return result;
+    }
+    let packageJson;
+    try {
+        packageJson = JSON.parse(readFileSync(packageJsonPath, 'utf-8'));
+    }
+    catch (error) {
+        logger.debug('Failed to read package.json: %s', error);
+        return result;
+    }
+    // Collect all @agentuity/* packages
+    const allDeps = {
+        ...packageJson.dependencies,
+        ...packageJson.devDependencies,
+    };
+    const agentuitPackages = Object.entries(allDeps)
+        .filter(([name]) => name.startsWith('@agentuity/'))
+        .map(([name, specifier]) => ({ name, specifier }));
+    if (agentuitPackages.length === 0) {
+        logger.debug('No @agentuity/* packages found in package.json');
+        return result;
+    }
+    // Check each package's installed version
+    for (const { name } of agentuitPackages) {
+        const installedVersion = getInstalledVersion(projectDir, name);
+        if (!installedVersion) {
+            logger.debug('%s: not installed, skipping', name);
+            continue;
+        }
+        const major = extractMajor(installedVersion);
+        const info = {
+            name,
+            version: installedVersion,
+            major,
+        };
+        result.packages.push(info);
+        // Check if this is a v1 package when CLI is v2+
+        if (major === 1 && cliMajor >= 2) {
+            result.outdated.push(info);
+            result.hasV1Packages = true;
+        }
+    }
+    // Check for major version mismatches across installed packages
+    if (result.packages.length > 1) {
+        const majors = new Set(result.packages.map((p) => p.major));
+        if (majors.size > 1) {
+            result.hasMajorMismatches = true;
+            // Find packages that don't match the most common major version
+            const majorCounts = new Map();
+            for (const pkg of result.packages) {
+                majorCounts.set(pkg.major, (majorCounts.get(pkg.major) || 0) + 1);
+            }
+            const mostCommonMajor = [...majorCounts.entries()].sort((a, b) => b[1] - a[1])[0]?.[0] || cliMajor;
+            for (const pkg of result.packages) {
+                if (pkg.major !== mostCommonMajor) {
+                    result.mismatched.push(pkg);
+                }
+            }
+        }
+    }
+    return result;
+}
+/**
+ * Format a warning message for version mismatches.
+ */
+export function formatVersionMismatchWarning(result) {
+    const lines = [];
+    if (result.hasV1Packages) {
+        lines.push('You are using Agentuity SDK v1 packages, but v2 is now available.');
+        lines.push('');
+        lines.push('  Outdated packages:');
+        for (const pkg of result.outdated) {
+            lines.push(`    • ${pkg.name}@${pkg.version}`);
+        }
+        lines.push('');
+        lines.push('  → Run `npx @agentuity/migrate` to upgrade your project to v2.');
+        lines.push('    This will automatically update your code and dependencies.');
+        lines.push('');
+        lines.push('  See the migration guide: https://docs.agentuity.com/migration/v1-to-v2');
+    }
+    else if (result.hasMajorMismatches) {
+        lines.push('Your project has mismatched major versions across @agentuity/* packages.');
+        lines.push('');
+        lines.push('  Packages:');
+        for (const pkg of result.packages) {
+            const marker = result.mismatched.includes(pkg) ? ' ⚠️' : '';
+            lines.push(`    • ${pkg.name}@${pkg.version} (v${pkg.major})${marker}`);
+        }
+        lines.push('');
+        lines.push('  → Run `bun install` to sync versions, or pin to the same major version.');
+    }
+    return lines.join('\n');
+}
+//# sourceMappingURL=version-mismatch.js.map

package/dist/utils/version-mismatch.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@agentuity/cli",
-	"version": "2.0.0-beta.0",
+	"version": "2.0.0-beta.1",
 	"license": "Apache-2.0",
 	"author": "Agentuity employees and contributors",
 	"type": "module",
@@ -41,12 +41,14 @@
 		"prepublishOnly": "bun run clean && bun run build"
 	},
 	"dependencies": {
-		"@agentuity/auth": "2.0.0-beta.0",
-		"@agentuity/core": "2.0.0-beta.0",
-		"@agentuity/server": "2.0.0-beta.0",
+		"@agentuity/auth": "2.0.0-beta.1",
+		"@agentuity/core": "2.0.0-beta.1",
+		"@agentuity/server": "2.0.0-beta.1",
 		"@datasert/cronjs-parser": "^1.4.0",
 		"@vitejs/plugin-react": "^5.1.2",
+		"acorn-loose": "^8.5.2",
 		"adm-zip": "^0.5.16",
+		"astring": "^1.9.0",
 		"cli-table3": "^0.6.5",
 		"commander": "^14.0.2",
 		"enquirer": "^2.4.1",
@@ -57,10 +59,10 @@
 		"typescript": "^5.9.0",
 		"vite": "^7.2.7",
 		"zod": "^4.3.5",
-		"@agentuity/frontend": "2.0.0-beta.0"
+		"@agentuity/frontend": "2.0.0-beta.1"
 	},
 	"devDependencies": {
-		"@agentuity/test-utils": "2.0.0-beta.0",
+		"@agentuity/test-utils": "2.0.0-beta.1",
 		"@types/adm-zip": "^0.5.7",
 		"@types/bun": "latest",
 		"@types/tar-fs": "^2.0.4",

package/src/auth.ts

@@ -107,14 +107,24 @@ async function resolveCachedOrgId(ctx: {
 }
 
 export async function resolveOrgIdWithoutPrompt(ctx: {
-	options: { orgId?: string };
+	options: { orgId?: string | boolean };
 	config: Config | null;
 	args?: Record<string, unknown> | unknown[];
 	opts?: Record<string, unknown> | unknown[];
 }): Promise<string | undefined> {
 	const { options, config, args, opts } = ctx;
 	const envOrgId = process.env[ORG_ID_ENV_VAR];
-	const flagOrgId = options.orgId && options.orgId !== envOrgId ? options.orgId : undefined;
+
+	// Handle --org flag: could be true (use default), false, or a string org ID
+	let flagOrgId: string | undefined;
+	if (options.orgId === true) {
+		// --org without argument means "use default org" - will fall through to preference/env
+		flagOrgId = undefined;
+	} else if (typeof options.orgId === 'string' && options.orgId !== envOrgId) {
+		flagOrgId = options.orgId;
+	} else {
+		flagOrgId = undefined;
+	}
 
 	if (flagOrgId) {
 		return flagOrgId;

package/src/cli.ts

@@ -541,6 +541,11 @@ export async function createCLI(version: string): Promise<Command> {
 			'Filter JSON output to specified fields (comma-separated, dot notation for nested)'
 		);
 
+	// Note: We intentionally do NOT add a global --org alias for --org-id because
+	// some subcommands (like env commands) define their own --org option with
+	// different semantics (boolean for "use org scope" vs string for specific org ID).
+	// Adding a global --org would shadow the subcommand's --org option.
+
 	const skipVersionCheckOption = program.createOption(
 		'--skip-version-check',
 		'Skip version compatibility check (dev only)'
@@ -1292,6 +1297,17 @@ async function registerSubcommand(
 	// Add --org-id if command requires/optional org and doesn't define it in schema
 	if (_deferOrgIdFlag && !hasOrgIdInSchema) {
 		cmd.option('--org-id <id>', 'organization ID');
+		// Add hidden --org alias, but only if schema doesn't define its own --org option
+		// (e.g., env commands use --org for "org scope" which is different from --org-id)
+		const schemaDefinesOrg = subcommand.schema?.options
+			? parseOptionsSchema(subcommand.schema.options).some((o) => o.name === 'org')
+			: false;
+		if (!schemaDefinesOrg) {
+			// Use [id] (optional) to allow --org without argument for default org
+			const orgAlias = cmd.createOption('--org [id]', 'Alias for --org-id');
+			orgAlias.hideHelp();
+			cmd.addOption(orgAlias);
+		}
 	}
 
 	// Add --project-id if command requires/optional project and doesn't define it in schema
@@ -1304,6 +1320,19 @@ async function registerSubcommand(
 		const options = cmdObj.opts();
 		const args = rawArgs.slice(0, -1);
 
+		// Normalize --org to --org-id for downstream code
+		// The --org [id] option is parsed into options.org, but code uses options.orgId
+		// Handle: --org (true -> undefined for default org), --org org_123 (string -> string)
+		if (options.org !== undefined && options.orgId === undefined) {
+			if (options.org === true) {
+				// --org without argument: mark as explicitly requested (use default org)
+				// Set to undefined so org resolution falls through to preference/env/prompt
+				options.orgId = undefined;
+			} else if (typeof options.org === 'string') {
+				options.orgId = options.org;
+			}
+		}
+
 		// Handle --describe mode: output command schema and exit
 		if (baseCtx.options.describe) {
 			const { extractSubcommandSchema } = await import('./schema-generator');
@@ -1331,7 +1360,10 @@ async function registerSubcommand(
 		// so subcommand-level options may not have them. Only merge when the user
 		// explicitly passed the flag on the CLI (not from env var defaults).
 		const argv = process.argv;
-		const hasExplicitOrgId = argv.some((a) => a === '--org-id' || a.startsWith('--org-id='));
+		const hasExplicitOrgId = argv.some(
+			(a) =>
+				a === '--org-id' || a.startsWith('--org-id=') || a === '--org' || a.startsWith('--org=')
+		);
 		const hasExplicitProjectId = argv.some(
 			(a) => a === '--project-id' || a.startsWith('--project-id=')
 		);

package/src/cmd/auth/ssh/delete.ts

@@ -15,7 +15,7 @@ const SSHDeleteResponseSchema = z.object({
 
 export const deleteCommand = createSubcommand({
 	name: 'delete',
-	aliases: ['rm', 'del', 'remove'],
+	aliases: ['rm', 'del', 'remove', 'terminate'],
 	description: 'Delete an SSH key from your account',
 	tags: ['destructive', 'deletes-resource', 'slow', 'requires-auth'],
 	requires: { apiClient: true, auth: true },

package/src/cmd/build/app-config-extractor.ts

@@ -0,0 +1,186 @@
+/**
+ * App Config Extractor
+ *
+ * Extracts analytics and workbench config from the user's createApp() call
+ * in app.ts. This is the v2 approach where createApp() is the single source
+ * of truth for runtime configuration (replacing agentuity.config.ts).
+ *
+ * Uses TypeScript's compiler API to reliably detect and extract values.
+ */
+
+import ts from 'typescript';
+import { join } from 'node:path';
+import type { Logger } from '../../types';
+
+/**
+ * Extracted runtime config from createApp() call.
+ */
+export interface ExtractedAppConfig {
+	/** analytics option value: boolean, object, or undefined if not set */
+	analytics?: boolean | Record<string, unknown>;
+	/** workbench option value: boolean, string, object, or undefined if not set */
+	workbench?: boolean | string | Record<string, unknown>;
+}
+
+/**
+ * Extract analytics and workbench config from a createApp() call.
+ *
+ * Uses TypeScript AST to find `createApp({ ... })` and extract the values
+ * of the `analytics` and `workbench` properties.
+ */
+function extractCreateAppConfig(sourceFile: ts.SourceFile): ExtractedAppConfig {
+	const result: ExtractedAppConfig = {};
+
+	// Walk the AST looking for createApp({ ... }) calls
+	function visit(node: ts.Node): void {
+		// Check for createApp(...) call
+		if (
+			ts.isCallExpression(node) &&
+			ts.isIdentifier(node.expression) &&
+			node.expression.text === 'createApp' &&
+			node.arguments.length > 0
+		) {
+			const firstArg = node.arguments[0];
+			if (!firstArg) return;
+			if (ts.isObjectLiteralExpression(firstArg)) {
+				// Found createApp({ ... }) — extract properties
+				for (const prop of firstArg.properties) {
+					if (!ts.isPropertyAssignment(prop)) continue;
+
+					const name = ts.isIdentifier(prop.name) ? prop.name.text : undefined;
+					if (!name) continue;
+
+					// prop.initializer should always exist for PropertyAssignment, but check to satisfy TS
+					if (!('initializer' in prop)) continue;
+					const initializer = (prop as { initializer: ts.Expression }).initializer;
+
+					if (name === 'analytics') {
+						const value = extractValue(initializer);
+						if (value !== undefined) {
+							if (typeof value === 'boolean') {
+								result.analytics = value;
+							} else if (typeof value === 'object') {
+								result.analytics = value as Record<string, unknown>;
+							}
+							// Ignore string/number for analytics
+						}
+					} else if (name === 'workbench') {
+						const value = extractValue(initializer);
+						if (value !== undefined) {
+							if (typeof value === 'boolean' || typeof value === 'string') {
+								result.workbench = value;
+							} else if (typeof value === 'object') {
+								result.workbench = value as Record<string, unknown>;
+							}
+							// Ignore number for workbench
+						}
+					}
+				}
+			}
+		}
+
+		ts.forEachChild(node, visit);
+	}
+
+	visit(sourceFile);
+	return result;
+}
+
+/**
+ * Extract a JavaScript value from a TypeScript AST expression node.
+ * Handles: boolean literals, string literals, numeric literals,
+ * object literals (as Record), and identifier references (by name).
+ */
+function extractValue(
+	node: ts.Node
+): boolean | string | number | Record<string, unknown> | undefined {
+	if (ts.isLiteralExpression(node)) {
+		// String literal or numeric literal
+		if (ts.isStringLiteral(node)) {
+			return node.text;
+		}
+		if (ts.isNumericLiteral(node)) {
+			return Number(node.text);
+		}
+	}
+
+	if (node.kind === ts.SyntaxKind.TrueKeyword) {
+		return true;
+	}
+	if (node.kind === ts.SyntaxKind.FalseKeyword) {
+		return false;
+	}
+
+	if (ts.isIdentifier(node)) {
+		// Return the identifier name (e.g., a variable reference)
+		return node.text;
+	}
+
+	if (ts.isObjectLiteralExpression(node)) {
+		const obj: Record<string, unknown> = {};
+		for (const prop of node.properties) {
+			if (!ts.isPropertyAssignment(prop)) continue;
+			if (!ts.isIdentifier(prop.name)) continue;
+
+			const key = prop.name.text;
+			obj[key] = extractValue(prop.initializer);
+		}
+		return obj;
+	}
+
+	return undefined;
+}
+
+/**
+ * Detect and extract analytics/workbench config from app.ts.
+ *
+ * This is the v2 approach: runtime config lives in createApp() only.
+ * The CLI reads these values at build time via AST parsing.
+ */
+export async function extractAppConfig(
+	rootDir: string,
+	logger: Logger
+): Promise<ExtractedAppConfig> {
+	// Look for app.ts in root first, then src/
+	let appFile = join(rootDir, 'app.ts');
+	if (!(await Bun.file(appFile).exists())) {
+		appFile = join(rootDir, 'src', 'app.ts');
+		if (!(await Bun.file(appFile).exists())) {
+			logger.trace('[config-extract] No app.ts found');
+			return {};
+		}
+	}
+
+	try {
+		const source = await Bun.file(appFile).text();
+
+		// Quick bail-out before parsing
+		if (!source.includes('createApp')) {
+			logger.trace('[config-extract] No createApp call in %s', appFile);
+			return {};
+		}
+
+		// Parse with TypeScript
+		const sourceFile = ts.createSourceFile(
+			appFile,
+			source,
+			ts.ScriptTarget.Latest,
+			true,
+			ts.ScriptKind.TS
+		);
+
+		const config = extractCreateAppConfig(sourceFile);
+
+		if (config.analytics !== undefined) {
+			logger.debug('[config-extract] Found analytics in createApp(): %o', config.analytics);
+		}
+		if (config.workbench !== undefined) {
+			logger.debug('[config-extract] Found workbench in createApp(): %o', config.workbench);
+		}
+
+		return config;
+	} catch (error) {
+		logger.warn('[config-extract] Failed to parse app.ts:', error);
+		return {};
+	}
+}