token-goat 2.9.30 → 2.9.31

package/dist/{token-goat-chunk-COBQGL5S.mjs → token-goat-chunk-INNPTRUX.mjs}

@@ -2,16 +2,7 @@ import { createRequire as __cjsRequire } from 'node:module';
 const require = __cjsRequire(import.meta.url);
 import {
   savedTokensFromBytes
-} from "./token-goat-chunk-3Z5S4KGM.mjs";
-import {
-  redactSecrets
-} from "./token-goat-chunk-4FVIAHSI.mjs";
-import {
-  loadConfig
-} from "./token-goat-chunk-7IN2MKDS.mjs";
-import {
-  resolveIndexPath
-} from "./token-goat-chunk-FNFBKLRD.mjs";
+} from "./token-goat-chunk-U4WHMG6Y.mjs";
 import {
   DEFAULT_MAX_BYTES,
   DEFAULT_MAX_LINES,
@@ -57,10 +48,26 @@ import {
   trimRepeatedPrefix,
   truncateMiddleSmart,
   truncateTableRows
-} from "./token-goat-chunk-KWPNJBDH.mjs";
+} from "./token-goat-chunk-4GILLLWY.mjs";
 import {
   stripAnsiEscapes
 } from "./token-goat-chunk-HAVAOB3S.mjs";
+import {
+  redactSecrets
+} from "./token-goat-chunk-T5P5ACNQ.mjs";
+import {
+  loadConfig
+} from "./token-goat-chunk-7EZTZOMC.mjs";
+import {
+  countNoun
+} from "./token-goat-chunk-HU4TORC5.mjs";
+import {
+  echoedValue,
+  fencedCommand
+} from "./token-goat-chunk-GGGG7RWB.mjs";
+import {
+  resolveIndexPath
+} from "./token-goat-chunk-FNFBKLRD.mjs";
 import {
   init_define_import_meta_env
 } from "./token-goat-chunk-A37V4PBF.mjs";
@@ -119,21 +126,15 @@ var CompressedOutput = class {
     if (this.originalBytes <= 0) return 0;
     return 100 * this.bytesSaved / this.originalBytes;
   }
-  /**
-   * Byte cost of the trailing marker {@link withMarker} would append for this result's filter name and percentage. The marker is not free — a rewrite whose `bytesSaved` doesn't even cover its own marker is strictly worse than doing nothing.
-   */
+  /** Byte cost of the trailing marker {@link withMarker} would append for this result's filter name and percentage. The marker is not free — a rewrite whose `bytesSaved` doesn't even cover its own marker is strictly worse than doing nothing. */
   get markerBytes() {
     return byteLength(compressionMarker(this.filterName, this.percentSaved));
   }
-  /**
-   * Net savings after subtracting the marker's own byte cost — the true benefit of shipping the rewrite instead of the untouched original.
-   */
+  /** Net savings after subtracting the marker's own byte cost — the true benefit of shipping the rewrite instead of the untouched original. */
   get netSavingsBytes() {
     return this.bytesSaved - this.markerBytes;
   }
