@docker-doctor/cli 0.5.1 → 0.5.2

package/dist/cli.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { a as runDockerfileRules, c as createComposeLocator, d as discoverProject, f as version, i as runComposeRules, l as parseCompose, n as calculateScore, o as allRules, r as loadConfig, s as findRule, t as toJsonReport, u as parseDockerfile } from "./src-NqSwkGiS.mjs";
+import { a as runDockerfileRules, c as createComposeLocator, d as discoverProject, f as version, i as runComposeRules, l as parseCompose, n as calculateScore, o as allRules, r as loadConfig, s as findRule, t as toJsonReport, u as parseDockerfile } from "./src-BOGzkp17.mjs";
 import fs from "node:fs/promises";
 import path from "node:path";
 import os from "node:os";
@@ -574,9 +574,17 @@ const writeDiagnosticsDirectory = async (diagnostics, report, rootDir) => {
 		recursive: true
 	});
 	await fs.mkdir(dir, { recursive: true });
+	const sanitizedReport = {
+		...report,
+		diagnostics: report.diagnostics.map((d) => ({
+			...d,
+			file: sanitizePath(d.file),
+			message: sanitizeMessage(d.message)
+		}))
+	};
 	await fs.writeFile(path.join(dir, "diagnostics.json"), JSON.stringify({
 		note: TRUST_BOUNDARY_NOTE,
-		...report
+		...sanitizedReport
 	}, null, 2), "utf-8");
 	const writes = [];
 	for (const [rule, ruleDiagnostics] of groupDiagnosticsByRule(diagnostics)) {
@@ -649,7 +657,7 @@ const buildHandoffPayload = (input) => {
 	];
 	for (const [index, [rule, ruleDiagnostics]] of groups.entries()) {
 		const [first] = ruleDiagnostics;
-		const category = findRule(rule)?.category ?? "General";
+		const category = first.category ?? findRule(rule)?.category ?? "General";
 		const countBadge = ruleDiagnostics.length > 1 ? ` (×${ruleDiagnostics.length})` : "";
 		lines.push(`${index + 1}. ${SEVERITY_LABEL[first.severity]} ${category}: ${sanitizeMessage(first.message)} [${rule}]${countBadge}`, `   Fix: ${first.help}`);
 		const files = [...new Set(ruleDiagnostics.map((d) => d.file))];
@@ -784,7 +792,7 @@ const printDiagnostics = (diagnostics, verbose, fileContents, categoryIssueCount
 		console.log(`\n  Run ${chalk.cyan("docker-doctor --verbose")} to list every error and warning`);
 		const ruleCounts = {};
 		for (const d of diagnostics) ruleCounts[d.rule] = (ruleCounts[d.rule] || 0) + 1;
-		const migrationRules = Object.entries(ruleCounts).filter(([_, count]) => count >= 5);
+		const migrationRules = Object.entries(ruleCounts).filter(([, count]) => count >= 5);
 		if (migrationRules.length > 0) {
 			console.log();
 			console.log(`  ${chalk.yellow("⚠ Migration-scale change: sample before you sweep")}`);
@@ -911,7 +919,7 @@ const formatTerminal = async (diagnostics, score, label, project, verbose = fals
 	let warningsCount = 0;
 	let errorsCount = 0;
 	for (const d of diagnostics) {
-		const category = findRule(d.rule)?.category || "Best Practices";
+		const category = d.category ?? findRule(d.rule)?.category ?? "Best Practices";
 		categoryIssueCounts[category] = (categoryIssueCounts[category] || 0) + 1;
 		if (d.severity === "warning") warningsCount += 1;
 		else if (d.severity === "error") errorsCount += 1;
@@ -1176,9 +1184,14 @@ const runInteractiveWizard = async (context) => {
 				console.log(`    Inputs and gating: ${chalk.cyan("https://docker-doctor.vercel.app/docs/guides/github-actions")}`);
 			}
 		}
-		if (context.diagnostics.length === 0) return;
+		if (context.diagnostics.length === 0) return true;
 		await runAgentHandoff(context);
-	} catch {}
+		return true;
+	} catch (error) {
+		const msg = error instanceof Error ? error.message : String(error);
+		console.error(`\n  ${chalk.yellow("⚠")} Post-scan step failed: ${msg}`);
+		return false;
+	}
 };
 const runRulesEngine = async (rootDir, project, rulesConfig, categoriesConfig, projectFilesList, fileContents, options, setStatus) => {
 	const diagnostics = [];
@@ -1193,7 +1206,7 @@ const runRulesEngine = async (rootDir, project, rulesConfig, categoriesConfig, p
 		try {
 			const content = await fs.readFile(fullPath, "utf-8");
 			fileContents[df] = content;
-			const instructions = parseDockerfile(content);
+			const instructions = parseDockerfile(content, df);
 			return runDockerfileRules(instructions, df, projectFilesList, rulesConfig, categoriesConfig);
 		} catch (error) {
 			const msg = error instanceof Error ? error.message : String(error);
@@ -1234,6 +1247,7 @@ const runRulesEngine = async (rootDir, project, rulesConfig, categoriesConfig, p
 	};
 };
 const SCAN_FAILURE_EXIT_CODE = 2;
+const POST_SCAN_FAILURE_EXIT_CODE = 1;
 const WHITESPACE_RUN = /\s+/gu;
 const flattenMessage = (message) => message.replaceAll(WHITESPACE_RUN, " ").trim();
 const scanExitCode = (scanIncomplete, failing) => {
@@ -1329,12 +1343,14 @@ program.argument("[dir]", "directory to scan", ".").option("-v, --verbose", "sho
 				return;
 			}
 			await formatTerminal(diagnostics, score, label, project, options.verbose, fileContents);
-			if (process.stdout.isTTY && process.stdin.isTTY) await runInteractiveWizard({
+			let wizardOk = true;
+			if (process.stdout.isTTY && process.stdin.isTTY) wizardOk = await runInteractiveWizard({
 				diagnostics,
 				report: toJsonReport(diagnostics, score, label, project),
 				rootDir
 			});
-			process.exitCode = scanExitCode(scanIncomplete, hasErrors);
+			const exitCode = scanExitCode(scanIncomplete, hasErrors);
+			process.exitCode = wizardOk ? exitCode : Math.max(POST_SCAN_FAILURE_EXIT_CODE, exitCode);
 		} finally {
 			if (spinnerInterval !== null) {
 				clearInterval(spinnerInterval);
@@ -1344,7 +1360,7 @@ program.argument("[dir]", "directory to scan", ".").option("-v, --verbose", "sho
 	} catch (error) {
 		const msg = error instanceof Error ? error.message : String(error);
 		console.error(`Error: ${msg}`);
-		process.exit(1);
+		process.exitCode = 1;
 	}
 });
 const CURATED_INSTALL_AGENTS = [
@@ -1378,10 +1394,14 @@ const resolveInstallAgents = async (requested) => {
 program.command("install").description("install the Docker Doctor agent skill for your coding agents").option("-a, --agent <agents...>", "agent id(s) to install for (e.g. claude-code codex cursor)").option("-g, --global", "install into each agent's global skills directory (e.g. ~/.claude/skills) instead of the current project").action(async (options) => {
 	if (!getSkillSourceDirectory()) {
 		console.error("Bundled skill not found — this looks like a broken installation.");
-		process.exit(1);
+		process.exitCode = 1;
+		return;
 	}
 	const agents = await resolveInstallAgents(options.agent);
-	if (agents === null) process.exit(1);
+	if (agents === null) {
+		process.exitCode = 1;
+		return;
+	}
 	if (agents.length === 0) {
 		console.log("Nothing selected — skipped.");
 		return;
@@ -1392,7 +1412,8 @@ program.command("install").description("install the Docker Doctor agent skill fo
 	});
 	if (!result) {
 		console.error("Failed to install the skill.");
-		process.exit(1);
+		process.exitCode = 1;
+		return;
 	}
 	for (const installed of result.installed) console.log(`  ${chalk.green("✔")} ${agentDisplayName(installed.agent)} → ${installed.path}`);
 	for (const failed of result.failed) console.log(`  ${chalk.red("✖")} ${agentDisplayName(failed.agent)}: ${failed.error}`);
@@ -1416,7 +1437,8 @@ rules.command("explain <rule>").description("explain a specific rule in detail")
 	const rule = findRule(ruleKey);
 	if (!rule) {
 		console.error(`Rule '${ruleKey}' not found.`);
-		process.exit(1);
+		process.exitCode = 1;
+		return;
 	}
 	console.log(`\nRule:             ${rule.key}`);
 	console.log(`Category:         ${rule.category}`);