logixia 2.0.0 → 2.0.6

package/dist/cli/index.js

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
-//#region rolldown:runtime
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+// \0rolldown/runtime.js
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -16,22 +17,18 @@ var __copyProps = (to, from, except, desc) => {
 	}
 	return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule || !__hasOwnProp.call(mod, "default") ? __defProp(target, "default", {
 	value: mod,
 	enumerable: true
 }) : target, mod));
-
-//#endregion
 let node_fs = require("node:fs");
 node_fs = __toESM(node_fs);
 let node_path = require("node:path");
 node_path = __toESM(node_path);
 let commander = require("commander");
-commander = __toESM(commander);
 let picocolors = require("picocolors");
 picocolors = __toESM(picocolors);
-
-//#region src/utils/csv.utils.ts
+// src/utils/csv.utils.ts
 const CSV_FORMULA_PREFIX = /^[=+\-@\t\r]/;
 /**
 * Render one CSV field. String values that a spreadsheet would treat as a
@@ -48,9 +45,7 @@ function csvField(value, alwaysQuote = false) {
 	if (alwaysQuote || /[",\r\n]/.test(str)) return `"${str.replace(/"/g, "\"\"")}"`;
 	return str;
 }
-
-//#endregion
-//#region src/cli/utils.ts
+// src/cli/utils.ts
 /**
 * Render a single cell value. Uses a null/undefined check rather than `||` so
 * falsy-but-real values (0, false, '') still render — a `count=0` or
@@ -88,6 +83,25 @@ function formatAsTable(rows, columns) {
 		rows.map((r) => columns.map((c, i) => cellText(r[c]).padEnd(colWidths[i] ?? 0)).join(" | ")).join("\n")
 	].join("\n");
 }
+/** Parse like {@link safeParseLogs} but keep each entry's original file line number. */
+function parseLogLines(raw) {
+	const parsed = [];
+	for (const [i, text] of raw.split(/\r?\n/).entries()) {
+		if (!text) continue;
+		try {
+			parsed.push({
+				line: i + 1,
+				entry: JSON.parse(text)
+			});
+		} catch {
+			parsed.push({
+				line: i + 1,
+				entry: { message: text }
+			});
+		}
+	}
+	return parsed;
+}
 function safeParseLogs(raw) {
 	const lines = raw.split(/\r?\n/).filter(Boolean);
 	const parsed = [];
@@ -101,9 +115,7 @@ function safeParseLogs(raw) {
 	}
 	return parsed;
 }
