@echomem/mcp 1.4.45 → 1.4.46

package/dist/setup.js

@@ -15,7 +15,7 @@
  */
 import http from "node:http";
 import { randomUUID } from "node:crypto";
-import { execFileSync, spawn } from "node:child_process";
+import { execFileSync, spawn, spawnSync, } from "node:child_process";
 import { Worker } from "node:worker_threads";
 import fs from "node:fs";
 import os from "node:os";
@@ -505,6 +505,118 @@ function claudeCodeLocalEchoMemProjects(configPath) {
         .map(([projectPath]) => projectPath)
         .sort();
 }
+function versionedClaudeCodeExecutables(root, executable) {
+    let versions;
+    try {
+        versions = fs.readdirSync(root, { withFileTypes: true });
+    }
+    catch {
+        return [];
+    }
+    return versions
+        .filter((entry) => entry.isDirectory())
+        .sort((left, right) => right.name.localeCompare(left.name, undefined, { numeric: true }))
+        .map((entry) => path.join(root, entry.name, executable))
+        .filter((candidate) => fs.existsSync(candidate));
+}
+/**
+ * Return every safe Claude Code launcher location worth trying. Claude Desktop bundles the CLI,
+ * but Windows Store/MSIX installs expose its real files below the package LocalCache instead of
+ * the caller's ordinary APPDATA/PATH view.
+ */
+export function claudeCodeCommandCandidates(options = {}) {
+    const platform = options.platform ?? process.platform;
+    const env = options.env ?? process.env;
+    const homeDir = options.homeDir ?? os.homedir();
+    const candidates = [];
+    const configured = env.CLAUDE_CODE_EXECUTABLE?.trim();
+    if (configured)
+        candidates.push(configured);
+    candidates.push("claude");
+    if (platform === "win32") {
+        const appData = env.APPDATA?.trim() || path.join(homeDir, "AppData", "Roaming");
+        const localAppData = env.LOCALAPPDATA?.trim() || path.join(homeDir, "AppData", "Local");
+        candidates.push(...versionedClaudeCodeExecutables(path.join(appData, "Claude", "claude-code"), "claude.exe"), ...versionedClaudeCodeExecutables(path.join(localAppData, "Claude", "claude-code"), "claude.exe"));
+        const packagesRoot = path.join(localAppData, "Packages");
+        try {
+            for (const entry of fs.readdirSync(packagesRoot, { withFileTypes: true })) {
+                if (!entry.isDirectory() || !/^Claude_/i.test(entry.name))
+                    continue;
+                candidates.push(...versionedClaudeCodeExecutables(path.join(packagesRoot, entry.name, "LocalCache", "Roaming", "Claude", "claude-code"), "claude.exe"));
+            }
+        }
+        catch {
+            /* A non-Store install has no Packages directory. */
+        }
+        const executionAlias = path.join(localAppData, "Microsoft", "WindowsApps", "claude.exe");
+        if (fs.existsSync(executionAlias))
+            candidates.push(executionAlias);
+    }
+    else if (platform === "darwin") {
+        for (const candidate of [
+            "/Applications/Claude.app/Contents/Resources/claude",
+            path.join(homeDir, "Applications", "Claude.app", "Contents", "Resources", "claude"),
+            "/opt/homebrew/bin/claude",
+            "/usr/local/bin/claude",
+        ]) {
+            if (fs.existsSync(candidate))
+                candidates.push(candidate);
+        }
+    }
+    return [...new Set(candidates)];
+}
+function escapeWindowsCmdCommand(value) {
+    return value.replace(/([()\][%!^"`<>&|;, *?])/g, "^$1");
+}
+function escapeWindowsCmdArgument(value) {
+    let escaped = value
+        .replace(/(?=(\\+?)?)\1"/g, "$1$1\\\"")
+        .replace(/(?=(\\+?)?)\1$/g, "$1$1");
+    escaped = `"${escaped}"`;
+    return escaped.replace(/([()\][%!^"`<>&|;, *?])/g, "^$1");
+}
+function execClaudeCodeSync(args, options, commandCandidates) {
+    let candidates = commandCandidates ? [...commandCandidates] : claudeCodeCommandCandidates();
+    if (process.platform === "win32" && !commandCandidates) {
+        try {
+            const pathMatches = execFileSync("where.exe", ["claude"], {
+                encoding: "utf8",
+                stdio: ["ignore", "pipe", "ignore"],
+                timeout: 3000,
+                windowsHide: true,
+            }).split(/\r?\n/).map((candidate) => candidate.trim()).filter(Boolean);
+            candidates = [...new Set([...pathMatches, ...candidates])];
+        }
+        catch {
+            /* The bundled Desktop candidates below remain available. */
+        }
+    }
+    let lastError = new Error("Claude Code CLI was not found.");
+    for (const command of candidates) {
+        try {
+            if (process.platform === "win32" && /\.(cmd|bat)$/i.test(command)) {
+                const shellCommand = [escapeWindowsCmdCommand(command), ...args.map(escapeWindowsCmdArgument)].join(" ");
+                const spawnOptions = {
+                    ...options,
+                    windowsHide: true,
+                    windowsVerbatimArguments: true,
+                };
+                const result = spawnSync(process.env.ComSpec || "cmd.exe", ["/d", "/s", "/c", `"${shellCommand}"`], spawnOptions);
+                if (result.error)
+                    throw result.error;
+                if (result.status !== 0) {
+                    throw new Error(result.stderr?.trim() || `Claude Code exited with status ${result.status ?? "unknown"}.`);
+                }
+                return result.stdout || "";
+            }
+            return execFileSync(command, args, process.platform === "win32" ? { ...options, windowsHide: true } : options);
+        }
+        catch (error) {
+            lastError = error;
+        }
+    }
+    throw lastError;
+}
 export function writeClaudeCodeConfig(entry, options = {}) {
     // EchoMem belongs at user scope so every Claude Code project resolves the same durable runtime.
     // Older CLI versions wrote local/project entries, which take precedence over user scope and can
@@ -520,12 +632,12 @@ export function writeClaudeCodeConfig(entry, options = {}) {
     });
     const runClaude = (args, cwd) => {
         try {
-            execFileSync("claude", args, {
+            execClaudeCodeSync(args, {
                 cwd,
                 encoding: "utf8",
                 stdio: ["ignore", "pipe", "pipe"],
                 timeout: 10000,
-            });
+            }, options.claudeCommands);
             return true;
         }
         catch {
@@ -765,7 +877,7 @@ function inspectClaudeCodeConfig(client, desiredVersion) {
     if (!fs.existsSync(home(".claude")))
         return null;
     try {
-        const output = execFileSync("claude", ["mcp", "list"], {
+        const output = execClaudeCodeSync(["mcp", "list"], {
             encoding: "utf8",
             stdio: ["ignore", "pipe", "ignore"],
             timeout: 3000,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@echomem/mcp",
-  "version": "1.4.45",
+  "version": "1.4.46",
   "description": "EchoMem MCP bridge: cloud-first memory tools and the Agent Doctor workspace forensics report (cost ledger + 3D repo city)",
   "main": "dist/index.js",
   "type": "module",