@herbertgao/pi-extensions 2026.9.0 → 2026.9.2

package/node_modules/pi-lens/dist/clients/formatters.js

@@ -11,15 +11,21 @@
 import { logExtension } from "./extension-log.js";
 import { AsyncLocalStorage } from "node:async_hooks";
 import * as fs from "node:fs/promises";
+import * as os from "node:os";
 import * as path from "node:path";
 import { BoundedLruCache } from "./bounded-cache.js";
-import { normalizeMapKey } from "./path-utils.js";
+import { createGenerationSource } from "./generation-guard.js";
+import { findNearestMarkerRoot, isRealGitMarker, normalizeMapKey, } from "./path-utils.js";
+import { resolveCargoPackageEdition } from "./cargo-manifest.js";
+import { resolveKtfmtGradleStyle } from "./gradle-ktfmt-style.js";
+import { resolvePhpCsFixerConfig } from "./php-cs-fixer-config.js";
 import { TERRAGRUNT_FILENAMES } from "./file-kinds.js";
+import { stripAnsi } from "./sanitize.js";
 import { detectIndentation, hasDetectableIndentation, } from "./dispatch/indent-detect.js";
 import { logLatency } from "./latency-logger.js";
 import { compareOrdinal } from "./string-utils.js";
 import { classifyProbeFailure, createAvailabilityLatch, logAvailabilityDecision, startHostStallSampler, } from "./dispatch/runners/utils/availability-policy.js";
-import { findGlobalBinary, findLocalBinUpwards } from "./package-manager.js";
+import { findGlobalBinary, findLocalBinUpwards, VENDOR_BIN_DIRS, VENV_BIN_DIRS, } from "./package-manager.js";
 import { safeSpawnAsync } from "./safe-spawn.js";
 import { assertInstallAllowed } from "./project-trust.js";
 import { tryLazyInstallForFormatter } from "./dispatch/runners/utils/lazy-installer.js";
