@echomem/mcp 1.4.42 → 1.4.43

package/dist/index.js

@@ -613,6 +613,8 @@ function toolEventName(canonicalName, status) {
 class EchoMemApiClient {
     store;
     axios;
+    activeToken;
+    accountGeneration = 0;
     boundSourceSession = null;
     requestSourceSession = new AsyncLocalStorage();
     sourceSessionsByCanonicalKey = new Map();
@@ -623,6 +625,7 @@ class EchoMemApiClient {
     deleteConfirmations = new Map();
     constructor(store) {
         this.store = store;
+        this.activeToken = store.getToken();
         this.axios = axios.create({
             baseURL: ECHO_API_BASE_URL.replace(/\/$/, ""),
             headers: {
@@ -632,7 +635,7 @@ class EchoMemApiClient {
         // Read the token fresh on EVERY request (not baked in at construction) so a `login` that runs
         // after the editor already launched the bridge is picked up on the next call — no restart.
         this.axios.interceptors.request.use((config) => {
-            const token = this.store.getToken();
+            const token = this.synchronizeAccountContext();
             if (token)
                 config.headers.set("Authorization", `Bearer ${token}`);
             const sourceSession = this.getBoundSourceSession();
@@ -642,21 +645,46 @@ class EchoMemApiClient {
             return config;
         });
     }
+    /**
+     * Account-scoped state must move atomically with the credential file. The token is intentionally
+     * read fresh, but encryption, identity, source-session, and confirmation caches belong to the
+     * token that populated them and cannot survive an in-process account switch.
+     */
+    synchronizeAccountContext() {
+        const token = this.store.getToken();
+        if (token === this.activeToken)
+            return token;
+        this.activeToken = token;
+        this.accountGeneration += 1;
+        this.encConfigPromise = null;
+        this.whoamiCache = null;
+        this.boundSourceSession = null;
+        this.sourceSessionsByCanonicalKey.clear();
+        this.deleteConfirmations.clear();
+        return token;
+    }
+    /** Lets the MCP server invalidate its account-scoped tool-description caches too. */
+    refreshAccountContext() {
+        this.synchronizeAccountContext();
+        return this.accountGeneration;
+    }
     /** Whether a usable API token currently exists (read fresh from the keystore each call). */
     hasToken() {
-        return !!this.store.getToken();
+        return !!this.synchronizeAccountContext();
     }
     /** The per-process session id — the join key telemetry shares with grouped saves. */
     getSessionId() {
         return this.sessionId;
     }
     getBoundSourceSession() {
+        this.synchronizeAccountContext();
         return this.requestSourceSession.getStore() ?? this.boundSourceSession;
     }
     async withSourceSession(sourceSession, operation) {
         return sourceSession ? this.requestSourceSession.run(sourceSession, operation) : operation();
     }
     async bindSourceSession(verified, persistForBridge = true) {
+        this.synchronizeAccountContext();
         const cached = this.sourceSessionsByCanonicalKey.get(verified.canonicalKey);
         if (cached) {
             if (persistForBridge)
@@ -739,16 +767,23 @@ class EchoMemApiClient {
             return undefined;
         }
     }
-    /** Encryption config for the account, fetched once and cached. Failures are not cached. */
+    /** Encryption config for the current account, cached only for the lifetime of its token. */
     async getEncryptionConfig() {
+        const generation = this.refreshAccountContext();
         if (!this.encConfigPromise) {
-            this.encConfigPromise = fetchEncryptionConfig(this.axios).catch((error) => {
-                this.encConfigPromise = null; // allow retry next call
+            const request = fetchEncryptionConfig(this.axios).catch((error) => {
+                if (this.encConfigPromise === request)
+                    this.encConfigPromise = null; // allow retry next call
                 console.error(`[encryption] config fetch failed: ${describeError(error)} — refusing memory access`);
                 throw new EncryptionStatusUnavailableError("EchoMem could not verify the account encryption state");
             });
+            this.encConfigPromise = request;
         }
-        return this.encConfigPromise;
+        const request = this.encConfigPromise;
+        const config = await request;
+        if (this.refreshAccountContext() !== generation)
+            return this.getEncryptionConfig();
+        return config;
     }
     /**
      * Resolve the encryption state for a read/write. For encrypted accounts this REQUIRES a usable
@@ -756,13 +791,19 @@ class EchoMemApiClient {
      * handing the model ciphertext. For unencrypted accounts it returns `{ enabled: false }`.
      */
     async encState() {
+        const generation = this.refreshAccountContext();
         const cfg = await this.getEncryptionConfig();
+        if (this.refreshAccountContext() !== generation)
+            return this.encState();
         if (!cfg.enabled)
             return { enabled: false };
         const key = this.store.getKey();
         if (!key)
             throw new LockedError("EchoMem vault locked");
-        if (!(await verifyKeyB64(key, cfg))) {
+        const isValid = await verifyKeyB64(key, cfg);
+        if (this.refreshAccountContext() !== generation)
+            return this.encState();
+        if (!isValid) {
             // A file-backed stale key can be removed safely; environment-provided
             // keys remain under the caller's control and are ignored until corrected.
             if (!process.env.ECHO_ENCRYPTION_KEY)
@@ -779,16 +820,23 @@ class EchoMemApiClient {
         }
     }
     async whoami() {
+        const generation = this.refreshAccountContext();
         if (!this.whoamiCache) {
-            this.whoamiCache = this.axios
+            const request = this.axios
                 .get("/api/openclaw/v1/whoami", { timeout: 6000 })
                 .then((response) => response.data)
                 .catch((error) => {
-                this.whoamiCache = null; // don't pin a token-less failure; retry once a token exists
+                if (this.whoamiCache === request)
+                    this.whoamiCache = null;
                 throw error;
             });
+            this.whoamiCache = request;
         }
-        return this.whoamiCache;
+        const request = this.whoamiCache;
+        const identity = await request;
+        if (this.refreshAccountContext() !== generation)
+            return this.whoami();
+        return identity;
     }
     async fetchMemoryById(id, enc) {
         try {
@@ -1255,6 +1303,7 @@ function capWait(pending) {
 class EchoMemMCPServer {
     server;
     client;
+    accountGeneration = 0;
     mapCache = null;
     groupMapCache = null;
     events;
@@ -1327,8 +1376,19 @@ class EchoMemMCPServer {
             platform_source: hostPlatform,
         };
     }
+    refreshAccountContext() {
+        const generation = this.client.refreshAccountContext();
+        if (generation === this.accountGeneration)
+            return;
+        this.accountGeneration = generation;
+        this.mapCache = null;
+        this.groupMapCache = null;
+        this.mapInjected = false;
+        this.groupMapInjected = false;
+    }
     setupToolHandlers() {
         this.server.setRequestHandler(ListToolsRequestSchema, async () => {
+            this.refreshAccountContext();
             const clientVersion = this.server.getClientVersion();
             this.mcpClientName = clientVersion?.name ?? this.mcpClientName;
             this.mcpClientVersion = clientVersion?.version ?? this.mcpClientVersion;
@@ -1360,6 +1420,7 @@ class EchoMemMCPServer {
             return { tools: listToolSpecs({ map, groupMap, updateNotice }) };
         });
         this.server.setRequestHandler(CallToolRequestSchema, async (request, extra) => {
+            this.refreshAccountContext();
             const resolvedCanonicalName = resolveCanonicalToolName(request.params.name);
             const recallRoute = routePersonalRecallInvocation(resolvedCanonicalName, request.params.arguments);
             const canonicalName = recallRoute.canonicalName;

package/dist/setup-page/client-extraction.js

@@ -1090,6 +1090,41 @@ export const SETUP_PAGE_CLIENT_EXTRACTION = String.raw `      /* ---------- dash
       function paidRecallPlan(plan) {
         return ["pro", "power", "team", "enterprise"].indexOf(String(plan || "").toLowerCase()) >= 0;
       }
+      var planQuotaCatalog = null;
+      var planQuotaCatalogLastFetchedAt = 0;
+      function quotaLimitsForPlan(plan) {
+        var normalized = String(plan || "free").toLowerCase();
+        if (normalized === "team") normalized = "pro";
+        if (normalized === "enterprise") normalized = "power";
+        var limits = planQuotaCatalog && planQuotaCatalog[normalized];
+        if (!limits || typeof limits !== "object") return null;
+        if (
+          typeof limits.historicalConversationLimit !== "number" ||
+          typeof limits.memoryProcessingInputTokensWeeklyLimit !== "number" ||
+          typeof limits.memorySearchWeeklyLimit !== "number"
+        ) return null;
+        return limits;
+      }
+      function quotaNumber(value) {
+        return number(Math.max(0, Math.floor(value)));
+      }
+      function quotaTokens(value) {
+        var normalized = Math.max(0, Math.floor(value));
+        if (normalized > 0 && normalized % 1000000 === 0) return String(normalized / 1000000) + "M";
+        return normalized > 0 && normalized % 1000 === 0 ? String(normalized / 1000) + "K" : quotaNumber(normalized);
+      }
+      async function refreshPlanQuotaCatalog() {
+        if (Date.now() - planQuotaCatalogLastFetchedAt < 60000) return;
+        try {
+          var response = await fetch("https://echo-mem-chrome.vercel.app/api/public/plan-quotas", { cache: "no-store" });
+          var payload = response.ok ? await response.json() : null;
+          if (!payload || !payload.plans || typeof payload.plans !== "object") return;
+          planQuotaCatalog = payload.plans;
+          planQuotaCatalogLastFetchedAt = Date.now();
+        } catch (_) {
+          // Generic labels remain visible until the managed catalog is available.
+        }
+      }
       function setupPlanPrice(plan) {
         return plan === "power" ? "$100" : "$20";
       }
@@ -1151,7 +1186,7 @@ export const SETUP_PAGE_CLIENT_EXTRACTION = String.raw `      /* ---------- dash
         var statusLabel = canceled ? "Canceled" : (state === "trialing" ? "Trial active" : "Active");
         var lifecycle = paidPlanLifecycleText(plan);
         var quota = billingStatus && billingStatus.historicalConversationQuota;
-        var limit = quota && typeof quota.limit === "number" ? quota.limit : (plan === "power" ? 2000 : 500);
+        var limit = quota && typeof quota.limit === "number" ? quota.limit : null;
         var moneyFact = canceled
           ? "No future charge"
           : (state === "trialing" ? setupPlanPrice(plan) + "/month after trial" : setupPlanPrice(plan) + "/month");
@@ -1160,7 +1195,7 @@ export const SETUP_PAGE_CLIENT_EXTRACTION = String.raw `      /* ---------- dash
           '<section class="billingCommitment' + (canceled ? ' is-canceled' : '') + '" aria-label="Current plan commitment">' +
             '<div class="billingCommitmentIdentity"><span>' + esc(statusLabel) + '</span><strong>' + esc(planLabel) + '</strong></div>' +
             '<div class="billingCommitmentFacts">' +
-              '<span><b>' + esc(number(limit)) + '</b> coding-session imports</span>' +
+              '<span><b>' + esc(limit === null ? "Plan import allowance" : quotaNumber(limit)) + '</b>' + (limit === null ? "" : " coding-session imports") + '</span>' +
               '<span><b>' + esc(moneyFact) + '</b></span>' +
             '</div>' +
             '<p>' + esc(lifecycle || "Your paid plan is active.") + '</p>' +
@@ -1171,6 +1206,14 @@ export const SETUP_PAGE_CLIENT_EXTRACTION = String.raw `      /* ---------- dash
       }
       function setupPlanDefinition(plan) {
         var trialAvailable = !billingStatus || billingStatus.trialAvailable !== false;
+        var limits = quotaLimitsForPlan(plan);
+        var features = limits
+          ? [
+              quotaNumber(limits.historicalConversationLimit) + " past chats",
+              quotaTokens(limits.memoryProcessingInputTokensWeeklyLimit) + " new-chat tokens / week",
+              quotaNumber(limits.memorySearchWeeklyLimit) + " memory recalls / week"
+            ]
+          : ["Past-chat imports", "Weekly new-chat processing", "Weekly memory recalls"];
         if (plan === "power") return {
           id: "power",
           name: "Power",
@@ -1180,11 +1223,7 @@ export const SETUP_PAGE_CLIENT_EXTRACTION = String.raw `      /* ---------- dash
           cadence: trialAvailable ? "per month · 14-day trial" : "per month · billed immediately",
           sticker: "/hud-assets/echo-pricing-power-sticker.png",
           stickerAlt: "Power Echo arrives with a gold key and a crew of notebook helpers.",
-          features: [
-            "2,000 past chats",
-            "agent-heavy memory",
-            "2,000 memory recalls / week"
-          ]
+          features: features
         };
         if (plan === "pro") return {
           id: "pro",
@@ -1196,11 +1235,7 @@ export const SETUP_PAGE_CLIENT_EXTRACTION = String.raw `      /* ---------- dash
           sticker: "/hud-assets/echo-pricing-pro-sticker.png",
           stickerAlt: "Pro Echo organizes tabbed notebooks and a daily refresh control.",
           popular: true,
-          features: [
-            "500 past chats",
-            "daily memory updates",
-            "500 memory recalls / week"
-          ]
+          features: features
         };
         return {
           id: "free",
@@ -1211,7 +1246,7 @@ export const SETUP_PAGE_CLIENT_EXTRACTION = String.raw `      /* ---------- dash
           cadence: "free forever · no card needed",
           sticker: "/hud-assets/echo-pricing-free-sticker.png",
           stickerAlt: "Original Echo hugs one simple memory card.",
-          features: ["100 coding sessions", "a few new sessions / week", "100 memory recalls / week"]
+          features: features
         };
       }
       function renderPlanHabitat() {
@@ -1333,7 +1368,11 @@ export const SETUP_PAGE_CLIENT_EXTRACTION = String.raw `      /* ---------- dash
         if (setupPlanChoice === "free") {
           if (readySettings) readySettings.classList.remove("is-plan-open", "is-checkout-pending");
           if (planGateDecision) planGateDecision.classList.remove("is-checkout-pending");
-          slot.innerHTML = '<div class="setupPlanConfirmed"><span class="setupPlanConfirmedIcon" aria-hidden="true">' + setupIcon("check") + '</span><span class="setupPlanConfirmedCopy"><strong>Original Echo</strong><span>100 coding sessions and 100 memory recalls each week.</span></span><button type="button" class="textButton" id="changeSetupPlan">Change</button></div>';
+          var freeLimits = quotaLimitsForPlan("free");
+          var freePlanCopy = freeLimits
+            ? quotaNumber(freeLimits.historicalConversationLimit) + " coding sessions and " + quotaNumber(freeLimits.memorySearchWeeklyLimit) + " memory recalls each week."
+            : "Your managed import and weekly memory allowances are ready.";
+          slot.innerHTML = '<div class="setupPlanConfirmed"><span class="setupPlanConfirmedIcon" aria-hidden="true">' + setupIcon("check") + '</span><span class="setupPlanConfirmedCopy"><strong>Original Echo</strong><span>' + esc(freePlanCopy) + '</span></span><button type="button" class="textButton" id="changeSetupPlan">Change</button></div>';
           renderBillingCommitment("");
           var changeBtn = document.getElementById("changeSetupPlan");
           if (changeBtn) changeBtn.onclick = function () {
@@ -1434,6 +1473,7 @@ export const SETUP_PAGE_CLIENT_EXTRACTION = String.raw `      /* ---------- dash
           var nextBillingStatus = await getJson("/billing-status");
           if (billingEpoch !== accountStateEpoch || !connected) return;
           billingStatus = nextBillingStatus;
+          await refreshPlanQuotaCatalog();
           billingLastCheckedAt = Date.now();
           billingCheckMessage = "";
           if (readyStage === "sessions" && setupPlanConfirmed()) {

package/dist/setup.js

@@ -309,12 +309,51 @@ export function codexTomlBlock(entry) {
     const args = (Array.isArray(entry.args) ? entry.args : []).map((a) => JSON.stringify(String(a))).join(", ");
     return `[mcp_servers.echomem]\ncommand = ${command}\nargs = [${args}]\n`;
 }
-/**
- * Write/merge the EchoMem entry straight into Codex's config.toml — no `codex` CLI needed. Idempotent.
- * If an `[mcp_servers.echomem]` block already exists it is REPLACED (so re-running `setup` upgrades a
- * stale `npx -y` entry to the direct path); identical entries are left untouched.
- */
-export function writeCodexConfig(configPath, entry) {
+function objectRecord(value) {
+    return value && typeof value === "object" && !Array.isArray(value)
+        ? value
+        : undefined;
+}
+function validDesktopManagedEntry(value) {
+    const entry = objectRecord(value);
+    const environment = objectRecord(entry?.env);
+    if (!entry || environment?.ECHO_DESKTOP_MANAGED !== "1")
+        return false;
+    const command = entry.command;
+    const args = Array.isArray(entry.args) ? entry.args : [];
+    return typeof command === "string"
+        && fs.existsSync(command)
+        && typeof args[0] === "string"
+        && fs.existsSync(args[0]);
+}
+function codexEntryFromBlock(lines, start, end) {
+    let command;
+    let args = [];
+    let desktopManaged = false;
+    for (const line of lines.slice(start + 1, end)) {
+        const commandMatch = line.match(/^\s*command\s*=\s*(.+?)\s*$/);
+        const argsMatch = line.match(/^\s*args\s*=\s*(.+?)\s*$/);
+        try {
+            if (commandMatch)
+                command = JSON.parse(commandMatch[1]);
+            if (argsMatch)
+                args = JSON.parse(argsMatch[1]);
+        }
+        catch {
+            return undefined;
+        }
+        if (/ECHO_DESKTOP_MANAGED\s*=\s*["']1["']/.test(line))
+            desktopManaged = true;
+    }
+    if (typeof command !== "string")
+        return undefined;
+    return {
+        command,
+        args: Array.isArray(args) ? args : [],
+        ...(desktopManaged ? { env: { ECHO_DESKTOP_MANAGED: "1" } } : {}),
+    };
+}
+export function writeCodexConfig(configPath, entry, options = {}) {
     let content = "";
     try {
         content = fs.readFileSync(configPath, "utf8");
@@ -331,6 +370,9 @@ export function writeCodexConfig(configPath, entry) {
         let end = start + 1;
         while (end < lines.length && !/^\s*\[/.test(lines[end]))
             end++;
+        if (!options.forceHeadless && validDesktopManagedEntry(codexEntryFromBlock(lines, start, end))) {
+            return "desktop-managed";
+        }
         if (lines.slice(start, end).join("\n").trimEnd() === block)
             return "exists"; // already correct
         const next = [...lines.slice(0, start), ...block.split("\n"), ...lines.slice(end)];
@@ -403,7 +445,7 @@ export function writeAgentsMemoryGuidance(filePath) {
     return "wrote";
 }
 /** Merge the EchoMem entry into a JSON client's `mcpServers` map without clobbering siblings. */
-export function writeJsonClientConfig(configPath, entry) {
+export function writeJsonClientConfig(configPath, entry, options = {}) {
     let config = {};
     try {
         config = JSON.parse(fs.readFileSync(configPath, "utf8"));
@@ -412,9 +454,13 @@ export function writeJsonClientConfig(configPath, entry) {
         /* fresh config */
     }
     config.mcpServers = config.mcpServers || {};
+    if (!options.forceHeadless && validDesktopManagedEntry(config.mcpServers.echomem)) {
+        return "desktop-managed";
+    }
     config.mcpServers.echomem = entry;
     fs.mkdirSync(path.dirname(configPath), { recursive: true });
     fs.writeFileSync(configPath, JSON.stringify(config, null, 2));
+    return "wrote";
 }
 function readClaudeCodeConfigFile(configPath) {
     try {
@@ -428,12 +474,7 @@ function readClaudeCodeConfigFile(configPath) {
     }
 }
 function echoMemEntryFromServers(value) {
-    if (!value || typeof value !== "object" || Array.isArray(value))
-        return undefined;
-    const entry = value.echomem;
-    return entry && typeof entry === "object" && !Array.isArray(entry)
-        ? entry
-        : undefined;
+    return objectRecord(objectRecord(value)?.echomem);
 }
 function claudeEntriesMatch(actual, expected) {
     if (!actual || actual.command !== expected.command)
@@ -475,6 +516,7 @@ export function writeClaudeCodeConfig(entry, options = {}) {
         skippedLocalProjects: [],
         failedLocalProjects: [],
         restoredPreviousUserEntry: false,
+        preservedDesktopManaged: false,
     });
     const runClaude = (args, cwd) => {
         try {
@@ -496,20 +538,23 @@ export function writeClaudeCodeConfig(entry, options = {}) {
     const removeUser = () => runClaude(["mcp", "remove", "echomem", "-s", "user"]);
     const before = readClaudeCodeConfigFile(configPath);
     const previousUserEntry = echoMemEntryFromServers(before.mcpServers);
+    const preservedDesktopManaged = !options.forceHeadless
+        && validDesktopManagedEntry(previousUserEntry);
+    const desiredUserEntry = preservedDesktopManaged ? previousUserEntry : entry;
     let restoredPreviousUserEntry = false;
     // Avoid interrupting active/new sessions when the correct global entry is already installed.
-    if (!claudeEntriesMatch(previousUserEntry, entry)) {
+    if (!claudeEntriesMatch(previousUserEntry, desiredUserEntry)) {
         if (previousUserEntry && !removeUser())
             return emptyResult();
-        if (!addUser(entry)) {
+        if (!addUser(desiredUserEntry)) {
             if (previousUserEntry)
                 restoredPreviousUserEntry = addUser(previousUserEntry);
             return { ...emptyResult(), restoredPreviousUserEntry };
         }
     }
     const installedUserEntry = echoMemEntryFromServers(readClaudeCodeConfigFile(configPath).mcpServers);
-    if (!claudeEntriesMatch(installedUserEntry, entry)) {
-        return { ...emptyResult(), restoredPreviousUserEntry };
+    if (!claudeEntriesMatch(installedUserEntry, desiredUserEntry)) {
+        return { ...emptyResult(), restoredPreviousUserEntry, preservedDesktopManaged };
     }
     const removedLocalProjects = [];
     const skippedLocalProjects = [];
@@ -544,6 +589,7 @@ export function writeClaudeCodeConfig(entry, options = {}) {
         skippedLocalProjects,
         failedLocalProjects: unresolved,
         restoredPreviousUserEntry,
+        preservedDesktopManaged,
     };
 }
 function readJsonClientEntry(configPath) {
@@ -2747,6 +2793,8 @@ async function cmdSetup(flags) {
     const entry = buildServerEntry({ devEntryPath: typeof flags.dev === "string" ? flags.dev : undefined });
     const requested = typeof flags.client === "string" ? flags.client : undefined;
     const targets = selectSetupTargets(requested, Boolean(flags.all));
+    // --dev is already an explicit request to replace the managed runtime with a checkout.
+    const forceHeadless = flags["force-headless"] === true || typeof flags.dev === "string";
     const configurationFailures = [];
     if (targets.length === 0) {
         console.log("No client auto-detected. Add this MCP server entry manually:\n");
@@ -2756,20 +2804,34 @@ async function cmdSetup(flags) {
     else {
         for (const c of targets) {
             if (c.kind === "json") {
-                writeJsonClientConfig(c.configPath, entry);
-                console.log(`✅ Wrote EchoMem MCP entry to ${c.label}: ${c.configPath}`);
+                const result = writeJsonClientConfig(c.configPath, entry, { forceHeadless });
+                if (result === "desktop-managed") {
+                    console.log(`✅ Kept the valid Echo Desktop-managed EchoMem entry for ${c.label}: ${c.configPath}`);
+                }
+                else {
+                    console.log(`✅ Wrote EchoMem MCP entry to ${c.label}: ${c.configPath}`);
+                }
             }
             else if (c.kind === "command") {
-                const result = writeCodexConfig(c.configPath, entry);
+                const result = writeCodexConfig(c.configPath, entry, { forceHeadless });
                 if (result === "wrote")
                     console.log(`✅ Wrote EchoMem MCP entry to ${c.label}: ${c.configPath} — start a new Codex session to load it.`);
+                else if (result === "desktop-managed")
+                    console.log(`✅ Kept the valid Echo Desktop-managed EchoMem entry for ${c.label}: ${c.configPath}`);
                 else
                     console.log(`✅ ${c.label} already has the EchoMem MCP entry: ${c.configPath}`);
             }
             else {
-                const result = c.id === "claude-code" ? writeClaudeCodeConfig(entry) : "unavailable";
+                const result = c.id === "claude-code"
+                    ? writeClaudeCodeConfig(entry, { forceHeadless })
+                    : "unavailable";
                 if (result !== "unavailable" && result.state === "wrote") {
-                    console.log(`✅ Wrote EchoMem MCP entry to ${c.label} via \`claude mcp add-json\` — start a new Claude Code session to load it.`);
+                    if (result.preservedDesktopManaged) {
+                        console.log(`✅ Kept the valid Echo Desktop-managed EchoMem user entry for ${c.label}.`);
+                    }
+                    else {
+                        console.log(`✅ Wrote EchoMem MCP entry to ${c.label} via \`claude mcp add-json\` — start a new Claude Code session to load it.`);
+                    }
                     if (result.removedLocalProjects.length > 0) {
                         console.log(`✅ Removed ${result.removedLocalProjects.length} stale Claude Code project-local EchoMem ${result.removedLocalProjects.length === 1 ? "entry" : "entries"}.`);
                     }
@@ -3884,6 +3946,7 @@ Usage:
   echomem-mcp                       Run the MCP server (stdio; default — used by your editor)
   echomem-mcp setup [--client X]    Detect editor, write its MCP config, then connect this device
   echomem-mcp setup --skip-login    Write MCP config without opening login/browser
+  echomem-mcp setup --force-headless  Explicitly replace valid Echo Desktop-managed entries
   echomem-mcp setup --no-codex-skills  Skip installing the bundled EchoMem Codex skills
   echomem-mcp update --all          Install this bridge durably + repoint detected clients; no login/browser
   echomem-mcp update --client X     Repoint one MCP client; no login/browser

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@echomem/mcp",
-  "version": "1.4.42",
+  "version": "1.4.43",
   "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",