@agentuity/cli 0.1.39 → 0.1.41

package/dist/utils/deps.js

@@ -1,4 +1,5 @@
 import { $ } from 'bun';
+import { join } from 'node:path';
 export async function extractDependencies(projectDir, logger) {
     try {
         logger.debug('Extracting dependencies using bun pm ls --all');
@@ -8,7 +9,13 @@ export async function extractDependencies(projectDir, logger) {
             return [];
         }
         const output = result.stdout.toString();
-        const packages = parseBunPmLsOutput(output);
+        let packages = parseBunPmLsOutput(output);
+        // Load alias map from bun.lock to resolve npm aliases to actual package names
+        const aliasMap = await loadAliasMap(projectDir, logger);
+        if (aliasMap.size > 0) {
+            logger.debug('Loaded %d package aliases from bun.lock', aliasMap.size);
+            packages = resolveAliases(packages, aliasMap, logger);
+        }
         logger.debug('Extracted %d unique packages', packages.length);
         return packages;
     }
@@ -33,4 +40,120 @@ export function parseBunPmLsOutput(output) {
     }
     return Array.from(packages.values());
 }
+/**
+ * Load alias mappings from bun.lock file.
+ *
+ * The bun.lock file contains a "packages" object where:
+ * - Keys are the package names as they appear in node_modules (alias names for aliased packages)
+ * - Values are arrays where the first element is "actualPackageName@version"
+ *
+ * For npm aliases like `"tailwind-merge-v2": "npm:tailwind-merge@2.6.0"`:
+ * - Key: "tailwind-merge-v2"
+ * - Value[0]: "tailwind-merge@2.6.0"
+ *
+ * This function builds a map from "aliasName@version" to the actual PackageRef.
+ */
+export async function loadAliasMap(projectDir, logger) {
+    const aliasMap = new Map();
+    try {
+        const lockfilePath = join(projectDir, 'bun.lock');
+        const lockfile = Bun.file(lockfilePath);
+        if (!(await lockfile.exists())) {
+            logger.debug('No bun.lock file found, skipping alias resolution');
+            return aliasMap;
+        }
+        const content = await lockfile.text();
+        const parsed = parseBunLockFile(content);
+        if (!parsed || !parsed.packages) {
+            return aliasMap;
+        }
+        for (const [aliasName, packageInfo] of Object.entries(parsed.packages)) {
+            if (!Array.isArray(packageInfo) || packageInfo.length === 0) {
+                continue;
+            }
+            const actualPackageSpec = packageInfo[0];
+            if (typeof actualPackageSpec !== 'string') {
+                continue;
+            }
+            // Parse "actualPackageName@version" from the first element
+            const atIndex = actualPackageSpec.lastIndexOf('@');
+            if (atIndex <= 0) {
+                continue;
+            }
+            const actualName = actualPackageSpec.substring(0, atIndex);
+            const actualVersion = actualPackageSpec.substring(atIndex + 1);
+            // Only add to alias map if the alias name differs from the actual name
+            // This indicates an npm alias (e.g., tailwind-merge-v2 -> tailwind-merge)
+            if (aliasName !== actualName) {
+                const aliasKey = `${aliasName}@${actualVersion}`;
+                aliasMap.set(aliasKey, { name: actualName, version: actualVersion });
+            }
+        }
+    }
+    catch (error) {
+        logger.debug('Failed to parse bun.lock for alias resolution: %s', error);
+    }
+    return aliasMap;
+}
+/**
+ * Parse bun.lock file content.
+ *
+ * bun.lock uses a relaxed JSON format (JSONC) with trailing commas, which
+ * standard JSON.parse cannot handle. We need to strip trailing commas before parsing.
+ *
+ * Structure:
+ * {
+ *   "lockfileVersion": 1,
+ *   "packages": {
+ *     "package-name": ["actual-package@version", "", {}, "sha512-..."],
+ *     ...
+ *   }
+ * }
+ */
+export function parseBunLockFile(content) {
+    try {
+        // bun.lock uses JSONC format with trailing commas - strip them before parsing
+        const sanitized = stripTrailingCommas(content);
+        return JSON.parse(sanitized);
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * Strip trailing commas from JSONC content to make it valid JSON.
+ * Handles trailing commas before ] and } characters.
+ */
+function stripTrailingCommas(content) {
+    // Match comma followed by optional whitespace and then ] or }
+    return content.replace(/,(\s*[}\]])/g, '$1');
+}
+/**
+ * Resolve npm aliases in the package list to their actual package names.
+ *
+ * This prevents false positives in malware detection where alias names
+ * (e.g., "tailwind-merge-v2") are flagged as suspicious when they're
+ * actually legitimate aliases for real packages (e.g., "tailwind-merge").
+ */
+export function resolveAliases(packages, aliasMap, logger) {
+    const resolved = new Map();
+    for (const pkg of packages) {
+        const aliasKey = `${pkg.name}@${pkg.version}`;
+        const actualPkg = aliasMap.get(aliasKey);
+        if (actualPkg) {
+            logger.debug('Resolved npm alias: %s@%s -> %s@%s', pkg.name, pkg.version, actualPkg.name, actualPkg.version);
+            const resolvedKey = `${actualPkg.name}@${actualPkg.version}`;
+            if (!resolved.has(resolvedKey)) {
+                resolved.set(resolvedKey, actualPkg);
+            }
+        }
+        else {
+            const key = `${pkg.name}@${pkg.version}`;
+            if (!resolved.has(key)) {
+                resolved.set(key, pkg);
+            }
+        }
+    }
+    return Array.from(resolved.values());
+}
 //# sourceMappingURL=deps.js.map