-
-//#endregion
-//#region src/cli/commands/analyze.ts
+// src/cli/commands/analyze.ts
 function parseDurationToMs(input) {
 	if (!input) return;
 	const m = input.match(/^(\d+)([smhd])$/i);
@@ -139,6 +151,7 @@ async function analyzeFileContents(raw, opts = {}) {
 		total: filtered.length,
 		byLevel
 	};
+	if (opts.format === "csv") return sanitizeForTerminal(["level,count", ...Object.keys(byLevel).map((k) => `${csvField(k)},${byLevel[k]}`)].join("\n"));
 	return formatAsTable(Object.keys(byLevel).map((k) => ({
 		level: k,
 		count: byLevel[k]
@@ -157,16 +170,10 @@ const analyzeCommand = new commander.Command("analyze").description("Analyze log
 	}
 	console.log(result);
 });
-
-//#endregion
-//#region src/cli/commands/explore.ts
+// src/cli/commands/explore.ts
 const CSI = "\x1B[";
-const clearScreen = CSI + "2J";
-const clearLine = CSI + "K";
-const hideCursor = CSI + "?25l";
-const showCursor = CSI + "?25h";
-const altScreen = CSI + "?1049h";
-const mainScreen = CSI + "?1049l";
+const clearScreen = "\x1B[2J";
+const clearLine = "\x1B[K";
 function moveTo(row, col) {
 	return `${CSI}${row};${col}H`;
 }
@@ -243,7 +250,7 @@ function coloriseStackFrame(frame) {
 function buildDetailLines(entry) {
 	if (!entry) return [picocolors.default.dim("  No entry selected")];
 	const lines = [];
-	const { stack,...rest } = entry;
+	const { stack, ...rest } = entry;
 	const jsonText = sanitizeForTerminal(JSON.stringify(rest, null, 2));
 	for (const l of jsonText.split("\n")) lines.push("  " + syntaxColorJson(l));
 	if (stack) {
@@ -280,7 +287,7 @@ var TUIExplorer = class {
 		this.STATUS_ROWS = 1;
 		this.DETAIL_ROWS = 9;
 		this.filePath = node_path.default.resolve(process.cwd(), filePath);
-		this.levelFilters = new Set([
+		this.levelFilters = /* @__PURE__ */ new Set([
 			"error",
 			"warn",
 			"info",
@@ -301,7 +308,7 @@ var TUIExplorer = class {
 		this.filePos = node_fs.default.statSync(this.filePath).size;
 		this.allEntries = safeParseLogs(raw);
 		this.applyFilters();
-		write(altScreen + hideCursor);
+		write("\x1B[?1049h\x1B[?25l");
 		this.getTerminalSize();
 		process.stdout.on("resize", () => {
 			this.getTerminalSize();
@@ -367,7 +374,7 @@ var TUIExplorer = class {
 		const leftLen = stripAnsi(left).length;
 		const rightLen = stripAnsi(right).length;
 		const gap = Math.max(1, w - leftLen - rightLen);
-		write(moveTo(1, 1) + picocolors.default.bgBlack(left + " ".repeat(gap) + right) + clearLine + "\n");
+		write(moveTo(1, 1) + picocolors.default.bgBlack(left + " ".repeat(gap) + right) + "\x1B[K\n");
 	}
 	drawFilterBar() {
 		const badges = [
@@ -385,14 +392,12 @@ var TUIExplorer = class {
 		const left = "  " + badges;
 		const right = searchPart + " ";
 		const gap = Math.max(1, w - stripAnsi(left).length - stripAnsi(right).length);
-		write(moveTo(2, 1) + picocolors.default.bgBlack(left + " ".repeat(gap) + right) + clearLine + "\n");
+		write(moveTo(2, 1) + picocolors.default.bgBlack(left + " ".repeat(gap) + right) + "\x1B[K\n");
 	}
 	drawColHeader() {
 		const w = this.width;
-		const timeCol = " TIME         ";
-		const levelCol = " LVL ";
 		const msgWidth = Math.max(20, w - 14 - 5 - 2);
-		write(moveTo(3, 1) + compose(picocolors.default.bold, picocolors.default.bgBlack, picocolors.default.dim)(timeCol + levelCol + " " + this.pad("MESSAGE", msgWidth)) + clearLine + "\n");
+		write(moveTo(3, 1) + compose(picocolors.default.bold, picocolors.default.bgBlack, picocolors.default.dim)(" TIME          LVL  " + this.pad("MESSAGE", msgWidth)) + "\x1B[K\n");
 	}
 	drawList() {
 		const lr = this.LIST_ROWS;
@@ -436,7 +441,7 @@ var TUIExplorer = class {
 		const label = selected ? ` ▼ DETAIL  (${this.selectedIndex + 1}/${this.filteredEntries.length}) ` : " ▼ DETAIL ";
 		const labelLen = stripAnsi(label).length;
 		const sepLine = compose(picocolors.default.bgBlack, picocolors.default.cyan, picocolors.default.bold)(label) + picocolors.default.dim("─".repeat(Math.max(0, w - labelLen)));
-		write(moveTo(sepRow, 1) + sepLine + clearLine + "\n");
+		write(moveTo(sepRow, 1) + sepLine + "\x1B[K\n");
 		const lines = buildDetailLines(selected);
 		for (let row = 0; row < 8; row++) {
 			write(moveTo(sepRow + 1 + row, 1));
@@ -548,7 +553,6 @@ var TUIExplorer = class {
 			case "q":
 				this.cleanup();
 				return;
-			default: break;
 		}
 		this.redraw();
 	}
@@ -666,7 +670,7 @@ var TUIExplorer = class {
 	}
 	cleanup() {
 		if (this.fileWatcher) node_fs.default.unwatchFile(this.filePath);
-		write(showCursor + mainScreen);
+		write("\x1B[?25h\x1B[?1049l");
 		if (process.stdin.isTTY) process.stdin.setRawMode(false);
 		process.stdin.pause();
 		process.exit(0);
@@ -679,9 +683,7 @@ const exploreCommand = new commander.Command("explore").description("Interactive
 		search: String(opts.search ?? "")
 	}).run();
 });
-
-//#endregion
-//#region src/cli/commands/export.ts
+// src/cli/commands/export.ts
 async function exportLogs(raw, opts = {}) {
 	const entries = safeParseLogs(raw);
 	const fields = opts.fields ? opts.fields.split(",").map((f) => f.trim()) : null;
@@ -722,9 +724,36 @@ const exportCommand = new commander.Command("export").description("Export log fi
 		console.log(`Exported to: ${outPath}`);
 	} else console.log(output);
 });
-
-//#endregion
-//#region src/cli/commands/query.ts
+// src/cli/commands/query.ts
+/**
+* logixia CLI — SQL-like log query engine
+*
+* Supports a subset of SQL syntax over NDJSON / JSON log files:
+*
+*   SELECT * FROM logs WHERE level='error' AND duration > 500
+*   SELECT level, message FROM logs WHERE level='warn'
+*   COUNT BY level
+*   AVG(duration) BY endpoint
+*   GROUP BY statusCode
+*
+* Time-range shortcuts (--since / --until):
+*   --since "last 2 hours"
+*   --since "last 30 minutes"
+*   --since "today"
+*   --since "2024-01-15T08:00:00"
+*
+* @example Basic filter
+*   logixia query app.log --sql "SELECT * FROM logs WHERE level='error'"
+*
+* @example Aggregation
+*   logixia query app.log --sql "COUNT BY level"
+*
+* @example Time range + table output
+*   logixia query app.log --since "last 1 hour" --format table
+*
+* @example Live tail with SQL filter
+*   logixia query app.log --follow --sql "WHERE level='error'"
+*/
 /**
 * Parse a human-friendly time range string into a `Date`.
 * Returns `undefined` when the string is not recognised.
@@ -766,11 +795,12 @@ function parseTimeRange(value) {
 function maskQuoted(sql) {
 	let out = "";
 	let quote = null;
-	for (const ch of sql) if (quote !== null) if (ch === quote) {
-		quote = null;
-		out += ch;
-	} else out += "_";
-	else {
+	for (const ch of sql) if (quote !== null) {
+		if (ch === quote) {
+			quote = null;
+			out += ch;
+		} else out += "_";
+	} else {
 		if (ch === "'" || ch === "\"") quote = ch;
 		out += ch;
 	}
@@ -1019,7 +1049,7 @@ function matchesNode(row, node) {
 }
 function runAggregation(entries, agg) {
 	const { fn, field, groupBy } = agg;
-	if (!groupBy) return picocolors.default.yellow("Aggregation requires a GROUP BY field");
+	if (!groupBy) return { warning: "Aggregation requires a GROUP BY field" };
 	const groups = /* @__PURE__ */ new Map();
 	for (const entry of entries) {
 		const key = String(entry[groupBy] ?? "(empty)");
@@ -1027,42 +1057,48 @@ function runAggregation(entries, agg) {
 		if (bucket) bucket.push(entry);
 		else groups.set(key, [entry]);
 	}
-	if (fn === "COUNT" || fn === "GROUP") return formatAsTable([...groups.entries()].map(([k, v]) => ({
-		[groupBy]: k,
-		count: v.length
-	})).sort((a, b) => b.count - a.count), [groupBy, "count"]);
-	if (!field) return picocolors.default.yellow("Numeric aggregation requires a field: AVG(field) BY group");
-	return formatAsTable([...groups.entries()].map(([k, v]) => {
-		const nums = v.map((e) => Number(e[field])).filter((n) => !Number.isNaN(n));
-		let result;
-		switch (fn) {
-			case "AVG":
-				result = nums.length ? nums.reduce((a, b) => a + b, 0) / nums.length : 0;
-				break;
-			case "SUM":
-				result = nums.reduce((a, b) => a + b, 0);
-				break;
-			case "MIN":
-				result = nums.length ? Math.min(...nums) : 0;
-				break;
-			case "MAX":
-				result = nums.length ? Math.max(...nums) : 0;
-				break;
-			default: result = 0;
-		}
-		return {
+	if (fn === "COUNT" || fn === "GROUP") return {
+		rows: [...groups.entries()].map(([k, v]) => ({
 			[groupBy]: k,
-			[`${fn}(${field})`]: Math.round(result * 100) / 100,
 			count: v.length
-		};
-	}).sort((a, b) => {
-		const key = `${fn}(${field})`;
-		return b[key] - a[key];
-	}), [
-		groupBy,
-		`${fn}(${field})`,
-		"count"
-	]);
+		})).sort((a, b) => b.count - a.count),
+		columns: [groupBy, "count"]
+	};
+	if (!field) return { warning: "Numeric aggregation requires a field: AVG(field) BY group" };
+	return {
+		rows: [...groups.entries()].map(([k, v]) => {
+			const nums = v.map((e) => Number(e[field])).filter((n) => !Number.isNaN(n));
+			let result;
+			switch (fn) {
+				case "AVG":
+					result = nums.length ? nums.reduce((a, b) => a + b, 0) / nums.length : 0;
+					break;
+				case "SUM":
+					result = nums.reduce((a, b) => a + b, 0);
+					break;
+				case "MIN":
+					result = nums.length ? Math.min(...nums) : 0;
+					break;
+				case "MAX":
+					result = nums.length ? Math.max(...nums) : 0;
+					break;
+				default: result = 0;
+			}
+			return {
+				[groupBy]: k,
+				[`${fn}(${field})`]: Math.round(result * 100) / 100,
+				count: v.length
+			};
+		}).sort((a, b) => {
+			const key = `${fn}(${field})`;
+			return b[key] - a[key];
+		}),
+		columns: [
+			groupBy,
+			`${fn}(${field})`,
+			"count"
+		]
+	};
 }
 function projectRow(row, select) {
 	if (select === "*") return row;
@@ -1070,6 +1106,11 @@ function projectRow(row, select) {
 	for (const field of select) projected[field] = row[field];
 	return projected;
 }
+/** json prints an array (`[]` when empty); ndjson prints one row per line (nothing when empty). */
+function printMachineRows(rows, format) {
+	if (format === "json") console.log(sanitizeForTerminal(JSON.stringify(rows, null, 2)));
+	else if (rows.length > 0) console.log(rows.map((r) => sanitizeForTerminal(JSON.stringify(r))).join("\n"));
+}
 function formatResults(results, format) {
 	if (results.length === 0) return picocolors.default.yellow("No results found");
 	if (format === "json") return sanitizeForTerminal(JSON.stringify(results, null, 2));
@@ -1104,10 +1145,19 @@ function executeQuery(entries, opts) {
 		limit: null
 	};
 	if (query.where) rows = rows.filter((row) => matchesWhere(row, query.where));
-	if (query.aggregation) return {
-		results: [],
-		aggregationOutput: runAggregation(rows, query.aggregation)
-	};
+	if (query.aggregation) {
+		const agg = runAggregation(rows, query.aggregation);
+		if ("warning" in agg) return {
+			results: [],
+			aggregationOutput: picocolors.default.yellow(agg.warning),
+			aggregationRows: []
+		};
+		return {
+			results: [],
+			aggregationOutput: formatAsTable(agg.rows, agg.columns),
+			aggregationRows: agg.rows
+		};
+	}
 	const orderField = ((_query$orderBy = query.orderBy) === null || _query$orderBy === void 0 ? void 0 : _query$orderBy.field) ?? opts.orderBy;
 	if (orderField) {
 		var _query$orderBy2;
@@ -1129,7 +1179,8 @@ function executeQuery(entries, opts) {
 	rows = rows.map((row) => projectRow(row, query.select));
 	return {
 		results: rows,
-		aggregationOutput: null
+		aggregationOutput: null,
+		aggregationRows: null
 	};
 }
 const queryCommand = new commander.Command("query").description("Query log files with SQL-like syntax\n\n  Examples:\n    logixia query app.log --sql \"SELECT * FROM logs WHERE level='error'\"\n    logixia query app.log --sql \"COUNT BY level\"\n    logixia query app.log --sql \"AVG(duration) BY endpoint\"\n    logixia query app.log --since \"last 2 hours\" --format table\n    logixia query app.log --follow --sql \"WHERE level='error'\"\n").argument("<file>", "Path to NDJSON or JSON log file").option("--sql <query>", "SQL-like query string").option("--since <time>", "Only include entries after this time (e.g. \"last 2 hours\", \"today\")").option("--until <time>", "Only include entries before this time").option("--limit <n>", "Maximum number of results to return").option("--order-by <field>", "Sort results by this field").option("--format <fmt>", "Output format: line, table, json, ndjson", "line").option("--follow", "Follow file for new entries matching the query (tail mode)", false).action(async (file, opts) => {
@@ -1141,22 +1192,26 @@ const queryCommand = new commander.Command("query").description("Query log files
 	const entries = safeParseLogs(node_fs.default.readFileSync(full, "utf8"));
 	const parsedLimit = opts.limit === void 0 ? NaN : Number.parseInt(opts.limit, 10);
 	const limitN = Number.isNaN(parsedLimit) ? void 0 : parsedLimit;
-	const { results, aggregationOutput } = executeQuery(entries, {
+	const { results, aggregationOutput, aggregationRows } = executeQuery(entries, {
 		sql: opts.sql,
 		since: opts.since,
 		until: opts.until,
 		limit: limitN,
 		orderBy: opts.orderBy
 	});
+	const machineFormat = opts.format === "json" || opts.format === "ndjson";
+	const status = machineFormat ? console.error : console.log;
 	if (aggregationOutput !== null) {
-		console.log(picocolors.default.bold("\nAggregation result:"));
-		console.log(aggregationOutput);
+		status(picocolors.default.bold("\nAggregation result:"));
+		if (machineFormat) printMachineRows(aggregationRows ?? [], opts.format);
+		else console.log(aggregationOutput);
 	} else {
-		console.log(picocolors.default.bold(`\nFound ${picocolors.default.cyan(String(results.length))} match${results.length === 1 ? "" : "es"}`));
-		if (results.length > 0) console.log(formatResults(results, opts.format || "line"));
+		status(picocolors.default.bold(`\nFound ${picocolors.default.cyan(String(results.length))} match${results.length === 1 ? "" : "es"}`));
+		if (machineFormat) printMachineRows(results, opts.format);
+		else if (results.length > 0) console.log(formatResults(results, opts.format || "line"));
 	}
 	if (opts.follow) {
-		console.log(picocolors.default.dim("\n--- following (ctrl-c to exit) ---"));
+		status(picocolors.default.dim("\n--- following (ctrl-c to exit) ---"));
 		let pos = node_fs.default.statSync(full).size;
 		let buffer = "";
 		node_fs.default.watchFile(full, { interval: 300 }, (curr) => {
@@ -1187,9 +1242,7 @@ const queryCommand = new commander.Command("query").description("Query log files
 		});
 	}
 });
-
-//#endregion
-//#region src/cli/commands/search.ts
+// src/cli/commands/search.ts
 function parseQuery(query) {
 	const match = query.match(/^(\w+):(.+)$/);
 	if (match) return {
@@ -1198,31 +1251,76 @@ function parseQuery(query) {
 	};
 	return { value: query };
 }
-async function searchLogs(raw, opts = {}) {
-	const entries = safeParseLogs(raw);
-	const criteria = parseQuery(opts.query || "");
-	return entries.filter((entry) => {
+function entryMatcher(query) {
+	const criteria = parseQuery(query);
+	const needle = criteria.value.toLowerCase();
+	return (entry) => {
 		const row = entry;
 		if (criteria.field) {
 			const fieldValue = row[criteria.field];
 			if (fieldValue === void 0) return false;
-			return String(fieldValue).toLowerCase().includes(criteria.value.toLowerCase());
-		} else return JSON.stringify(row).toLowerCase().includes(criteria.value.toLowerCase());
-	});
+			return String(fieldValue).toLowerCase().includes(needle);
+		}
+		return JSON.stringify(row).toLowerCase().includes(needle);
+	};
 }
-function formatSearchResults(results, format, _context) {
-	if (format === "json") return sanitizeForTerminal(JSON.stringify(results, null, 2));
+/**
+* Like grep -C: matches plus `context` parsed entries (blank lines are skipped) before and
+* after each, in file order, tagged with their original file line numbers. Single pass.
+*/
+async function searchLogsWithContext(raw, opts = {}) {
+	const parsed = parseLogLines(raw);
+	const isMatch = entryMatcher(opts.query || "");
+	const context = Math.max(0, Number.parseInt(String(opts.context ?? 0), 10) || 0);
+	const matched = parsed.map((p) => isMatch(p.entry));
+	const nextMatch = Array.from({ length: parsed.length }, () => Number.POSITIVE_INFINITY);
+	let next = Number.POSITIVE_INFINITY;
+	for (let i = parsed.length - 1; i >= 0; i--) {
+		if (matched[i]) next = i;
+		nextMatch[i] = next;
+	}
+	const hits = [];
+	let lastMatch = Number.NEGATIVE_INFINITY;
+	for (const [i, p] of parsed.entries()) {
+		if (matched[i]) lastMatch = i;
+		if (i - lastMatch <= context || nextMatch[i] - i <= context) hits.push({
+			index: i,
+			line: p.line,
+			entry: p.entry,
+			match: Boolean(matched[i])
+		});
+	}
+	return hits;
+}
+function matchedColumns(hits) {
+	const cols = /* @__PURE__ */ new Set();
+	for (const h of hits) if (h.match) for (const k of Object.keys(h.entry || {})) cols.add(k);
+	if (cols.size === 0) for (const h of hits) for (const k of Object.keys(h.entry || {})) cols.add(k);
+	return [...cols].slice(0, 4);
+}
+function formatSearchResults(hits, format) {
+	if (format === "json") return sanitizeForTerminal(JSON.stringify(hits.filter((h) => h.match).map((h) => h.entry), null, 2));
+	if (hits.length === 0) return picocolors.default.yellow("No results found");
 	if (format === "table") {
-		if (results.length === 0) return picocolors.default.yellow("No results found");
-		return formatAsTable(results, Object.keys(results[0] || {}).slice(0, 4));
+		const withContext = hits.some((h) => !h.match);
+		const rows = hits.map((h) => withContext ? {
+			match: h.match ? "*" : "",
+			...h.entry
+		} : h.entry);
+		const columns = matchedColumns(hits);
+		return formatAsTable(rows, withContext ? ["match", ...columns] : columns);
 	}
-	if (results.length === 0) return picocolors.default.yellow("No results found");
-	return results.map((r, idx) => {
-		const line = sanitizeForTerminal(JSON.stringify(r));
-		return `${picocolors.default.gray(String(idx + 1) + ":")} ${line}`;
-	}).join("\n");
+	const lines = [];
+	let prev = -1;
+	for (const h of hits) {
+		if (prev >= 0 && h.index > prev + 1) lines.push(picocolors.default.gray("--"));
+		prev = h.index;
+		const sep = h.match ? ":" : "-";
+		lines.push(`${picocolors.default.gray(String(h.line) + sep)} ${sanitizeForTerminal(JSON.stringify(h.entry))}`);
+	}
+	return lines.join("\n");
 }
-const searchCommand = new commander.Command("search").description("Search log files with query patterns").argument("<file>", "Path to log file").option("--query <query>", "Search query (e.g., \"user_id:123\" or \"error\")", "").option("--format <fmt>", "Output format (table, json, line)", "line").option("--context <lines>", "Lines of context around matches", "0").action(async (file, opts) => {
+const searchCommand = new commander.Command("search").description("Search log files with query patterns").argument("<file>", "Path to log file").option("--query <query>", "Search query (e.g., \"user_id:123\" or \"error\")", "").option("--format <fmt>", "Output format (table, json, line)", "line").option("--context <lines>", "Entries of context around each match (line/table formats)", "0").action(async (file, opts) => {
 	const full = node_path.default.resolve(process.cwd(), file);
 	if (!node_fs.default.existsSync(full)) {
 		console.error(`File not found: ${full}`);
@@ -1232,13 +1330,12 @@ const searchCommand = new commander.Command("search").description("Search log fi
 		console.error("--query is required");
 		process.exit(2);
 	}
-	const results = await searchLogs(node_fs.default.readFileSync(full, "utf8"), opts);
-	console.log(picocolors.default.bold(`\nFound ${results.length} matches`));
-	console.log(formatSearchResults(results, opts.format, Number.parseInt(opts.context || "0")));
+	const hits = await searchLogsWithContext(node_fs.default.readFileSync(full, "utf8"), opts);
+	const count = hits.filter((h) => h.match).length;
+	(opts.format === "json" ? console.error : console.log)(picocolors.default.bold(`\nFound ${count} matches`));
+	console.log(formatSearchResults(hits, opts.format));
 });
-
-//#endregion
-//#region src/cli/commands/stats.ts
+// src/cli/commands/stats.ts
 async function generateStats(raw, opts = {}) {
 	const entries = safeParseLogs(raw);
 	const group = opts.groupBy || "level";
@@ -1298,9 +1395,7 @@ const statsCommand = new commander.Command("stats").description("Show statistics
 	if (opts.format === "json") console.log(sanitizeForTerminal(JSON.stringify(stats, null, 2)));
 	else console.log(formatStatsOutput(stats, file));
 });
-
-//#endregion
-//#region src/cli/commands/tail.ts
+// src/cli/commands/tail.ts
 function parseFilter(filter) {
 	if (!filter) return null;
 	const match = filter.match(/^(\w+):(.+)$/);
@@ -1368,9 +1463,7 @@ const tailCommand = new commander.Command("tail").description("Follow log files
 		});
 	}
 });
-
-//#endregion
-//#region src/cli/index.ts
+// src/cli/index.ts
 const pkgPath = node_path.default.resolve(__dirname, "../..", "package.json");
 let pkg;
 try {
@@ -1400,7 +1493,5 @@ function isDirectRun(argv1, file) {
 	}
 }
 if (isDirectRun(process.argv[1], __filename)) program.parse(process.argv);
-
-//#endregion
 exports.isDirectRun = isDirectRun;
-exports.program = program;
+exports.program = program;

package/dist/cloudwatch.d.mts

@@ -1,3 +1,2 @@
-import "./transport.types-BMnurPcc.mjs";
-import { n as CloudWatchTransportConfig, t as CloudWatchTransport } from "./cloudwatch.transport-UlyZFWMn.mjs";
+import { n as CloudWatchTransportConfig, t as CloudWatchTransport } from "./cloudwatch.transport-CjVrI6S4.mjs";
 export { CloudWatchTransport, CloudWatchTransportConfig };

package/dist/cloudwatch.d.ts

@@ -1,3 +1,2 @@
-import "./transport.types-CGoHpWQR.js";
-import { n as CloudWatchTransportConfig, t as CloudWatchTransport } from "./cloudwatch.transport-DsEq633o.js";
+import { n as CloudWatchTransportConfig, t as CloudWatchTransport } from "./cloudwatch.transport-CQyT6U91.js";
 export { CloudWatchTransport, CloudWatchTransportConfig };

package/dist/cloudwatch.js

@@ -1,7 +1,3 @@
-require('./internal-log-BUJYMZbE.js');
-require('./safe-stringify-DWo3aZp_.js');
-require('./batch-buffer-BY-mRWIK.js');
-const require_cloudwatch_transport = require('./cloudwatch.transport-BO1ahxw-.js');
-require('./entry-fields-BvOLFlJ4.js');
-
-exports.CloudWatchTransport = require_cloudwatch_transport.CloudWatchTransport;
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_cloudwatch_transport = require("./cloudwatch.transport-Ch1Uae-0.js");
+exports.CloudWatchTransport = require_cloudwatch_transport.CloudWatchTransport;

package/dist/cloudwatch.mjs

@@ -1,7 +1 @@
-import "./internal-log-Cm8SOWSV.mjs";
-import "./safe-stringify-DJ66tW5I.mjs";
-import "./batch-buffer-PGvSgbmd.mjs";
-import { t as CloudWatchTransport } from "./cloudwatch.transport-DZ6ies7g.mjs";
-import "./entry-fields-BJkuPnIg.mjs";
-
-export { CloudWatchTransport };
+export { t as CloudWatchTransport } from "./cloudwatch.transport-DZqF2xZO.mjs";

package/dist/{cloudwatch.transport-DsEq633o.d.ts → cloudwatch.transport-CQyT6U91.d.ts}

@@ -1,7 +1,4 @@
-import { p as TransportLogEntry, s as IAsyncTransport } from "./transport.types-CGoHpWQR.js";
-
-//#region src/transports/cloudwatch.transport.d.ts
-
+import { _ as TransportLogEntry, l as IAsyncTransport } from "./transport.types-CzJq4IrF.js";
 interface CloudWatchTransportConfig {
   /** AWS region, e.g. `'us-east-1'`. Falls back to `AWS_REGION` env var. */
   region?: string;
@@ -83,6 +80,5 @@ declare class CloudWatchTransport implements IAsyncTransport {
   private ensureStream;
   private call;
 }
-//#endregion
 export { CloudWatchTransportConfig as n, CloudWatchTransport as t };
-//# sourceMappingURL=cloudwatch.transport-DsEq633o.d.ts.map
+//# sourceMappingURL=cloudwatch.transport-CQyT6U91.d.ts.map

package/dist/cloudwatch.transport-CQyT6U91.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cloudwatch.transport-CQyT6U91.d.ts","names":[],"sources":["../src/transports/cloudwatch.transport.ts"],"mappings":";UAmDiB;;EAEf;;EAEA;;EAEA;;EAEA;;EAEA;;EAEA;;EAEA;;;;;;EAMA;;;;;EAKA;;;;;;EAMA;;EAEA;;;;;;EAMA;;EAEA;;EAEA;;EAEA;;;;;cAkCW,+BAA+B;WAC1B;WACA;WACA;WACA;mBAEC;mBACA;UACT;mBACS;mBACA;UACT;mBAES;mBACA;mBACA;mBACA;mBACA;mBACA;EAEL,YAAA,QAAQ;EAmCpB,MAAM,OAAO;EAOb,SAAS;;;;;;EASH,SAAS;UAQP;UAyBM;UAkBA;UAsBA"}