-  /**
-   * Single definition of "is this rewrite worth shipping". `minNetSavingsBytes` is the configured floor (`bash_compress.min_net_savings_bytes`) below which a rewrite is considered too trivial to justify destabilising the bytes (breaks provider prefix caching) for — every consumer that chooses between the compressed body and the original output must go through this, not re-derive its own `bytesSaved > 0` check.
-   */
+  /** Single definition of "is this rewrite worth shipping". `minNetSavingsBytes` is the configured floor (`bash_compress.min_net_savings_bytes`) below which a rewrite is considered too trivial to justify destabilising the bytes (breaks provider prefix caching) for — every consumer that chooses between the compressed body and the original output must go through this, not re-derive its own `bytesSaved > 0` check. */
   worthApplying(minNetSavingsBytes) {
     return isRewriteWorthwhile({
       originalBytes: this.originalBytes,
@@ -142,9 +143,7 @@ var CompressedOutput = class {
       minNetSavingsBytes
     });
   }
-  /**
-   * `text` with the trailing compression-summary marker appended. Skipped entirely when the rewrite doesn't clear `minNetSavingsBytes` (default 0, i.e. the marker must at least pay for itself) so raw output never carries a marker for a trivial or net-negative rewrite.
-   */
+  /** `text` with the trailing compression-summary marker appended. Skipped entirely when the rewrite doesn't clear `minNetSavingsBytes` (default 0, i.e. the marker must at least pay for itself) so raw output never carries a marker for a trivial or net-negative rewrite. */
   withMarker(minNetSavingsBytes = 0) {
     if (!this.worthApplying(minNetSavingsBytes)) return this.text;
     return this.text + compressionMarker(this.filterName, this.percentSaved);
@@ -157,9 +156,7 @@ var ToolFilter = class {
   subcommands = /* @__PURE__ */ new Set();
   /** When true, pass raw error output through on non-zero exit. */
   errorPassthrough = false;
-  /**
-   * Return true when this filter should run for `argv`. Checks `binaries` against the lowercased stem (and full name, for dot-in-name binaries like `py.test`) of `argv[0]`; when `subcommands` is non-empty, requires one in the first three positional args.
-   */
+  /** Return true when this filter should run for `argv`. Checks `binaries` against the lowercased stem (and full name, for dot-in-name binaries like `py.test`) of `argv[0]`; when `subcommands` is non-empty, requires one in the first three positional args. */
   matches(argv) {
     if (argv.length === 0) return false;
     const first = argv[0];
@@ -189,15 +186,11 @@ var ToolFilter = class {
   preClip(stdout, _argv) {
     return stdout;
   }
-  /**
-   * Hook applied to each stream right after {@link normalise}. Identity by default; the git filter family overrides it to strip CRLF warnings. Keeps `apply` free of per-family name checks.
-   */
+  /** Hook applied to each stream right after {@link normalise}. Identity by default; the git filter family overrides it to strip CRLF warnings. Keeps `apply` free of per-family name checks. */
   postNormalise(text) {
     return text;
   }
-  /**
-   * Template: when {@link errorPassthrough} is set, return the raw combined error output on non-zero exit before delegating to {@link compressBody}. Filters that handle errors structurally (pytest, cargo) override this directly and leave `errorPassthrough` false.
-   */
+  /** Template: when {@link errorPassthrough} is set, return the raw combined error output on non-zero exit before delegating to {@link compressBody}. Filters that handle errors structurally (pytest, cargo) override this directly and leave `errorPassthrough` false. */
   compress(stdout, stderr, exitCode, argv, ctx = {}) {
     if (this.errorPassthrough) {
       const err = preserveStderrOnError(stdout, stderr, exitCode);
@@ -205,18 +198,14 @@ var ToolFilter = class {
     }
     return this.compressBody(stdout, stderr, exitCode, argv, ctx);
   }
-  /**
-   * Inner compression logic, called after the error-passthrough guard. Default is a passthrough that joins the two streams — useful when the only compression is the ANSI / progress strip `apply` already performed.
-   */
+  /** Inner compression logic, called after the error-passthrough guard. Default is a passthrough that joins the two streams — useful when the only compression is the ANSI / progress strip `apply` already performed. */
   compressBody(stdout, stderr, _exitCode, _argv, _ctx = {}) {
     if (stderr && stdout) return `${stdout.replace(/\s+$/, "")}
 ---
 ${stderr.replace(/\s+$/, "")}`;
     return stdout || stderr;
   }
-  /**
-   * Top-level entry: sanitise → input cap → normalise → compress → line/byte cap → wrap in {@link CompressedOutput}. Faithful port of the Python `apply` 10-step pipeline. Errors from {@link compress} fall back to a truncated view so the agent always sees something.
-   */
+  /** Top-level entry: sanitise → input cap → normalise → compress → line/byte cap → wrap in {@link CompressedOutput}. Faithful port of the Python `apply` 10-step pipeline. Errors from {@link compress} fall back to a truncated view so the agent always sees something. */
   apply(stdout, stderr, exitCode, argv, opts = {}) {
     const maxLines = opts.maxLines ?? DEFAULT_MAX_LINES;
     const maxBytes = opts.maxBytes ?? DEFAULT_MAX_BYTES;
@@ -251,7 +240,7 @@ ${stderr.replace(/\s+$/, "")}`;
     if (soClipped !== so || seClipped !== se) {
       so = soClipped;
       se = seClipped;
-      notes.push(`clipped line(s) wider than ${INPUT_MAX_LINE_CHARS} chars`);
+      notes.push(`clipped lines wider than ${INPUT_MAX_LINE_CHARS} chars`);
     }
     const originalBytes = soBytes.length + seBytes.length;
     if (!so.trim() && !se.trim()) {
@@ -290,7 +279,7 @@ ${stderr.replace(/\s+$/, "")}`;
     const redacted = redactSecrets(body);
     body = redacted.text;
     redactedCount += redacted.count;
-    if (redactedCount > 0) notes.push(`redacted ${redactedCount} secret-shaped value(s)`);
+    if (redactedCount > 0) notes.push(`redacted ${countNoun(redactedCount, "secret-shaped value")}`);
     const shown = notes.filter((n) => n !== EARLY_EXIT_NOTE);
     if (shown.length) body = `[${shown.join("; ")}]
 ${body}`;
@@ -550,7 +539,7 @@ var GoTestFilter = class extends ToolFilter {
     maybeNote(
       notes,
       raceCount,
-      `kept ${raceCount} DATA RACE block(s) verbatim (goroutine stacks collapsed)`
+      `kept ${countNoun(raceCount, "DATA RACE block")} verbatim (goroutine stacks collapsed)`
     );
     maybeNote(notes, passCount, `collapsed ${passCount} PASS testcases`);
     maybeNote(notes, skipCount, `collapsed ${skipCount} SKIP testcases`);
@@ -1002,7 +991,7 @@ var ghCopilotFilter = makeAiCliFilter({
   name: "gh-copilot",
   binaries: ["gh"],
   dropRules: [_GH_COPILOT_SPINNER_RE, _GH_COPILOT_BANNER_RE, _GH_COPILOT_DISCLAIMER_RE],
-  droppedNoiseNote: (n) => `dropped ${n} boilerplate/disclaimer line(s)`,
+  droppedNoiseNote: (n) => `dropped ${countNoun(n, "boilerplate/disclaimer line")}`,
   // GhCopilotFilter only fires for `gh copilot explain/suggest`; the broader GhFilter in CI_FILTERS claims all other `gh` commands.
   customMatches: (argv) => {
     if (!argv.length) return false;
@@ -1019,7 +1008,7 @@ var copilotFilter = makeAiCliFilter({
   binaries: ["copilot"],
   dropRules: [_COPILOT_WORKSPACE_NOISE_RE, _GH_COPILOT_SPINNER_RE, _GH_COPILOT_BANNER_RE, _GH_COPILOT_DISCLAIMER_RE],
   keepLastRules: [{ re: _COPILOT_COMPLETION_STATS_RE, note: (v) => `stats: ${v}` }],
-  droppedNoiseNote: (n) => `dropped ${n} boilerplate/disclaimer line(s)`
+  droppedNoiseNote: (n) => `dropped ${countNoun(n, "boilerplate/disclaimer line")}`
 });
 var aiderFilter = makeAiCliFilter({
   name: "aider",
@@ -1029,14 +1018,14 @@ var aiderFilter = makeAiCliFilter({
     {
       re: _AIDER_APPLYING_RE,
       position: "prepend",
-      note: (n) => `[token-goat: ${n} 'applying edits' progress line(s) collapsed; disable via TOKEN_GOAT_BASH_COMPRESS for full output]`
+      note: (n) => `[token-goat: ${countNoun(n, "'applying edits' progress line")} collapsed; disable via TOKEN_GOAT_BASH_COMPRESS for full output]`
     }
   ],
   keepLastRules: [
     { re: _AIDER_TOKENS_RE, note: (v) => `token usage: ${v}` },
     { re: _AIDER_COST_RE, note: (v) => `cost: ${v}` }
   ],
-  droppedNoiseNote: (n) => `dropped ${n} noise line(s)`
+  droppedNoiseNote: (n) => `dropped ${countNoun(n, "noise line")}`
 });
 var geminiCliFilter = makeAiCliFilter({
   name: "gemini-cli",
@@ -1046,16 +1035,16 @@ var geminiCliFilter = makeAiCliFilter({
     {
       re: _GEMINI_STARTUP_RE,
       position: "prepend",
-      note: (n) => `[token-goat: ${n} Gemini CLI startup status line(s) collapsed; disable via TOKEN_GOAT_BASH_COMPRESS for full output]`
+      note: (n) => `[token-goat: ${countNoun(n, "Gemini CLI startup status line")} collapsed; disable via TOKEN_GOAT_BASH_COMPRESS for full output]`
     },
     {
       re: _GEMINI_TOOL_SPINNER_RE,
       position: "prepend",
-      note: (n) => `[token-goat: ${n} tool-call spinner line(s) collapsed]`
+      note: (n) => `[token-goat: ${countNoun(n, "tool-call spinner line")} collapsed]`
     }
   ],
   keepLastRules: [{ re: _GEMINI_TOKEN_METER_RE, note: (v) => `context: ${v}` }],
-  droppedNoiseNote: (n) => `dropped ${n} noise line(s)`
+  droppedNoiseNote: (n) => `dropped ${countNoun(n, "noise line")}`
 });
 var claudeCliFilter = makeAiCliFilter({
   name: "claude-cli",
@@ -1065,14 +1054,14 @@ var claudeCliFilter = makeAiCliFilter({
     {
       re: _CLAUDE_CLI_TOOL_LOG_RE,
       position: "note",
-      note: (n) => `collapsed ${n} tool-call log line(s)`
+      note: (n) => `collapsed ${countNoun(n, "tool-call log line")}`
     }
   ],
   keepLastRules: [
     { re: _CLAUDE_CLI_STATS_RE, note: (v) => `stats: ${v}` },
     { re: _CLAUDE_CLI_CONTEXT_RE, note: (v) => `context: ${v}` }
   ],
-  droppedNoiseNote: (n) => `dropped ${n} noise line(s)`,
+  droppedNoiseNote: (n) => `dropped ${countNoun(n, "noise line")}`,
   // Exact 'claude' stem only; skip management subcommands (install, update, etc.)
   customMatches: (argv) => {
     if (!argv.length) return false;
@@ -1085,7 +1074,7 @@ var cursorFilter = makeAiCliFilter({
   name: "cursor",
   binaries: ["cursor"],
   dropRules: [_CURSOR_BANNER_RE, _CURSOR_STARTUP_RE, _CURSOR_TELEMETRY_RE],
-  droppedNoiseNote: (n) => `dropped ${n} startup/telemetry noise line(s)`
+  droppedNoiseNote: (n) => `dropped ${countNoun(n, "startup/telemetry noise line")}`
 });
 var windsurfFilter = makeAiCliFilter({
   name: "windsurf",
@@ -1103,11 +1092,11 @@ var windsurfFilter = makeAiCliFilter({
     {
       re: _WINDSURF_CASCADE_TOOL_RE,
       position: "note",
-      note: (n) => `collapsed ${n} Cascade tool-call line(s); disable via TOKEN_GOAT_BASH_COMPRESS for full output`
+      note: (n) => `collapsed ${countNoun(n, "Cascade tool-call line")}; disable via TOKEN_GOAT_BASH_COMPRESS for full output`
     }
   ],
   keepLastRules: [{ re: _WINDSURF_CONTEXT_RE, note: (v) => `context: ${v}` }],
-  droppedNoiseNote: (n) => `dropped ${n} startup/activation noise line(s)`
+  droppedNoiseNote: (n) => `dropped ${countNoun(n, "startup/activation noise line")}`
 });
 var openCodeFilter = makeAiCliFilter({
   name: "opencode",
@@ -1118,7 +1107,7 @@ var openCodeFilter = makeAiCliFilter({
       // Tool calls and tool results share a single counter.
       res: [_OPENCODE_TOOL_CALL_RE, _OPENCODE_TOOL_RESULT_RE],
       position: "append",
-      note: (n) => `[token-goat: ${n} tool call/result line(s) collapsed; disable via TOKEN_GOAT_BASH_COMPRESS for full output]`
+      note: (n) => `[token-goat: ${countNoun(n, "tool call/result line")} collapsed; disable via TOKEN_GOAT_BASH_COMPRESS for full output]`
     }
   ],
   keepLastRules: [
@@ -1126,7 +1115,7 @@ var openCodeFilter = makeAiCliFilter({
     { re: _OPENCODE_MODEL_RE_KL, note: (v) => `model: ${v}` },
     { re: _OPENCODE_CONTEXT_RE, note: (v) => `context: ${v}` }
   ],
-  droppedNoiseNote: (n) => `dropped ${n} noise line(s)`
+  droppedNoiseNote: (n) => `dropped ${countNoun(n, "noise line")}`
 });
 var continueFilter = makeAiCliFilter({
   name: "continue",
@@ -1138,13 +1127,13 @@ var continueFilter = makeAiCliFilter({
       position: "append",
       keepLast: true,
       note: (n, last) => {
-        const summary = last ?? `${n} indexing progress line(s)`;
-        return `[token-goat: ${n} indexing progress line(s) collapsed; last: ${summary}; disable via TOKEN_GOAT_BASH_COMPRESS for full output]`;
+        const summary = last ?? `${countNoun(n, "indexing progress line")}`;
+        return `[token-goat: ${countNoun(n, "indexing progress line")} collapsed; last: ${summary}; disable via TOKEN_GOAT_BASH_COMPRESS for full output]`;
       }
     }
   ],
   keepLastRules: [{ re: _CONTINUE_TOKENS_RE, note: (v) => `tokens: ${v}` }],
-  droppedNoiseNote: (n) => `dropped ${n} noise line(s)`
+  droppedNoiseNote: (n) => `dropped ${countNoun(n, "noise line")}`
 });
 var clineFilter = makeAiCliFilter({
   name: "cline",
@@ -1155,7 +1144,7 @@ var clineFilter = makeAiCliFilter({
     {
       re: _CLINE_FILE_READ_RE,
       position: "append",
-      note: (n) => `[token-goat: ${n} file-read progress line(s) collapsed; disable via TOKEN_GOAT_BASH_COMPRESS for full output]`
+      note: (n) => `[token-goat: ${countNoun(n, "file-read progress line")} collapsed; disable via TOKEN_GOAT_BASH_COMPRESS for full output]`
     }
   ],
   keepLastRules: [
@@ -1163,7 +1152,7 @@ var clineFilter = makeAiCliFilter({
     { re: _CLINE_COST_RE, note: (v) => `cost: ${v}` },
     { re: _CLINE_CONTEXT_RE, note: (v) => `context: ${v}` }
   ],
-  droppedNoiseNote: (n) => `dropped ${n} noise line(s)`
+  droppedNoiseNote: (n) => `dropped ${countNoun(n, "noise line")}`
 });
 var CodexExecFilter = class extends ToolFilter {
   name = "codex-exec";
@@ -1227,7 +1216,7 @@ var CodexExecFilter = class extends ToolFilter {
       droppedTurns = labelIdxs.length - 1;
       answerLines = _trimBlankEdges(lines.slice(lastCodexIdx + 1, scanEnd));
     }
-    const dropped = droppedTurns > 0 ? `, ${droppedTurns} earlier turn(s) dropped` : "";
+    const dropped = droppedTurns > 0 ? `, ${countNoun(droppedTurns, "earlier turn")} dropped` : "";
     const summary = `[codex: model=${model}, tokens=${tokensCount}${dropped}]`;
     return this.finalize([summary, ...answerLines]);
   }
@@ -1299,10 +1288,10 @@ var GradleFilter = class extends ToolFilter {
     const posArgs = positionalArgs(argv.slice(1));
     const sub = posArgs[0]?.toLowerCase() ?? "";
     if (sub === "dependencies" || sub === "deps") {
-      return headTailCompress(merged.split("\n"), 10, 10, "lines");
+      return headTailCompress(merged.split("\n"), 10, 10, "line");
     }
     if (sub === "tasks") {
-      return headTailCompress(merged.split("\n"), 20, 5, "lines");
+      return headTailCompress(merged.split("\n"), 20, 5, "line");
     }
     return this._compressBuild(merged);
   }
@@ -1321,7 +1310,7 @@ var GradleFilter = class extends ToolFilter {
     let droppedTestSkipped = 0;
     const flushSuppressedFrames = () => {
       if (suppressedInTrace > 0) {
-        kept.push(`[token-goat: \u2026and ${suppressedInTrace} more stack frames]`);
+        kept.push(`[token-goat: \u2026and ${countNoun(suppressedInTrace, "more stack frame")}]`);
         suppressedInTrace = 0;
       }
     };
@@ -1418,15 +1407,15 @@ var MavenFilter = class extends ToolFilter {
     const posArgs = positionalArgs(argv.slice(1));
     const sub = posArgs[0] ?? "";
     if (sub === "dependency:tree") {
-      return headTailCompress(lines, 10, 10, "lines");
+      return headTailCompress(lines, 10, 10, "line");
     }
     if (sub === "install") {
-      return headTailCompress(lines, 5, 30, "lines");
+      return headTailCompress(lines, 5, 30, "line");
     }
     if (sub === "test" || sub === "verify" || sub === "package") {
       return this._compressTest(lines);
     }
-    return headTailCompress(lines, 10, 10, "lines");
+    return headTailCompress(lines, 10, 10, "line");
   }
   _compressTest(lines) {
     const kept = [];
@@ -2000,7 +1989,7 @@ var LernaFilter = class extends ToolFilter {
       kept.push(line);
     }
     const out = [...ranSample];
-    if (ranExtra) out.push(`[token-goat: \u2026and ${ranExtra} more 'info run Ran' lines]`);
+    if (ranExtra) out.push(`[token-goat: \u2026and ${countNoun(ranExtra, "more 'info run Ran' line")}]`);
     out.push(...kept);
     return this.finalize(out);
   }
@@ -2063,7 +2052,7 @@ var TurboFilter = class extends ToolFilter {
       kept.push(line);
     }
     const notes = [];
-    maybeNote(notes, cacheHitTasks.size, `collapsed ${cacheHitTasks.size} cache-hit task(s)`);
+    maybeNote(notes, cacheHitTasks.size, `collapsed ${countNoun(cacheHitTasks.size, "cache-hit task")}`);
     this.emitNotes(kept, notes);
     return this.finalize(kept);
   }
@@ -2668,7 +2657,7 @@ ${stdout.replace(/\s+$/, "")}` : stderr : stdout;
     maybeNote(notes, droppedProgress, `dropped ${droppedProgress} Checking/Downloading/progress lines`);
     const failed = exitCode !== 0 || kept.some((l) => CARGO_ERROR_HEADER_RE.test(l));
     const collapsedWarnings = failed ? collapseCargoWarnings(kept) : 0;
-    maybeNote(notes, collapsedWarnings, `collapsed ${collapsedWarnings} warning block(s) because the build failed`);
+    maybeNote(notes, collapsedWarnings, `collapsed ${countNoun(collapsedWarnings, "warning block")} because the build failed`);
     this.emitNotes(kept, notes);
     return this.finalize(kept);
   }
@@ -3048,11 +3037,7 @@ var GhRunLogFilter = class extends ToolFilter {
     const name = pathName(first).toLowerCase();
     if (stem !== "gh" && name !== "gh") return false;
     const positionals = positionalArgs(argv.slice(1));
-    return positionals.length >= 2 && positionals[0] === "run" && positionals[1] === "view" && // `--log-failed` is the CI-triage spelling and emits the identical
-    // job/step/timestamp column format, so it needs this filter too. A plain
-    // `argv.includes('--log')` is a whole-token test and never matches it,
-    // which sent it to GhFilter -- whose pass-step regex anchors at line
-    // start and so matches nothing while the column prefix is still present.
+    return positionals.length >= 2 && positionals[0] === "run" && positionals[1] === "view" && // `--log-failed` is the CI-triage spelling and emits the identical job/step/timestamp column format, so it needs this filter too. A plain `argv.includes('--log')` is a whole-token test and never matches it, which sent it to GhFilter -- whose pass-step regex anchors at line start and so matches nothing while the column prefix is still present.
     (argv.includes("--log") || argv.includes("--log-failed"));
   }
   compress(stdout, stderr, _exitCode, _argv) {
@@ -3122,13 +3107,13 @@ var GhRunLogFilter = class extends ToolFilter {
     }
     flushGroup();
     if (setupActions.length) {
-      kept.push(`[token-goat: Setup: ${setupActions.length} action(s) collapsed]`);
+      kept.push(`[token-goat: Setup: ${countNoun(setupActions.length, "action")} collapsed]`);
     }
     const notes = [];
     maybeNote(notes, droppedBoilerplate, `dropped ${droppedBoilerplate} boilerplate lines`);
     maybeNote(notes, droppedCommands, `dropped ${droppedCommands} ##[command] echo lines`);
     maybeNote(notes, droppedCleanup, `dropped ${droppedCleanup} cleanup lines`);
-    maybeNote(notes, collapsedGroups, `collapsed ${collapsedGroups} log group(s)`);
+    maybeNote(notes, collapsedGroups, `collapsed ${countNoun(collapsedGroups, "log group")}`);
     this.emitNotes(kept, notes);
     return this.finalize(kept);
   }
@@ -3247,7 +3232,7 @@ var PreCommitFilter = class extends ToolFilter {
         const status = m.groups?.["status"] ?? "";
         if (status === "Failed" || status === "Pre-commit hook failed") {
           if (passed || skipped) {
-            kept.push(`[token-goat: collapsed ${passed} Passed, ${skipped} Skipped hook(s)]`);
+            kept.push(`[token-goat: collapsed ${passed} Passed, ${countNoun(skipped, "Skipped hook")}]`);
             passed = 0;
             skipped = 0;
           }
@@ -3275,7 +3260,7 @@ var PreCommitFilter = class extends ToolFilter {
       kept.push(line);
     }
     if (passed || skipped) {
-      kept.push(`[token-goat: collapsed ${passed} Passed, ${skipped} Skipped hook(s)]`);
+      kept.push(`[token-goat: collapsed ${passed} Passed, ${countNoun(skipped, "Skipped hook")}]`);
     }
     if (infoDropped) {
       kept.push(`[token-goat: dropped ${infoDropped} pre-commit [INFO] env-setup lines]`);
@@ -3361,7 +3346,7 @@ var BanditFilter = class extends ToolFilter {
     }
     if (inIssue) flushIssue();
     const notes = [];
-    maybeNote(notes, lowDropped, `collapsed ${lowDropped} LOW severity issue block(s)`);
+    maybeNote(notes, lowDropped, `collapsed ${countNoun(lowDropped, "LOW severity issue block")}`);
     this.emitNotes(kept, notes);
     return this.finalize(kept);
   }
@@ -3492,7 +3477,7 @@ var SnykFilter = class extends ToolFilter {
       if (_SNYK_LICENSE_RE.test(line) && !_SNYK_TREE_LINE_RE.test(line)) {
         if (inMoreAbout) {
           if (moreAboutDropped) {
-            kept.push(`[token-goat: collapsed ${moreAboutDropped} 'More about' URL line(s)]`);
+            kept.push(`[token-goat: collapsed ${countNoun(moreAboutDropped, "'More about' URL line")}]`);
             moreAboutDropped = 0;
           }
           inMoreAbout = false;
@@ -3509,7 +3494,7 @@ var SnykFilter = class extends ToolFilter {
         if (line.trim() && !line.trim().startsWith("http")) {
           inMoreAbout = false;
           if (moreAboutDropped) {
-            kept.push(`[token-goat: collapsed ${moreAboutDropped} 'More about' URL line(s)]`);
+            kept.push(`[token-goat: collapsed ${countNoun(moreAboutDropped, "'More about' URL line")}]`);
             moreAboutDropped = 0;
           }
         } else {
@@ -3539,14 +3524,14 @@ var SnykFilter = class extends ToolFilter {
         treeHidden = 0;
       }
       if (moreAboutDropped) {
-        kept.push(`[token-goat: collapsed ${moreAboutDropped} 'More about' URL line(s)]`);
+        kept.push(`[token-goat: collapsed ${countNoun(moreAboutDropped, "'More about' URL line")}]`);
         moreAboutDropped = 0;
       }
       kept.push(line);
     }
     if (treeHidden) kept.push(`[token-goat: +${treeHidden} dependency tree lines collapsed]`);
     if (moreAboutDropped) {
-      kept.push(`[token-goat: collapsed ${moreAboutDropped} 'More about' URL line(s)]`);
+      kept.push(`[token-goat: collapsed ${countNoun(moreAboutDropped, "'More about' URL line")}]`);
     }
     return this.finalize(kept);
   }
@@ -3582,7 +3567,7 @@ var SemgrepFilter = class extends ToolFilter {
           }
         }
         if (localDropped) {
-          blockOut.push(`  [token-goat: collapsed ${localDropped} Details/annotation URL line(s)]`);
+          blockOut.push(`  [token-goat: collapsed ${countNoun(localDropped, "Details/annotation URL line")}]`);
         }
         kept.push(...blockOut);
         ruleCounts.set(currentRule, count + 1);
@@ -3607,7 +3592,7 @@ var SemgrepFilter = class extends ToolFilter {
         currentBlock = [];
         for (const [ruleId, supCnt] of [...ruleSuppressed.entries()].sort()) {
           kept.push(
-            `[token-goat: ${ruleId} \u2014 ${supCnt} additional match(es) collapsed (kept first ${this._maxPerRule})]`
+            `[token-goat: ${ruleId} \u2014 ${countNoun(supCnt, "additional match", "additional matches")} collapsed (kept first ${this._maxPerRule})]`
           );
         }
         ruleSuppressed.clear();
@@ -3626,7 +3611,7 @@ var SemgrepFilter = class extends ToolFilter {
     flushBlock();
     for (const [ruleId, supCnt] of [...ruleSuppressed.entries()].sort()) {
       kept.push(
-        `[token-goat: ${ruleId} \u2014 ${supCnt} additional match(es) collapsed (kept first ${this._maxPerRule})]`
+        `[token-goat: ${ruleId} \u2014 ${countNoun(supCnt, "additional match", "additional matches")} collapsed (kept first ${this._maxPerRule})]`
       );
     }
     return this.finalize(kept);
@@ -3807,10 +3792,10 @@ ${stderr.replace(/\s+$/, "")}` : stderr;
       kept.push(line);
     }
     const notes = [];
-    maybeNote(notes, uploadCount, `uploaded ${uploadCount} file(s)`);
-    maybeNote(notes, downloadCount, `downloaded ${downloadCount} file(s)`);
-    maybeNote(notes, failedCount, `${failedCount} transfer(s) failed`);
-    maybeNote(notes, progressDropped, `dropped ${progressDropped} progress line(s)`);
+    maybeNote(notes, uploadCount, `uploaded ${countNoun(uploadCount, "file")}`);
+    maybeNote(notes, downloadCount, `downloaded ${countNoun(downloadCount, "file")}`);
+    maybeNote(notes, failedCount, `${countNoun(failedCount, "transfer")} failed`);
+    maybeNote(notes, progressDropped, `dropped ${countNoun(progressDropped, "progress line")}`);
     this.emitNotes(kept, notes);
     return this.finalize(kept);
   }
@@ -3848,7 +3833,7 @@ ${stderr.replace(/\s+$/, "")}` : stderr;
         inProgressRun.delete(resourceId);
         if (prevCount) {
           keptEvents.push({
-            __token_goat__: `${prevCount} repeated ${prevStatus} event(s) for ${resourceId} collapsed`
+            __token_goat__: `${prevCount} repeated ${prevStatus} ${prevCount === 1 ? "event" : "events"} for ${resourceId} collapsed`
           });
         }
         keptEvents.push(event);
@@ -3858,7 +3843,7 @@ ${stderr.replace(/\s+$/, "")}` : stderr;
         if (prevCount) {
           const prevStatus = lastResourceStatus.get(resourceId) ?? "IN_PROGRESS";
           keptEvents.push({
-            __token_goat__: `${prevCount} repeated ${prevStatus} event(s) for ${resourceId} collapsed`
+            __token_goat__: `${prevCount} repeated ${prevStatus} ${prevCount === 1 ? "event" : "events"} for ${resourceId} collapsed`
           });
         }
         keptEvents.push(event);
@@ -3869,7 +3854,7 @@ ${stderr.replace(/\s+$/, "")}` : stderr;
       if (count) {
         const prevStatus = lastResourceStatus.get(resourceId) ?? "IN_PROGRESS";
         keptEvents.push({
-          __token_goat__: `${count} repeated ${prevStatus} event(s) for ${resourceId} collapsed`
+          __token_goat__: `${count} repeated ${prevStatus} ${count === 1 ? "event" : "events"} for ${resourceId} collapsed`
         });
       }
     }
@@ -3920,8 +3905,8 @@ ${stderr.replace(/\s+$/, "")}` : stderr;
     }
     kept = this._maybeCollapseStructured(kept);
     const notes = [];
-    maybeNote(notes, spinnersDropped, `dropped ${spinnersDropped} spinner line(s)`);
-    maybeNote(notes, apiEnableDropped, `collapsed ${apiEnableDropped} API enablement line(s)`);
+    maybeNote(notes, spinnersDropped, `dropped ${countNoun(spinnersDropped, "spinner line")}`);
+    maybeNote(notes, apiEnableDropped, `collapsed ${countNoun(apiEnableDropped, "API enablement line")}`);
     this.emitNotes(kept, notes);
     return this.finalize(kept);
   }
@@ -3994,7 +3979,7 @@ ${stderr.replace(/\s+$/, "")}` : stderr;
     }
     if (inProgressRun && lastProgressStatus) kept.push(lastProgressStatus);
     const notes = [];
-    maybeNote(notes, previewDropped, `collapsed ${previewDropped} preview warning(s)`);
+    maybeNote(notes, previewDropped, `collapsed ${countNoun(previewDropped, "preview warning")}`);
     this.emitNotes(kept, notes);
     return this.finalize(kept);
   }
@@ -4036,7 +4021,7 @@ var TerraformFilter = class extends ToolFilter {
       const filtered = lines.filter((ln) => !_TF_REFRESH_RE.test(ln));
       if (filtered.length > 30) {
         const nonEmpty = filtered.filter((ln) => ln.trim());
-        text = headTailCompress(nonEmpty, 10, 20, "lines");
+        text = headTailCompress(nonEmpty, 10, 20, "line");
       } else if (filtered.length < lines.length) {
         text = filtered.join("\n");
       }
@@ -4143,7 +4128,7 @@ ${stderr.replace(/\s+$/, "")}` : stderr;
     }
     const notes = [];
     maybeNote(notes, droppedRefresh, `dropped ${droppedRefresh} terraform refresh/read lines`);
-    maybeNote(notes, droppedNoChange, `collapsed ${droppedNoChange} unchanged/read-only block(s)`);
+    maybeNote(notes, droppedNoChange, `collapsed ${countNoun(droppedNoChange, "unchanged/read-only block")}`);
     maybeNote(notes, droppedKaa, `collapsed ${droppedKaa} (known after apply) attribute lines`);
     this.emitNotes(finalKept, notes);
     return this.finalize(finalKept);
@@ -4185,7 +4170,7 @@ ${stderr.replace(/\s+$/, "")}` : stderr;
     for (const line of stillLast.values()) kept.push(line);
     const notes = [];
     maybeNote(notes, droppedRefresh, `dropped ${droppedRefresh} terraform refresh/read lines`);
-    maybeNote(notes, stillDropped, `collapsed ${stillDropped} Still creating/modifying line(s)`);
+    maybeNote(notes, stillDropped, `collapsed ${countNoun(stillDropped, "Still creating/modifying line")}`);
     this.emitNotes(kept, notes);
     return this.finalize(kept);
   }
@@ -4205,7 +4190,7 @@ ${stderr.replace(/\s+$/, "")}` : stderr;
     const notes = [];
     maybeNote(notes, providerCollapsed, `collapsed ${providerCollapsed} provider install/find lines`);
     if (nonEmpty.length > 12) {
-      let compressed = headTailCompress(nonEmpty, 5, 5, "lines");
+      let compressed = headTailCompress(nonEmpty, 5, 5, "line");
       if (notes.length) compressed = `${compressed.replace(/\s+$/, "")}
 [token-goat: ${notes.join("; ")}]`;
       return compressed;
@@ -4257,7 +4242,7 @@ ${stderr.replace(/\s+$/, "")}` : stderr;
     if (collapsedTotal === 0) {
       const nonEmpty = kept.filter((ln) => ln.trim());
       if (nonEmpty.length > 30) {
-        return headTailCompress(nonEmpty, 20, 10, "lines");
+        return headTailCompress(nonEmpty, 20, 10, "line");
       }
     }
     const notes = [];
@@ -4438,7 +4423,7 @@ var AnsibleFilter = class extends ToolFilter {
     const merged = this.combineOutput(stdout, stderr);
     const nonEmpty = merged.split("\n").filter((ln) => ln.trim());
     if (nonEmpty.length > 10) {
-      return headTailCompress(nonEmpty, 5, 5, "galaxy lines");
+      return headTailCompress(nonEmpty, 5, 5, "galaxy line");
     }
     return nonEmpty.join("\n");
   }
@@ -4596,13 +4581,13 @@ var VaultFilter = class extends ToolFilter {
       } else {
         kept.push(...listItems.slice(0, 5));
         kept.push(
-          `[token-goat: ${listItems.length - 5} more secret path(s) omitted; disable via TOKEN_GOAT_BASH_COMPRESS for full list]`
+          `[token-goat: ${countNoun(listItems.length - 5, "more secret path")} omitted; disable via TOKEN_GOAT_BASH_COMPRESS for full list]`
         );
       }
     }
     const notes = [];
-    maybeNote(notes, metaCount, `collapsed ${metaCount} Vault lease/token metadata line(s)`);
-    maybeNote(notes, dividerCount, `dropped ${dividerCount} table divider line(s)`);
+    maybeNote(notes, metaCount, `collapsed ${countNoun(metaCount, "Vault lease/token metadata line")}`);
+    maybeNote(notes, dividerCount, `dropped ${countNoun(dividerCount, "table divider line")}`);
     this.emitNotes(kept, notes);
     return this.finalize(kept);
   }
@@ -4656,15 +4641,15 @@ var PackerFilter = class extends ToolFilter {
     const out = [];
     if (waitingCount) {
       out.push(
-        `[token-goat: ${waitingCount} SSH/WinRM connection-wait poll line(s) collapsed; disable via TOKEN_GOAT_BASH_COMPRESS for full output]`
+        `[token-goat: ${countNoun(waitingCount, "SSH/WinRM connection-wait poll line")} collapsed; disable via TOKEN_GOAT_BASH_COMPRESS for full output]`
       );
     }
     if (provisionerCount) {
-      out.push(`[token-goat: collapsed ${provisionerCount} provisioner step announcement(s)]`);
+      out.push(`[token-goat: collapsed ${countNoun(provisionerCount, "provisioner step announcement")}]`);
     }
     out.push(...kept);
     const notes = [];
-    maybeNote(notes, noiseCount, `dropped ${noiseCount} network/heartbeat/pause noise line(s)`);
+    maybeNote(notes, noiseCount, `dropped ${countNoun(noiseCount, "network/heartbeat/pause noise line")}`);
     this.emitNotes(out, notes);
     return this.finalize(out);
   }
@@ -4735,18 +4720,18 @@ var NixFilter = class extends ToolFilter {
     const out = [];
     if (fetchCount) {
       out.push(
-        `[token-goat: fetched/substituted ${fetchCount} store path(s) from binary cache; disable via TOKEN_GOAT_BASH_COMPRESS for full list]`
+        `[token-goat: fetched/substituted ${countNoun(fetchCount, "store path")} from binary cache; disable via TOKEN_GOAT_BASH_COMPRESS for full list]`
       );
     }
     if (buildCount) {
-      out.push(`[token-goat: built ${buildCount} Nix derivation(s)]`);
+      out.push(`[token-goat: built ${countNoun(buildCount, "Nix derivation")}]`);
     }
     if (flakeUpdateCount) {
-      out.push(`[token-goat: collapsed ${flakeUpdateCount} flake lock update line(s)]`);
+      out.push(`[token-goat: collapsed ${countNoun(flakeUpdateCount, "flake lock update line")}]`);
     }
     out.push(...kept);
     const notes = [];
-    maybeNote(notes, droppedNoise, `dropped ${droppedNoise} Nix scheduler/sandbox noise line(s)`);
+    maybeNote(notes, droppedNoise, `dropped ${countNoun(droppedNoise, "Nix scheduler/sandbox noise line")}`);
     this.emitNotes(out, notes);
     return this.finalize(out);
   }
@@ -4801,19 +4786,19 @@ var WranglerFilter = class extends ToolFilter {
     const out = [];
     if (uploadCount) {
       out.push(
-        `[token-goat: ${uploadCount} asset upload line(s) collapsed; disable via TOKEN_GOAT_BASH_COMPRESS for full list]`
+        `[token-goat: ${countNoun(uploadCount, "asset upload line")} collapsed; disable via TOKEN_GOAT_BASH_COMPRESS for full list]`
       );
     }
     if (skipCount) {
-      out.push(`[token-goat: ${skipCount} asset-skip line(s) collapsed]`);
+      out.push(`[token-goat: ${countNoun(skipCount, "asset-skip line")} collapsed]`);
     }
     if (bulkCount) {
-      out.push(`[token-goat: ${bulkCount} bulk-operation progress line(s) collapsed]`);
+      out.push(`[token-goat: ${countNoun(bulkCount, "bulk-operation progress line")} collapsed]`);
     }
     out.push(...kept);
     const notes = [];
-    maybeNote(notes, droppedBuild, `dropped ${droppedBuild} build-step noise line(s)`);
-    maybeNote(notes, droppedDev, `dropped ${droppedDev} dev-mode noise line(s)`);
+    maybeNote(notes, droppedBuild, `dropped ${countNoun(droppedBuild, "build-step noise line")}`);
+    maybeNote(notes, droppedDev, `dropped ${countNoun(droppedDev, "dev-mode noise line")}`);
     this.emitNotes(out, notes);
     return this.finalize(out);
   }
@@ -4870,16 +4855,16 @@ var HardhatFilter = class extends ToolFilter {
     const out = [];
     if (compilingCount) {
       out.push(
-        `[token-goat: collapsed ${compilingCount} Solidity compilation step line(s); disable via TOKEN_GOAT_BASH_COMPRESS for full output]`
+        `[token-goat: collapsed ${countNoun(compilingCount, "Solidity compilation step line")}; disable via TOKEN_GOAT_BASH_COMPRESS for full output]`
       );
     }
     if (solcTimingCount) {
-      out.push(`[token-goat: collapsed ${solcTimingCount} Solc per-version timing line(s)]`);
+      out.push(`[token-goat: collapsed ${countNoun(solcTimingCount, "Solc per-version timing line")}]`);
     }
     out.push(...kept);
     const notes = [];
-    maybeNote(notes, passCount, `collapsed ${passCount} passing test line(s)`);
-    maybeNote(notes, txNoiseCount, `dropped ${txNoiseCount} transaction receipt noise line(s)`);
+    maybeNote(notes, passCount, `collapsed ${countNoun(passCount, "passing test line")}`);
+    maybeNote(notes, txNoiseCount, `dropped ${countNoun(txNoiseCount, "transaction receipt noise line")}`);
     this.emitNotes(out, notes);
     return this.finalize(out);
   }
@@ -4930,13 +4915,13 @@ var ServerlessFilter = class extends ToolFilter {
     const out = [];
     if (stepCount) {
       out.push(
-        `[token-goat: collapsed ${stepCount} Serverless deploy step line(s); disable via TOKEN_GOAT_BASH_COMPRESS for full output]`
+        `[token-goat: collapsed ${countNoun(stepCount, "Serverless deploy step line")}; disable via TOKEN_GOAT_BASH_COMPRESS for full output]`
       );
     }
     out.push(...kept);
     const notes = [];
-    maybeNote(notes, inProgressCount, `dropped ${inProgressCount} CF _IN_PROGRESS event line(s)`);
-    maybeNote(notes, dotCount, `dropped ${dotCount} polling dot line(s)`);
+    maybeNote(notes, inProgressCount, `dropped ${countNoun(inProgressCount, "CF _IN_PROGRESS event line")}`);
+    maybeNote(notes, dotCount, `dropped ${countNoun(dotCount, "polling dot line")}`);
     this.emitNotes(out, notes);
     return this.finalize(out);
   }
@@ -5003,15 +4988,15 @@ var FlyFilter = class extends ToolFilter {
     const out = [];
     if (buildStepCount) {
       out.push(
-        `[token-goat: ${buildStepCount} Docker build step line(s) collapsed; disable via TOKEN_GOAT_BASH_COMPRESS for full output]`
+        `[token-goat: ${countNoun(buildStepCount, "Docker build step line")} collapsed; disable via TOKEN_GOAT_BASH_COMPRESS for full output]`
       );
     }
     if (machineWaitCount) {
-      out.push(`[token-goat: ${machineWaitCount} per-machine wait line(s) collapsed]`);
+      out.push(`[token-goat: ${countNoun(machineWaitCount, "per-machine wait line")} collapsed]`);
     }
     out.push(...kept);
     const notes = [];
-    maybeNote(notes, droppedNoise, `dropped ${droppedNoise} DNS/polling noise line(s)`);
+    maybeNote(notes, droppedNoise, `dropped ${countNoun(droppedNoise, "DNS/polling noise line")}`);
     this.emitNotes(out, notes);
     return this.finalize(out);
   }
@@ -5078,13 +5063,13 @@ var ForgeFilter = class extends ToolFilter {
     const out = [];
     if (compilingCount) {
       out.push(
-        `[token-goat: ${compilingCount} Solidity compilation step line(s) collapsed; disable via TOKEN_GOAT_BASH_COMPRESS for full output]`
+        `[token-goat: ${countNoun(compilingCount, "Solidity compilation step line")} collapsed; disable via TOKEN_GOAT_BASH_COMPRESS for full output]`
       );
     }
     out.push(...kept);
     const notes = [];
-    maybeNote(notes, passCount, `collapsed ${passCount} passing test line(s)`);
-    maybeNote(notes, droppedGasSep, `dropped ${droppedGasSep} gas-report table separator row(s)`);
+    maybeNote(notes, passCount, `collapsed ${countNoun(passCount, "passing test line")}`);
+    maybeNote(notes, droppedGasSep, `dropped ${countNoun(droppedGasSep, "gas-report table separator row")}`);
     this.emitNotes(out, notes);
     return this.finalize(out);
   }
@@ -5132,7 +5117,7 @@ function collapseDiffBlocksToCap(outBlocks, maxLines, shape) {
     const hunkCount = lines.filter((ln) => shape.isHunkHeader(ln)).length;
     const added = lines.filter(isDiffAdd).length;
     const removed = lines.filter(isDiffRemove).length;
-    const summary = `[token-goat: ${hunkCount} hunk(s), +${added} -${removed} lines collapsed to fit the line cap]`;
+    const summary = `[token-goat: ${countNoun(hunkCount, "hunk")}, +${added} -${removed} lines collapsed to fit the line cap]`;
     return { headerLines, summary, size: headerLines.length + 1 };
   };
   const collapsedSizes = outBlocks.map((block, i) => isFileBlock[i] ? collapsedFormOf(block).size : 0);
@@ -5243,16 +5228,16 @@ var GrepFilter = class extends ToolFilter {
     }
     const totalMatches = [...fileCounts.values()].reduce((a, b) => a + b, 0) + unattributed;
     const numFiles = fileCounts.size;
-    const outLines = ctx.inputTruncated ? [`grep: at least ${totalMatches} matches across ${numFiles} file(s) (counted over a truncated input; per-file counts below are lower bounds)`] : [`grep: ${totalMatches} matches across ${numFiles} file(s)`];
+    const outLines = ctx.inputTruncated ? [`grep: at least ${countNoun(totalMatches, "match", "matches")} across ${countNoun(numFiles, "file")} (counted over a truncated input; per-file counts below are lower bounds)`] : [`grep: ${countNoun(totalMatches, "match", "matches")} across ${countNoun(numFiles, "file")}`];
     const sorted = [...fileCounts.entries()].sort((a, b) => b[1] - a[1]);
     const shown = sorted.slice(0, _GREP_MAX_FILE_LINES);
     for (const [fname, count] of shown) {
-      outLines.push(`  ${fname}: ${count} match(es)`);
+      outLines.push(`  ${fname}: ${countNoun(count, "match", "matches")}`);
     }
     if (sorted.length > _GREP_MAX_FILE_LINES) {
       const remaining = sorted.length - _GREP_MAX_FILE_LINES;
       outLines.push(
-        `  [token-goat: +${remaining} more file(s) elided; use a more specific pattern or --include=<glob> to narrow]`
+        `  [token-goat: +${countNoun(remaining, "more file")} elided; use a more specific pattern or --include=<glob> to narrow]`
       );
     }
     if (unattributed) {
@@ -5285,10 +5270,7 @@ var RgFilter = class _RgFilter extends ToolFilter {
     }
     return false;
   }
-  // RgFilter only handles context-block output (-A/-B/-C/--context); a plain
-  // grep/rg with no context flags falls through to GrepFilter's per-file
-  // match-count summarizer, which produces dramatically smaller output.
-  // Both line regexes hard-code ripgrep's default field separators (`:` after a match's line number, `-` after a context line's). `--field-match-separator=-` makes a real match read `12-text`, which is exactly the shape this filter drops, so a search that overrides either separator is released to the generic path rather than compressed against an assumption it broke.
+  // RgFilter only handles context-block output (-A/-B/-C/--context); a plain grep/rg with no context flags falls through to GrepFilter's per-file match-count summarizer, which produces dramatically smaller output. Both line regexes hard-code ripgrep's default field separators (`:` after a match's line number, `-` after a context line's). `--field-match-separator=-` makes a real match read `12-text`, which is exactly the shape this filter drops, so a search that overrides either separator is released to the generic path rather than compressed against an assumption it broke.
   static _hasCustomFieldSeparator(argv) {
     const flags = ["--field-match-separator", "--field-context-separator"];
     return argv.some((a) => flags.some((f) => a === f || a.startsWith(f + "=")));
@@ -5311,7 +5293,7 @@ var RgFilter = class _RgFilter extends ToolFilter {
     const firstDropped = scored[_RG_TOP_GROUPS]?.score;
     const tied = firstDropped !== void 0 && firstDropped === lastKept;
     return joined + `
-[token-goat: ${suppressed} more match groups suppressed${tied ? ", tied on match count with the ones kept and separated only by filename order" : ", each with fewer matches than those kept"}: rerun with -l for filenames only]`;
+[token-goat: ${countNoun(suppressed, "more match group")} suppressed${tied ? ", tied on match count with the ones kept and separated only by filename order" : ", each with fewer matches than those kept"}: rerun with -l for filenames only]`;
   }
   // Same per-line clip GrepFilter applies: every branch below can return match lines verbatim, so the cap is applied once here rather than at each of the five return sites.
   compress(stdout, stderr, exitCode, argv) {
@@ -5344,8 +5326,8 @@ var RgFilter = class _RgFilter extends ToolFilter {
 };
 var _LS_PASSTHROUGH = 25;
 var _LS_MAX_ENTRIES = 10;
-var _LS_HIDDEN_MARKER = "[token-goat: {n} more entries \u2014 use eza --tree or ls | grep PATTERN to filter]";
-var _LS_HIDDEN_MARKER_EXT = "[token-goat: {n} more entries \u2014 by type: {ext_summary}]";
+var _LS_HIDDEN_MARKER = "[token-goat: {n} \u2014 use eza --tree or ls | grep PATTERN to filter]";
+var _LS_HIDDEN_MARKER_EXT = "[token-goat: {n} \u2014 by type: {ext_summary}]";
 function _lsExtFromLine(line) {
   const stripped = line.trimEnd();
   if (stripped.endsWith("/")) return null;
@@ -5409,7 +5391,7 @@ var LsFilter = class _LsFilter extends ToolFilter {
     const hiddenCount = entryIdx.length - keptEntryIdx.size;
     const fileEntries = entryIdx.slice(_LS_MAX_ENTRIES).map((i) => lines[i]).filter((l) => !_DIR_EXE_DIR_ENTRY_RE.test(l));
     const extPart = _lsExtSummary(fileEntries);
-    const hiddenMarker = extPart ? _LS_HIDDEN_MARKER_EXT.replace("{n}", String(hiddenCount)).replace("{ext_summary}", () => extPart) : _LS_HIDDEN_MARKER.replace("{n}", String(hiddenCount));
+    const hiddenMarker = extPart ? _LS_HIDDEN_MARKER_EXT.replace("{n}", () => countNoun(hiddenCount, "more entry", "more entries")).replace("{ext_summary}", () => extPart) : _LS_HIDDEN_MARKER.replace("{n}", () => countNoun(hiddenCount, "more entry", "more entries"));
     const out = [];
     let hiddenMarkerEmitted = false;
     for (let i = 0; i < lines.length; i++) {
@@ -5448,9 +5430,9 @@ var LsFilter = class _LsFilter extends ToolFilter {
     const hidden = entries.length - _LS_MAX_ENTRIES;
     const extPart = _lsExtSummary(entries.slice(_LS_MAX_ENTRIES));
     if (extPart) {
-      out.push(_LS_HIDDEN_MARKER_EXT.replace("{n}", String(hidden)).replace("{ext_summary}", () => extPart));
+      out.push(_LS_HIDDEN_MARKER_EXT.replace("{n}", () => countNoun(hidden, "more entry", "more entries")).replace("{ext_summary}", () => extPart));
     } else {
-      out.push(_LS_HIDDEN_MARKER.replace("{n}", String(hidden)));
+      out.push(_LS_HIDDEN_MARKER.replace("{n}", () => countNoun(hidden, "more entry", "more entries")));
     }
     return out;
   }
@@ -5484,9 +5466,7 @@ var _SUMMARY_KEYWORDS = ["director", "file", "total"];
 var EzaFilter = class _EzaFilter extends ToolFilter {
   name = "eza";
   binaries = /* @__PURE__ */ new Set(["eza", "exa", "ls"]);
-  // Flags eza/exa support that plain GNU/BSD `ls` does not -- used to disambiguate the shared
-  // 'ls' binary claim below (a common `alias ls=eza` setup means the literal command text is
-  // "ls ...", but token-goat only ever sees that raw text, never the shell's alias resolution).
+  // Flags eza/exa support that plain GNU/BSD `ls` does not -- used to disambiguate the shared 'ls' binary claim below (a common `alias ls=eza` setup means the literal command text is "ls ...", but token-goat only ever sees that raw text, never the shell's alias resolution).
   static _EZA_ONLY_FLAGS = /* @__PURE__ */ new Set([
     "--tree",
     "-T",
@@ -5497,14 +5477,7 @@ var EzaFilter = class _EzaFilter extends ToolFilter {
     "--git-repos-no-status",
     "--level"
   ]);
-  // LsFilter (registered before EzaFilter in SHELL_FILE_FILTERS) always wins a plain `ls`
-  // invocation since binary-name matching alone can't tell a real GNU/BSD `ls` from an
-  // `alias ls=eza` shell alias -- the literal command text is "ls ..." either way. Without this
-  // gate, EzaFilter's own 'ls' binary claim was permanently unreachable dead code: LsFilter's
-  // generic ls-format compressor (no awareness of eza's tree/column output) silently ran on
-  // every aliased `ls --tree`/`ls --icons`/etc. invocation instead. Mirrors RgFilter's own
-  // `_hasContextFlags` gate, which resolves the same kind of shared-binary ambiguity between
-  // itself and GrepFilter.
+  // LsFilter (registered before EzaFilter in SHELL_FILE_FILTERS) always wins a plain `ls` invocation since binary-name matching alone can't tell a real GNU/BSD `ls` from an `alias ls=eza` shell alias -- the literal command text is "ls ..." either way. Without this gate, EzaFilter's own 'ls' binary claim was permanently unreachable dead code: LsFilter's generic ls-format compressor (no awareness of eza's tree/column output) silently ran on every aliased `ls --tree`/`ls --icons`/etc. invocation instead. Mirrors RgFilter's own `_hasContextFlags` gate, which resolves the same kind of shared-binary ambiguity between itself and GrepFilter.
   matches(argv) {
     if (!super.matches(argv)) return false;
     const first = argv[0];
@@ -5525,7 +5498,7 @@ var EzaFilter = class _EzaFilter extends ToolFilter {
   }
   _compressTree(nonEmpty) {
     if (nonEmpty.length <= 60) return nonEmpty.join("\n").trimEnd();
-    return headTailCompress(nonEmpty, 40, 10, "items").trimEnd();
+    return headTailCompress(nonEmpty, 40, 10, "item").trimEnd();
   }
   _compressFlatListing(nonEmpty, _argv) {
     if (nonEmpty.length <= _EZA_PASSTHROUGH) return nonEmpty.join("\n").trimEnd();
@@ -5537,7 +5510,7 @@ var EzaFilter = class _EzaFilter extends ToolFilter {
     if (headerIdx > 0) kept.push(...nonEmpty.slice(0, headerIdx));
     const dataLines = nonEmpty.slice(headerIdx);
     if (dataLines.length > 30) {
-      const compressed = headTailCompress(dataLines, 25, 5, "entries");
+      const compressed = headTailCompress(dataLines, 25, 5, "entry", "entries");
       kept.push(...compressed.split("\n"));
     } else {
       kept.push(...dataLines);
@@ -5614,7 +5587,7 @@ var FdFilter = class extends ToolFilter {
     const lines = text.split("\n");
     const nonEmpty = lines.filter((l) => l.trim());
     if (nonEmpty.length <= _FD_COMPRESS_THRESHOLD) return text.trimEnd();
-    return headTailCompress(nonEmpty, 35, 5, "paths");
+    return headTailCompress(nonEmpty, 35, 5, "path");
   }
 };
 var WcFilter = class extends ToolFilter {
@@ -5649,7 +5622,7 @@ var BatFilter = class extends ToolFilter {
     const lines = _stripBatBorders(text.split("\n"));
     const nonEmpty = lines.filter((l) => l.trim());
     if (nonEmpty.length <= 50) return lines.join("\n").trimEnd();
-    return headTailCompress(nonEmpty, 40, 10, "lines").trimEnd();
+    return headTailCompress(nonEmpty, 40, 10, "line").trimEnd();
   }
 };
 var _DELTA_SEP_CHARS = new Set("\u2500\u2501");
@@ -5668,7 +5641,7 @@ var DeltaFilter = class extends ToolFilter {
     const lines = _stripDeltaSeparators(text.split("\n"));
     const nonEmpty = lines.filter((l) => l.trim());
     if (nonEmpty.length <= 80) return lines.join("\n").trimEnd();
-    return headTailCompress(nonEmpty, 60, 20, "lines").trimEnd();
+    return headTailCompress(nonEmpty, 60, 20, "line").trimEnd();
   }
 };
 var FzfFilter = class extends ToolFilter {
@@ -5680,7 +5653,7 @@ var FzfFilter = class extends ToolFilter {
     const lines = text.split("\n");
     const nonEmpty = lines.filter((l) => l.trim());
     if (nonEmpty.length <= 50) return text.trimEnd();
-    return headTailCompress(nonEmpty, 40, 10, "lines").trimEnd();
+    return headTailCompress(nonEmpty, 40, 10, "line").trimEnd();
   }
 };
 var LazyGitFilter = class extends ToolFilter {
@@ -5705,7 +5678,7 @@ var JqFilter = class extends ToolFilter {
     const lines = text.split("\n");
     const nonEmpty = lines.filter((l) => l.trim());
     if (nonEmpty.length <= 200) return text.trimEnd();
-    return headTailCompress(nonEmpty, 150, 50, "lines").trimEnd();
+    return headTailCompress(nonEmpty, 150, 50, "line").trimEnd();
   }
 };
 var YqFilter = class extends ToolFilter {
@@ -5717,7 +5690,7 @@ var YqFilter = class extends ToolFilter {
     const lines = text.split("\n");
     const nonEmpty = lines.filter((l) => l.trim());
     if (nonEmpty.length <= 150) return text.trimEnd();
-    return headTailCompress(nonEmpty, 100, 50, "lines").trimEnd();
+    return headTailCompress(nonEmpty, 100, 50, "line").trimEnd();
   }
 };
 var _CURL_VERBOSE_META_RE = /^[*>](\s|$)/;
@@ -5915,7 +5888,7 @@ function _scoreAndCapHunks(hunkLines, maxHunks) {
     if (keepSet.has(i)) out.push(...actual[i] ?? []);
   }
   out.push(
-    `[... ${dropped.length} more hunks, avg density ${avg.toFixed(2)} \u2014 likely whitespace/formatting]`
+    `[... ${countNoun(dropped.length, "more hunk")}, avg density ${avg.toFixed(2)} \u2014 likely whitespace/formatting]`
   );
   return out;
 }
@@ -6152,7 +6125,7 @@ var FileTypeFilter = class extends ToolFilter {
     const lines = merged.split(/\r?\n/);
     if (lines.length <= _FILE_BATCH_LIMIT) return merged;
     const remaining = lines.length - _FILE_BATCH_LIMIT;
-    const kept = [...lines.slice(0, _FILE_BATCH_LIMIT), `[token-goat: ${remaining} more file entries truncated]
+    const kept = [...lines.slice(0, _FILE_BATCH_LIMIT), `[token-goat: ${countNoun(remaining, "more file entry", "more file entries")} truncated]
 `];
     return this.finalize(kept);
   }
@@ -6307,9 +6280,7 @@ var SHELL_FILE_FILTERS = [
   ffmpegFilter,
   // Diff tool (plain POSIX diff; git diff is handled by GitFilter)
   diffFilter,
-  // Directory listings — EzaFilter before LsFilter: EzaFilter's matches() gate falls through to
-  // LsFilter for a plain `ls` with no eza-only flag, but must run FIRST so it can actually claim
-  // an aliased `ls --tree`/`ls --icons`/etc. invocation (see EzaFilter.matches doc comment).
+  // Directory listings — EzaFilter before LsFilter: EzaFilter's matches() gate falls through to LsFilter for a plain `ls` with no eza-only flag, but must run FIRST so it can actually claim an aliased `ls --tree`/`ls --icons`/etc. invocation (see EzaFilter.matches doc comment).
   ezaFilter,
   lsFilter,
   fdFilter,
@@ -6363,8 +6334,8 @@ var NodeFilter = class extends ToolFilter {
       kept.push(line);
     }
     const notes = [];
-    maybeNote(notes, collapsedInternal, `collapsed ${collapsedInternal} node: internal frame(s)`);
-    maybeNote(notes, collapsedModules, `collapsed ${collapsedModules} node_modules frame(s)`);
+    maybeNote(notes, collapsedInternal, `collapsed ${countNoun(collapsedInternal, "node: internal frame")}`);
+    maybeNote(notes, collapsedModules, `collapsed ${countNoun(collapsedModules, "node_modules frame")}`);
     this.emitNotes(kept, notes);
     return this.finalize(kept);
   }
@@ -6405,7 +6376,7 @@ var PythonFilter = class extends ToolFilter {
         for (const group of frameGroups) out.push(...group);
       } else {
         for (const group of frameGroups.slice(0, 2)) out.push(...group);
-        out.push(`    ... [${frameGroups.length - 5} more frames elided by token-goat]`);
+        out.push(`    ... [${countNoun(frameGroups.length - 5, "more frame")} elided by token-goat]`);
         for (const group of frameGroups.slice(frameGroups.length - 3)) out.push(...group);
       }
       frameGroups = [];
@@ -6451,7 +6422,7 @@ var PythonFilter = class extends ToolFilter {
       const count = j - i;
       if (count >= 5) {
         out.push(line);
-        out.push(`[token-goat: previous line repeated ${count - 1} more time(s)]`);
+        out.push(`[token-goat: previous line repeated ${countNoun(count - 1, "more time")}]`);
       } else {
         for (let k = i; k < j; k++) out.push(lines[k]);
       }
@@ -6479,7 +6450,7 @@ var PythonFilter = class extends ToolFilter {
     }
     if (totalSuppressed > 0) {
       out.push(
-        `[token-goat: ${totalSuppressed} repeated warning(s) suppressed; run without TOKEN_GOAT_BASH_COMPRESS for full list]`
+        `[token-goat: ${countNoun(totalSuppressed, "repeated warning")} suppressed; run without TOKEN_GOAT_BASH_COMPRESS for full list]`
       );
     }
     return out;
@@ -6532,7 +6503,7 @@ var RubyFilter = class extends ToolFilter {
       kept.push(line);
     }
     const notes = [];
-    maybeNote(notes, dotCount, `collapsed ${dotCount} passing test dot(s)`);
+    maybeNote(notes, dotCount, `collapsed ${countNoun(dotCount, "passing test dot")}`);
     if (summaryLine) kept.push(summaryLine);
     this.emitNotes(kept, notes);
     return this.finalize(kept);
@@ -6562,7 +6533,7 @@ var BunFilter = class extends ToolFilter {
     if (sub === "build") return this._compressBuild(lines);
     const nonEmpty = lines.filter((l) => l.trim());
     if (nonEmpty.length <= 80) return this.finalize(lines);
-    return headTailCompress(lines, 60, 20, "lines");
+    return headTailCompress(lines, 60, 20, "line");
   }
   _compressInstall(lines) {
     const kept = [];
@@ -6579,7 +6550,7 @@ var BunFilter = class extends ToolFilter {
       kept.push(line);
     }
     const notes = [];
-    maybeNote(notes, downloadCount, `collapsed ${downloadCount} package download/install line(s)`);
+    maybeNote(notes, downloadCount, `collapsed ${countNoun(downloadCount, "package download/install line")}`);
     this.emitNotes(kept, notes);
     return this.finalize(kept);
   }
@@ -6598,7 +6569,7 @@ var BunFilter = class extends ToolFilter {
       kept.push(line);
     }
     const notes = [];
-    maybeNote(notes, passCount, `collapsed ${passCount} passing test(s)`);
+    maybeNote(notes, passCount, `collapsed ${countNoun(passCount, "passing test")}`);
     this.emitNotes(kept, notes);
     return this.finalize(kept);
   }
@@ -6624,7 +6595,7 @@ var BunFilter = class extends ToolFilter {
     const extra = assets.length - 10;
     return [
       ...assets.slice(0, 10),
-      `[token-goat: ${extra} more asset/chunk line(s) elided; run 'bun build' for full output]`
+      `[token-goat: ${countNoun(extra, "more asset/chunk line")} elided; run 'bun build' for full output]`
     ];
   }
 };
@@ -6678,7 +6649,7 @@ var DenoFilter = class extends ToolFilter {
       kept.push(line);
     }
     const notes = [];
-    maybeNote(notes, passCount, `collapsed ${passCount} passing test(s)`);
+    maybeNote(notes, passCount, `collapsed ${countNoun(passCount, "passing test")}`);
     this.emitNotes(kept, notes);
     return this.finalize(kept);
   }
@@ -6697,7 +6668,7 @@ var DenoFilter = class extends ToolFilter {
       kept.push(line);
     }
     const notes = [];
-    maybeNote(notes, downloadCount, `collapsed ${downloadCount} download line(s)`);
+    maybeNote(notes, downloadCount, `collapsed ${countNoun(downloadCount, "download line")}`);
     this.emitNotes(kept, notes);
     return this.finalize(kept);
   }
@@ -6719,15 +6690,15 @@ var DenoFilter = class extends ToolFilter {
       kept.push(line);
     }
     const notes = [];
-    maybeNote(notes, progressCount, `collapsed ${progressCount} check-progress line(s)`);
-    maybeNote(notes, permWarnCount, `collapsed ${permWarnCount} permission warning(s)`);
+    maybeNote(notes, progressCount, `collapsed ${countNoun(progressCount, "check-progress line")}`);
+    maybeNote(notes, permWarnCount, `collapsed ${countNoun(permWarnCount, "permission warning")}`);
     this.emitNotes(kept, notes);
     return this.finalize(kept);
   }
   _compressGeneric(lines) {
     const nonEmpty = lines.filter((l) => l.trim());
     if (nonEmpty.length <= 30) return this.finalize(lines);
-    return headTailCompress(lines, 40, 20, "lines");
+    return headTailCompress(lines, 40, 20, "line");
   }
 };
 var denoFilter = new DenoFilter();
@@ -6773,8 +6744,8 @@ var FlutterFilter = class extends ToolFilter {
       kept.push(line);
     }
     const notes = [];
-    maybeNote(notes, compilingCount, `collapsed ${compilingCount} Dart source compilation(s)`);
-    maybeNote(notes, fontAssetCount, `collapsed ${fontAssetCount} font asset line(s)`);
+    maybeNote(notes, compilingCount, `collapsed ${countNoun(compilingCount, "Dart source compilation")}`);
+    maybeNote(notes, fontAssetCount, `collapsed ${countNoun(fontAssetCount, "font asset line")}`);
     this.emitNotes(kept, notes);
     return this.finalize(kept);
   }
@@ -6793,7 +6764,7 @@ var FlutterFilter = class extends ToolFilter {
       kept.push(line);
     }
     const notes = [];
-    maybeNote(notes, progressCount, `collapsed ${progressCount} test-progress line(s)`);
+    maybeNote(notes, progressCount, `collapsed ${countNoun(progressCount, "test-progress line")}`);
     this.emitNotes(kept, notes);
     return this.finalize(kept);
   }
@@ -6812,7 +6783,7 @@ var FlutterFilter = class extends ToolFilter {
       kept.push(line);
     }
     const notes = [];
-    maybeNote(notes, pkgCount, `collapsed ${pkgCount} package line(s)`);
+    maybeNote(notes, pkgCount, `collapsed ${countNoun(pkgCount, "package line")}`);
     this.emitNotes(kept, notes);
     return this.finalize(kept);
   }
@@ -6855,7 +6826,7 @@ var DartFilter = class extends ToolFilter {
       kept.push(line);
     }
     const notes = [];
-    maybeNote(notes, analyzingCount, `collapsed ${analyzingCount} analysis-progress line(s)`);
+    maybeNote(notes, analyzingCount, `collapsed ${countNoun(analyzingCount, "analysis-progress line")}`);
     this.emitNotes(kept, notes);
     return this.finalize(kept);
   }
@@ -6874,7 +6845,7 @@ var DartFilter = class extends ToolFilter {
       kept.push(line);
     }
     const notes = [];
-    maybeNote(notes, progressCount, `collapsed ${progressCount} test-progress line(s)`);
+    maybeNote(notes, progressCount, `collapsed ${countNoun(progressCount, "test-progress line")}`);
     this.emitNotes(kept, notes);
     return this.finalize(kept);
   }
@@ -6898,8 +6869,8 @@ var DartFilter = class extends ToolFilter {
       kept.push(line);
     }
     const notes = [];
-    maybeNote(notes, pkgCount, `collapsed ${pkgCount} package line(s)`);
-    maybeNote(notes, downloadCount, `collapsed ${downloadCount} download line(s)`);
+    maybeNote(notes, pkgCount, `collapsed ${countNoun(pkgCount, "package line")}`);
+    maybeNote(notes, downloadCount, `collapsed ${countNoun(downloadCount, "download line")}`);
     this.emitNotes(kept, notes);
     return this.finalize(kept);
   }
@@ -6918,7 +6889,7 @@ var DartFilter = class extends ToolFilter {
       kept.push(line);
     }
     const notes = [];
-    maybeNote(notes, compileCount, `collapsed ${compileCount} compilation step(s)`);
+    maybeNote(notes, compileCount, `collapsed ${countNoun(compileCount, "compilation step")}`);
     this.emitNotes(kept, notes);
     return this.finalize(kept);
   }
@@ -6959,7 +6930,7 @@ var SwiftFilter = class extends ToolFilter {
       kept.push(line);
     }
     const notes = [];
-    maybeNote(notes, compileCount, `collapsed ${compileCount} compile/link step(s)`);
+    maybeNote(notes, compileCount, `collapsed ${countNoun(compileCount, "compile/link step")}`);
     this.emitNotes(kept, notes);
     return this.finalize(kept);
   }
@@ -6983,7 +6954,7 @@ var SwiftFilter = class extends ToolFilter {
       kept.push(line);
     }
     const notes = [];
-    maybeNote(notes, passCount + startCount, `collapsed ${passCount + startCount} test-pass/start line(s)`);
+    maybeNote(notes, passCount + startCount, `collapsed ${countNoun(passCount + startCount, "test-pass/start line")}`);
     this.emitNotes(kept, notes);
     return this.finalize(kept);
   }
@@ -7019,8 +6990,8 @@ var XcodeFilter = class extends ToolFilter {
       kept.push(line);
     }
     const notes = [];
-    maybeNote(notes, compileCount, `collapsed ${compileCount} compile/link step(s)`);
-    maybeNote(notes, taskBodyCount, `collapsed ${taskBodyCount} task-body line(s)`);
+    maybeNote(notes, compileCount, `collapsed ${countNoun(compileCount, "compile/link step")}`);
+    maybeNote(notes, taskBodyCount, `collapsed ${countNoun(taskBodyCount, "task-body line")}`);
     this.emitNotes(kept, notes);
     return this.finalize(kept);
   }
@@ -7084,7 +7055,7 @@ var MixFilter = class extends ToolFilter {
       kept.push(line);
     }
     const notes = [];
-    maybeNote(notes, depCount, `collapsed ${depCount} dependency fetch line(s)`);
+    maybeNote(notes, depCount, `collapsed ${countNoun(depCount, "dependency fetch line")}`);
     this.emitNotes(kept, notes);
     return this.finalize(kept);
   }
@@ -7103,7 +7074,7 @@ var MixFilter = class extends ToolFilter {
       kept.push(line);
     }
     const notes = [];
-    maybeNote(notes, compilingCount, `collapsed ${compilingCount} compilation batch(es)`);
+    maybeNote(notes, compilingCount, `collapsed ${countNoun(compilingCount, "compilation batch", "compilation batches")}`);
     this.emitNotes(kept, notes);
     return this.finalize(kept);
   }
@@ -7124,12 +7095,11 @@ var MixFilter = class extends ToolFilter {
       kept.push(line);
     }
     const notes = [];
-    maybeNote(notes, dotCount, `collapsed ${dotCount} passing test dot(s)`);
+    maybeNote(notes, dotCount, `collapsed ${countNoun(dotCount, "passing test dot")}`);
     this.emitNotes(kept, notes);
     return this.finalize(kept);
   }
-  // Deliberate passthrough: mix ecto.* output is already terse (no per-line noise pattern
-  // to collapse), so nothing is filtered here.
+  // Deliberate passthrough: mix ecto.* output is already terse (no per-line noise pattern to collapse), so nothing is filtered here.
   _compressEcto(lines) {
     return this.finalize(lines);
   }
@@ -7187,13 +7157,13 @@ var ZigFilter = class extends ToolFilter {
     }
     const out = [...stepSample];
     if (stepCount > ZIG_STEP_SAMPLE) {
-      out.push(`[token-goat: +${stepCount - ZIG_STEP_SAMPLE} more build step(s)...]`);
+      out.push(`[token-goat: +${countNoun(stepCount - ZIG_STEP_SAMPLE, "more build step")}...]`);
     }
     out.push(...kept);
     const notes = [];
-    maybeNote(notes, testPassCount, `collapsed ${testPassCount} passing test(s)`);
-    maybeNote(notes, fetchCount, `collapsed ${fetchCount} fetch line(s)`);
-    maybeNote(notes, infoNoiseCount, `dropped ${infoNoiseCount} info-noise line(s)`);
+    maybeNote(notes, testPassCount, `collapsed ${countNoun(testPassCount, "passing test")}`);
+    maybeNote(notes, fetchCount, `collapsed ${countNoun(fetchCount, "fetch line")}`);
+    maybeNote(notes, infoNoiseCount, `dropped ${countNoun(infoNoiseCount, "info-noise line")}`);
     this.emitNotes(out, notes);
     return this.finalize(out);
   }
@@ -7249,8 +7219,8 @@ var RCmdFilter = class extends ToolFilter {
       kept.push(line);
     }
     const prepend = [];
-    if (okCount) prepend.push(`[token-goat: collapsed ${okCount} R CMD check-OK line(s)]`);
-    if (installSectionCount) prepend.push(`[token-goat: collapsed ${installSectionCount} package installation/loading line(s)]`);
+    if (okCount) prepend.push(`[token-goat: collapsed ${countNoun(okCount, "R CMD check-OK line")}]`);
+    if (installSectionCount) prepend.push(`[token-goat: collapsed ${countNoun(installSectionCount, "package installation/loading line")}]`);
     return this.finalize([...prepend, ...kept]);
   }
 };
@@ -7292,22 +7262,22 @@ var erlangFilter = makeLanguageFilter({
     {
       re: REBAR3_COMPILING_RE,
       position: "prepend",
-      note: (n) => `[token-goat: collapsed ${n} Erlang module compilation(s)]`
+      note: (n) => `[token-goat: collapsed ${countNoun(n, "Erlang module compilation")}]`
     },
     {
       re: REBAR3_FETCH_RE,
       position: "prepend",
-      note: (n) => `[token-goat: collapsed ${n} dependency fetch/resolve line(s)]`
+      note: (n) => `[token-goat: collapsed ${countNoun(n, "dependency fetch/resolve line")}]`
     },
     {
       re: REBAR3_STEP_NOISE_RE,
       position: "note",
-      note: (n) => `dropped ${n} rebar3 build-step line(s)`
+      note: (n) => `dropped ${countNoun(n, "rebar3 build-step line")}`
     },
     {
       res: [REBAR3_EUNIT_PASS_RE, REBAR3_CT_PASS_RE],
       position: "note",
-      note: (n) => `collapsed ${n} test-pass line(s)`
+      note: (n) => `collapsed ${countNoun(n, "test-pass line")}`
     }
   ]
 });
@@ -7335,22 +7305,22 @@ var crystalFilter = makeLanguageFilter({
     {
       re: CRYSTAL_COMPILING_RE,
       position: "prepend",
-      note: (n) => `[token-goat: collapsed ${n} Crystal compiling/linking step(s)]`
+      note: (n) => `[token-goat: collapsed ${countNoun(n, "Crystal compiling/linking step")}]`
     },
     {
       re: CRYSTAL_SHARDS_PROGRESS_RE,
       position: "prepend",
-      note: (n) => `[token-goat: collapsed ${n} shards dependency operation(s)]`
+      note: (n) => `[token-goat: collapsed ${countNoun(n, "shards dependency operation")}]`
     },
     {
       re: CRYSTAL_SPEC_PASS_RE,
       position: "note",
-      note: (n) => `collapsed ${n} spec-pass line(s)`
+      note: (n) => `collapsed ${countNoun(n, "spec-pass line")}`
     },
     {
       re: CRYSTAL_DOT_PROGRESS_RE,
       position: "note",
-      note: (n) => `collapsed ${n} progress dot(s)`
+      note: (n) => `collapsed ${countNoun(n, "progress dot")}`
     }
   ]
 });
@@ -7380,24 +7350,24 @@ var haskellFilter = makeLanguageFilter({
     {
       re: HASKELL_RESOLVING_RE,
       position: "prepend",
-      note: (n) => `[token-goat: collapsed ${n} dependency resolve/download line(s)]`
+      note: (n) => `[token-goat: collapsed ${countNoun(n, "dependency resolve/download line")}]`
     },
     {
       re: HASKELL_COMPILING_RE,
       position: "prepend",
-      note: (n) => `[token-goat: collapsed ${n} module compilation(s)]`
+      note: (n) => `[token-goat: collapsed ${countNoun(n, "module compilation")}]`
     },
     {
       re: HASKELL_LINKING_RE,
       position: "prepend",
-      note: (n) => `[token-goat: collapsed ${n} linking/building step(s)]`
+      note: (n) => `[token-goat: collapsed ${countNoun(n, "linking/building step")}]`
     }
   ],
   dedupeRules: [
     {
       re: HASKELL_WARNING_RE,
       maxPerKey: 3,
-      note: (n) => `deduplicated ${n} repeated warning(s)`
+      note: (n) => `deduplicated ${countNoun(n, "repeated warning")}`
     }
   ]
 });