package/dist/utils/deps.js.map

@@ -1 +1 @@
-{"version":3,"file":"deps.js","sourceRoot":"","sources":["../../src/utils/deps.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAQxB,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACxC,UAAkB,EAClB,MAAc;IAEd,IAAI,CAAC;QACJ,MAAM,CAAC,KAAK,CAAC,+CAA+C,CAAC,CAAC;QAE9D,MAAM,MAAM,GAAG,MAAM,CAAC,CAAA,iBAAiB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,KAAK,EAAE,CAAC,OAAO,EAAE,CAAC;QAE1E,IAAI,MAAM,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;YAC3B,MAAM,CAAC,IAAI,CACV,+DAA+D,EAC/D,MAAM,CAAC,QAAQ,CACf,CAAC;YACF,OAAO,EAAE,CAAC;QACX,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QACxC,MAAM,QAAQ,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC;QAE5C,MAAM,CAAC,KAAK,CAAC,8BAA8B,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC9D,OAAO,QAAQ,CAAC;IACjB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,MAAM,CAAC,IAAI,CAAC,oCAAoC,EAAE,KAAK,CAAC,CAAC;QACzD,OAAO,EAAE,CAAC;IACX,CAAC;AACF,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,MAAc;IAChD,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAsB,CAAC;IAC/C,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAEjC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QAC1B,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAC;QAC3D,IAAI,KAAK,EAAE,CAAC;YACX,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YACtB,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YACzB,MAAM,GAAG,GAAG,GAAG,IAAI,IAAI,OAAO,EAAE,CAAC;YACjC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;gBACxB,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;YACtC,CAAC;QACF,CAAC;IACF,CAAC;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;AACtC,CAAC"}
+{"version":3,"file":"deps.js","sourceRoot":"","sources":["../../src/utils/deps.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@agentuity/cli",
-	"version": "0.1.39",
+	"version": "0.1.41",
 	"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.39",
-		"@agentuity/core": "0.1.39",
-		"@agentuity/server": "0.1.39",
+		"@agentuity/auth": "0.1.41",
+		"@agentuity/core": "0.1.41",
+		"@agentuity/server": "0.1.41",
 		"@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.39"
+		"@agentuity/frontend": "0.1.41"
 	},
 	"devDependencies": {
-		"@agentuity/test-utils": "0.1.39",
+		"@agentuity/test-utils": "0.1.41",
 		"@types/adm-zip": "^0.5.7",
 		"@types/bun": "latest",
 		"@types/tar-fs": "^2.0.4",

package/src/agent-detection.ts

@@ -151,7 +151,9 @@ function detectParentAgent(): Promise<string | undefined> {
 			return;
 		}
 
-		walkTree(ppid, 0).then(resolve).catch(() => resolve(undefined));
+		walkTree(ppid, 0)
+			.then(resolve)
+			.catch(() => resolve(undefined));
 	});
 }
 