@@ -49,6 +55,19 @@ export async function tryLazyInstallFormatterTool(tool, cwd) {
  * stock command there is exactly the stock-style imposition the fix bans.
  */
 export const SKIP_FORMATTING = "skip-formatting";
+/**
+ * Sentinel a `resolveCommand` returns when it has PROVEN the selected
+ * formatter has no executable — the binary is absent from every place the
+ * resolver probed (node_modules/.bin, a venv, a managed install dir, PATH) and
+ * no alternative resolved (#2413). Distinct from `null` ("no override, fall
+ * back to the static `command`") and from SKIP_FORMATTING ("style-preserving
+ * refusal"): the static fallback for these formatters is the SAME bare binary
+ * the resolver just proved missing, so spawning it only re-triggers the ENOENT
+ * the resolver already observed — and reporting that as a formatting failure is
+ * the exact defect this fixes (recurring defect shape 10: an unavailable
+ * producer collapsed into an ordinary failed result).
+ */
+export const FORMATTER_UNAVAILABLE = "formatter-unavailable";
 // --- Utility Functions ---
 async function fileExists(filePath) {
     try {
@@ -63,12 +82,47 @@ async function findUp(targets, startDir, stopDir = path.parse(startDir).root) {
     const found = [];
     let currentDir = startDir;
     while (currentDir !== stopDir) {
-        for (const target of targets) {
-            const checkPath = path.join(currentDir, target);
-            if (await fileExists(checkPath)) {
-                found.push(checkPath);
+        // One `readdir` per directory instead of one `access` per target: the
+        // per-target probe made this loop's cost O(targets), so a long target
+        // list (e.g. `FORMATTER_CONFIG_FILES`) paid for every entry at every
+        // ancestor directory even when almost none of them exist (#1603).
+        let entries;
+        try {
+            entries = await fs.readdir(currentDir);
+        }
+        catch {
+            entries = [];
+        }
+        if (entries.length > 0) {
+            // On default-case-insensitive platforms the old `fs.access` probe
+            // matched a config file regardless of on-disk casing; fold so the
+            // readdir membership check keeps that behavior.
+            const foldCase = process.platform === "win32" || process.platform === "darwin";
+            const entrySet = new Set(foldCase ? entries.map((e) => e.toLowerCase()) : entries);
+            for (const target of targets) {
+                // Nested candidates (for example node_modules/.bin/biome) do
+                // not appear as direct readdir members. They retain the old
+                // bounded candidate probe; direct names use the O(depth + matches)
+                // directory-membership path above.
+                if (target.includes("/") || target.includes("\\"))
+                    continue;
+                if (entrySet.has(foldCase ? target.toLowerCase() : target)) {
+                    const candidate = path.join(currentDir, target);
+                    // Directory membership is only a cheap candidate filter. Keep the
+                    // old access check for matched entries so dangling links and entries
+                    // that cannot be read do not become config evidence (#1603 R2).
+                    if (await fileExists(candidate))
+                        found.push(candidate);
+                }
             }
         }
+        for (const target of targets) {
+            if (!target.includes("/") && !target.includes("\\"))
+                continue;
+            const candidate = path.join(currentDir, target);
+            if (await fileExists(candidate))
+                found.push(candidate);
+        }
         const parent = path.dirname(currentDir);
         if (parent === currentDir)
             break;
@@ -76,6 +130,10 @@ async function findUp(targets, startDir, stopDir = path.parse(startDir).root) {
     }
     return found;
 }
+/** Test-only access to the real filesystem walker and its candidate filter. */
+export function _findUpForTests(targets, startDir, stopDir) {
+    return findUp(targets, startDir, stopDir);
+}
 const WHICH_BUDGET_MS = 5000;
 /**
  * PATH lookups, governed by the shared availability policy (#1495).
@@ -337,79 +395,58 @@ async function resolveGoFmtBinary() {
 /**
  * Walk up from cwd looking for a binary in .venv or venv.
  * Returns the absolute path if found, null otherwise.
+ *
+ * Tool-resolution walker, not a config lookup (#2514/#2517 policy): escaping
+ * the project upward past HOME means STOP, not keep reading — a `.venv`/`venv`
+ * bin found at or above HOME can never be THIS project's own virtualenv. The
+ * ceiling lives in `findLocalBinUpwards` and is default-on there; the tests
+ * that pin a fake HOME drive that walker directly rather than threading a
+ * `homeDir` no production caller ever passed (#2544 review F3).
+ *
+ * On Windows the candidate order is EXT-OUTER, DIR-INNER — `.venv/Scripts/x.exe`,
+ * `venv/Scripts/x.exe`, then the bare names — which is what the pre-fold copy
+ * did and what `findLocalBinUpwards` preserves.
  */
 async function findInVenv(binary, cwd) {
-    const isWin = process.platform === "win32";
-    const candidates = isWin
-        ? [
-            `.venv/Scripts/${binary}.exe`,
-            `venv/Scripts/${binary}.exe`,
-            `.venv/Scripts/${binary}`,
-            `venv/Scripts/${binary}`,
-        ]
-        : [`.venv/bin/${binary}`, `venv/bin/${binary}`];
-    let dir = cwd;
-    const root = path.parse(dir).root;
-    while (dir !== root) {
-        for (const candidate of candidates) {
-            const full = path.join(dir, candidate);
-            if (await fileExists(full))
-                return full;
-        }
-        const parent = path.dirname(dir);
-        if (parent === dir)
-            break;
-        dir = parent;
-    }
-    return null;
+    return (findLocalBinUpwards(binary, cwd, {
+        windowsExt: ".exe",
+        binDirs: VENV_BIN_DIRS,
+    }) ?? null);
 }
 /**
  * Check vendor/bin for PHP Composer-managed tools.
  * Walks up from cwd to find vendor/bin/<binary>.
+ *
+ * Tool-resolution walker, not a config lookup (#2514/#2517 policy): escaping
+ * the project upward past HOME means STOP, not keep reading — a `vendor/bin`
+ * match found at or above HOME can never be THIS project's own Composer
+ * install. Same single walker as `findInVenv` above; only `binDirs` and the
+ * Windows extension differ.
  */
 async function findInVendorBin(binary, cwd) {
-    const isWin = process.platform === "win32";
-    const names = isWin ? [`${binary}.bat`, binary] : [binary];
-    let dir = cwd;
-    const root = path.parse(dir).root;
-    while (dir !== root) {
-        for (const name of names) {
-            const full = path.join(dir, "vendor", "bin", name);
-            if (await fileExists(full))
-                return full;
-        }
-        const parent = path.dirname(dir);
-        if (parent === dir)
-            break;
-        dir = parent;
-    }
-    return null;
+    return (findLocalBinUpwards(binary, cwd, {
+        windowsExt: ".bat",
+        binDirs: VENDOR_BIN_DIRS,
+    }) ?? null);
 }
 /**
  * Check node_modules/.bin for locally installed Node tools.
  * Walks up from cwd to find node_modules/.bin/<binary>.
+ *
+ * #2514: this WAS a private, byte-for-byte duplicate of
+ * `findLocalBinUpwards` (`package-manager.ts`) — the same walk `stylua`
+ * below, `taplo.ts`, `knip-client.ts`, and (via `findNodeToolBinary`)
+ * `dependency-checker.ts`/`jscpd-client.ts` already reuse. A stray
+ * `~/node_modules/.bin/oxfmt.cmd` (the home-level pi-extensions manifest
+ * installs its own bins) was picked up as the project's formatter because
+ * this copy had no HOME ceiling; fixing only this copy would have left every
+ * other caller of `findLocalBinUpwards` with the same defect. Delegating
+ * here instead of hand-rolling a second ceiling keeps there being exactly one
+ * `node_modules/.bin` walker — see that function for the tool-resolution
+ * "escaping the project means STOP" policy (#2517).
  */
 async function findInNodeModules(binary, cwd) {
-    const isWin = process.platform === "win32";
-    let dir = cwd;
-    const root = path.parse(dir).root;
-    while (dir !== root) {
-        const candidates = isWin
-            ? [
-                path.join(dir, "node_modules", ".bin", `${binary}.cmd`),
-                path.join(dir, "node_modules", ".bin", binary),
-            ]
-            : [path.join(dir, "node_modules", ".bin", binary)];
-        for (const full of candidates) {
-            if (await fileExists(full))
-                return full;
-        }
-        const parent = path.dirname(dir);
-        if (parent === dir)
-            break;
-        dir = parent;
-    }
-    return null;
+    return findLocalBinUpwards(binary, cwd) ?? null;
 }
 /**
  * Returns true if `bundle exec <gem>` should be used:
@@ -566,6 +603,110 @@ async function indentationArgs(filePath, tool, cwd) {
         String(indentation.width),
     ];
 }
+const FORMATTER_MARKERS_BY_NAME = new Map([
+    ["biome", ["biome.json", "biome.jsonc", "package.json"]],
+    [
+        "prettier",
+        [
+            ".prettierrc",
+            ".prettierrc.json",
+            ".prettierrc.yaml",
+            ".prettierrc.yml",
+            ".prettierrc.js",
+            ".prettierrc.cjs",
+            ".prettierrc.mjs",
+            "prettier.config.js",
+            "prettier.config.cjs",
+            "prettier.config.mjs",
+            ".prettierignore",
+            "package.json",
+        ],
+    ],
+    [
+        "oxfmt",
+        ["oxfmt.toml", ".oxfmtrc.json", "vite-plus.json", "package.json"],
+    ],
+    ["ruff", ["pyproject.toml", "ruff.toml", ".ruff.toml"]],
+    ["black", ["pyproject.toml", "black.toml", ".black"]],
+    ["sqlfluff", [".sqlfluff", "pyproject.toml", "setup.cfg"]],
+    ["rustfmt", ["rustfmt.toml", ".rustfmt.toml", "Cargo.toml"]],
+    ["rubocop", [".rubocop.yml", ".rubocop.yaml"]],
+    ["standardrb", [".standard.yml", ".standard.yaml"]],
+    ["clang-format", [".clang-format", "_clang-format"]],
+    ["php-cs-fixer", [".php-cs-fixer.php", ".php-cs-fixer.dist.php"]],
+    ["stylua", ["stylua.toml", ".stylua.toml"]],
+    ["ocamlformat", [".ocamlformat"]],
+    ["google-java-format", [".google-java-format", ".editorconfig"]],
+    ["cljfmt", [".cljfmt.edn", "cljfmt.edn", ".cljfmt"]],
+    [
+        "cmake-format",
+        [
+            ".cmake-format",
+            ".cmake-format.yaml",
+            ".cmake-format.yml",
+            ".cmake-format.json",
+            ".cmake-format.py",
+            "cmake-format.yaml",
+            "cmake-format.yml",
+            ".editorconfig",
+        ],
+    ],
+    [
+        "psscriptanalyzer-format",
+        ["PSScriptAnalyzerSettings.psd1", "ScriptAnalyzerSettings.psd1"],
+    ],
+    [
+        "csharpier",
+        [
+            ".csharpierrc",
+            ".csharpierrc.json",
+            ".csharpierrc.yaml",
+            ".csharpierrc.yml",
+        ],
+    ],
+    ["ormolu", [".ormolu"]],
+    ["taplo", ["taplo.toml", ".taplo.toml"]],
+    ["terraform", [".terraform.lock.hcl"]],
+    ["swiftformat", [".swiftformat"]],
+    ["fantomas", [".fantomasignore", ".editorconfig"]],
+    ["mix", [".formatter.exs"]],
+    ["shfmt", [".editorconfig"]],
+    ["ktlint", [".editorconfig"]],
+    [
+        "ktfmt",
+        [
+            ".editorconfig",
+            ".ktfmt",
+            ".ktfmt.kts",
+            "build.gradle",
+            "build.gradle.kts",
+            "settings.gradle",
+            "settings.gradle.kts",
+        ],
+    ],
+]);
+/**
+ * Resolve the cwd for the formatter child, capped at the user's home
+ * directory. Files outside a project retain the historical file-directory
+ * cwd. The optional homeDir is only for the ceiling regression test.
+ */
+export function resolveFormatterCwd(absolutePath, formatterName, homeDir = os.homedir()) {
+    const fileDir = path.dirname(path.resolve(absolutePath));
+    const effectiveHome = homeDir || undefined;
+    const markers = formatterName
+        ? [...(FORMATTER_MARKERS_BY_NAME.get(formatterName) ?? []), ".gitignore"]
+        : [".gitignore"];
+    const root = findNearestMarkerRoot(fileDir, markers, {
+        homeDir: effectiveHome,
+    });
+    if (root)
+        return root;
+    const gitRoot = findNearestMarkerRoot(fileDir, [".git"], {
+        homeDir: effectiveHome,
+        markerPredicate: isRealGitMarker,
+    });
+    return gitRoot ?? fileDir;
+}
 /**
  * Every biome invocation must carry this. Biome exits 1 with "No files were
  * processed in the specified paths" when the path is ignored by the repo's own
@@ -747,7 +888,11 @@ export const oxfmtFormatter = {
         const found = await which("oxfmt");
         if (found)
             return [found, OXFMT_NO_ERROR_ON_UNMATCHED, filePath];
-        return null;
+        // #2413: neither node_modules/.bin nor PATH has oxfmt, and `detect()` is
+        // config-only (it never probes the binary), so selection can reach here
+        // with nothing installed. The static command is bare `oxfmt` — spawning it
+        // only reproduces the reported `spawn oxfmt ENOENT`. Prove it unavailable.
+        return FORMATTER_UNAVAILABLE;
     },
     // Single source of truth: OXFMT_SUPPORTED_EXTENSIONS in tool-policy.ts.
     // Do not hand-maintain a second copy of this list (#1134 — previously two
@@ -784,7 +929,12 @@ export const ruffFormatter = {
         const installed = await ensureTool(toolId);
         if (installed)
             return [installed, ...args, filePath];
-        return null;
+        // #2413: `ensureTool` already resolves PATH, global bins and the managed
+        // dir (and attempts an install) before returning falsy, so reaching here
+        // means ruff is genuinely nowhere. `detect()`'s `hasRuffConfig` branch has
+        // no binary check, so a config-only project selects ruff with nothing
+        // installed; the static bare `ruff` would then ENOENT. Prove it unavailable.
+        return FORMATTER_UNAVAILABLE;
     },
     async detect(cwd) {
         if (hasRuffConfig(cwd))
@@ -847,6 +997,18 @@ export const rustfmtFormatter = {
     name: "rustfmt",
     command: ["rustfmt", "$FILE"],
     extensions: [".rs"],
+    // #2466: rustfmt defaults to an OLDER edition than the file's actual Cargo
+    // package when invoked bare, so it can reject valid newer-edition syntax
+    // (e.g. Rust 2024). Carry the nearest package's `edition` (honoring
+    // `edition.workspace = true` inheritance) through `--edition`; `undefined`
+    // (unreadable/unparseable manifest) falls back to the static command
+    // above, unchanged from pre-#2466 behavior.
+    async resolveCommand(filePath, _cwd) {
+        const edition = await resolveCargoPackageEdition(filePath);
+        if (edition === undefined)
+            return null;
+        return ["rustfmt", "--edition", edition, filePath];
+    },
     async detect(cwd) {
         if ((await which("rustfmt")) !== null)
             return true;
@@ -971,13 +1133,27 @@ export const ktfmtFormatter = {
     // ktfmt formats in place when given a file path (no flag needed).
     command: ["ktfmt", "$FILE"],
     extensions: [".kt", ".kts"],
+    // #2468: ktfmt's CLI never reads a project's Gradle `ktfmt { googleStyle()
+    // | kotlinLangStyle() }` selection — style is CLI-flag-only
+    // (`--google-style`/`--kotlinlang-style`, verified against ktfmt v0.63's
+    // own arg parser). Carry the nearest module's declared style through;
+    // `undefined` (no declaration, unreadable/unparseable manifest, or an
+    // unsupported style like the removed `dropboxStyle()`) falls back to the
+    // bare invocation, unchanged from pre-#2468 behavior.
     async resolveCommand(filePath, _cwd) {
+        const styleFlag = await resolveKtfmtGradleStyle(filePath);
         const inPath = await which("ktfmt");
         if (inPath)
-            return [inPath, filePath];
+            return styleFlag ? [inPath, styleFlag, filePath] : [inPath, filePath];
         const { ensureTool } = await import("./installer/index.js");
         const installed = await ensureTool("ktfmt");
-        return installed ? [installed, filePath] : null;
+        // #2413: which() and ensureTool (PATH/global/managed + install) both
+        // failed, and `detect()` gates only on hasKtfmtConfig — no binary probe —
+        // so a config-only project reaches here with ktfmt absent. The static
+        // command is bare `ktfmt`; spawning it reproduces the ENOENT class.
+        if (!installed)
+            return FORMATTER_UNAVAILABLE;
+        return styleFlag ? [installed, styleFlag, filePath] : [installed, filePath];
     },
     async detect(cwd) {
         // Opt-in only: ktfmt becomes the formatter when the project elects it,
@@ -1063,18 +1239,49 @@ export const phpCsFixerFormatter = {
     name: "php-cs-fixer",
     command: ["php-cs-fixer", "fix", "$FILE"],
     extensions: [".php"],
+    // #2472: php-cs-fixer does NOT walk up parent directories looking for its
+    // own config the way prettier/biome/eslint do (verified against upstream
+    // `computeConfigFiles()` — see `resolvePhpCsFixerConfig`'s doc comment),
+    // and `formatFile` spawns with cwd = the FILE's own directory, which is
+    // not necessarily where the ancestor config `detect()` found actually
+    // lives. Always resolve the binary explicitly here (vendor/bin first,
+    // then global) rather than falling through to the static `command` above
+    // — that static command can never carry `--config`, so a config found at
+    // an ancestor would silently be dropped whenever the vendor lookup here
+    // missed but a global binary still resolved. `--config` is attached
+    // whenever a config resolves, even when it sits in the file's own
+    // directory (AC3): unlike the pre-#2472 code, correctness no longer
+    // depends on php-cs-fixer's own (nonexistent) upward search.
     async resolveCommand(filePath, cwd) {
-        const vendor = await findInVendorBin("php-cs-fixer", cwd);
-        if (vendor)
-            return [vendor, "fix", filePath];
-        return null;
+        const configPath = resolvePhpCsFixerConfig(filePath);
+        const binary = (await findInVendorBin("php-cs-fixer", cwd)) ??
+            (await which("php-cs-fixer"));
+        // #2413/#2472 review F4: both probes (vendor/bin, then PATH) have
+        // PROVEN the binary is absent — returning `null` here would fall back
+        // to the static `command` above, which is the SAME bare
+        // `php-cs-fixer` this just failed to find, spawning it only to
+        // re-observe the ENOENT already known. Report the proven-missing
+        // state instead so `formatFile` skips the wasted spawn.
+        if (!binary)
+            return FORMATTER_UNAVAILABLE;
+        return configPath
+            ? [binary, "fix", "--config", configPath, filePath]
+            : [binary, "fix", filePath];
     },
     async detect(cwd) {
         const vendorBin = await findInVendorBin("php-cs-fixer", cwd);
         const globalBin = await which("php-cs-fixer");
         if (!vendorBin && !globalBin)
             return false;
-        // Only run if project has explicit config
+        // Only run if project has explicit config. This is a presence-only
+        // climb from the project `cwd` (not necessarily the formatted file's
+        // own directory) via this file's own `findUp` — deliberately NOT
+        // merged with `resolvePhpCsFixerConfig` above (#2472 AC4): that
+        // resolver climbs from the FILE's directory and needs the exact
+        // winning path for `--config`, while this only needs a yes/no answer
+        // from whatever `cwd` the caller passed. `rustfmtFormatter.detect`
+        // keeps the same non-merged shape against `resolveCargoPackageEdition`
+        // for the identical reason.
         const configs = [".php-cs-fixer.php", ".php-cs-fixer.dist.php"];
         const found = await findUp(configs, cwd);
         return found.length > 0;
@@ -1333,9 +1540,15 @@ export const ALL_FORMATTERS = [
 const FILENAME_FORMATTER_BASENAMES = new Set(ALL_FORMATTERS.flatMap((f) => f.filenames ?? []));
 // Cache for detection results - stores array of enabled formatter names per cwd+ext
 const detectionCache = new BoundedLruCache(32);
+// The signature is immutable for a cache generation. This memo is separate
+// from detectionCache because a cwd can have several extension entries, and a
+// warm lookup must not repeat the ancestor walk or stat matched configs.
+const formatterSignatureFlights = new BoundedLruCache(32);
+const formatterCacheGeneration = createGenerationSource("formatter-cache");
 // These are the formatter configuration files consulted by the policy helpers
-// above. Their metadata is part of detection cache identity: changing a file
-// must re-run detection even when PATH and installed tools are unchanged. A
+// above. Their metadata is captured by the cold detection signature. The
+// write-result seam invalidates that signature when a config path changes, so
+// detection re-runs even when PATH and installed tools are unchanged. A
 // filename a `has*Config` check reads but this list omits is invisible to the
 // cache: the signature never moves when that file is added, so a project that
 // opts in AFTER the first `getFormattersForFile` call for its cwd keeps
@@ -1436,6 +1649,18 @@ async function formatterConfigSignature(cwd) {
     }));
     return parts.join("|");
 }
+async function getFormatterConfigSignature(cwd, normalizedCwd) {
+    const existing = formatterSignatureFlights.get(normalizedCwd);
+    if (existing)
+        return existing.promise;
+    const promise = formatterConfigSignature(cwd).finally(() => {
+        const current = formatterSignatureFlights.get(normalizedCwd);
+        if (current?.promise === promise)
+            formatterSignatureFlights.delete(normalizedCwd);
+    });
+    formatterSignatureFlights.set(normalizedCwd, { promise });
+    return promise;
+}
 // --- Public API ---
 export async function getFormattersForFile(filePath, cwd) {
     const ext = path.extname(filePath).toLowerCase();
@@ -1449,31 +1674,19 @@ export async function getFormattersForFile(filePath, cwd) {
     const cacheKey = FILENAME_FORMATTER_BASENAMES.has(base)
         ? `${normalizedCwd}:${ext}:${base}`
         : `${normalizedCwd}:${ext}`;
-    const configSignature = await formatterConfigSignature(cwd);
-    // Check cache
+    // A warm entry is authoritative until the write-result seam invalidates its
+    // config path. This is the only way to make the warm path free of config
+    // polling while still reacting immediately to pi-authored create/remove/
+    // change events. External editor changes remain a documented session-boundary
+    // limitation, like other write-result-owned freshness seams.
     let cached = detectionCache.get(normalizedCwd);
-    if (cached && cached.signature !== configSignature) {
-        // An EXISTING entry whose signature moved is the user telling us the world
-        // changed. Re-probe PATH too, so "install the tool, touch the config" still
-        // works within one session now that a durable absence latches (#1495).
-        // Scoped to a real change on purpose: keying this off "no entry yet" would
-        // drop every PATH verdict on the first save in each new directory, which in
-        // a monorepo means re-probing forever.
-        detectionCache.delete(normalizedCwd);
-        cached = undefined;
-        resetWhichLatches();
-    }
-    if (!cached) {
-        cached = { signature: configSignature, entries: new Map() };
-        detectionCache.set(normalizedCwd, cached);
-    }
-    if (cached.entries.has(cacheKey)) {
+    if (cached?.entries.has(cacheKey)) {
         const enabledNames = cached.entries.get(cacheKey);
         const selectedFormatterName = enabledNames && enabledNames.length > 0 ? enabledNames[0] : null;
         logLatency({
             type: "phase",
             phase: "formatter_selected",
-            filePath: filePath,
+            filePath,
             durationMs: 0,
             metadata: {
                 formatter: selectedFormatterName,
@@ -1485,9 +1698,26 @@ export async function getFormattersForFile(filePath, cwd) {
         });
         if (!enabledNames || enabledNames.length === 0)
             return [];
-        // Return cached formatters by name (preserves priority order)
         return ALL_FORMATTERS.filter((f) => enabledNames.includes(f.name));
     }
+    if (!cached) {
+        const generation = formatterCacheGeneration.capture();
+        const configSignature = await getFormatterConfigSignature(cwd, normalizedCwd);
+        // An invalidation can happen while the first signature walk is in flight.
+        // Do not publish a pre-invalidation signature into the new generation.
+        if (!generation.isCurrent()) {
+            return getFormattersForFile(filePath, cwd);
+        }
+        // Another cold caller for this cwd can finish the shared signature flight
+        // first. Re-read the LRU before installing an object so the later caller
+        // merges its extension entry into the existing object instead of replacing
+        // the earlier entry.
+        cached = detectionCache.get(normalizedCwd);
+        if (!cached) {
+            cached = { signature: configSignature, entries: new Map() };
+            detectionCache.set(normalizedCwd, cached);
+        }
+    }
     // Detect formatters for this extension (or exact filename, e.g. terragrunt.hcl)
     const matching = ALL_FORMATTERS.filter((f) => f.extensions.includes(ext) || f.filenames?.includes(base));
     const formatterPolicy = getFormatterPolicyForFile(filePath);
@@ -1641,7 +1871,11 @@ export async function getFormattersForFile(filePath, cwd) {
         return enabled;
     // Store the list of enabled formatter names in cache
     const enabledNames = enabled.map((f) => f.name);
-    cached.entries.set(cacheKey, enabledNames);
+    // An invalidation may have removed or replaced this object while detection
+    // awaited a tool probe. Never repopulate the old generation.
+    if (detectionCache.get(normalizedCwd) === cached) {
+        cached.entries.set(cacheKey, enabledNames);
+    }
     return enabled;
 }
 /**
@@ -1655,9 +1889,21 @@ export async function getFormattersForFile(filePath, cwd) {
  * therefore re-arms every directory EXCEPT the one the user is working in.
  */
 export function clearFormatterCache() {
+    formatterCacheGeneration.bump();
+    formatterSignatureFlights.clear();
     detectionCache.clear();
     resetWhichLatches();
 }
+const formatterConfigBasenames = new Set(FORMATTER_CONFIG_FILES.map((fileName) => fileName.toLowerCase()));
+/** Invalidate selection when the write-result seam reports a config path. */
+export function invalidateFormatterCacheForPath(filePath) {
+    const basename = filePath.includes("\\")
+        ? path.win32.basename(filePath)
+        : path.basename(filePath);
+    if (!formatterConfigBasenames.has(basename.toLowerCase()))
+        return;
+    clearFormatterCache();
+}
 /**
  * Test-only internals access for the session-state registry probe (#1895):
  * the conformance suite must arm all four pieces of state this reset claims
@@ -1669,19 +1915,17 @@ export function _getFormatterResetStateForTests() {
         whichTransientCommands,
         cooldownRecordedForRetryAtMs,
         detectionCache,
+        formatterSignatureFlights,
     };
 }
 export function clearFormatterRuntimeState() {
-    detectionCache.clear();
-    resetWhichLatches();
+    clearFormatterCache();
     // NO `resetLazyInstallAttempts()` here (#1537 review F1). This function runs
     // from `resetFormatService()`, which `handleTurnEnd` calls every turn — so
     // clearing the lazy-install hold here made "held for the session" mean "held
     // for a turn", and a failing install re-ran every turn. The hold's only reset
     // is `session_start`'s block in runtime-session.ts.
 }
-// ESC is built via fromCharCode so no raw control byte sits in the source.
-const ANSI_ESCAPE = new RegExp(`${String.fromCharCode(27)}\\[[0-9;]*[A-Za-z]`, "g");
 const BOX_DRAWING_GLOBAL = /[\u2500-\u257F]/g;
 const HAS_BOX_DRAWING = /[\u2500-\u257F]/;
 /**
@@ -1698,7 +1942,7 @@ const HAS_BOX_DRAWING = /[\u2500-\u257F]/;
  */
 export function firstDiagnosticLine(text) {
     for (const raw of (text ?? "").split("\n")) {
-        const line = raw.replace(ANSI_ESCAPE, "").trimEnd();
+        const line = stripAnsi(raw).trimEnd();
         const stripped = line.replace(BOX_DRAWING_GLOBAL, "").trim();
         if (!stripped)
             continue;
@@ -1724,6 +1968,12 @@ async function resolveFormatterCommand(formatter, absolutePath, cwd) {
         : null;
     if (resolved === SKIP_FORMATTING)
         return SKIP_FORMATTING;
+    // The resolver proved the executable absent — DO NOT fall through to the
+    // static bare command, which is the same binary it just probed and missing
+    // (#2413). The caller turns this into a typed `unavailable` outcome, never a
+    // spawn and never a failure.
+    if (resolved === FORMATTER_UNAVAILABLE)
+        return FORMATTER_UNAVAILABLE;
     if (resolved !== null)
         return resolved;
     const fallback = formatter.command.map((c) => c.replace("$FILE", absolutePath));
@@ -1743,6 +1993,7 @@ export async function formatFile(filePath, formatter) {
     try {
         const absolutePath = path.resolve(filePath);
         const cwd = path.dirname(absolutePath);
+        const formatterCwd = resolveFormatterCwd(absolutePath, formatter.name);
         const contentBefore = await fs.readFile(absolutePath, "utf-8");
         // Resolve command: prefer local (venv/vendor/node_modules) over global.
         // The shared seam must honor SKIP_FORMATTING before selecting the static
@@ -1751,13 +2002,40 @@ export async function formatFile(filePath, formatter) {
         if (cmd === SKIP_FORMATTING) {
             // Style-preserving refusal (#1144): no repo config and no detectable
             // indentation to pin — formatting would impose the tool's stock style.
-            return { success: true, changed: false };
+            return { success: true, changed: false, outcome: "skipped" };
+        }
+        if (cmd === FORMATTER_UNAVAILABLE) {
+            // The resolver proved the executable absent (#2413): the oxfmt ENOENT
+            // trap and its siblings. This is unavailable infrastructure, not a code
+            // failure — success stays true so it is never counted as a failed file
+            // or requeued, and the typed outcome keeps it out of the failure bucket.
+            return {
+                success: true,
+                changed: false,
+                outcome: "unavailable",
+                error: `${formatter.name}: formatter executable not found`,
+            };
         }
         // Run formatter without blocking the event loop.
         const result = await safeSpawnAsync(cmd[0], cmd.slice(1), {
             timeout: 15000,
-            cwd,
+            cwd: formatterCwd,
         });
+        // A resolver that could NOT prove absence (it never probed PATH — e.g.
+        // black/sqlfluff, which only look in a venv) legitimately falls back to the
+        // bare static command. When that bare command is missing, the spawn boundary
+        // reports a typed `tool-not-found` failure — never a nonzero exit. Treat it
+        // as unavailable, not a formatting failure, closing the same #2413 class for
+        // the formatters whose `null` correctly means "static untried" (no
+        // oxfmt-specific string matching — this reads the typed spawn-failure kind).
+        if (result.spawnFailure?.kind === "tool-not-found") {
+            return {
+                success: true,
+                changed: false,
+                outcome: "unavailable",
+                error: result.spawnFailure.message,
+            };
+        }
         // Strict by default (#1337): only a formatter with a documented
         // benign-nonzero mode (`lenientExitCode`) may exit nonzero and still be
         // read as a successful run. Everything else that exits nonzero never
@@ -1770,6 +2048,7 @@ export async function formatFile(filePath, formatter) {
             return {
                 success: false,
                 changed: false,
+                outcome: "failed",
                 error: result.error?.message ||
                     firstDiagnosticLine(result.stderr) ||
                     // biome, ktlint and `mix format` report on STDOUT; without this
@@ -1785,12 +2064,14 @@ export async function formatFile(filePath, formatter) {
         return {
             success: true,
             changed,
+            outcome: changed ? "formatted" : "unchanged",
         };
     }
     catch (err) {
         return {
             success: false,
             changed: false,
+            outcome: "failed",
             error: err instanceof Error ? err.message : String(err),
         };
     }