@@ -7427,16 +7397,16 @@ var elmFilter = makeLanguageFilter({
     {
       re: ELM_DOWNLOADING_RE,
       position: "prepend",
-      note: (n) => `[token-goat: Downloaded ${n} Elm package(s); disable via TOKEN_GOAT_BASH_COMPRESS for full list]`
+      note: (n) => `[token-goat: Downloaded ${countNoun(n, "Elm package")}; disable via TOKEN_GOAT_BASH_COMPRESS for full list]`
     },
     {
       re: ELM_COMPILING_RE,
       position: "prepend",
-      note: (n) => `[token-goat: collapsed ${n} Elm source file compilation(s)]`
+      note: (n) => `[token-goat: collapsed ${countNoun(n, "Elm source file compilation")}]`
     }
   ],
   dropRules: [ELM_DOT_PROGRESS_RE, ELM_DEPS_PROGRESS_RE],
-  droppedNoiseNote: (n) => `dropped ${n} dependency-progress line(s)`
+  droppedNoiseNote: (n) => `dropped ${countNoun(n, "dependency-progress line")}`
 });
 var JULIA_PKG_RESOLVING_RE = (
   // eslint-disable-next-line no-control-regex
@@ -7471,17 +7441,17 @@ var juliaFilter = makeLanguageFilter({
     {
       res: [JULIA_PKG_DEP_LINE_RE, JULIA_PKG_STATUS_RE],
       position: "prepend",
-      note: (n) => `[token-goat: ${n} Julia package operation(s); disable via TOKEN_GOAT_BASH_COMPRESS for full list]`
+      note: (n) => `[token-goat: ${countNoun(n, "Julia package operation")}; disable via TOKEN_GOAT_BASH_COMPRESS for full list]`
     },
     {
       res: [JULIA_PKG_RESOLVING_RE, JULIA_PKG_INSTALLED_RE, JULIA_PKG_BUILDING_RE, JULIA_PRECOMPILE_RE],
       position: "prepend",
-      note: (n) => `[token-goat: collapsed ${n} Pkg progress banner(s)]`
+      note: (n) => `[token-goat: collapsed ${countNoun(n, "Pkg progress banner")}]`
     },
     {
       re: JULIA_TEST_PASS_RE,
       position: "note",
-      note: (n) => `collapsed ${n} test-pass line(s)`
+      note: (n) => `collapsed ${countNoun(n, "test-pass line")}`
     }
   ]
 });