package/src/cmd/auth/org/index.ts

@@ -115,7 +115,10 @@ const currentCommand = createSubcommand({
 	requires: { auth: true, apiClient: true },
 	examples: [
 		{ command: getCommand('auth org current'), description: 'Show default organization ID' },
-		{ command: getCommand('auth org current --name'), description: 'Show default organization name' },
+		{
+			command: getCommand('auth org current --name'),
+			description: 'Show default organization name',
+		},
 		{ command: getCommand('auth org current --json'), description: 'Show output in JSON format' },
 	],
 	schema: {
@@ -125,7 +128,10 @@ const currentCommand = createSubcommand({
 		response: z
 			.object({
 				id: z.string().nullable().describe('The current organization ID or null if not set'),
-				name: z.string().nullable().describe('The current organization name or null if not set or not found'),
+				name: z
+					.string()
+					.nullable()
+					.describe('The current organization name or null if not set or not found'),
 			})
 			.describe('The current organization details'),
 	},

package/src/cmd/build/entry-generator.ts

@@ -84,6 +84,7 @@ export async function generateEntryFile(options: GenerateEntryOptions): Promise<
 		`  createWorkbenchRouter,`,
 		`  bootstrapRuntimeEnv,`,
 		`  patchBunS3ForStorageDev,`,
+		`  runShutdown,`,
 	];
 
 	const imports = [
@@ -377,6 +378,24 @@ if (typeof Bun !== 'undefined') {
 	if (isDevelopment() && process.env.VITE_PORT) {
 		otel.logger.debug(\`Proxying Vite assets from port \${process.env.VITE_PORT}\`);
 	}
+
+	// Register signal handlers for graceful shutdown (production only)
+	// Dev mode has its own handlers in devmode.ts
+	if (!isDevelopment()) {
+		const handleShutdown = async (signal: string) => {
+			otel.logger.info(\`Received \${signal}, initiating graceful shutdown...\`);
+			try {
+				await runShutdown();
+				otel.logger.info('Shutdown complete');
+			} catch (err) {
+				otel.logger.error(\`Error during shutdown: \${err instanceof Error ? err.message : String(err)}\`);
+			}
+			process.exit(0);
+		};
+
+		process.once('SIGTERM', () => handleShutdown('SIGTERM'));
+		process.once('SIGINT', () => handleShutdown('SIGINT'));
+	}
 }
 
 // FOUND AN ERROR IN THIS FILE?

package/src/cmd/cloud/deploy-fork.ts

@@ -75,6 +75,77 @@ export async function runForkedDeploy(options: ForkDeployOptions): Promise<ForkD
 	const cleanLogsFile = join(tmpdir(), `agentuity-deploy-${deploymentId}-logs.txt`);
 	let outputBuffer = '';
 	let proc: Subprocess | null = null;
+	let cancelled = false;
+
+	// Signal handler to forward signals to child process and report cancellation
+	const handleSignal = async (signal: NodeJS.Signals) => {
+		if (cancelled) return;
+		cancelled = true;
+
+		logger.debug('Received %s, forwarding to child process', signal);
+
+		// Kill the child process if it's still running
+		if (proc && proc.exitCode === null) {
+			try {
+				proc.kill(signal);
+			} catch (err) {
+				logger.debug('Failed to kill child process: %s', err);
+			}
+		}
+
+		// Report deployment as cancelled (with timeout to ensure prompt exit)
+		const cancelMessage = 'Deployment cancelled by user';
+		const timeoutMs = 3000; // 3 second timeout
+		const timeoutPromise = new Promise<void>((resolve) => {
+			setTimeout(() => {
+				logger.debug('API call to report cancellation timed out after %dms', timeoutMs);
+				resolve();
+			}, timeoutMs);
+		});
+
+		const apiCallPromise = projectDeploymentFail(apiClient, deploymentId, {
+			error: cancelMessage,
+			diagnostics: {
+				success: false,
+				errors: [
+					{
+						type: 'general',
+						scope: 'deploy',
+						message: cancelMessage,
+						code: 'DEPLOY_CANCELLED',
+					},
+				],
+				warnings: [],
+				diagnostics: [],
+				error: cancelMessage,
+			},
+		}).catch((err) => {
+			logger.debug('Failed to report cancellation: %s', err);
+		});
+
+		// Race API call against timeout to ensure prompt exit
+		await Promise.race([apiCallPromise, timeoutPromise]);
+
+		// Exit with signal-specific exit code
+		const signalExitCodes: Record<string, number> = {
+			SIGINT: 130, // 128 + 2
+			SIGTERM: 143, // 128 + 15
+			SIGHUP: 129, // 128 + 1
+			SIGQUIT: 131, // 128 + 3
+		};
+		const exitCode = signalExitCodes[signal] ?? 128;
+		process.exit(exitCode);
+	};
+
+	// Install signal handlers
+	const sigintHandler = () => {
+		void handleSignal('SIGINT');
+	};
+	const sigtermHandler = () => {
+		void handleSignal('SIGTERM');
+	};
+	process.on('SIGINT', sigintHandler);
+	process.on('SIGTERM', sigtermHandler);
 
 	try {
 		const childArgs = [
@@ -282,6 +353,10 @@ export async function runForkedDeploy(options: ForkDeployOptions): Promise<ForkD
 			},
 		};
 	} finally {
+		// Clean up signal handlers
+		process.off('SIGINT', sigintHandler);
+		process.off('SIGTERM', sigtermHandler);
+
 		// Clean up temp files
 		for (const file of [reportFile, cleanLogsFile]) {
 			if (existsSync(file)) {

package/src/cmd/cloud/queue/publish.ts

@@ -38,6 +38,7 @@ export const publishSubcommand = createCommand({
 			partitionKey: z.string().optional().describe('Partition key for ordering'),
 			idempotencyKey: z.string().optional().describe('Idempotency key to prevent duplicates'),
 			ttl: z.coerce.number().optional().describe('Message TTL in seconds'),
+			sync: z.boolean().optional().describe('Publish synchronously (wait for persistence)'),
 		}),
 		response: MessageSchema,
 	},
@@ -62,6 +63,11 @@ export const publishSubcommand = createCommand({
 			}
 		}
 
+		const apiOptions = getQueueApiOptions(ctx) ?? {};
+		if (opts.sync) {
+			apiOptions.sync = true;
+		}
+
 		const message = await publishMessage(
 			client,
 			args.queue_name,
@@ -72,7 +78,7 @@ export const publishSubcommand = createCommand({
 				idempotency_key: opts.idempotencyKey,
 				ttl_seconds: opts.ttl,
 			},
-			getQueueApiOptions(ctx)
+			apiOptions
 		);
 
 		if (!options.json) {

package/src/cmd/cloud/queue/util.ts

@@ -26,9 +26,10 @@ export async function createQueueAPIClient(ctx: QueueContext): Promise<APIClient
 
 /**
  * Creates QueueApiOptions from the CLI context.
- * Prioritizes explicit orgId on context, then falls back to global --org-id option.
+ * Prioritizes explicit orgId on context, then falls back to global --org-id option,
+ * and finally to the preferred org from the profile configuration.
  */
 export function getQueueApiOptions(ctx: QueueContext): QueueApiOptions | undefined {
-	const orgId = ctx.orgId ?? ctx.options.orgId;
+	const orgId = ctx.orgId ?? ctx.options.orgId ?? ctx.config?.preferences?.orgId;
 	return orgId ? { orgId } : undefined;
 }

package/src/cmd/cloud/stream/get.ts

@@ -6,7 +6,7 @@ import { getCommand } from '../../../command-prefix';
 
 const GetStreamResponseSchema = z.object({
 	id: z.string().describe('Stream ID'),
-	name: z.string().describe('Stream name'),
+	namespace: z.string().describe('Stream namespace'),
 	metadata: z.record(z.string(), z.string()).describe('Stream metadata'),
 	url: z.string().describe('Public URL'),
 	sizeBytes: z.number().describe('Size in bytes'),
@@ -70,7 +70,7 @@ export const getSubcommand = createCommand({
 				const stream = await storage.get(args.id);
 				return {
 					id: args.id,
-					name: stream.name ?? '',
+					namespace: stream.namespace ?? '',
 					metadata: stream.metadata ?? {},
 					url: stream.url ?? '',
 					sizeBytes: stats.size,
@@ -91,10 +91,10 @@ export const getSubcommand = createCommand({
 
 			const sizeBytes = stream.sizeBytes ?? 0;
 
-			console.log(`Name:     ${tui.bold(stream.name ?? 'unknown')}`);
-			console.log(`ID:       ${stream.id}`);
-			console.log(`Size:     ${tui.formatBytes(sizeBytes)}`);
-			console.log(`URL:      ${tui.link(stream.url ?? 'unknown')}`);
+			console.log(`Namespace: ${tui.bold(stream.namespace ?? 'unknown')}`);
+			console.log(`ID:        ${stream.id}`);
+			console.log(`Size:      ${tui.formatBytes(sizeBytes)}`);
+			console.log(`URL:       ${tui.link(stream.url ?? 'unknown')}`);
 			if (stream.metadata && Object.keys(stream.metadata).length > 0) {
 				console.log(`Metadata:`);
 				for (const [key, value] of Object.entries(stream.metadata)) {
@@ -106,7 +106,7 @@ export const getSubcommand = createCommand({
 
 		return {
 			id: stream.id,
-			name: stream.name,
+			namespace: stream.namespace,
 			metadata: stream.metadata,
 			url: stream.url,
 			sizeBytes: stream.sizeBytes,

package/src/cmd/cloud/stream/list.ts

@@ -6,7 +6,7 @@ import { getCommand } from '../../../command-prefix';
 
 const StreamInfoSchema = z.object({
 	id: z.string().describe('Stream ID'),
-	name: z.string().describe('Stream name'),
+	namespace: z.string().describe('Stream namespace'),
 	metadata: z.record(z.string(), z.string()).describe('Stream metadata'),
 	url: z.string().describe('Public URL'),
 	sizeBytes: z.number().describe('Size in bytes'),
@@ -30,7 +30,10 @@ export const listSubcommand = createCommand({
 			command: getCommand('cloud stream ls --size 50'),
 			description: 'List 50 most recent streams',
 		},
-		{ command: getCommand('cloud stream list --name agent-logs'), description: 'Filter by name' },
+		{
+			command: getCommand('cloud stream list --namespace agent-logs'),
+			description: 'Filter by namespace',
+		},
 		{
 			command: getCommand('cloud stream list --metadata type=export'),
 			description: 'Filter by metadata',
@@ -41,7 +44,7 @@ export const listSubcommand = createCommand({
 		options: z.object({
 			size: z.number().optional().describe('maximum number of streams to return (default: 100)'),
 			offset: z.number().optional().describe('number of streams to skip for pagination'),
-			name: z.string().optional().describe('filter by stream name'),
+			namespace: z.string().optional().describe('filter by stream namespace'),
 			metadata: z
 				.string()
 				.optional()
@@ -95,7 +98,7 @@ export const listSubcommand = createCommand({
 		const result = await storage.list({
 			limit: opts.size,
 			offset: opts.offset,
-			name: opts.name,
+			namespace: opts.namespace,
 			metadata: metadataFilter,
 		});
 
@@ -115,7 +118,7 @@ export const listSubcommand = createCommand({
 				const metadataStr =
 					Object.keys(stream.metadata).length > 0 ? JSON.stringify(stream.metadata) : '-';
 				return {
-					Name: stream.name,
+					Namespace: stream.namespace,
 					ID: stream.id,
 					Size: tui.formatBytes(sizeBytes),
 					Metadata:
@@ -125,7 +128,7 @@ export const listSubcommand = createCommand({
 			});
 
 			tui.table(tableData, [
-				{ name: 'Name', alignment: 'left' },
+				{ name: 'Namespace', alignment: 'left' },
 				{ name: 'ID', alignment: 'left' },
 				{ name: 'Size', alignment: 'right' },
 				{ name: 'Metadata', alignment: 'left' },

package/src/utils/deps.ts

@@ -1,4 +1,5 @@
 import { $ } from 'bun';
+import { join } from 'node:path';
 import type { Logger } from '../types';
 
 export interface PackageRef {
@@ -6,6 +7,13 @@ export interface PackageRef {
 	version: string;
 }
 
+/**
+ * Mapping from alias key (aliasName@version) to actual package reference.
+ * Used to resolve npm aliases (e.g., "tailwind-merge-v2": "npm:tailwind-merge@2.6.0")
+ * to their actual package names for accurate malware detection.
+ */
+export type AliasMap = Map<string, PackageRef>;
+
 export async function extractDependencies(
 	projectDir: string,
 	logger: Logger
@@ -24,7 +32,14 @@ export async function extractDependencies(
 		}
 
 		const output = result.stdout.toString();
-		const packages = parseBunPmLsOutput(output);
+		let packages = parseBunPmLsOutput(output);
+
+		// Load alias map from bun.lock to resolve npm aliases to actual package names
+		const aliasMap = await loadAliasMap(projectDir, logger);
+		if (aliasMap.size > 0) {
+			logger.debug('Loaded %d package aliases from bun.lock', aliasMap.size);
+			packages = resolveAliases(packages, aliasMap, logger);
+		}
 
 		logger.debug('Extracted %d unique packages', packages.length);
 		return packages;
@@ -52,3 +67,151 @@ export function parseBunPmLsOutput(output: string): PackageRef[] {
 
 	return Array.from(packages.values());
 }
+
+/**
+ * Load alias mappings from bun.lock file.
+ *
+ * The bun.lock file contains a "packages" object where:
+ * - Keys are the package names as they appear in node_modules (alias names for aliased packages)
+ * - Values are arrays where the first element is "actualPackageName@version"
+ *
+ * For npm aliases like `"tailwind-merge-v2": "npm:tailwind-merge@2.6.0"`:
+ * - Key: "tailwind-merge-v2"
+ * - Value[0]: "tailwind-merge@2.6.0"
+ *
+ * This function builds a map from "aliasName@version" to the actual PackageRef.
+ */
+export async function loadAliasMap(projectDir: string, logger: Logger): Promise<AliasMap> {
+	const aliasMap: AliasMap = new Map();
+
+	try {
+		const lockfilePath = join(projectDir, 'bun.lock');
+		const lockfile = Bun.file(lockfilePath);
+
+		if (!(await lockfile.exists())) {
+			logger.debug('No bun.lock file found, skipping alias resolution');
+			return aliasMap;
+		}
+
+		const content = await lockfile.text();
+		const parsed = parseBunLockFile(content);
+
+		if (!parsed || !parsed.packages) {
+			return aliasMap;
+		}
+
+		for (const [aliasName, packageInfo] of Object.entries(parsed.packages)) {
+			if (!Array.isArray(packageInfo) || packageInfo.length === 0) {
+				continue;
+			}
+
+			const actualPackageSpec = packageInfo[0];
+			if (typeof actualPackageSpec !== 'string') {
+				continue;
+			}
+
+			// Parse "actualPackageName@version" from the first element
+			const atIndex = actualPackageSpec.lastIndexOf('@');
+			if (atIndex <= 0) {
+				continue;
+			}
+
+			const actualName = actualPackageSpec.substring(0, atIndex);
+			const actualVersion = actualPackageSpec.substring(atIndex + 1);
+
+			// Only add to alias map if the alias name differs from the actual name
+			// This indicates an npm alias (e.g., tailwind-merge-v2 -> tailwind-merge)
+			if (aliasName !== actualName) {
+				const aliasKey = `${aliasName}@${actualVersion}`;
+				aliasMap.set(aliasKey, { name: actualName, version: actualVersion });
+			}
+		}
+	} catch (error) {
+		logger.debug('Failed to parse bun.lock for alias resolution: %s', error);
+	}
+
+	return aliasMap;
+}
+
+/**
+ * Parse bun.lock file content.
+ *
+ * bun.lock uses a relaxed JSON format (JSONC) with trailing commas, which
+ * standard JSON.parse cannot handle. We need to strip trailing commas before parsing.
+ *
+ * Structure:
+ * {
+ *   "lockfileVersion": 1,
+ *   "packages": {
+ *     "package-name": ["actual-package@version", "", {}, "sha512-..."],
+ *     ...
+ *   }
+ * }
+ */
+export function parseBunLockFile(content: string): BunLockFile | null {
+	try {
+		// bun.lock uses JSONC format with trailing commas - strip them before parsing
+		const sanitized = stripTrailingCommas(content);
+		return JSON.parse(sanitized) as BunLockFile;
+	} catch {
+		return null;
+	}
+}
+
+/**
+ * Strip trailing commas from JSONC content to make it valid JSON.
+ * Handles trailing commas before ] and } characters.
+ */
+function stripTrailingCommas(content: string): string {
+	// Match comma followed by optional whitespace and then ] or }
+	return content.replace(/,(\s*[}\]])/g, '$1');
+}
+
+/**
+ * Represents the structure of a bun.lock file.
+ */
+export interface BunLockFile {
+	lockfileVersion?: number;
+	packages?: Record<string, unknown[]>;
+}
+
+/**
+ * Resolve npm aliases in the package list to their actual package names.
+ *
+ * This prevents false positives in malware detection where alias names
+ * (e.g., "tailwind-merge-v2") are flagged as suspicious when they're
+ * actually legitimate aliases for real packages (e.g., "tailwind-merge").
+ */
+export function resolveAliases(
+	packages: PackageRef[],
+	aliasMap: AliasMap,
+	logger: Logger
+): PackageRef[] {
+	const resolved = new Map<string, PackageRef>();
+
+	for (const pkg of packages) {
+		const aliasKey = `${pkg.name}@${pkg.version}`;
+		const actualPkg = aliasMap.get(aliasKey);
+
+		if (actualPkg) {
+			logger.debug(
+				'Resolved npm alias: %s@%s -> %s@%s',
+				pkg.name,
+				pkg.version,
+				actualPkg.name,
+				actualPkg.version
+			);
+			const resolvedKey = `${actualPkg.name}@${actualPkg.version}`;
+			if (!resolved.has(resolvedKey)) {
+				resolved.set(resolvedKey, actualPkg);
+			}
+		} else {
+			const key = `${pkg.name}@${pkg.version}`;
+			if (!resolved.has(key)) {
+				resolved.set(key, pkg);
+			}
+		}
+	}
+
+	return Array.from(resolved.values());
+}