@dollhousemcp/mcp-server 2.0.36 → 2.0.38

package/dist/utils/pathSecurity.js

@@ -1,8 +1,97 @@
+import * as fs from 'node:fs';
 import * as path from 'node:path';
+function isMissingPathError(error) {
+    const code = typeof error === 'object' && error !== null && 'code' in error
+        ? error.code
+        : undefined;
+    return code === 'ENOENT' || code === 'ENOTDIR';
+}
+/**
+ * lstat of the deepest ancestor of `startPath` that exists, or null when
+ * nothing up to the filesystem root exists. Used to vet paths that will be
+ * created later: their containment depends on the directory they will be
+ * created inside.
+ *
+ * KNOWN LIMIT (#2344): this stops at the first ancestor lstat can see, and
+ * lstat resolves intermediate symlinks — so a symlink whose target already
+ * contains a matching subdirectory is reported as a plain directory and the
+ * symlink component itself is never inspected. Walking every lexical ancestor
+ * instead is not an option: system symlinks (macOS /tmp -> /private/tmp,
+ * /var -> /private/var) sit above every temp path and would false-positive.
+ * Full protection needs a caller-known boundary, which is exactly what
+ * vetOutputBase() provides — see the contract note on resolvePathWithinBase.
+ */
+function nearestExistingAncestorStats(startPath) {
+    let previous = startPath;
+    let current = path.dirname(startPath);
+    while (current !== previous) {
+        try {
+            return fs.lstatSync(current);
+        }
+        catch (error) {
+            if (!isMissingPathError(error)) {
+                throw error;
+            }
+        }
+        previous = current;
+        current = path.dirname(current);
+    }
+    return null;
+}
+function assertNotSymlink(pathToCheck, message) {
+    let stats;
+    try {
+        stats = fs.lstatSync(pathToCheck);
+    }
+    catch (error) {
+        if (isMissingPathError(error)) {
+            // The path does not exist yet, so it will be created by a later
+            // mkdir/write. That is only safe if the directory it gets created
+            // inside is real: a symlinked existing ancestor would redirect the
+            // recursive create outside the containment boundary (#2342).
+            const ancestorStats = nearestExistingAncestorStats(pathToCheck);
+            if (ancestorStats?.isSymbolicLink()) {
+                throw new Error(message);
+            }
+            return;
+        }
+        throw error;
+    }
+    if (stats.isSymbolicLink()) {
+        throw new Error(message);
+    }
+}
+function assertNoSymlinkedDescendants(resolvedBase, resolvedTarget) {
+    const relativePath = path.relative(resolvedBase, resolvedTarget);
+    if (!relativePath) {
+        return;
+    }
+    let currentPath = resolvedBase;
+    for (const segment of relativePath.split(path.sep)) {
+        if (!segment) {
+            continue;
+        }
+        currentPath = path.join(currentPath, segment);
+        assertNotSymlink(currentPath, 'Path segment resolves through a symbolic link');
+    }
+}
 /**
  * Resolve a target path and verify that it remains inside the intended base
  * directory. This is separator-aware, so sibling paths such as `/tmp/base2`
- * are not treated as children of `/tmp/base`.
+ * are not treated as children of `/tmp/base`. Existing symlinked base paths
+ * and symlinked descendants under the base are rejected because writes would
+ * follow them outside the lexical containment boundary. A base that does not
+ * exist yet is vetted through its nearest existing ancestor: if that ancestor
+ * is a symlink, the recursive mkdir/write that follows would be redirected
+ * outside the intended tree, so it is rejected too (#2342).
+ *
+ * CONTRACT (#2344): the base's own ancestry can only be best-effort vetted
+ * here — a symlink whose target pre-contains matching subdirectories is not
+ * detectable without a caller-known boundary (see nearestExistingAncestorStats
+ * for why walking every ancestor false-positives on system symlinks). Do NOT
+ * pass user-controlled base paths directly to this function: vet them first
+ * with vetOutputBase(), which contains them canonically against an anchor and
+ * returns the canonical base to use here. Every current caller does this.
  */
 export function resolvePathWithinBase(baseDir, ...segments) {
     if (!baseDir || typeof baseDir !== 'string') {
@@ -23,8 +112,89 @@ export function resolvePathWithinBase(baseDir, ...segments) {
         || relativePath.startsWith('..' + path.sep)
         || path.isAbsolute(relativePath);
     if (!isTraversal) {
+        assertNotSymlink(resolvedBase, 'Base directory resolves through a symbolic link');
+        assertNoSymlinkedDescendants(resolvedBase, resolvedTarget);
         return resolvedTarget;
     }
     throw new Error('Resolved path escapes the base directory');
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGF0aFNlY3VyaXR5LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL3BhdGhTZWN1cml0eS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssSUFBSSxNQUFNLFdBQVcsQ0FBQztBQUVsQzs7OztHQUlHO0FBQ0gsTUFBTSxVQUFVLHFCQUFxQixDQUFDLE9BQWUsRUFBRSxHQUFHLFFBQWtCO0lBQzFFLElBQUksQ0FBQyxPQUFPLElBQUksT0FBTyxPQUFPLEtBQUssUUFBUSxFQUFFLENBQUM7UUFDNUMsTUFBTSxJQUFJLFNBQVMsQ0FBQywyQ0FBMkMsQ0FBQyxDQUFDO0lBQ25FLENBQUM7SUFFRCxLQUFLLE1BQU0sT0FBTyxJQUFJLFFBQVEsRUFBRSxDQUFDO1FBQy9CLElBQUksT0FBTyxPQUFPLEtBQUssUUFBUSxFQUFFLENBQUM7WUFDaEMsTUFBTSxJQUFJLFNBQVMsQ0FBQywrQkFBK0IsQ0FBQyxDQUFDO1FBQ3ZELENBQUM7UUFDRCxJQUFJLE9BQU8sQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQztZQUMzQixNQUFNLElBQUksS0FBSyxDQUFDLG1DQUFtQyxDQUFDLENBQUM7UUFDdkQsQ0FBQztJQUNILENBQUM7SUFFRCxNQUFNLFlBQVksR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQzNDLE1BQU0sY0FBYyxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsWUFBWSxFQUFFLEdBQUcsUUFBUSxDQUFDLENBQUM7SUFDL0QsTUFBTSxZQUFZLEdBQUcsSUFBSSxDQUFDLFFBQVEsQ0FBQyxZQUFZLEVBQUUsY0FBYyxDQUFDLENBQUM7SUFDakUsTUFBTSxXQUFXLEdBQUcsWUFBWSxLQUFLLElBQUk7V0FDcEMsWUFBWSxDQUFDLFVBQVUsQ0FBQyxJQUFJLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQztXQUN4QyxJQUFJLENBQUMsVUFBVSxDQUFDLFlBQVksQ0FBQyxDQUFDO0lBRW5DLElBQUksQ0FBQyxXQUFXLEVBQUUsQ0FBQztRQUNqQixPQUFPLGNBQWMsQ0FBQztJQUN4QixDQUFDO0lBRUQsTUFBTSxJQUFJLEtBQUssQ0FBQywwQ0FBMEMsQ0FBQyxDQUFDO0FBQzlELENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgKiBhcyBwYXRoIGZyb20gJ25vZGU6cGF0aCc7XG5cbi8qKlxuICogUmVzb2x2ZSBhIHRhcmdldCBwYXRoIGFuZCB2ZXJpZnkgdGhhdCBpdCByZW1haW5zIGluc2lkZSB0aGUgaW50ZW5kZWQgYmFzZVxuICogZGlyZWN0b3J5LiBUaGlzIGlzIHNlcGFyYXRvci1hd2FyZSwgc28gc2libGluZyBwYXRocyBzdWNoIGFzIGAvdG1wL2Jhc2UyYFxuICogYXJlIG5vdCB0cmVhdGVkIGFzIGNoaWxkcmVuIG9mIGAvdG1wL2Jhc2VgLlxuICovXG5leHBvcnQgZnVuY3Rpb24gcmVzb2x2ZVBhdGhXaXRoaW5CYXNlKGJhc2VEaXI6IHN0cmluZywgLi4uc2VnbWVudHM6IHN0cmluZ1tdKTogc3RyaW5nIHtcbiAgaWYgKCFiYXNlRGlyIHx8IHR5cGVvZiBiYXNlRGlyICE9PSAnc3RyaW5nJykge1xuICAgIHRocm93IG5ldyBUeXBlRXJyb3IoJ0Jhc2UgZGlyZWN0b3J5IG11c3QgYmUgYSBub24tZW1wdHkgc3RyaW5nJyk7XG4gIH1cblxuICBmb3IgKGNvbnN0IHNlZ21lbnQgb2Ygc2VnbWVudHMpIHtcbiAgICBpZiAodHlwZW9mIHNlZ21lbnQgIT09ICdzdHJpbmcnKSB7XG4gICAgICB0aHJvdyBuZXcgVHlwZUVycm9yKCdQYXRoIHNlZ21lbnRzIG11c3QgYmUgc3RyaW5ncycpO1xuICAgIH1cbiAgICBpZiAoc2VnbWVudC5pbmNsdWRlcygnXFwwJykpIHtcbiAgICAgIHRocm93IG5ldyBFcnJvcignUGF0aCBzZWdtZW50IGNvbnRhaW5zIGEgbnVsbCBieXRlJyk7XG4gICAgfVxuICB9XG5cbiAgY29uc3QgcmVzb2x2ZWRCYXNlID0gcGF0aC5yZXNvbHZlKGJhc2VEaXIpO1xuICBjb25zdCByZXNvbHZlZFRhcmdldCA9IHBhdGgucmVzb2x2ZShyZXNvbHZlZEJhc2UsIC4uLnNlZ21lbnRzKTtcbiAgY29uc3QgcmVsYXRpdmVQYXRoID0gcGF0aC5yZWxhdGl2ZShyZXNvbHZlZEJhc2UsIHJlc29sdmVkVGFyZ2V0KTtcbiAgY29uc3QgaXNUcmF2ZXJzYWwgPSByZWxhdGl2ZVBhdGggPT09ICcuLidcbiAgICB8fCByZWxhdGl2ZVBhdGguc3RhcnRzV2l0aCgnLi4nICsgcGF0aC5zZXApXG4gICAgfHwgcGF0aC5pc0Fic29sdXRlKHJlbGF0aXZlUGF0aCk7XG5cbiAgaWYgKCFpc1RyYXZlcnNhbCkge1xuICAgIHJldHVybiByZXNvbHZlZFRhcmdldDtcbiAgfVxuXG4gIHRocm93IG5ldyBFcnJvcignUmVzb2x2ZWQgcGF0aCBlc2NhcGVzIHRoZSBiYXNlIGRpcmVjdG9yeScpO1xufVxuIl19
+/** True when a base-relative path points outside the base. */
+function escapesBase(relativePath) {
+    return relativePath === '..'
+        || relativePath.startsWith('..' + path.sep)
+        || path.isAbsolute(relativePath);
+}
+/**
+ * Canonical (realpath) form of a path that may not fully exist yet: the
+ * deepest existing ancestor is resolved through every symlink, and the
+ * not-yet-created suffix is appended unchanged. This answers "where would a
+ * recursive mkdir/write on this path REALLY land?" — which per-component
+ * lstat checks cannot, because lstat resolves intermediate symlinks and only
+ * reports on the final component (#2344).
+ */
+export function canonicalizePath(inputPath) {
+    const resolved = path.resolve(inputPath);
+    const missing = [];
+    let current = resolved;
+    for (;;) {
+        try {
+            const canonical = fs.realpathSync(current);
+            return missing.length ? path.join(canonical, ...missing) : canonical;
+        }
+        catch (error) {
+            if (!isMissingPathError(error)) {
+                throw error;
+            }
+        }
+        const parent = path.dirname(current);
+        if (parent === current) {
+            // Nothing on the chain exists (should not happen for absolute paths —
+            // the root exists — but keep a lexical fallback rather than throwing).
+            return missing.length ? path.join(current, ...missing) : current;
+        }
+        missing.unshift(path.basename(current));
+        current = parent;
+    }
+}
+/**
+ * Vets a user-supplied output base for CLI writes and returns the canonical
+ * path all subsequent writes should use (#2344).
+ *
+ * Two regimes, split by what the user lexically named:
+ *
+ *  - Base inside the anchor (relative outputs like the './anthropic-skills'
+ *    default): the canonical base must stay inside the canonical anchor.
+ *    A symlink that redirects it elsewhere — including one whose target
+ *    already contains matching subdirectories, the case per-component lstat
+ *    checks miss — is rejected. Comparing in canonical space means system
+ *    links above the anchor (macOS /tmp -> /private/tmp) never false-positive.
+ *
+ *  - Base outside the anchor (explicit absolute or ../ outputs): the user
+ *    named that destination, so there is no boundary to defend. Instead of
+ *    guessing intent, the real destination is disclosed via `onDisclose`
+ *    whenever it differs from the lexical path, and the canonical path is
+ *    returned so what was vetted is what gets written.
+ */
+export function vetOutputBase(baseDir, options) {
+    if (!baseDir || typeof baseDir !== 'string') {
+        throw new TypeError('Base directory must be a non-empty string');
+    }
+    if (baseDir.includes('\0')) {
+        throw new Error('Path segment contains a null byte');
+    }
+    const resolvedAnchor = path.resolve(options?.anchor ?? process.cwd());
+    const resolvedBase = path.resolve(baseDir);
+    const canonicalBase = canonicalizePath(resolvedBase);
+    if (!escapesBase(path.relative(resolvedAnchor, resolvedBase))) {
+        const canonicalAnchor = canonicalizePath(resolvedAnchor);
+        if (escapesBase(path.relative(canonicalAnchor, canonicalBase))) {
+            throw new Error(`Output path resolves outside the working directory through a symbolic link (real destination: ${canonicalBase})`);
+        }
+        return canonicalBase;
+    }
+    if (canonicalBase !== resolvedBase) {
+        options?.onDisclose?.(canonicalBase);
+    }
+    return canonicalBase;
+}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"pathSecurity.js","sourceRoot":"","sources":["../../src/utils/pathSecurity.ts"],"names":[],"mappings":"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","sourcesContent":["import * as fs from 'node:fs';\nimport * as path from 'node:path';\n\nfunction isMissingPathError(error: unknown): boolean {\n  const code = typeof error === 'object' && error !== null && 'code' in error\n    ? (error as NodeJS.ErrnoException).code\n    : undefined;\n  return code === 'ENOENT' || code === 'ENOTDIR';\n}\n\n/**\n * lstat of the deepest ancestor of `startPath` that exists, or null when\n * nothing up to the filesystem root exists. Used to vet paths that will be\n * created later: their containment depends on the directory they will be\n * created inside.\n *\n * KNOWN LIMIT (#2344): this stops at the first ancestor lstat can see, and\n * lstat resolves intermediate symlinks — so a symlink whose target already\n * contains a matching subdirectory is reported as a plain directory and the\n * symlink component itself is never inspected. Walking every lexical ancestor\n * instead is not an option: system symlinks (macOS /tmp -> /private/tmp,\n * /var -> /private/var) sit above every temp path and would false-positive.\n * Full protection needs a caller-known boundary, which is exactly what\n * vetOutputBase() provides — see the contract note on resolvePathWithinBase.\n */\nfunction nearestExistingAncestorStats(startPath: string): fs.Stats | null {\n  let previous = startPath;\n  let current = path.dirname(startPath);\n  while (current !== previous) {\n    try {\n      return fs.lstatSync(current);\n    } catch (error) {\n      if (!isMissingPathError(error)) {\n        throw error;\n      }\n    }\n    previous = current;\n    current = path.dirname(current);\n  }\n  return null;\n}\n\nfunction assertNotSymlink(pathToCheck: string, message: string): void {\n  let stats: fs.Stats;\n  try {\n    stats = fs.lstatSync(pathToCheck);\n  } catch (error) {\n    if (isMissingPathError(error)) {\n      // The path does not exist yet, so it will be created by a later\n      // mkdir/write. That is only safe if the directory it gets created\n      // inside is real: a symlinked existing ancestor would redirect the\n      // recursive create outside the containment boundary (#2342).\n      const ancestorStats = nearestExistingAncestorStats(pathToCheck);\n      if (ancestorStats?.isSymbolicLink()) {\n        throw new Error(message);\n      }\n      return;\n    }\n    throw error;\n  }\n  if (stats.isSymbolicLink()) {\n    throw new Error(message);\n  }\n}\n\nfunction assertNoSymlinkedDescendants(resolvedBase: string, resolvedTarget: string): void {\n  const relativePath = path.relative(resolvedBase, resolvedTarget);\n  if (!relativePath) {\n    return;\n  }\n\n  let currentPath = resolvedBase;\n  for (const segment of relativePath.split(path.sep)) {\n    if (!segment) {\n      continue;\n    }\n\n    currentPath = path.join(currentPath, segment);\n    assertNotSymlink(currentPath, 'Path segment resolves through a symbolic link');\n  }\n}\n\n/**\n * Resolve a target path and verify that it remains inside the intended base\n * directory. This is separator-aware, so sibling paths such as `/tmp/base2`\n * are not treated as children of `/tmp/base`. Existing symlinked base paths\n * and symlinked descendants under the base are rejected because writes would\n * follow them outside the lexical containment boundary. A base that does not\n * exist yet is vetted through its nearest existing ancestor: if that ancestor\n * is a symlink, the recursive mkdir/write that follows would be redirected\n * outside the intended tree, so it is rejected too (#2342).\n *\n * CONTRACT (#2344): the base's own ancestry can only be best-effort vetted\n * here — a symlink whose target pre-contains matching subdirectories is not\n * detectable without a caller-known boundary (see nearestExistingAncestorStats\n * for why walking every ancestor false-positives on system symlinks). Do NOT\n * pass user-controlled base paths directly to this function: vet them first\n * with vetOutputBase(), which contains them canonically against an anchor and\n * returns the canonical base to use here. Every current caller does this.\n */\nexport function resolvePathWithinBase(baseDir: string, ...segments: string[]): string {\n  if (!baseDir || typeof baseDir !== 'string') {\n    throw new TypeError('Base directory must be a non-empty string');\n  }\n\n  for (const segment of segments) {\n    if (typeof segment !== 'string') {\n      throw new TypeError('Path segments must be strings');\n    }\n    if (segment.includes('\\0')) {\n      throw new Error('Path segment contains a null byte');\n    }\n  }\n\n  const resolvedBase = path.resolve(baseDir);\n  const resolvedTarget = path.resolve(resolvedBase, ...segments);\n  const relativePath = path.relative(resolvedBase, resolvedTarget);\n  const isTraversal = relativePath === '..'\n    || relativePath.startsWith('..' + path.sep)\n    || path.isAbsolute(relativePath);\n\n  if (!isTraversal) {\n    assertNotSymlink(resolvedBase, 'Base directory resolves through a symbolic link');\n    assertNoSymlinkedDescendants(resolvedBase, resolvedTarget);\n    return resolvedTarget;\n  }\n\n  throw new Error('Resolved path escapes the base directory');\n}\n\n/** True when a base-relative path points outside the base. */\nfunction escapesBase(relativePath: string): boolean {\n  return relativePath === '..'\n    || relativePath.startsWith('..' + path.sep)\n    || path.isAbsolute(relativePath);\n}\n\n/**\n * Canonical (realpath) form of a path that may not fully exist yet: the\n * deepest existing ancestor is resolved through every symlink, and the\n * not-yet-created suffix is appended unchanged. This answers \"where would a\n * recursive mkdir/write on this path REALLY land?\" — which per-component\n * lstat checks cannot, because lstat resolves intermediate symlinks and only\n * reports on the final component (#2344).\n */\nexport function canonicalizePath(inputPath: string): string {\n  const resolved = path.resolve(inputPath);\n  const missing: string[] = [];\n  let current = resolved;\n  for (;;) {\n    try {\n      const canonical = fs.realpathSync(current);\n      return missing.length ? path.join(canonical, ...missing) : canonical;\n    } catch (error) {\n      if (!isMissingPathError(error)) {\n        throw error;\n      }\n    }\n    const parent = path.dirname(current);\n    if (parent === current) {\n      // Nothing on the chain exists (should not happen for absolute paths —\n      // the root exists — but keep a lexical fallback rather than throwing).\n      return missing.length ? path.join(current, ...missing) : current;\n    }\n    missing.unshift(path.basename(current));\n    current = parent;\n  }\n}\n\n/**\n * Vets a user-supplied output base for CLI writes and returns the canonical\n * path all subsequent writes should use (#2344).\n *\n * Two regimes, split by what the user lexically named:\n *\n *  - Base inside the anchor (relative outputs like the './anthropic-skills'\n *    default): the canonical base must stay inside the canonical anchor.\n *    A symlink that redirects it elsewhere — including one whose target\n *    already contains matching subdirectories, the case per-component lstat\n *    checks miss — is rejected. Comparing in canonical space means system\n *    links above the anchor (macOS /tmp -> /private/tmp) never false-positive.\n *\n *  - Base outside the anchor (explicit absolute or ../ outputs): the user\n *    named that destination, so there is no boundary to defend. Instead of\n *    guessing intent, the real destination is disclosed via `onDisclose`\n *    whenever it differs from the lexical path, and the canonical path is\n *    returned so what was vetted is what gets written.\n */\nexport function vetOutputBase(\n  baseDir: string,\n  options?: { anchor?: string; onDisclose?: (canonicalBase: string) => void },\n): string {\n  if (!baseDir || typeof baseDir !== 'string') {\n    throw new TypeError('Base directory must be a non-empty string');\n  }\n  if (baseDir.includes('\\0')) {\n    throw new Error('Path segment contains a null byte');\n  }\n\n  const resolvedAnchor = path.resolve(options?.anchor ?? process.cwd());\n  const resolvedBase = path.resolve(baseDir);\n  const canonicalBase = canonicalizePath(resolvedBase);\n\n  if (!escapesBase(path.relative(resolvedAnchor, resolvedBase))) {\n    const canonicalAnchor = canonicalizePath(resolvedAnchor);\n    if (escapesBase(path.relative(canonicalAnchor, canonicalBase))) {\n      throw new Error(\n        `Output path resolves outside the working directory through a symbolic link (real destination: ${canonicalBase})`,\n      );\n    }\n    return canonicalBase;\n  }\n\n  if (canonicalBase !== resolvedBase) {\n    options?.onDisclose?.(canonicalBase);\n  }\n  return canonicalBase;\n}\n"]}

package/dist/web/routes/setupRoutes.d.ts

@@ -33,6 +33,13 @@ export declare function createSetupRoutes(opts?: {
     _installPermissionHook?: (client: string) => Promise<InstallPermissionHookResult>;
     /** Override permission hook status reconciler. For testing only. */
     _reconcilePermissionHookStatus?: (client: string) => Promise<PermissionHookStatus>;
+    /**
+     * Override the NVM launcher mitigation applied after a successful install.
+     * For testing only. Without this seam the install handler runs the real
+     * applyNvmLauncherIfNeeded against the real homedir(); on a machine WITH NVM
+     * that patches the developer's real client configs (issue #2338).
+     */
+    _applyNvmLauncher?: (client: string) => Promise<NvmLauncherResult>;
     /** Enable automatic hook asset repair during detect. Defaults off in tests. */
     _autoRepairPermissionHooksOnDetect?: boolean;
     /** Skip the sliding-window rate limiter. For testing only. */
@@ -59,18 +66,27 @@ export type NvmLauncherResult = 'applied' | 'not-applicable' | 'failed';
  */
 export declare function applyNvmLauncherIfNeeded(client: string, home?: string): Promise<NvmLauncherResult>;
 /**
- * Startup repair: re-creates the wrapper and re-patches all known JSON-format
- * client configs on every server start. Handles two cases:
- *   1. Wrapper was deleted — recreates it so configs pointing to it keep working.
- *   2. Pre-existing install (user installed before this fix shipped) — patches
- *      configs that still use bare `npx`.
+ * Startup repair + self-heal: reconciles every known JSON-format client config
+ * on each server start. Behaviour depends on whether NVM is installed, matching
+ * the acceptance matrix in https://github.com/DollhouseMCP/mcp-server/issues/2338:
+ *
+ *   • NVM present  → (re)create the wrapper and point each config at it. Covers a
+ *     deleted wrapper, a pre-fix install still on bare `npx`, and a config left
+ *     pointing at a dead temp-dir wrapper (regenerates the real one). Healthy
+ *     configs re-serialise byte-identically, so this is a no-op for them.
+ *   • NVM absent   → never create a wrapper, but SELF-HEAL any config whose
+ *     command points at a `dollhousemcp-nvm.sh` that no longer exists (e.g. the
+ *     #2338 test leak, or a user who removed ~/.dollhouse/bin) back to bare `npx`,
+ *     preserving args so the client can launch DollhouseMCP again.
  *
  * Fire-and-forget from startWebServer. All errors are swallowed and logged.
  *
  * @param home               - Override home directory (injectable for tests)
  * @param configPathResolver - Override config path lookup (injectable for tests).
- *                             Return null to skip a client entirely.
- *                             Defaults to the production getConfigPath.
+ *                             Return null to skip a client entirely. Defaults to a
+ *                             home-derived resolver so `home` stays authoritative
+ *                             — the default must NOT reach the real homedir() when
+ *                             a fake home is supplied (#2338).
  */
 export declare function repairNvmLauncherOnStartup(home?: string, configPathResolver?: (client: string) => string | null): Promise<void>;
 /**

package/dist/web/routes/setupRoutes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setupRoutes.d.ts","sourceRoot":"","sources":["../../../src/web/routes/setupRoutes.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"setupRoutes.d.ts","sourceRoot":"","sources":["../../../src/web/routes/setupRoutes.ts"],"names":[],"mappings":"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"}