@@ -7518,8 +7488,8 @@ var PowerShellErrorFilter = class extends ToolFilter {
       kept.push(line);
     }
     const notes = [];
-    if (noiseCount > 0) notes.push(`collapsed ${noiseCount} verbose/debug/install-progress line(s)`);
-    if (warnElided > 0) notes.push(`deduplicated ${warnElided} repeated WARNING(s)`);
+    if (noiseCount > 0) notes.push(`collapsed ${countNoun(noiseCount, "verbose/debug/install-progress line")}`);
+    if (warnElided > 0) notes.push(`deduplicated ${countNoun(warnElided, "repeated WARNING")}`);
     this.emitNotes(kept, notes);
     return this.finalize(kept);
   }
@@ -7528,7 +7498,7 @@ var PowerShellErrorFilter = class extends ToolFilter {
     return text.replace(PS_CNF_ERROR_RE, (match, headerCmd, categoryCmd) => {
       const cmd = (categoryCmd || headerCmd || "").trim();
       const elidedLines = match.replace(/\r?\n$/, "").split(/\r?\n/).length;
-      return `PowerShell CommandNotFoundException: '${cmd}' not found (elided ${elidedLines} lines of stack trace). If invoked from Bash/Git-Bash and the command used $_, bash pre-expands it before PowerShell sees it -- escape as \`$_\` (backtick) or single-quote the whole -Command string.`;
+      return `PowerShell CommandNotFoundException: ${echoedValue(cmd)} not found (elided ${elidedLines} lines of stack trace). If invoked from Bash/Git-Bash and the command used $_, bash pre-expands it before PowerShell sees it -- escape as \`$_\` (backtick) or single-quote the whole -Command string.`;
     });
   }
 };
