token-goat 2.8.3 → 2.8.6

package/dist/{token-goat-chunk-EFF2XCLB.mjs → token-goat-chunk-GUNYAGOZ.mjs}

@@ -5,7 +5,7 @@ import {
   redactSecrets,
   resolveIndexPath,
   stripAnsiCodes
-} from "./token-goat-chunk-6ODZ6PZK.mjs";
+} from "./token-goat-chunk-2JZ66BBE.mjs";
 
 // src/tool_filters/helpers.ts
 import * as fs from "node:fs";
@@ -1484,6 +1484,13 @@ var _CLINE_WANTS_EXECUTE_RE = /^\s*Cline\s+wants\s+to\s+(?:execute|run|write|rea
 var _CODEX_SEPARATOR_RE = /^-{4,}$/;
 var _CODEX_MODEL_RE = /^model\s*:\s*(?<model>\S+)/i;
 var _CODEX_TOKENS_USED_RE = /^tokens used$/i;
+var _CODEX_TOKEN_COUNT_RE = /^\d[\d,]*$/;
+function _trimBlankEdges(input) {
+  let out = input;
+  while (out.length && !(out[0] ?? "").trim()) out = out.slice(1);
+  while (out.length && !(out[out.length - 1] ?? "").trim()) out = out.slice(0, -1);
+  return out;
+}
 var ghCopilotFilter = makeAiCliFilter({
   name: "gh-copilot",
   binaries: ["gh"],
@@ -1679,34 +1686,42 @@ var CodexExecFilter = class extends ToolFilter {
         break;
       }
     }
-    let lastCodexIdx = null;
-    for (let i = secondSepIdx + 1; i < lines.length; i++) {
-      if ((lines[i] ?? "").trim().toLowerCase() === "codex") lastCodexIdx = i;
-    }
-    if (lastCodexIdx === null) return combined;
     let tokensLineIdx = null;
+    let countLineIdx = null;
     let tokensCount = "?";
-    const searchFloor = Math.max(lastCodexIdx + 1, lines.length - 6);
-    for (let i = lines.length - 1; i >= searchFloor; i--) {
-      if (_CODEX_TOKENS_USED_RE.test((lines[i] ?? "").trim())) {
-        tokensLineIdx = i;
-        for (let j = i + 1; j < Math.min(i + 3, lines.length); j++) {
-          const candidate = (lines[j] ?? "").trim();
-          if (candidate) {
-            tokensCount = candidate;
-            break;
-          }
+    for (let i = lines.length - 1; i > secondSepIdx; i--) {
+      if (!_CODEX_TOKENS_USED_RE.test((lines[i] ?? "").trim())) continue;
+      for (let j = i + 1; j < Math.min(i + 3, lines.length); j++) {
+        const candidate = (lines[j] ?? "").trim();
+        if (!candidate) continue;
+        if (_CODEX_TOKEN_COUNT_RE.test(candidate)) {
+          tokensLineIdx = i;
+          countLineIdx = j;
+          tokensCount = candidate;
         }
         break;
       }
+      if (tokensLineIdx !== null) break;
+    }
+    let answerLines = null;
+    let droppedTurns = 0;
+    if (countLineIdx !== null) {
+      const echo = _trimBlankEdges(lines.slice(countLineIdx + 1));
+      if (echo.length) answerLines = echo;
     }
-    const answerEnd = tokensLineIdx !== null ? tokensLineIdx : lines.length;
-    let answerLines = lines.slice(lastCodexIdx + 1, answerEnd);
-    while (answerLines.length && !(answerLines[0] ?? "").trim()) answerLines = answerLines.slice(1);
-    while (answerLines.length && !(answerLines[answerLines.length - 1] ?? "").trim()) {
-      answerLines = answerLines.slice(0, -1);
+    if (answerLines === null) {
+      const scanEnd = tokensLineIdx !== null ? tokensLineIdx : lines.length;
+      const labelIdxs = [];
+      for (let i = secondSepIdx + 1; i < scanEnd; i++) {
+        if ((lines[i] ?? "").trim().toLowerCase() === "codex") labelIdxs.push(i);
+      }
+      const lastCodexIdx = labelIdxs.length ? labelIdxs[labelIdxs.length - 1] : null;
+      if (lastCodexIdx === null) return combined;
+      droppedTurns = labelIdxs.length - 1;
+      answerLines = _trimBlankEdges(lines.slice(lastCodexIdx + 1, scanEnd));
     }
-    const summary = `[codex: model=${model}, tokens=${tokensCount}]`;
+    const dropped = droppedTurns > 0 ? `, ${droppedTurns} earlier turn(s) dropped` : "";
+    const summary = `[codex: model=${model}, tokens=${tokensCount}${dropped}]`;
     return this.finalize([summary, ...answerLines]);
   }
 };
@@ -3245,6 +3260,7 @@ var _BANDIT_CODE_SCANNED_RE = /^Code scanned:/;
 var _BANDIT_TOTAL_ISSUES_RE = /^Total issues \(by/;
 var _BANDIT_STAT_LINE_RE = /^\s+\|?\s*\d/;
 var _BANDIT_TESTING_RE = /^testing\s/;
+var _BANDIT_SEPARATOR_RE = /^-{10,}\s*$/;
 var _TRIVY_LOG_RE = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}[^\s]*\s+(?:INFO|WARN|DEBUG|ERROR)\s/;
 var _TRIVY_TABLE_SEP_RE = /^[+|-]+$/;
 var _TRIVY_TABLE_ROW_RE = /^\|/;
@@ -3252,7 +3268,7 @@ var _TRIVY_TOTAL_RE = /^Total:\s*\d+/i;
 var _TRIVY_NO_VULN_RE = /no\s+vulnerabilit/i;
 var _TRIVY_TARGET_RE = /^(?:[-=]+\s+)?(?:Python|Ruby|Node\.js|Go|Java|PHP|Rust|OS Packages|Alpine|Debian|Ubuntu|RHEL|CentOS|npm|pip|gem|cargo|pom\.xml|Gemfile\.lock|requirements|package-lock|yarn\.lock|composer\.lock|go\.sum|Cargo\.lock|\S+\s+\()/i;
 var _SNYK_TESTING_RE = /^Testing\s/i;
-var _SNYK_TREE_LINE_RE = /^(?:[├└│\s]|[|\\`][-\s]| {2})/;
+var _SNYK_TREE_LINE_RE = /^\s*(?:[├└│]|[|\\`][-\s])/;
 var _SNYK_VULN_HEADER_RE = /(?:✗|x|X)?\s*(?:Critical|High|Medium|Low|Info)\s+severity/i;
 var _SNYK_MORE_ABOUT_RE = /^\s*(?:More about this vulnerability|https?:\/\/\S+)/i;
 var _SNYK_SUMMARY_RE = /(?:✔|✗|Tested\s+\d+|unique vulnerabilities|no vulnerable paths|issues found)/i;
@@ -3443,6 +3459,7 @@ var GhRunLogFilter = class extends ToolFilter {
     const flushGroup = () => {
       if (!groupLines.length) return;
       if (groupHasFailure || groupLines.length <= GROUP_COLLAPSE_THRESHOLD) {
+        if (groupName) kept.push(`[group: ${groupName}]`);
         kept.push(...groupLines);
       } else {
         kept.push(`[group: ${groupName} \u2014 ${groupLines.length} lines collapsed by token-goat]`);
@@ -3658,16 +3675,22 @@ var BanditFilter = class extends ToolFilter {
     let inIssue = false;
     let currentSeverity = "";
     let issueBuf = [];
+    let dropTrailingSeparator = false;
     const flushIssue = () => {
       const sev = currentSeverity.toUpperCase();
       if (sev === "HIGH" || sev === "MEDIUM") {
         kept.push(...issueBuf);
       } else {
         lowDropped++;
+        dropTrailingSeparator = true;
       }
     };
     let inStatsBlock = false;
     for (const line of lines) {
+      if (dropTrailingSeparator) {
+        dropTrailingSeparator = false;
+        if (_BANDIT_SEPARATOR_RE.test(line)) continue;
+      }
       if (_BANDIT_TESTING_RE.test(line)) continue;
       if (_BANDIT_CODE_SCANNED_RE.test(line) || _BANDIT_TOTAL_ISSUES_RE.test(line)) {
         if (inIssue) {
@@ -4024,6 +4047,7 @@ var _TF_STILL_RE = /^[a-z0-9_.[\]"-]+: Still (?:creating|modifying|destroying)\.
 var _TF_APPLY_COMPLETE_RE = /^Apply complete! Resources:/;
 var _TF_RESOURCE_COMPLETE_RE = /^[a-z0-9_.[\]"-]+: (?:Creation|Destruction|Modifications?) complete/i;
 var _TF_PLAN_ATTR_DIFF_RE = /^\s+[~+-]\s+\S/;
+var _TF_PLAN_ACTION_HDR_RE = /^\s*#\s+\S+\s+(?:will be|must be|has been|has moved|will no longer be)\b/;
 var _TF_KNOWN_AFTER_APPLY_RE = /\(known after apply\)/;
 var _TF_INIT_PROVIDER_RE = /^\s*-\s+(?:Finding|Installing|Installed|Downloading|Locking)\s+\S+/i;
 var _TF_SHOW_RESOURCE_HDR_RE = /^# (?:(?:module\.[^.\s]+\.)?[a-z][a-z0-9_]+\.[a-zA-Z0-9_.[\]-]+):$/;
@@ -4144,10 +4168,14 @@ ${stderr.replace(/\s+$/, "")}` : stderr;
     }
     let finalKept;
     if (summaryLine !== null) {
-      const tailLines = kept.filter((ln) => !_TF_REFRESH_RE.test(ln));
-      finalKept = [summaryLine];
+      const tailLines = kept.filter((ln) => !_TF_REFRESH_RE.test(ln) && ln !== summaryLine);
       const tailStart = Math.max(0, tailLines.length - 20);
-      finalKept.push(...tailLines.slice(tailStart).filter((ln) => ln !== summaryLine));
+      const head = tailLines.slice(0, tailStart);
+      const headActions = head.filter((ln) => _TF_PLAN_ACTION_HDR_RE.test(ln));
+      finalKept = [summaryLine, ...headActions];
+      const omitted = head.length - headActions.length;
+      if (omitted > 0) finalKept.push(`[token-goat: ${omitted} plan detail lines omitted]`);
+      finalKept.push(...tailLines.slice(tailStart));
     } else {
       finalKept = kept;
     }
@@ -8936,17 +8964,26 @@ var EnvFilter = class extends ToolFilter {
     if (totalVars <= ENV_PASSTHROUGH_THRESHOLD) return merged;
     const kept = [];
     let suppressed = 0;
+    let inSuppressedValue = false;
     for (const line of lines) {
       const m = ENV_LINE_RE.exec(line);
       if (!m) {
+        if (line === "---") {
+          inSuppressedValue = false;
+          kept.push(line);
+          continue;
+        }
+        if (inSuppressedValue) continue;
         kept.push(line);
         continue;
       }
       const varName = m[1];
       if (ENV_KEEP_VARS.has(varName) || ENV_KEEP_PREFIXES.some((p) => varName.startsWith(p))) {
         kept.push(line);
+        inSuppressedValue = false;
       } else {
         suppressed++;
+        inSuppressedValue = true;
       }
     }
     if (suppressed) {
@@ -9471,17 +9508,26 @@ function _compressKubectlDescribe(text) {
     }
     if (stripped.startsWith("Events:")) {
       kept.push("");
-      kept.push("Events:");
-      const eventLines = lines.slice(i + 1).filter((l) => l.trim());
-      if (eventLines.length > 0) {
-        if (eventLines.length > 10) {
-          kept.push(`  [token-goat: ${eventLines.length - 10} earlier events elided]`);
-          kept.push(...eventLines.slice(-10));
-        } else {
-          kept.push(...eventLines);
+      kept.push(line.replace(/\s+$/, ""));
+      const eventIndent = line.length - line.trimStart().length;
+      const eventLines = [];
+      i++;
+      while (i < lines.length) {
+        const nxt = lines[i];
+        if (nxt.trim()) {
+          const nxtIndent = nxt.length - nxt.trimStart().length;
+          if (nxtIndent <= eventIndent) break;
+          eventLines.push(nxt);
         }
+        i++;
       }
-      break;
+      if (eventLines.length > 10) {
+        kept.push(`  [token-goat: ${eventLines.length - 10} earlier events elided]`);
+        kept.push(...eventLines.slice(-10));
+      } else {
+        kept.push(...eventLines);
+      }
+      continue;
     }
     if (_KEY_PREFIXES.some((pfx) => stripped.startsWith(pfx))) {
       kept.push(line);
@@ -10918,7 +10964,12 @@ var _RUFF_SUCCESS_RE = /^(?:All checks passed!|No errors found\.?)\s*$/;
 var _RUFF_FORMAT_REFORMATTED_RE = /^reformatted\s+\S/;
 var _RUFF_FORMAT_WOULD_REFORMAT_RE = /^would reformat\s+\S/i;
 var _RUFF_CONTEXT_LINE_RE = /^\s*(?:\d+\s*)?\|/;
-var _RUFF_HELP_LINE_RE = /^\s*=\s*help:/i;
+var _RUFF_HELP_LINE_RE = /^\s*(?:=\s*)?help:/i;
+var _RUFF_FULL_HEADER_RE = /^(?<code>[A-Z]+\d+)(?:\s+\[\*\])?\s+\S/;
+var _RUFF_FULL_LOCATION_RE = /^\s*-->\s*(?<file>.+?):\d+:\d+\s*$/;
+function _isRuffFullHeader(lines, i) {
+  return _RUFF_FULL_HEADER_RE.test(lines[i] ?? "") && _RUFF_FULL_LOCATION_RE.test(lines[i + 1] ?? "");
+}
 var RuffFilter = class extends ToolFilter {
   name = "ruff";
   binaries = /* @__PURE__ */ new Set(["ruff"]);
@@ -10955,23 +11006,45 @@ var RuffFilter = class extends ToolFilter {
         const bucket = byCode.get(code) ?? [];
         bucket.push({ file, text });
         byCode.set(code, bucket);
-        indexed.push({ kind: "viol", code, file, text });
+        indexed.push({ kind: "viol", code, file, text, headerLines: 1 });
+        continue;
+      }
+      const fullHeader = _RUFF_FULL_HEADER_RE.exec(line);
+      const fullLoc = fullHeader?.groups ? _RUFF_FULL_LOCATION_RE.exec(lines[i + 1] ?? "") : null;
+      if (fullHeader?.groups && fullLoc?.groups) {
+        const code = fullHeader.groups["code"];
+        const file = fullLoc.groups["file"];
+        const text = [line, lines[i + 1]];
+        i += 2;
+        while (i < lines.length && lines[i].trim() !== "" && !_RUFF_FOOTER_RE.test(lines[i]) && !_isRuffFullHeader(lines, i)) {
+          text.push(lines[i]);
+          i++;
+        }
+        const bucket = byCode.get(code) ?? [];
+        bucket.push({ file, text });
+        byCode.set(code, bucket);
+        indexed.push({ kind: "viol", code, file, text, headerLines: 2 });
       } else {
         indexed.push({ kind: "other", line });
         i++;
       }
     }
     const summarised = /* @__PURE__ */ new Map();
+    const contextCollapsed = /* @__PURE__ */ new Set();
     for (const [code, entries] of byCode) {
       const files = new Set(entries.map((e) => e.file));
       if (entries.length >= 3 && files.size >= 2) {
         const example = entries[0].text[0];
         summarised.set(code, `${code}: ${entries.length} occurrences in ${files.size} files (example: ${example})`);
+      } else if (entries.length >= 3 && entries.some((e) => e.text.length > 1)) {
+        contextCollapsed.add(code);
       }
     }
     const out = [];
     const emittedSummary = /* @__PURE__ */ new Set();
     const footerLines = [];
+    const seenPerCode = /* @__PURE__ */ new Map();
+    let contextBlocksDropped = 0;
     for (const seg of indexed) {
       if (seg.kind === "footer") {
         footerLines.push(seg.line);
@@ -10986,11 +11059,27 @@ var RuffFilter = class extends ToolFilter {
           out.push(summarised.get(seg.code));
           emittedSummary.add(seg.code);
         }
+      } else if (contextCollapsed.has(seg.code)) {
+        const seen = seenPerCode.get(seg.code) ?? 0;
+        seenPerCode.set(seg.code, seen + 1);
+        if (seen === 0 || seg.text.length <= seg.headerLines) {
+          out.push(...seg.text);
+        } else {
+          out.push(...seg.text.slice(0, seg.headerLines));
+          contextBlocksDropped++;
+        }
       } else {
         out.push(...seg.text);
       }
     }
     out.push(...footerLines);
+    const notes = [];
+    maybeNote(
+      notes,
+      contextBlocksDropped,
+      `dropped ${contextBlocksDropped} repeated source-context blocks (locations kept)`
+    );
+    this.emitNotes(out, notes);
     return squeezeBlankLines(out.join("\n"));
   }
   _compressFormat(merged, exitCode) {
@@ -11343,6 +11432,7 @@ var MypyFilter = class extends ToolFilter {
 var _GOLANGCI_ISSUE_RE = /^(?<file>[^:\s][^:]*\.go):(?<line>\d+)(?::\d+)?:\s+(?<msg>.+?)\s+\((?<linter>[^)]+)\)\s*$/;
 var _GOLANGCI_SUMMARY_RE = /^(?:Found \d+ issues?\.|Issues? found\.|Run with --fix)|^(?:ERRO\s|WARN\s)/i;
 var _GOLANGCI_NOISE_RE = /^(?:golangci-lint\s+version|time=|level=(?:info|debug)|msg="(?:Running|Starting|Finishing))/i;
+var _GOLANGCI_CARET_RE = /^\s*\^[~^]*\s*$/;
 var GolangciLintFilter = class _GolangciLintFilter extends ToolFilter {
   name = "golangci-lint";
   binaries = /* @__PURE__ */ new Set(["golangci-lint"]);
@@ -11360,7 +11450,9 @@ var GolangciLintFilter = class _GolangciLintFilter extends ToolFilter {
     const kept = [];
     let noiseDropped = 0;
     let issuesCollapsed = 0;
-    for (const line of lines) {
+    let contextDropped = 0;
+    for (let i = 0; i < lines.length; i++) {
+      const line = lines[i];
       if (_GOLANGCI_NOISE_RE.test(line)) {
         noiseDropped++;
         continue;
@@ -11371,6 +11463,17 @@ var GolangciLintFilter = class _GolangciLintFilter extends ToolFilter {
       }
       const m = _GOLANGCI_ISSUE_RE.exec(line);
       if (m?.groups) {
+        const next = lines[i + 1] ?? "";
+        let source = null;
+        let caret = null;
+        if (!_GOLANGCI_ISSUE_RE.test(next) && !_GOLANGCI_SUMMARY_RE.test(next) && _GOLANGCI_CARET_RE.test(lines[i + 2] ?? "")) {
+          source = next;
+          caret = lines[i + 2];
+          i += 2;
+        } else if (_GOLANGCI_CARET_RE.test(next)) {
+          caret = next;
+          i += 1;
+        }
         const filePath = m.groups["file"];
         const linter = m.groups["linter"];
         const key = `${filePath}\0${linter}`;
@@ -11378,9 +11481,15 @@ var GolangciLintFilter = class _GolangciLintFilter extends ToolFilter {
         issueCounts.set(key, count + 1);
         if (count < _GolangciLintFilter._KEEP_FIRST_N) {
           kept.push(line);
-        } else if (count === _GolangciLintFilter._KEEP_FIRST_N) {
-          kept.push(`[token-goat: __placeholder__${filePath}__${linter}__]`);
-          issuesCollapsed++;
+          if (source !== null) contextDropped++;
+          if (caret !== null) contextDropped++;
+        } else {
+          if (count === _GolangciLintFilter._KEEP_FIRST_N) {
+            kept.push(`[token-goat: __placeholder__${filePath}__${linter}__]`);
+            issuesCollapsed++;
+          }
+          if (source !== null) contextDropped++;
+          if (caret !== null) contextDropped++;
         }
         continue;
       }
@@ -11402,6 +11511,7 @@ var GolangciLintFilter = class _GolangciLintFilter extends ToolFilter {
     }
     const notes = [];
     maybeNote(notes, noiseDropped, `dropped ${noiseDropped} structured-log noise lines`);
+    maybeNote(notes, contextDropped, `dropped ${contextDropped} redundant source-context/caret lines`);
     if (issuesCollapsed) {
       const totalIssues = [...issueCounts.values()].reduce((a, b) => a + b, 0);
       const keptIssues = [...issueCounts.values()].reduce(
@@ -11418,7 +11528,8 @@ var GolangciLintFilter = class _GolangciLintFilter extends ToolFilter {
 };
 var _PYLINT_MODULE_RE = /^\*{10,}\s+Module\s/;
 var _PYLINT_ISSUE_RE = /^[^\s].*:\d+:\d+:\s+[CWEFR]\d{4}/;
-var _PYLINT_CODE_RE = /\s([CWEFR]\d{4})\s/;
+var _PYLINT_CODE_RE = /\s([CWEFR]\d{4})(?=[\s:]|$)/;
+var _PYLINT_SYMBOL_RE = /\(([a-z][a-z0-9]*(?:-[a-z0-9]+)*)\)\s*$/;
 var _PYLINT_RATING_RE = /^Your code has been rated at/;
 var _PYLINT_SEPARATOR_RE = /^-{10,}$/;
 var _PYLINT_CONFIG_RE = /^(?:Using config file|Loading plugin|No config file found)/;
@@ -11432,6 +11543,7 @@ var PylintFilter = class _PylintFilter extends ToolFilter {
     const kept = [];
     const codeCounts = /* @__PURE__ */ new Map();
     const pendingPlaceholders = [];
+    const codeSymbols = /* @__PURE__ */ new Map();
     let deduplicated = 0;
     let droppedSeparators = 0;
     let droppedConfig = 0;
@@ -11463,6 +11575,8 @@ var PylintFilter = class _PylintFilter extends ToolFilter {
         const code = m ? m[1] : "__unknown__";
         const severity = code[0] ?? "?";
         const key = `${currentModule ?? ""}\0${code}`;
+        const symM = _PYLINT_SYMBOL_RE.exec(line);
+        if (symM && !codeSymbols.has(key)) codeSymbols.set(key, symM[1]);
         const count = codeCounts.get(key) ?? 0;
         codeCounts.set(key, count + 1);
         const alwaysKeep = severity === "E" || severity === "F";
@@ -11475,12 +11589,11 @@ var PylintFilter = class _PylintFilter extends ToolFilter {
           moduleHasKeptIssue = true;
         } else {
           if (count === _PylintFilter._KEEP_PER_CODE) {
-            const codeName = code.slice(1);
             if (pendingModule !== null) {
               kept.push(pendingModule);
               pendingModule = null;
             }
-            pendingPlaceholders.push({ index: kept.length, code, codeName, key });
+            pendingPlaceholders.push({ index: kept.length, code, key });
             kept.push("");
             moduleHasKeptIssue = true;
           }
@@ -11495,14 +11608,16 @@ var PylintFilter = class _PylintFilter extends ToolFilter {
       }
       kept.push(line);
     }
-    for (const { index, code, codeName, key } of pendingPlaceholders) {
+    for (const { index, code, key } of pendingPlaceholders) {
       const elided = (codeCounts.get(key) ?? 0) - _PylintFilter._KEEP_PER_CODE;
-      kept[index] = `[token-goat: +${elided} more ${code} (${codeName}); disable via TOKEN_GOAT_BASH_COMPRESS]`;
+      const symbol = codeSymbols.get(key);
+      const label = symbol !== void 0 ? `${code} (${symbol})` : code;
+      kept[index] = `[token-goat: +${elided} more ${label}; disable via TOKEN_GOAT_BASH_COMPRESS]`;
     }
     const notes = [];
-    maybeNote(notes, deduplicated, `deduplicated ${deduplicated} repeated-code issue lines`);
-    maybeNote(notes, droppedSeparators, `dropped ${droppedSeparators} separator lines`);
-    maybeNote(notes, droppedConfig, `dropped ${droppedConfig} config-loading lines`);
+    maybeNote(notes, deduplicated, `deduplicated ${deduplicated} repeated-code issue line${plural(deduplicated)}`);
+    maybeNote(notes, droppedSeparators, `dropped ${droppedSeparators} separator line${plural(droppedSeparators)}`);
+    maybeNote(notes, droppedConfig, `dropped ${droppedConfig} config-loading line${plural(droppedConfig)}`);
     this.emitNotes(kept, notes);
     return this.finalize(kept);
   }
@@ -11711,7 +11826,7 @@ var LinterFilter = class extends ToolFilter {
     return _compressEslintStanza(merged);
   }
 };
-var _KTLINT_ISSUE_RE = /^(.+\.kt):(\d+):(\d+):\s+(error|warning):\s+(.+)\s+\(([^)]+)\)$/i;
+var _KTLINT_ISSUE_RE = /^(.+\.kts?):(\d+):(\d+):\s+(?:(error|warning):\s+)?(.+)\s+\(([^)]+)\)$/i;
 var _KTLINT_CHECKSTYLE_TAG_RE = /^\s*<(?:\?xml|checkstyle|file)\b/i;
 var _KTLINT_CHECKSTYLE_ERROR_RE = /^\s*<error\b.*\bsource="([^"]+)"/i;
 var _KTLINT_SUMMARY_RE = /^\s*(?:\d+\s+lint\s+error|ktlint\s+\d+\.\d+|Kotlin\s+style\s+guide|No\s+lint\s+errors|Resolving|Checking|Formatting)/i;
@@ -11750,7 +11865,7 @@ var KtlintFilter = class _KtlintFilter extends ToolFilter {
           kept.push(line);
         } else {
           if (count === _KtlintFilter._KEEP_PER_RULE + 1) {
-            pendingPlaceholders.push({ index: kept.length, rule, suffix: "violations" });
+            pendingPlaceholders.push({ index: kept.length, rule, suffix: "violations", indent: "  " });
             kept.push("");
           }
           deduplicated++;
@@ -11759,7 +11874,7 @@ var KtlintFilter = class _KtlintFilter extends ToolFilter {
       }
       const m = _KTLINT_ISSUE_RE.exec(line);
       if (m) {
-        const severity = m[4].toLowerCase();
+        const severity = (m[4] ?? "").toLowerCase();
         const rule = m[6];
         const count = (ruleCounts.get(rule) ?? 0) + 1;
         ruleCounts.set(rule, count);
@@ -11768,7 +11883,12 @@ var KtlintFilter = class _KtlintFilter extends ToolFilter {
           kept.push(line);
         } else {
           if (count === _KtlintFilter._KEEP_PER_RULE + 1) {
-            pendingPlaceholders.push({ index: kept.length, rule, suffix: "warnings" });
+            pendingPlaceholders.push({
+              index: kept.length,
+              rule,
+              suffix: severity === "warning" ? "warnings" : "violations",
+              indent: ""
+            });
             kept.push("");
           }
           deduplicated++;
@@ -11781,9 +11901,8 @@ var KtlintFilter = class _KtlintFilter extends ToolFilter {
       }
       kept.push(line);
     }
-    for (const { index, rule, suffix } of pendingPlaceholders) {
+    for (const { index, rule, suffix, indent } of pendingPlaceholders) {
       const elided = (ruleCounts.get(rule) ?? 0) - _KtlintFilter._KEEP_PER_RULE;
-      const indent = suffix === "violations" ? "  " : "";
       kept[index] = `${indent}[token-goat: +${elided} more ${rule} ${suffix}; disable via TOKEN_GOAT_BASH_COMPRESS for full list]`;
     }
     const notes = [];
@@ -12092,7 +12211,7 @@ var CppcheckFilter = class extends ToolFilter {
 };
 var _CLANG_TIDY_WARNINGS_GENERATED_RE = /^\d+\s+warning(?:s)?\s+generated\./;
 var _CLANG_TIDY_PROCESSING_RE = /^clang-tidy:\s+Processing\s+\d+/i;
-var _CLANG_TIDY_DIAG_RE = /^.+\.(?:c|cpp|cxx|cc|h|hpp|hxx):\d+:\d+:\s+(?:error|warning|note|remark):/;
+var _CLANG_TIDY_DIAG_RE = /^.+\.(?:c|cpp|cxx|cc|h|hpp|hxx|cuh|cu|tcc|inl|mm|m):\d+:\d+:\s+(?:error|warning|note|remark):/;
 var _CLANG_TIDY_NOTE_RE = /^.+:\d+:\d+:\s+note:/;
 var _CLANG_TIDY_CONTEXT_RE = /^\s+(?:\^[~^]*|~+)\s*$|^\s{4,}\S/;
 var _CLANG_TIDY_INCLUDE_RE = /^In\s+file\s+included\s+from\s+/;

package/dist/{token-goat-chunk-VAGPOZHO.mjs → token-goat-chunk-L2XHDICZ.mjs}

@@ -10,11 +10,11 @@ import {
   selectFilter,
   shlexSplit,
   wrappedShell
-} from "./token-goat-chunk-EFF2XCLB.mjs";
+} from "./token-goat-chunk-GUNYAGOZ.mjs";
 import {
   loadConfig,
   recordStat
-} from "./token-goat-chunk-6ODZ6PZK.mjs";
+} from "./token-goat-chunk-2JZ66BBE.mjs";
 import "./token-goat-chunk-AO2QD2AG.mjs";
 import "./token-goat-chunk-AEX54RUZ.mjs";
 

package/dist/{token-goat-chunk-DP3NNGGV.mjs → token-goat-chunk-LJEETTER.mjs}

@@ -4,14 +4,14 @@ import {
   buildEvent,
   relay,
   relayInProcess
-} from "./token-goat-chunk-NKNCHJ4H.mjs";
+} from "./token-goat-chunk-MA5237JN.mjs";
 import {
   MAX_STDIN_BYTES,
   readStdinJson
-} from "./token-goat-chunk-4HIMCBYK.mjs";
-import "./token-goat-chunk-PWVXXPCC.mjs";
-import "./token-goat-chunk-EFF2XCLB.mjs";
-import "./token-goat-chunk-6ODZ6PZK.mjs";
+} from "./token-goat-chunk-TELKICYU.mjs";
+import "./token-goat-chunk-DK4VLLYB.mjs";
+import "./token-goat-chunk-GUNYAGOZ.mjs";
+import "./token-goat-chunk-2JZ66BBE.mjs";
 import "./token-goat-chunk-AO2QD2AG.mjs";
 import "./token-goat-chunk-AEX54RUZ.mjs";
 export {