@alint-js/cli 0.0.28 → 0.0.30

package/dist/bin/index.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { t as executeCli } from "../cli-DEGDq_sM.mjs";
+import { t as executeCli } from "../cli-fZkZ4dza.mjs";
 import process from "node:process";
 //#region src/bin/index.ts
 executeCli(process.argv, {

package/dist/{cli-DEGDq_sM.mjs → cli-fZkZ4dza.mjs}

@@ -3,18 +3,20 @@ import { inspect } from "node:util";
 import { cac } from "cac";
 import { appendFile, mkdir, readFile, readdir, rm, stat } from "node:fs/promises";
 import { getGlobalSetupConfigPath, getProjectSetupConfigPath, getStatsDir, installStaticPlugins, loadAlintConfig, loadSetupConfig, mergeSetupConfigs, writeSetupConfig } from "@alint-js/config";
-import { AlintRunError, hasDiscoveryFilePatterns, matchesDiscoveryFile, normalizeConfig, resolveConfigForDirectory, resolveConfigForFile, runAlint } from "@alint-js/core";
+import { AlintRunCancelledError, AlintRunError, hasDiscoveryFilePatterns, matchesDiscoveryFile, normalizeConfig, resolveConfigForDirectory, resolveConfigForFile, runAlint } from "@alint-js/core";
 import { isAbsolute, join, relative, resolve } from "pathe";
 import { getBorderCharacters, table } from "table";
 import { errorMessageFrom } from "@moeru/std/error";
-import c, { createColors } from "tinyrainbow";
+import { createColors } from "tinyrainbow";
 import cliSpinners from "cli-spinners";
 import { relative as relative$1 } from "node:path";
+import fastStringTruncatedWidth from "fast-string-truncated-width";
+import fastStringWidth from "fast-string-width";
 import Gitignore from "gitignore-fs";
 import { Minimatch, minimatch } from "minimatch";
 import { errorMessageFrom as errorMessageFrom$1 } from "@moeru/std";
 //#region package.json
-var version = "0.0.28";
+var version = "0.0.30";
 //#endregion
 //#region src/cli/commands/command.ts
 function defineCommand(node) {
@@ -190,7 +192,6 @@ function shouldSkipOptionValue(arg) {
 		"--cache-location",
 		"--config",
 		"--cwd",
-		"--file-concurrency",
 		"--format",
 		"--model",
 		"--provider-endpoint",
@@ -545,7 +546,7 @@ function formatJson(result) {
 }
 //#endregion
 //#region src/cli/reporters/stylish.ts
-const colors$2 = createColors({ force: true });
+const colors$3 = createColors({ force: true });
 function formatStylish(input, options = {}) {
 	const diagnostics = Array.isArray(input) ? input : input.diagnostics;
 	const result = Array.isArray(input) ? void 0 : input;
@@ -590,12 +591,12 @@ function createStyle(color) {
 		warning: identity
 	};
 	return {
-		error: colors$2.red,
-		file: colors$2.underline,
-		location: colors$2.dim,
-		ruleId: colors$2.dim,
-		summaryToken: colors$2.cyan,
-		warning: colors$2.yellow
+		error: colors$3.red,
+		file: colors$3.underline,
+		location: colors$3.dim,
+		ruleId: colors$3.dim,
+		summaryToken: colors$3.cyan,
+		warning: colors$3.yellow
 	};
 }
 function formatDiagnosticCount(total, cached, label) {
@@ -640,20 +641,19 @@ function formatDiagnostics(format, result, options = {}) {
 function createPlainProgressReporter(options) {
 	const writeLine = (line) => options.write(`${line}\n`);
 	return {
-		onRuleStart: (payload) => {
-			const target = payload.path.target.name ? `${payload.path.target.kind} ${payload.path.target.name}` : payload.path.target.kind;
-			writeLine(`scan ${payload.path.file.path} > ${target} > ${payload.path.rule.id}`);
+		onJobStart: (payload) => {
+			const target = payload.job.target.name ? `${payload.job.target.kind} ${payload.job.target.name}` : payload.job.target.kind;
+			writeLine(`scan ${payload.job.inputPath} > ${target} > ${payload.job.ruleId}`);
 		},
 		onRunEnd: (payload) => {
 			const warnCount = countDiagnostics$1(payload.diagnostics, "warn");
 			const errorCount = countDiagnostics$1(payload.diagnostics, "error");
-			const state = payload.errored > 0 ? "failed" : "finished";
-			const cached = payload.cached > 0 ? `, ${payload.cached} cached` : "";
-			const errored = payload.errored > 0 ? `, ${payload.errored} errored` : "";
-			writeLine(`alint ${state}: ${warnCount} warn, ${errorCount} error, ${payload.usage.totalTokens} tokens${cached}${errored}`);
+			const state = payload.execution.failed > 0 ? "failed" : "finished";
+			const { cached, cancelled, completed, failed, skipped } = payload.execution;
+			writeLine(`alint ${state}: ${warnCount} warn, ${errorCount} error, ${payload.usage.totalTokens} tokens, ${completed} completed, ${cached} cached, ${failed} failed, ${cancelled} cancelled, ${skipped} skipped`);
 		},
 		onRunStart: (payload) => {
-			writeLine(`alint started: ${payload.filesTotal} files, ${payload.rulesTotal} rules, ${payload.planned} planned executions`);
+			writeLine(`alint started: ${payload.jobsTotal} queued jobs`);
 		}
 	};
 }
@@ -662,217 +662,150 @@ function countDiagnostics$1(diagnostics, severity) {
 }
 //#endregion
 //#region src/cli/reporters/progress/summary.ts
-const colors$1 = createColors({ force: true });
+const colors$2 = createColors({ force: true });
+const graphemeSegmenter = new Intl.Segmenter(void 0, { granularity: "grapheme" });
 function createSummaryProgressReporter(options) {
 	const now = Date.now;
-	const state = {
-		cached: 0,
-		completed: 0,
-		diagnostics: [],
-		errored: 0,
-		files: /* @__PURE__ */ new Map(),
-		planned: 0,
-		spinnerIndex: 0,
-		totalTokens: 0
-	};
+	const state = createInitialState();
 	return {
 		getRows: () => createRows(state, options, now()),
-		onDiagnostic: (payload) => {
-			state.diagnostics = payload.diagnostics;
+		onDiagnostic: ({ diagnostic }) => {
+			state.diagnostics.push(diagnostic);
 		},
-		onFileEnd: (payload) => {
-			const file = getFileState(state, payload.file);
-			file.endedAt = payload.endedAt ?? now();
-			file.rule = void 0;
-			file.target = void 0;
-		},
-		onFileStart: (payload) => {
-			const file = getFileState(state, payload.file);
-			file.startedAt = payload.startedAt ?? now();
-			file.endedAt = void 0;
+		onJobEnd: (payload) => {
+			const current = state.jobs.get(payload.job.id);
+			state.jobs.set(payload.job.id, {
+				job: payload.job,
+				startedAt: payload.startedAt ?? current?.startedAt,
+				state: payload.state
+			});
+			transition(state.execution, "running", payload.state);
 		},
-		onRuleEnd: (payload) => {
-			const file = getFileState(state, payload.path.file);
-			if (payload.cache === "hit") {
-				state.cached += 1;
-				file.cached += 1;
-			}
-			if (payload.state === "completed") {
-				state.completed += 1;
-				file.completed += 1;
-			}
-			if (payload.state === "errored") {
-				state.errored += 1;
-				file.errored += 1;
-			}
-			if (file.rule?.id === payload.path.rule.id) file.rule = void 0;
+		onJobQueued: ({ job }) => {
+			state.jobs.set(job.id, {
+				job,
+				state: "queued"
+			});
+			state.execution.queued += 1;
 		},
-		onRuleStart: (payload) => {
-			const file = getFileState(state, payload.path.file);
-			file.startedAt ??= payload.startedAt ?? now();
-			file.rule = {
-				id: payload.path.rule.id,
+		onJobStart: (payload) => {
+			state.jobs.set(payload.job.id, {
+				job: payload.job,
 				startedAt: payload.startedAt ?? now(),
-				target: formatTarget(payload)
-			};
-			file.target = file.rule.target;
+				state: "running"
+			});
+			transition(state.execution, "queued", "running");
 		},
 		onRunEnd: (payload) => {
-			state.cached = payload.cached;
-			state.completed = payload.completed;
-			state.diagnostics = payload.diagnostics;
-			state.endedAt = payload.endedAt ?? now();
-			state.errored = payload.errored;
-			state.planned = payload.planned;
-			state.runStartedAt = payload.startedAt ?? state.runStartedAt;
+			state.diagnostics = [...payload.diagnostics];
+			state.execution = { ...payload.execution };
 			state.totalTokens = payload.usage.totalTokens;
 		},
-		onRunStart: (payload) => {
-			state.cached = 0;
-			state.completed = 0;
+		onRunStart: ({ jobsTotal }) => {
 			state.diagnostics = [];
-			state.endedAt = void 0;
-			state.errored = 0;
-			state.files = /* @__PURE__ */ new Map();
-			state.planned = payload.planned;
-			state.runStartedAt = payload.startedAt ?? now();
+			state.execution = createCounts(jobsTotal);
+			state.jobs.clear();
 			state.spinnerIndex = 0;
 			state.totalTokens = 0;
-			for (const file of payload.files ?? []) state.files.set(file.path, createFileState(file));
-		},
-		onTargetEnd: (payload) => {
-			const file = getFileState(state, payload.path.file);
-			const target = formatTarget(payload);
-			if (file.target === target) file.target = void 0;
 		},
-		onTargetStart: (payload) => {
-			const file = getFileState(state, payload.path.file);
-			file.startedAt ??= payload.startedAt ?? now();
-			file.target = formatTarget(payload);
-		},
-		onUsage: (payload) => {
-			state.totalTokens = payload.total.totalTokens;
+		onUsage: ({ record }) => {
+			if (record.totalTokens != null && Number.isFinite(record.totalTokens)) state.totalTokens += record.totalTokens;
 		},
 		tick: () => {
 			state.spinnerIndex = (state.spinnerIndex + 1) % Math.max(options.spinnerFrames.length, 1);
 		}
 	};
 }
+function completeGraphemeBoundary(input, maximumIndex) {
+	let boundary = 0;
+	for (const segment of graphemeSegmenter.segment(input)) {
+		const end = segment.index + segment.segment.length;
+		if (end > maximumIndex) break;
+		boundary = end;
+	}
+	return boundary;
+}
 function countDiagnostics(diagnostics, severity) {
 	return diagnostics.filter((diagnostic) => diagnostic.severity === severity).length;
 }
-function countQueuedFiles(state) {
-	return [...state.files.values()].filter((file) => file.startedAt === void 0 && file.endedAt === void 0 && (file.file.planned ?? 0) > 0).length;
-}
-function createFileState(file) {
+function createCounts(planned = 0) {
 	return {
 		cached: 0,
+		cancelled: 0,
 		completed: 0,
-		errored: 0,
-		file
+		failed: 0,
+		planned,
+		queued: 0,
+		running: 0,
+		skipped: 0
+	};
+}
+function createInitialState() {
+	return {
+		diagnostics: [],
+		execution: createCounts(),
+		jobs: /* @__PURE__ */ new Map(),
+		spinnerIndex: 0,
+		totalTokens: 0
 	};
 }
 function createRows(state, options, now) {
-	const rows = getActiveFiles(state).flatMap((file) => formatFileRows(file, state, options, now));
-	const queued = countQueuedFiles(state);
+	if (options.rows !== void 0 && options.rows <= 0) return [];
 	const warnCount = countDiagnostics(state.diagnostics, "warn");
 	const errorCount = countDiagnostics(state.diagnostics, "error");
-	const footer = formatFooter(state, warnCount, errorCount, queued, options, now);
-	if (queued > 0) rows.push(formatQueuedRow(queued, options));
-	if (rows.length === 0) rows.push(formatIdleRow(state, options));
-	rows.push("", footer);
-	return options.color ? rows.map((row) => styleRow(row, state, warnCount, errorCount, options)) : rows;
-}
-function escapeRegExp(value) {
-	return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
-function estimateTotal(elapsedMs, completed, planned) {
-	if (completed <= 0 || planned <= 0) return;
-	return elapsedMs * planned / completed;
+	const runningJobs = [...state.jobs.values()].filter((job) => job.state === "running").sort((left, right) => left.job.index - right.job.index);
+	const footerRows = 1;
+	const separatorRows = options.rows === void 0 || options.rows >= 2 ? 1 : 0;
+	const contentBudget = options.rows === void 0 ? Number.POSITIVE_INFINITY : Math.max(options.rows - footerRows - separatorRows, 0);
+	const jobBudget = runningJobs.length > contentBudget ? Math.max(contentBudget - 1, 0) : contentBudget;
+	const visible = runningJobs.slice(0, jobBudget).map((job) => formatJobRow(job, state, options, now));
+	const hiddenJobs = runningJobs.length - visible.length;
+	if (hiddenJobs > 0 && contentBudget > 0) visible.push(fitRow(`    └─ … ${hiddenJobs} more running jobs hidden`, options.columns));
+	if (separatorRows === 1) visible.push("");
+	visible.push(formatFooter(state, warnCount, errorCount, options));
+	return options.color ? visible.map((row) => styleRow(row, state, warnCount, errorCount, options)) : visible;
 }
 function fitRow(row, columns) {
 	if (columns <= 0) return "";
-	if (row.length <= columns) return row;
-	if (columns === 1) return "…";
-	return `${row.slice(0, columns - 1)}…`;
+	if (fastStringWidth(row) <= columns) return row;
+	let limit = columns;
+	while (limit > 0) {
+		const result = fastStringTruncatedWidth(row, {
+			ellipsis: "…",
+			limit
+		});
+		const index = completeGraphemeBoundary(row, result.index);
+		const visible = row.slice(0, index);
+		const fitted = `${visible}${visible.includes("\x1B") ? "\x1B[0m" : ""}${result.ellipsed ? "…" : ""}`;
+		const overflow = fastStringWidth(fitted) - columns;
+		if (overflow <= 0) return fitted;
+		limit -= overflow;
+	}
+	return "";
 }
 function formatDuration(ms) {
-	if (ms === void 0 || !Number.isFinite(ms)) return "?";
 	return `${(Math.max(ms, 0) / 1e3).toFixed(1)}s`;
 }
-function formatEstimatedDuration(ms) {
-	return `~${formatDuration(ms)}`;
-}
-function formatFilePath(filePath, cwd) {
-	if (!cwd) return filePath;
-	return relative$1(cwd, filePath) || filePath;
-}
-function formatFileRows(file, state, options, now) {
-	const firstRow = formatFileSummaryRow(file, state, options);
-	if (!file.rule) return [firstRow];
-	const elapsed = now - file.rule.startedAt;
-	const done = file.completed + file.cached + file.errored;
-	const estimated = estimateTotal(file.startedAt === void 0 ? elapsed : now - file.startedAt, done, file.file.planned ?? 0);
-	return [firstRow, fitRow(`    ${file.rule.target} > ${file.rule.id} (${formatDuration(elapsed)}, ${formatEstimatedDuration(estimated)})`, options.columns)];
-}
-function formatFileSummaryRow(file, state, options) {
-	const prefix = `${options.spinnerFrames[state.spinnerIndex] ?? ""} ${formatFilePath(file.file.path, options.cwd)}`;
-	const counter = `${file.completed}/${file.cached}/${file.errored}/${file.file.planned ?? 0}`;
-	return fitRow(`${prefix}${" ".repeat(Math.max(1, options.columns - prefix.length - counter.length))}${counter}`, options.columns);
-}
-function formatFooter(state, warnCount, errorCount, queued, options, now) {
-	const endedAt = state.endedAt ?? now;
-	const elapsed = state.runStartedAt === void 0 ? void 0 : endedAt - state.runStartedAt;
-	const completed = state.completed + state.cached + state.errored;
-	const estimated = elapsed === void 0 ? void 0 : estimateTotal(elapsed, completed, state.planned);
-	const estimatedTokens = completed > 0 && state.planned > 0 ? Math.ceil(state.totalTokens * state.planned / completed).toLocaleString("en-US") : "?";
-	return fitRow([
-		`${formatDuration(elapsed)} -> ${formatEstimatedDuration(estimated)}`,
-		`${state.totalTokens.toLocaleString("en-US")} tokens -> ~${estimatedTokens} tokens`,
-		`${queued} queued / ${state.cached} cached / ${warnCount} warn / ${errorCount} error`
-	].join(" | "), options.columns);
-}
-function formatIdleRow(state, options) {
-	const prefix = `${options.spinnerFrames[state.spinnerIndex] ?? ""} alint`;
-	const counter = `${state.completed}/${state.cached}/${state.errored}/${state.planned}`;
-	return fitRow(`${prefix}${" ".repeat(Math.max(1, options.columns - prefix.length - counter.length))}${counter}`, options.columns);
-}
-function formatQueuedRow(queued, options) {
-	return fitRow(`  ${queued} ${queued === 1 ? "file" : "files"} queued`, options.columns);
-}
-function formatTarget(payload) {
-	return payload.path.target.name ? `${payload.path.target.kind} ${payload.path.target.name}` : payload.path.target.kind;
-}
-function getActiveFiles(state) {
-	return [...state.files.values()].filter((file) => file.startedAt !== void 0 && file.endedAt === void 0).sort((left, right) => left.file.index - right.file.index);
-}
-function getFileState(state, file) {
-	const existingFile = state.files.get(file.path);
-	if (existingFile) {
-		existingFile.file = {
-			...existingFile.file,
-			...file,
-			planned: file.planned ?? existingFile.file.planned
-		};
-		return existingFile;
-	}
-	const nextFile = createFileState({
-		...file,
-		planned: file.planned ?? (state.files.size === 0 ? state.planned : void 0)
-	});
-	state.files.set(file.path, nextFile);
-	return nextFile;
+function formatFooter(state, warnCount, errorCount, options) {
+	const { cached, failed, queued, running } = state.execution;
+	return fitRow(`${running} running / ${queued} queued / ${cached} cached / ${warnCount} warn / ${errorCount} error / ${failed} failed / ${state.totalTokens} tokens`, options.columns);
 }
-function replaceFirst(row, search, replacement) {
-	if (search.length === 0) return row;
-	return row.replace(new RegExp(escapeRegExp(search)), replacement);
+function formatJobRow(jobState, state, options, now) {
+	const spinner = options.spinnerFrames[state.spinnerIndex] ?? "";
+	const inputPath = options.cwd ? relative$1(options.cwd, jobState.job.inputPath) || "." : jobState.job.inputPath;
+	const target = jobState.job.target.name ? `${jobState.job.target.kind} ${jobState.job.target.name}` : jobState.job.target.kind;
+	const startedAt = jobState.startedAt ?? now;
+	return fitRow(`${spinner} ${inputPath} > ${target} > ${jobState.job.ruleId} (${formatDuration(now - startedAt)})`, options.columns);
 }
 function styleRow(row, state, warnCount, errorCount, options) {
 	let styledRow = row;
 	const spinner = options.spinnerFrames[state.spinnerIndex] ?? "";
-	if (spinner) styledRow = replaceFirst(styledRow, spinner, colors$1.cyan(spinner));
-	styledRow = styledRow.replace(/\|/g, colors$1.gray("|")).replace(`${warnCount} warn`, colors$1.yellow(`${warnCount} warn`)).replace(`${errorCount} error`, (errorCount > 0 ? colors$1.red : colors$1.gray)(`${errorCount} error`)).replace(/(\d+\/\d+\/\d+\/\d+)/, (match) => state.errored > 0 ? colors$1.red(match) : colors$1.gray(match)).replace(/(\d[\d,]* tokens)/g, (match) => colors$1.cyan(match));
-	return styledRow;
+	if (spinner) styledRow = styledRow.replace(spinner, colors$2.cyan(spinner));
+	return styledRow.replace(/\//g, colors$2.gray("/")).replace(`${warnCount} warn`, colors$2.yellow(`${warnCount} warn`)).replace(`${errorCount} error`, (errorCount > 0 ? colors$2.red : colors$2.gray)(`${errorCount} error`)).replace(`${state.execution.failed} failed`, (state.execution.failed > 0 ? colors$2.red : colors$2.gray)(`${state.execution.failed} failed`));
+}
+function transition(counts, from, to) {
+	counts[from] -= 1;
+	counts[to] += 1;
 }
 //#endregion
 //#region src/cli/reporters/progress/tty.ts
@@ -936,6 +869,7 @@ function createCliProgressReporter(options) {
 		color: options.color,
 		columns: options.columns,
 		cwd: options.cwd,
+		rows: options.rows,
 		spinnerFrames: cliSpinners.dots.frames
 	});
 	const renderer = createTtyProgressRenderer({
@@ -961,20 +895,16 @@ function createRenderingProgressReporter(summary, renderer) {
 			summary.onDiagnostic?.(payload);
 			renderer.render();
 		},
-		onFileEnd: (payload) => {
-			summary.onFileEnd?.(payload);
-			renderer.render();
-		},
-		onFileStart: (payload) => {
-			summary.onFileStart?.(payload);
+		onJobEnd: (payload) => {
+			summary.onJobEnd?.(payload);
 			renderer.render();
 		},
-		onRuleEnd: (payload) => {
-			summary.onRuleEnd?.(payload);
+		onJobQueued: (payload) => {
+			summary.onJobQueued?.(payload);
 			renderer.render();
 		},
-		onRuleStart: (payload) => {
-			summary.onRuleStart?.(payload);
+		onJobStart: (payload) => {
+			summary.onJobStart?.(payload);
 			renderer.render();
 		},
 		onRunEnd: (payload) => {
@@ -985,14 +915,6 @@ function createRenderingProgressReporter(summary, renderer) {
 			summary.onRunStart?.(payload);
 			renderer.start();
 		},
-		onTargetEnd: (payload) => {
-			summary.onTargetEnd?.(payload);
-			renderer.render();
-		},
-		onTargetStart: (payload) => {
-			summary.onTargetStart?.(payload);
-			renderer.render();
-		},
 		onUsage: (payload) => {
 			summary.onUsage?.(payload);
 			renderer.render();
@@ -1174,18 +1096,20 @@ async function walkFiles(root, options) {
 }
 //#endregion
 //#region src/cli/commands/lint/errors.ts
-function formatRunError(error, color) {
-	return `${color ? c.red("error") : "error"} ${formatRunErrorContext(error)}\n  Rule running failed due to ${error.failure?.message ?? error.message}\n`;
+const colors$1 = createColors({ force: true });
+function formatCancelledError(error, color) {
+	return `${color ? colors$1.red("error") : "error"} ${error.message}\n`;
 }
-function formatRunErrorContext(error) {
-	const failure = error.failure;
-	if (!failure) return "alint run failed";
-	const target = failure.target ? failure.target.name ? `${failure.target.kind} ${failure.target.name}` : failure.target.kind : void 0;
+function formatRunError(error, color) {
 	return [
-		failure.filePath,
-		target,
-		failure.ruleId
-	].filter(Boolean).join(" > ");
+		`${color ? colors$1.red("error") : "error"} ${error.message}`,
+		...error.failures.map(formatFailure),
+		""
+	].join("\n");
+}
+function formatFailure(failure) {
+	const target = failure.job.target.name ? `${failure.job.target.kind} ${failure.job.target.name}` : failure.job.target.kind;
+	return `  [${failure.kind}] ${failure.job.inputPath} > ${target} > ${failure.job.ruleId}: ${failure.message}`;
 }
 //#endregion
 //#region src/cli/commands/lint/runner.ts
@@ -1198,14 +1122,12 @@ function resolveConfigRunner(config) {
 function resolveRunnerConfig(setupConfig, config, options) {
 	const cache = resolveRunnerCacheConfig(setupConfig.runner?.cache, config.runner?.cache, options);
 	const stats = resolveRunnerStatsConfig(setupConfig.runner?.stats, config.runner?.stats, options);
-	const fileConcurrency = parsePositiveIntegerOption(options.fileConcurrency, "--file-concurrency");
 	const ruleConcurrency = parsePositiveIntegerOption(options.ruleConcurrency, "--rule-concurrency");
 	const timeoutMs = parsePositiveIntegerOption(options.timeoutMs, "--timeout-ms");
 	const runner = {
 		...setupConfig.runner ?? {},
 		...config.runner ?? {},
 		cache,
-		fileConcurrency: fileConcurrency ?? config.runner?.fileConcurrency ?? setupConfig.runner?.fileConcurrency,
 		ruleConcurrency: ruleConcurrency ?? config.runner?.ruleConcurrency ?? setupConfig.runner?.ruleConcurrency,
 		stats,
 		timeoutMs: timeoutMs ?? config.runner?.timeoutMs ?? setupConfig.runner?.timeoutMs
@@ -1450,8 +1372,9 @@ function toStatsUsageRecord(record) {
 function createStatsCollector() {
 	const counts = {
 		cached: 0,
+		cancelled: 0,
 		completed: 0,
-		errored: 0,
+		failed: 0,
 		planned: 0
 	};
 	let startedAt;
@@ -1461,10 +1384,11 @@ function createStatsCollector() {
 		durationMs: () => startedAt !== void 0 && endedAt !== void 0 ? endedAt - startedAt : void 0,
 		reporter: {
 			onRunEnd: (payload) => {
-				counts.cached = payload.cached;
-				counts.completed = payload.completed;
-				counts.errored = payload.errored;
-				counts.planned = payload.planned;
+				counts.cached = payload.execution.cached;
+				counts.cancelled = payload.execution.cancelled;
+				counts.completed = payload.execution.completed;
+				counts.failed = payload.execution.failed;
+				counts.planned = payload.execution.planned;
 				endedAt = payload.endedAt;
 			},
 			onRunStart: (payload) => {
@@ -1476,46 +1400,50 @@ function createStatsCollector() {
 function mergeProgressReporters(base, extra) {
 	if (!base) return extra;
 	if (!extra) return base;
+	const baseState = {
+		disabled: false,
+		reporter: base
+	};
+	const extraState = {
+		disabled: false,
+		reporter: extra
+	};
+	let firstFailure;
+	const deliver = (state, callback) => {
+		if (state.disabled) return;
+		try {
+			callback(state.reporter);
+		} catch (error) {
+			state.disabled = true;
+			firstFailure ??= normalizeReporterError(error);
+		}
+	};
+	const deliverBoth = (callback) => {
+		deliver(baseState, callback);
+		deliver(extraState, callback);
+	};
 	return {
 		onDiagnostic: (payload) => {
-			base.onDiagnostic?.(payload);
-			extra.onDiagnostic?.(payload);
+			deliverBoth((reporter) => reporter.onDiagnostic?.(payload));
 		},
-		onFileEnd: (payload) => {
-			base.onFileEnd?.(payload);
-			extra.onFileEnd?.(payload);
+		onJobEnd: (payload) => {
+			deliverBoth((reporter) => reporter.onJobEnd?.(payload));
 		},
-		onFileStart: (payload) => {
-			base.onFileStart?.(payload);
-			extra.onFileStart?.(payload);
+		onJobQueued: (payload) => {
+			deliverBoth((reporter) => reporter.onJobQueued?.(payload));
 		},
-		onRuleEnd: (payload) => {
-			base.onRuleEnd?.(payload);
-			extra.onRuleEnd?.(payload);
-		},
-		onRuleStart: (payload) => {
-			base.onRuleStart?.(payload);
-			extra.onRuleStart?.(payload);
+		onJobStart: (payload) => {
+			deliverBoth((reporter) => reporter.onJobStart?.(payload));
 		},
 		onRunEnd: (payload) => {
-			base.onRunEnd?.(payload);
-			extra.onRunEnd?.(payload);
+			deliverBoth((reporter) => reporter.onRunEnd?.(payload));
+			if (firstFailure) throw firstFailure;
 		},
 		onRunStart: (payload) => {
-			base.onRunStart?.(payload);
-			extra.onRunStart?.(payload);
-		},
-		onTargetEnd: (payload) => {
-			base.onTargetEnd?.(payload);
-			extra.onTargetEnd?.(payload);
-		},
-		onTargetStart: (payload) => {
-			base.onTargetStart?.(payload);
-			extra.onTargetStart?.(payload);
+			deliverBoth((reporter) => reporter.onRunStart?.(payload));
 		},
 		onUsage: (payload) => {
-			base.onUsage?.(payload);
-			extra.onUsage?.(payload);
+			deliverBoth((reporter) => reporter.onUsage?.(payload));
 		}
 	};
 }
@@ -1537,11 +1465,21 @@ async function writeRunStats(target, collector, result, cwd) {
 		await store.record(createRunStat({
 			cwd,
 			durationMs: collector.durationMs(),
-			ruleCounts: collector.counts,
+			ruleCounts: {
+				cached: result.execution.cached,
+				cancelled: result.execution.cancelled,
+				completed: result.execution.completed,
+				failed: result.execution.failed,
+				planned: result.execution.planned
+			},
 			usage: result.usage
 		}));
 	} catch {}
 }
+function normalizeReporterError(error) {
+	if (error instanceof Error) return error;
+	return new Error(error != null ? String(error) : "Unknown progress reporter error.");
+}
 //#endregion
 //#region src/cli/commands/lint/index.ts
 const lint = defineCommand({
@@ -1592,11 +1530,15 @@ async function runLintCommand(files, options, io, interceptConsoleOutput) {
 		columns: io.stderr.columns ?? 80,
 		cwd: io.cwd,
 		isTty: io.stderr.isTTY === true,
+		rows: io.stderr.rows,
 		write: (chunk) => io.stderr.write(chunk)
 	}) : void 0;
 	const restoreProgressConsole = progress ? interceptConsoleOutput({ write: progress.write }) : void 0;
 	const statsTarget = resolveStatsWrite(runner?.stats, io.env);
 	const statsCollector = statsTarget ? createStatsCollector() : void 0;
+	const persistStats = async (runResult) => {
+		if (statsTarget && statsCollector) await writeRunStats(statsTarget, statsCollector, runResult, io.cwd);
+	};
 	let result;
 	try {
 		result = await runAlint({
@@ -1614,14 +1556,20 @@ async function runLintCommand(files, options, io, interceptConsoleOutput) {
 		restoreProgressConsole?.();
 		progress?.dispose();
 		if (error instanceof AlintRunError) {
+			await persistStats(error.result);
 			io.stderr.write(formatRunError(error, io.stderr.isTTY === true));
 			return 2;
 		}
+		if (error instanceof AlintRunCancelledError) {
+			await persistStats(error.result);
+			io.stderr.write(formatCancelledError(error, io.stderr.isTTY === true));
+			return 2;
+		}
 		throw error;
 	}
 	restoreProgressConsole?.();
 	progress?.dispose();
-	if (statsTarget && statsCollector) await writeRunStats(statsTarget, statsCollector, result, io.cwd);
+	await persistStats(result);
 	io.stdout.write(formatDiagnostics(options.format, result, { color: io.stdout.isTTY === true }));
 	return result.diagnostics.some((diagnostic) => diagnostic.severity === "error") ? 1 : 0;
 }
@@ -2292,7 +2240,7 @@ async function executeCli(argv, io) {
 		pendingResult = result;
 		return result;
 	};
-	cli.option("--no-cache", "Disable cache for this run").option("--cache-location <path>", "Path to the alint cache file or directory").option("-c, --config <path>", "Path to alint config file").option("--file-concurrency <count>", "Number of files to lint concurrently").option("--format <format>", "Reporter format", { default: "stylish" }).option("--model <model>", "Force a model override").option("-l, --lang <language>", "Ask model-backed rules to write diagnostics in this language").option("--progress", "Show run progress").option("--rule-concurrency <count>", "Number of rules to run concurrently within a file").option("--no-stats", "Do not record run stats for this run").option("--timeout-ms <ms>", "Rule execution timeout in milliseconds").version(version).help();
+	cli.option("--no-cache", "Disable cache for this run").option("--cache-location <path>", "Path to the alint cache file or directory").option("-c, --config <path>", "Path to alint config file").option("--format <format>", "Reporter format", { default: "stylish" }).option("--model <model>", "Force a model override").option("-l, --lang <language>", "Ask model-backed rules to write diagnostics in this language").option("--progress", "Show run progress").option("--rule-concurrency <count>", "Maximum rule executions across the entire run").option("--no-stats", "Do not record run stats for this run").option("--timeout-ms <ms>", "Rule execution timeout in milliseconds").version(version).help();
 	registerCommandTree(cli, commandTree, {
 		globalOptions,
 		interceptConsoleOutput,

package/dist/index.d.mts

@@ -14,6 +14,7 @@ interface CliIo {
 interface CliWritable {
   columns?: number;
   isTTY?: boolean;
+  rows?: number;
   write: (chunk: string) => unknown;
 }
 //#endregion

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { i as formatJson, n as formatDiagnostics, r as formatStylish, t as executeCli } from "./cli-DEGDq_sM.mjs";
+import { i as formatJson, n as formatDiagnostics, r as formatStylish, t as executeCli } from "./cli-fZkZ4dza.mjs";
 import { ignorePatternsAIAgents, ignorePatternsBuildOutputs, ignorePatternsCaches, ignorePatternsCommon, ignorePatternsEslintDefaults, ignorePatternsGenerated } from "@alint-js/config";
 import { defineConfig } from "@alint-js/core";
 export { defineConfig, executeCli, formatDiagnostics, formatJson, formatStylish, ignorePatternsAIAgents, ignorePatternsBuildOutputs, ignorePatternsCaches, ignorePatternsCommon, ignorePatternsEslintDefaults, ignorePatternsGenerated };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@alint-js/cli",
   "type": "module",
-  "version": "0.0.28",
+  "version": "0.0.30",
   "exports": {
     ".": {
       "types": "./dist/index.d.mts",
@@ -17,16 +17,18 @@
   ],
   "dependencies": {
     "@clack/prompts": "^1.7.0",
-    "@moeru/std": "^0.1.0-beta.18",
+    "@moeru/std": "^0.1.0-beta.20",
     "cac": "^7.0.0",
     "cli-spinners": "^3.4.0",
+    "fast-string-truncated-width": "^3.0.3",
+    "fast-string-width": "^3.0.2",
     "gitignore-fs": "^2.2.3",
     "minimatch": "^10.2.5",
     "pathe": "^2.0.3",
     "table": "^6.9.0",
     "tinyrainbow": "^3.1.0",
-    "@alint-js/config": "0.0.28",
-    "@alint-js/core": "0.0.28"
+    "@alint-js/core": "0.0.30",
+    "@alint-js/config": "0.0.30"
   },
   "devDependencies": {
     "@pnpm/find-workspace-dir": "^1000.1.5",