@@ -8254,7 +8224,7 @@ var SysPackageFilter = class extends ToolFilter {
       kept.push(line);
     }
     const out = [...progressSample];
-    if (progressExtra) out.push(`[token-goat: +${progressExtra} more brew progress lines collapsed]`);
+    if (progressExtra) out.push(`[token-goat: +${countNoun(progressExtra, "more brew progress line")} collapsed]`);
     out.push(...kept);
     return this.finalize(out);
   }
@@ -8376,7 +8346,7 @@ var SassFilter = class _SassFilter extends ToolFilter {
       kept.push(line);
     }
     const out = [...writeSample];
-    if (writeExtra) out.push(`[token-goat: +${writeExtra} more compiled CSS files; disable via TOKEN_GOAT_BASH_COMPRESS for full list]`);
+    if (writeExtra) out.push(`[token-goat: +${countNoun(writeExtra, "more compiled CSS file")}; disable via TOKEN_GOAT_BASH_COMPRESS for full list]`);
     out.push(...kept);
     const notes = [];
     maybeNote(notes, droppedMap, `dropped ${droppedMap} source-map write lines`);
@@ -8855,13 +8825,13 @@ var JsonArrayFilter = class extends ToolFilter {
     if (dupCounts.size) {
       for (const [ks, n] of dupCounts) {
         const keysRepr = ks.split(",").join(", ");
-        suffixLines.push(`[... ${n} duplicate objects with keys {${keysRepr}} omitted]`);
+        suffixLines.push(`[... ${countNoun(n, "duplicate object")} with keys {${keysRepr}} omitted]`);
       }
     }
     if (kept.length > JSON_ARRAY_MAX_ITEMS) {
       const extra = kept.length - JSON_ARRAY_MAX_ITEMS;
       kept.splice(JSON_ARRAY_MAX_ITEMS);
-      suffixLines.push(`[... ${extra} more items not shown]`);
+      suffixLines.push(`[... ${countNoun(extra, "more item")} not shown]`);
       changed = true;
     }
     if (!changed) return text;
@@ -9183,11 +9153,11 @@ var DockerComposeFilter = class extends ToolFilter {
       kept.push(line);
     }
     if (pullingCount > pullingKept) {
-      kept.push(`[token-goat: ${pullingCount - pullingKept} more Pulling lines elided]`);
+      kept.push(`[token-goat: ${countNoun(pullingCount - pullingKept, "more Pulling line")} elided]`);
     }
     for (const [containerKey, count] of [...healthCounts.entries()].sort()) {
       if (count > 1) {
-        kept.push(`[token-goat: ${count - 1} more health-check wait lines for ${containerKey}]`);
+        kept.push(`[token-goat: ${countNoun(count - 1, "more health-check wait line")} for ${containerKey}]`);
       }
     }
     const STREAM_THRESHOLD = 50;
@@ -9238,7 +9208,7 @@ function _compressKubectlEvents(text) {
       const elided = rows.length - _MAX_PER_REASON;
       totalElided += elided;
       kept.push(...rows.slice(-_MAX_PER_REASON));
-      kept.push(`  [token-goat: ${elided} earlier '${reason}' events elided]`);
+      kept.push(`  [token-goat: ${elided} earlier ${echoedValue(reason)} events elided]`);
     }
   }
   if (totalElided) {
@@ -9306,7 +9276,7 @@ function _compressKubectlDescribe(text) {
       }
       kept.push(...entries.slice(0, 3));
       if (entries.length > 3) {
-        kept.push(" ".repeat(headerIndent + 2) + `[token-goat: ${entries.length - 3} more entries elided]`);
+        kept.push(" ".repeat(headerIndent + 2) + `[token-goat: ${countNoun(entries.length - 3, "more entry", "more entries")} elided]`);
       }
       continue;
     }
@@ -9406,7 +9376,7 @@ var KubectlFilter = class extends ToolFilter {
       if (text.includes("\n")) {
         const nonEmpty = text.split("\n").filter((l) => l.trim());
         if (nonEmpty.length > 50) {
-          text = headTailCompress(nonEmpty, 30, 20, "log lines");
+          text = headTailCompress(nonEmpty, 30, 20, "log line");
         } else {
           text = nonEmpty.join("\n");
         }
@@ -9415,7 +9385,7 @@ var KubectlFilter = class extends ToolFilter {
     } else if (subcommand === "diff") {
       const diffLines = text.split("\n");
       if (diffLines.length > 50) {
-        text = headTailCompress(diffLines, 35, 15, "diff lines");
+        text = headTailCompress(diffLines, 35, 15, "diff line");
       }
     }
     if (stderr.trim()) {
@@ -9474,7 +9444,7 @@ function _collapseStackTraces(lines) {
       }
       out.push(...frames.slice(0, MAX_FRAMES).flat());
       if (frames.length > MAX_FRAMES) {
-        out.push(`    ... ${frames.length - MAX_FRAMES} more frames`);
+        out.push(`    ... ${countNoun(frames.length - MAX_FRAMES, "more frame")}`);
       }
       i = j;
     } else {
@@ -9501,7 +9471,7 @@ function _dedupLogLinesWithPodPrefix(lines, keepFirstN = 3) {
       if (prevKey !== null && prevKey !== key) {
         const pendingOmit = omit.get(prevKey) ?? 0;
         if (pendingOmit > 0) {
-          out.push(`[token-goat: ${pendingOmit} more similar lines omitted]`);
+          out.push(`[token-goat: ${countNoun(pendingOmit, "more similar line")} omitted]`);
           omit.set(prevKey, 0);
         }
       }
@@ -9514,7 +9484,7 @@ function _dedupLogLinesWithPodPrefix(lines, keepFirstN = 3) {
   const flushed = /* @__PURE__ */ new Set();
   for (const [key, count] of omit.entries()) {
     if (count > 0 && !flushed.has(key)) {
-      out.push(`[token-goat: ${count} more similar lines omitted]`);
+      out.push(`[token-goat: ${countNoun(count, "more similar line")} omitted]`);
       flushed.add(key);
     }
   }
@@ -9582,7 +9552,7 @@ var KubectlLogsFilter = class extends ToolFilter {
     nonEmpty = _collapseJsonBlobs(nonEmpty, 5);
     let result;
     if (nonEmpty.length > 200) {
-      result = headTailCompress(nonEmpty, 40, 40, "log lines");
+      result = headTailCompress(nonEmpty, 40, 40, "log line");
     } else {
       result = nonEmpty.join("\n");
     }
@@ -9639,7 +9609,7 @@ function _compressHelmTemplate(lines) {
     if (line.trim().startsWith("---")) sections.push(line);
   }
   if (sections.length === 0) {
-    return headTailCompress(lines, 10, 10, "template lines");
+    return headTailCompress(lines, 10, 10, "template line");
   }
   sections.push(
     `[token-goat: helm template ${total} total lines; showing ${sections.length} document headers only]`
@@ -9750,10 +9720,7 @@ function _stripGitCrlfWarnings(text) {
 }
 var GitBaseFilter = class extends ToolFilter {
   binaries = /* @__PURE__ */ new Set(["git"]);
-  // Overrides ToolFilter.matches() to scan gitPositionalArgs() instead of the generic
-  // positionalArgs() -- git's subcommand-identifying tokens must skip the value of -m/--message
-  // and other value-taking flags, or a word inside a commit message could be mistaken for
-  // another filter's subcommand keyword.
+  // Overrides ToolFilter.matches() to scan gitPositionalArgs() instead of the generic positionalArgs() -- git's subcommand-identifying tokens must skip the value of -m/--message and other value-taking flags, or a word inside a commit message could be mistaken for another filter's subcommand keyword.
   matches(argv) {
     if (argv.length === 0) return false;
     const first = argv[0];
@@ -9799,7 +9766,7 @@ function _summariseCommitHeader(lines) {
   const detailParts = [];
   if (author) detailParts.push(author);
   if (dateStr) detailParts.push(dateStr);
-  if (subject) detailParts.push(`"${subject}"`);
+  if (subject) detailParts.push(`${echoedValue(subject)}`);
   if (detailParts.length) parts.push("  " + detailParts.join(" | "));
   return parts;
 }
@@ -9871,7 +9838,7 @@ function _capStatLinesInBlock(block, maxFiles) {
       if (statIdx < maxFiles) {
         newLines.push(ln);
       } else if (!replaced) {
-        newLines.push(`[token-goat: +${elided} more stat lines omitted]`);
+        newLines.push(`[token-goat: +${countNoun(elided, "more stat line")} omitted]`);
         replaced = true;
       }
       statIdx++;
@@ -9909,7 +9876,7 @@ function _compressGitLogEnhanced(stdout, stderr, argv, inputTruncated = false, m
     let keptLines;
     if (blocks.length > ONELINE_CAP) {
       const elided = blocks.length - ONELINE_CAP;
-      const elidedNote = inputTruncated ? `[token-goat: at least ${elided} more commits (counted over a truncated input)]` : `[token-goat: +${elided} more commits]`;
+      const elidedNote = inputTruncated ? `[token-goat: at least ${countNoun(elided, "more commit")} (counted over a truncated input)]` : `[token-goat: +${countNoun(elided, "more commit")}]`;
       keptLines = [...blocks.slice(0, ONELINE_CAP), elidedNote];
     } else {
       keptLines = blocks;
@@ -10010,7 +9977,7 @@ function _compressGitDiffStat(stdout, stderr, argv) {
       }
       const keptStat = [
         ...statLines.slice(0, HEAD_FILES),
-        ` [token-goat: +${elided} more files changed, +${adds} -${dels} lines]`
+        ` [token-goat: +${countNoun(elided, "more file")} changed, +${adds} -${dels} lines]`
       ];
       out = [...otherLines, ...keptStat, ...summaryLines].join("\n");
     } else {
@@ -10106,7 +10073,7 @@ function _capHunksByDensity(hunks, maxHunksPerFile) {
   const kept = scored.filter((x) => keepSet.has(x.i)).map((x) => x.h);
   return {
     hunks: [hunks[0] ?? "", ...kept],
-    note: `[token-goat: ${dropped.length} more hunks, avg density ${avg.toFixed(2)} \u2014 likely whitespace/formatting]`
+    note: `[token-goat: ${countNoun(dropped.length, "more hunk")}, avg density ${avg.toFixed(2)} \u2014 likely whitespace/formatting]`
   };
 }
 function _collapseDiffBlocksToCap(outBlocks, maxLines) {
@@ -10179,7 +10146,7 @@ function _compressGitDiffBody(stdout, stderr, maxHunksPerFile = 10, maxLines) {
         if (nTrimmed > 0) {
           compressedHunks.push(
             trimmedLines.join("\n") + `
-[token-goat: ${nTrimmed} trailing context line(s) trimmed]`
+[token-goat: ${countNoun(nTrimmed, "trailing context line")} trimmed]`
           );
         } else {
           compressedHunks.push(hunk);
@@ -10315,7 +10282,7 @@ function _compressGitBlameAnnotated(lines, stderr) {
     out.push(runStartLine);
     if (runCount > 1) {
       const hashShort = currentHash ? currentHash.slice(0, 8) : "?";
-      out.push(`[token-goat: ${runCount - 1} more lines by ${currentAuthor} (${hashShort})]`);
+      out.push(`[token-goat: ${countNoun(runCount - 1, "more line")} by ${currentAuthor} (${hashShort})]`);
     }
   }
   for (const line of lines) {
@@ -10358,7 +10325,7 @@ function _compressGitBlamePorcelain(lines, stderr) {
     out.push(...blockLines);
     if (runCount > 1) {
       const hashShort = currentHash ? currentHash.slice(0, 8) : "?";
-      out.push(`[token-goat: ${runCount - 1} more lines by ${currentAuthor} (${hashShort})]`);
+      out.push(`[token-goat: ${countNoun(runCount - 1, "more line")} by ${currentAuthor} (${hashShort})]`);
     }
   }
   let i = 0;
@@ -10635,7 +10602,7 @@ function _compressGitPush(stdout, stderr) {
     const MAX_ERROR_LINES = 30;
     const flushCapMarker = () => {
       if (capReached) {
-        kept.push(`[token-goat: +${omittedCount} more error lines omitted]`);
+        kept.push(`[token-goat: +${countNoun(omittedCount, "more error line")} omitted]`);
       }
     };
     const resetBlock = () => {
@@ -10688,7 +10655,7 @@ function _truncateListing(stdout, stderr, head = 100) {
     merged = stdout;
   } else {
     merged = lines.slice(0, head).join("\n") + `
-[token-goat: +${lines.length - head} more lines elided]`;
+[token-goat: +${countNoun(lines.length - head, "more line")} elided]`;
   }
   if (stderr.trim()) merged += "\n---\n" + stderr.replace(/\s+$/, "");
   return merged;
@@ -10713,9 +10680,7 @@ function _compressGitRemote(stdout, stderr) {
 }
 var GitFilter = class extends GitBaseFilter {
   name = "git";
-  // No subcommands set — matches any git command as catch-all, except `git
-  // grep`, which is excluded here so dispatch falls through to GrepFilter
-  // (registered after GIT_FILTERS) and its per-file match-count summarizer.
+  // No subcommands set — matches any git command as catch-all, except `git grep`, which is excluded here so dispatch falls through to GrepFilter (registered after GIT_FILTERS) and its per-file match-count summarizer.
   matches(argv) {
     if (!super.matches(argv)) return false;
     return gitPositionalArgs(argv.slice(1))[0] !== "grep";
@@ -10755,7 +10720,7 @@ function _emitEslintRules(perRule) {
   const out = [];
   for (const [rule, entries] of [...perRule.entries()].sort()) {
     out.push(...entries.slice(0, 3));
-    if (entries.length > 3) out.push(`  [token-goat: +${entries.length - 3} more ${rule} violations]`);
+    if (entries.length > 3) out.push(`  [token-goat: +${countNoun(entries.length - 3, `more ${rule} violation`)}]`);
   }
   return out;
 }
@@ -11107,7 +11072,7 @@ var ESLintFilter = class extends ToolFilter {
       for (const [byRule, noun] of [[errorsByRule, "error"], [warningsByRule, "warning"]]) {
         for (const [rule, entries] of [...byRule.entries()].sort()) {
           fileOut.push(...entries.slice(0, 3));
-          if (entries.length > 3) fileOut.push(`  [token-goat: +${entries.length - 3} more ${rule} ${noun}s]`);
+          if (entries.length > 3) fileOut.push(`  [token-goat: +${countNoun(entries.length - 3, `more ${rule} ${noun}`)}]`);
         }
       }
       fileOut.push(...issues.slice(lastBody));
@@ -11288,7 +11253,7 @@ var BiomeFilter = class extends ToolFilter {
     if (ruleCollapsed.size) {
       for (const [rule, cnt] of [...ruleCollapsed.entries()].sort()) {
         kept.push(
-          `[token-goat: +${cnt} more ${rule} diagnostic(s) elided; run \`biome check\` for full output]`
+          `[token-goat: +${cnt} more ${rule} ${cnt === 1 ? "diagnostic" : "diagnostics"} elided; run \`biome check\` for full output]`
         );
       }
     }
@@ -11368,7 +11333,7 @@ var PrettierFilter = class _PrettierFilter extends ToolFilter {
     }
     const out = [...changedSample];
     if (changedExtra) {
-      out.push(`[token-goat: +${changedExtra} more formatted files; disable via TOKEN_GOAT_BASH_COMPRESS for full list]`);
+      out.push(`[token-goat: +${countNoun(changedExtra, "more formatted file")}; disable via TOKEN_GOAT_BASH_COMPRESS for full list]`);
     }
     out.push(...kept);
     const notes = [];
@@ -11738,7 +11703,7 @@ var BlackIsortFilter = class _BlackIsortFilter extends ToolFilter {
     }
     const out = [...reformatSample];
     if (reformatExtra) {
-      out.push(`[token-goat: +${reformatExtra} more reformatted files; disable via TOKEN_GOAT_BASH_COMPRESS for full list]`);
+      out.push(`[token-goat: +${countNoun(reformatExtra, "more reformatted file")}; disable via TOKEN_GOAT_BASH_COMPRESS for full list]`);
     }
     out.push(...kept);
     return this.finalize(out);
@@ -11767,7 +11732,7 @@ var BlackIsortFilter = class _BlackIsortFilter extends ToolFilter {
     }
     const out = [...fixSample];
     if (fixExtra) {
-      out.push(`[token-goat: +${fixExtra} more fixed files; disable via TOKEN_GOAT_BASH_COMPRESS for full list]`);
+      out.push(`[token-goat: +${countNoun(fixExtra, "more fixed file")}; disable via TOKEN_GOAT_BASH_COMPRESS for full list]`);
     }
     out.push(...kept);
     return this.finalize(out);
@@ -11854,7 +11819,7 @@ var GolangciLintFilter = class _GolangciLintFilter extends ToolFilter {
         const lnt = mPh[2];
         const total = issueCounts.get(`${fp}\0${lnt}`) ?? _GolangciLintFilter._KEEP_FIRST_N + 1;
         const extra = total - _GolangciLintFilter._KEEP_FIRST_N;
-        final.push(`[token-goat: +${extra} more ${lnt} issues in ${fp} omitted]`);
+        final.push(`[token-goat: +${countNoun(extra, `more ${lnt} issue`)} in ${fp} omitted]`);
       } else {
         final.push(line);
       }
@@ -11915,7 +11880,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", indent: "  " });
+            pendingPlaceholders.push({ index: kept.length, rule, suffix: "violation", indent: "  " });
             kept.push("");
           }
           deduplicated++;
@@ -11936,7 +11901,7 @@ var KtlintFilter = class _KtlintFilter extends ToolFilter {
             pendingPlaceholders.push({
               index: kept.length,
               rule,
-              suffix: severity === "warning" ? "warnings" : "violations",
+              suffix: severity === "warning" ? "warning" : "violation",
               indent: ""
             });
             kept.push("");
@@ -11953,7 +11918,7 @@ var KtlintFilter = class _KtlintFilter extends ToolFilter {
     }
     for (const { index, rule, suffix, indent } of pendingPlaceholders) {
       const elided = (ruleCounts.get(rule) ?? 0) - _KtlintFilter._KEEP_PER_RULE;
-      kept[index] = `${indent}[token-goat: +${elided} more ${rule} ${suffix}; disable via TOKEN_GOAT_BASH_COMPRESS for full list]`;
+      kept[index] = `${indent}[token-goat: +${countNoun(elided, `more ${rule} ${suffix}`)}; disable via TOKEN_GOAT_BASH_COMPRESS for full list]`;
     }
     const notes = [];
     maybeNote(notes, deduplicated, `deduplicated ${deduplicated} repeated-rule violation lines`);
@@ -11977,7 +11942,7 @@ var swiftlintFilter = makeLinterFilter({
     return { severity: m[3].toLowerCase(), ruleId: m[5].toLowerCase() };
   },
   alwaysKeepSeverities: ["error", "serious"],
-  collapseNote: (ruleId, extra) => `[token-goat: +${extra} more ${ruleId} warning(s) elided]`
+  collapseNote: (ruleId, extra) => `[token-goat: +${extra} more ${ruleId} ${extra === 1 ? "warning" : "warnings"} elided]`
 });
 var _PHPSTAN_SEP_RE = /^\s*-{3,}/;
 var _PHPSTAN_FILE_HEADER_RE = /^\s+Line\s+(\S.*\.php)\s*$/;
@@ -12009,7 +11974,7 @@ var PhpStanFilter = class extends ToolFilter {
       const msgs = fileMsgs.get(file);
       if (!msgs) return;
       const extraCount = [...msgs.values()].reduce((a, c) => a + Math.max(0, c - 3), 0);
-      if (extraCount) kept.push(`  [token-goat: +${extraCount} more duplicate error(s) in ${file}]`);
+      if (extraCount) kept.push(`  [token-goat: +${countNoun(extraCount, "more duplicate error")} in ${file}]`);
     };
     for (const line of lines) {
       if (_PHPSTAN_INFO_RE.test(line)) {
@@ -12083,7 +12048,7 @@ var PhpStanFilter = class extends ToolFilter {
     maybeNote(notes, droppedProgress, `dropped ${droppedProgress} progress/info lines`);
     const collapsed = [...errorTypeCounts.entries()].filter(([, v]) => v > 3);
     for (const [etype, extra] of collapsed.sort()) {
-      notes.push(`collapsed +${extra - 3} more ${etype} occurrence(s)`);
+      notes.push(`collapsed +${extra - 3} more ${etype} ${extra - 3 === 1 ? "occurrence" : "occurrences"}`);
     }
     this.emitNotes(kept, notes);
     return this.finalize(kept);
@@ -12660,16 +12625,14 @@ var PipFilter = class extends ToolFilter {
       kept.push(line);
     }
     const notes = [];
-    if (collects > 5) notes.push(`+${collects - 5} more 'Collecting' lines elided`);
+    if (collects > 5) notes.push(`+${countNoun(collects - 5, "more 'Collecting' line")} elided`);
     maybeNote(notes, downloads, `dropped ${downloads} download/cache-hit lines`);
     maybeNote(notes, buildNoise, `dropped ${buildNoise} build-wheel/metadata lines`);
     maybeNote(notes, verboseDropped, `dropped ${verboseDropped} verbose debug/trace lines`);
     this.emitNotes(kept, notes);
     return this.finalize(kept);
   }
-  // `pip list`/`pip freeze` output has no install noise to strip (just one
-  // package per line) but can still run to hundreds of lines; cap it the same
-  // way UvFilter._compressFreezeList caps `uv pip list`/`uv pip freeze`.
+  // `pip list`/`pip freeze` output has no install noise to strip (just one package per line) but can still run to hundreds of lines; cap it the same way UvFilter._compressFreezeList caps `uv pip list`/`uv pip freeze`.
   _compressFreezeList(text) {
     return compressFreezeList(text);
   }
@@ -12805,7 +12768,7 @@ var CondaFilter = class extends ToolFilter {
     if (pkgLines.length <= CONDA_LIST_THRESHOLD) return text.trimEnd();
     const shown = [...header, ...pkgLines.slice(0, CONDA_LIST_SHOW)];
     const remaining = pkgLines.length - CONDA_LIST_SHOW;
-    shown.push(`[token-goat: ${remaining} more packages elided; run conda list for full output]`);
+    shown.push(`[token-goat: ${countNoun(remaining, "more package")} elided; run conda list for full output]`);
     return shown.join("\n");
   }
   _compressEnvExport(text) {
@@ -12831,7 +12794,7 @@ var CondaFilter = class extends ToolFilter {
     const result = [
       ...otherLines.slice(0, insertAt),
       ...depLines.slice(0, CONDA_LIST_SHOW),
-      `  # [token-goat: ${remaining} more dependencies elided]`,
+      `  # [token-goat: ${countNoun(remaining, "more dependency", "more dependencies")} elided]`,
       ...otherLines.slice(insertAt)
     ];
     return result.join("\n");
@@ -13285,16 +13248,16 @@ var DepListFilter = class _DepListFilter extends ToolFilter {
     const nMore = lines.length - DEP_LIST_THRESHOLD;
     const shown = lines.slice(0, DEP_LIST_THRESHOLD);
     const hint = this._depCmdHint(argv);
-    const trailer = `...[${nMore} more packages \u2014 use '${hint}' to see full output]`;
+    const trailer = `...[${countNoun(nMore, "more package")} \u2014 use ${hint} to see full output]`;
     return shown.join("\n") + "\n" + trailer;
   }
   _depCmdHint(argv) {
     if (argv.length === 0) return "the original command";
     const stem = pathStem(argv[0]).toLowerCase();
     const pos = positionalArgs(argv.slice(1));
-    if (stem === "uv" && pos.length >= 2) return `uv ${pos[0]} ${pos[1]}`;
+    if (stem === "uv" && pos.length >= 2) return fencedCommand(`uv ${pos[0]} ${pos[1]}`);
     const subcmd = pos[0] ?? "";
-    return `${stem} ${subcmd}`.trim();
+    return fencedCommand(`${stem} ${subcmd}`.trim());
   }
 };
 var PACKAGE_MANAGER_FILTERS = [
@@ -13528,25 +13491,12 @@ var jestFilter = makeNodeTestRunnerFilter({
 var vitestFilter = makeNodeTestRunnerFilter({
   name: "vitest",
   binaries: ["vitest"],
-  // File-level pass header carries a duration: `✓ src/x.test.ts (12ms)`. The ` > ` exclusion is
-  // not decoration: a verbose per-test line whose test NAME happens to end in something shaped
-  // like a duration (`... to the documented min (100ms) 1ms`) is otherwise claimed here, and gets
-  // counted as a passing FILE. Both branches drop the line, so nothing is lost -- but the reported
-  // count is wrong, and wrong in a way that depends on which reporter produced the run.
+  // File-level pass header carries a duration: `✓ src/x.test.ts (12ms)`. The ` > ` exclusion is not decoration: a verbose per-test line whose test NAME happens to end in something shaped like a duration (`... to the documented min (100ms) 1ms`) is otherwise claimed here, and gets counted as a passing FILE. Both branches drop the line, so nothing is lost -- but the reported count is wrong, and wrong in a way that depends on which reporter produced the run.
   passFileRe: /^\s*✓(?!.*\s>\s)\s+\S.*\([\d.]+\s*[a-zA-Z]\w*\)/,
   failFileRe: /^\s*(?:×|FAIL|✗|✘)\s+\S/,
-  // Real vitest right-aligns its summary labels, so every one of these arrives indented:
-  // `      Tests  140 passed (140)`. Anchoring at `^` matched none of them. They survived only
-  // by falling through to the keep-verbatim branch, which is not the same rule -- a summary line
-  // reached while a fail block is open was swallowed into that block instead of ending it.
+  // Real vitest right-aligns its summary labels, so every one of these arrives indented: `      Tests  140 passed (140)`. Anchoring at `^` matched none of them. They survived only by falling through to the keep-verbatim branch, which is not the same rule -- a summary line reached while a fail block is open was swallowed into that block instead of ending it.
   summaryRe: /^\s*(Test Files|Tests|Modules|Duration|Start at)[\s:]+\d/,
-  // Two shapes, because the reporter decides which one a passing test prints. The default
-  // reporter indents a per-test tick under its file header (`  ✓ should pass`). `--reporter=
-  // verbose` prints one line per test at a single leading space, carrying the full
-  // `file > describe > name` path instead: ` ✓ tests/x.test.ts > safeJoin > joins normally 28ms`.
-  // Those lines match no rule at all today, so a verbose run compresses by nothing. The ` > `
-  // is what separates them from a file-level header, which passFileRe claims first and which
-  // never contains one.
+  // Two shapes, because the reporter decides which one a passing test prints. The default reporter indents a per-test tick under its file header (`  ✓ should pass`). `--reporter= verbose` prints one line per test at a single leading space, carrying the full `file > describe > name` path instead: ` ✓ tests/x.test.ts > safeJoin > joins normally 28ms`. Those lines match no rule at all today, so a verbose run compresses by nothing. The ` > ` is what separates them from a file-level header, which passFileRe claims first and which never contains one.
   testTickRe: /^\s{2,}✓\s|^\s*✓\s.*\s>\s/,
   outputHdrRe: /^\s*stdout\s*\|/,
   outputNoun: "stdout",