@echomem/mcp 1.4.18 → 1.4.20

package/README.md

@@ -25,8 +25,11 @@ For **zero-knowledge accounts**, the key never leaves your machine. The bridge h
 - **writes:** the key is handed to your own backend transiently in the `X-Encryption-Key` header so
   memories are encrypted at rest (the server processes plaintext for the request only — never stores
   the key).
-- **locked state:** if the key is absent or past its TTL (7 days, matching the extension), tools
-  return a `🔒 locked` nudge to run `echomem-mcp unlock` — **ciphertext is never handed to the model**.
+- **trusted-device lifecycle:** after a verified login/unlock, the MCP key remains available until
+  the user runs `echomem-mcp lock`, logs out, or removes the local credentials. If the key is absent,
+  tools tell the user to run `echomem-mcp unlock` in their own terminal. The passphrase prompt is
+  visible while typed characters stay hidden, and the current agent session can retry immediately
+  after unlock — **ciphertext is never handed to the model**.
 
 Unencrypted accounts are unaffected. `search_memories` returns retrieved memories by default so
 your MCP client does the final answer generation; pass `includeAnswer: true` only if you need the
@@ -47,8 +50,11 @@ to the global install, but installing globally avoids the issue entirely). The c
 launch-at-login also runs from the installed path. `init` is the flagship one-liner — it wraps `setup --all --with-hud`: it writes each
 installed agent's MCP config (with **no secret** in it — credentials live in
 `~/.echomem/credentials.json`, mode 0600), adds the EchoMem memory guidance to their global
-`AGENTS.md` / `CLAUDE.md`, opens the browser to approve the device (and unlock the vault for
-encrypted accounts), then launches the context HUD. Reload your editors and you're done.
+`AGENTS.md` / `CLAUDE.md`, installs first-party `echomem-search`, `echomem-save`,
+`echomem-forget`, and `echomem-login` skills for Codex, opens the browser to approve the device
+(and unlock the vault for encrypted accounts), then launches the context HUD. EchoMem updates only
+its own skill folders; other memory-provider skills are detected and reported but never modified.
+Reload your editors and you're done.
 
 Prefer to keep it minimal? `echomem-mcp setup` configures only the auto-detected editor and skips the
 HUD; the granular commands below still work.
@@ -64,7 +70,8 @@ HUD; the granular commands below still work.
 | `npx -y @echomem/mcp@latest update --client codex` | Update one client only |
 | `echomem-mcp setup --with-hud [--client codex]` | Write client config + log in + launch the EchoMem context HUD |
 | `echomem-mcp login` | Approve device in browser (or use `--token` / `--passphrase`) |
-| `echomem-mcp unlock` | Re-derive the encryption key after its TTL (or `--passphrase`) |
+| `echomem-mcp unlock` | Privately unlock the vault on this trusted device |
+| `echomem-mcp lock` | Remove the local vault key while keeping the device login |
 | `echomem-mcp status` | Show token / key / detected clients, configured bridge versions, and update guidance |
 | `echomem-mcp doctor [--no-network]` | Diagnose configured client bridge versions |
 | `echomem-mcp logout` | Remove stored credentials |

package/dist/codex-session-files.js

@@ -35,6 +35,12 @@ function normalizedSessionId(value) {
     const trimmed = value.trim();
     return new RegExp(`^${UUID_RE.source}$`, "i").test(trimmed) ? trimmed.toLowerCase() : trimmed;
 }
+function isAutomaticCodexSource(source) {
+    if (typeof source !== "string")
+        return false;
+    const normalized = source.trim().toLowerCase().replace(/-/g, "_");
+    return normalized === "auto_review" || normalized === "guardian";
+}
 function metadataFromFile(file) {
     try {
         for (const line of initialJsonLines(file)) {
@@ -63,7 +69,7 @@ function metadataFromFile(file) {
             return {
                 id: rawId || null,
                 startedAtMs: Number.isFinite(timestamp) ? timestamp : null,
-                userInitiated: !isSubagent && !hasParent,
+                userInitiated: !isSubagent && !hasParent && !isAutomaticCodexSource(source),
             };
         }
         return { id: null, startedAtMs: null, userInitiated: null };

package/dist/hud/server.js

@@ -319,6 +319,9 @@ async function handleBillingStatus(res) {
     }
     let plan = "unknown";
     let paid = false;
+    let historicalConversationQuota = null;
+    let memoryProcessingQuota = null;
+    let memorySearchQuota = null;
     try {
         const response = await fetch(`${API_BASE}/api/extension/account/bootstrap`, {
             headers: { Authorization: `Bearer ${token}` },
@@ -327,34 +330,35 @@ async function handleBillingStatus(res) {
         if (response.ok) {
             plan = typeof data.plan === "string" ? data.plan.toLowerCase() : "free";
             paid = ["pro", "power", "team", "enterprise"].includes(plan);
+            historicalConversationQuota = data.historicalConversationQuota ?? null;
+            memoryProcessingQuota = data.memoryProcessingQuota ?? null;
+            memorySearchQuota = data.memorySearchQuota ?? null;
         }
     }
     catch {
         /* Local alert still gives the HUD something useful. */
     }
-    if (alert && (alert.kind === "quota_exceeded" || !paid)) {
+    const quotaPayload = {
+        historicalConversationQuota,
+        memoryProcessingQuota,
+        memorySearchQuota,
+    };
+    // Free now includes recall. Ignore old plan_required alerts that may still
+    // be present on disk from a previous bridge version.
+    if (alert && (alert.kind === "quota_exceeded" || alert.kind === "billing_attention")) {
         return respond({
             ok: true,
             state: alert.kind,
             plan: alert.plan || plan,
-            message: alert.kind === "quota_exceeded" ? "Recall limit reached." : "Recall needs a plan.",
+            message: alert.kind === "quota_exceeded" ? "Plan limit reached." : "Billing needs attention.",
             detail: alert.message,
             code: alert.code,
             pricingUrl: appendSource(alert.pricingUrl || pricingUrl, "hud"),
             updatedAt: alert.updatedAt,
+            ...quotaPayload,
         });
     }
-    if (!paid && plan === "free") {
-        return respond({
-            ok: true,
-            state: "plan_required",
-            plan,
-            message: "Recall needs a plan.",
-            detail: "Search and recall require Echo Pro or Power. Saving conversations keeps working.",
-            pricingUrl,
-        });
-    }
-    respond({ ok: true, state: "ok", plan, paid, pricingUrl });
+    respond({ ok: true, state: "ok", plan, paid, pricingUrl, ...quotaPayload });
 }
 function appendSource(url, source) {
     try {

package/dist/hud/web.js

@@ -678,6 +678,85 @@ export const HUD_HTML = String.raw `<!doctype html>
         box-shadow: 0 12px 20px -16px rgba(122, 36, 30, 0.95);
       }
       .billing-link:hover { filter: brightness(0.96); }
+      .quota-card {
+        display: none;
+        margin: 0 0 10px;
+        padding: 12px 13px 13px;
+        border: 1px solid rgba(26, 58, 143, 0.18);
+        border-radius: 12px;
+        background: rgba(255, 255, 255, 0.72);
+        box-shadow: 0 1px 5px rgba(26, 58, 143, 0.05);
+      }
+      .quota-head {
+        display: flex;
+        align-items: center;
+        gap: 7px;
+        margin-bottom: 9px;
+      }
+      .quota-title {
+        color: var(--ink);
+        font-size: 10.5px;
+        font-weight: 850;
+        letter-spacing: 0.015em;
+      }
+      .quota-plan {
+        border-radius: 999px;
+        background: rgba(26, 58, 143, 0.07);
+        padding: 2px 7px;
+        color: var(--blue);
+        font-size: 9px;
+        font-weight: 850;
+        text-transform: uppercase;
+      }
+      .quota-manage {
+        margin-left: auto;
+        border: 0;
+        padding: 0;
+        background: transparent;
+        color: var(--faint);
+        font-family: inherit;
+        font-size: 9.5px;
+        font-weight: 750;
+        cursor: pointer;
+      }
+      .quota-manage:hover { color: var(--blue); }
+      .quota-list { display: grid; gap: 9px; }
+      .quota-row { --quota-color: var(--blue); }
+      .quota-row.is-warn { --quota-color: #c98712; }
+      .quota-row.is-limit { --quota-color: #c7372f; }
+      .quota-line, .quota-subline {
+        display: flex;
+        align-items: baseline;
+        justify-content: space-between;
+        gap: 10px;
+      }
+      .quota-name { color: var(--muted); font-size: 10px; font-weight: 720; }
+      .quota-value {
+        color: var(--ink);
+        font-family: "JetBrains Mono", ui-monospace, monospace;
+        font-size: 9.5px;
+        font-weight: 760;
+        white-space: nowrap;
+      }
+      .quota-track {
+        height: 4px;
+        margin-top: 4px;
+        overflow: hidden;
+        border-radius: 999px;
+        background: rgba(26, 58, 143, 0.11);
+      }
+      .quota-fill {
+        width: 0;
+        height: 100%;
+        border-radius: inherit;
+        background: var(--quota-color);
+        transition: width .28s ease, background .2s ease;
+      }
+      .quota-subline { margin-top: 3px; }
+      .quota-reset, .quota-percent { color: var(--faint); font-size: 8.5px; font-weight: 650; }
+      .quota-row.is-limit .quota-value,
+      .quota-row.is-limit .quota-percent { color: #9d2b25; font-weight: 850; }
+      .quota-row.is-unavailable .quota-fill { background: rgba(26, 58, 143, 0.14); }
       button.renew-btn {
         display: none;
         width: 100%;
@@ -838,6 +917,30 @@ export const HUD_HTML = String.raw `<!doctype html>
       </div>
       <div class="details">
         <div class="timeline-scrollbar hidden" id="timelineScrollbar" aria-hidden="true"><span class="timeline-thumb" id="timelineThumb"></span></div>
+        <section class="quota-card" id="quotacard" aria-label="Plan usage">
+          <div class="quota-head">
+            <span class="quota-title">Plan usage</span>
+            <span class="quota-plan" id="quotaplan">Free</span>
+            <button class="quota-manage" id="quotamanage" type="button">Manage</button>
+          </div>
+          <div class="quota-list">
+            <div class="quota-row" data-quota="processing">
+              <div class="quota-line"><span class="quota-name">Processing this week</span><span class="quota-value"></span></div>
+              <div class="quota-track"><div class="quota-fill"></div></div>
+              <div class="quota-subline"><span class="quota-reset"></span><span class="quota-percent"></span></div>
+            </div>
+            <div class="quota-row" data-quota="searches">
+              <div class="quota-line"><span class="quota-name">Memory searches</span><span class="quota-value"></span></div>
+              <div class="quota-track"><div class="quota-fill"></div></div>
+              <div class="quota-subline"><span class="quota-reset"></span><span class="quota-percent"></span></div>
+            </div>
+            <div class="quota-row" data-quota="historical">
+              <div class="quota-line"><span class="quota-name">Bulk history imports</span><span class="quota-value"></span></div>
+              <div class="quota-track"><div class="quota-fill"></div></div>
+              <div class="quota-subline"><span class="quota-reset">Lifetime limit</span><span class="quota-percent"></span></div>
+            </div>
+          </div>
+        </section>
         <div class="now-card" id="nowcard">
           <div class="now-sess">
             <img class="now-icon" id="nowicon" src="/assets/hud/codex.svg" alt="" />
@@ -903,6 +1006,9 @@ export const HUD_HTML = String.raw `<!doctype html>
       const billingTitle = document.getElementById("billingtitle");
       const billingCopy = document.getElementById("billingcopy");
       const billingLink = document.getElementById("billinglink");
+      const quotaCard = document.getElementById("quotacard");
+      const quotaPlan = document.getElementById("quotaplan");
+      const quotaManage = document.getElementById("quotamanage");
       const renewBtn = document.getElementById("renewbtn");
       const renewResult = document.getElementById("renewresult");
       const renewMsg = document.getElementById("renewmsg");
@@ -1134,7 +1240,7 @@ export const HUD_HTML = String.raw `<!doctype html>
         if (!id) return;
         fetch("/jump?id=" + encodeURIComponent(id)).catch(() => {});
       }
-      if (billingLink) billingLink.addEventListener("click", (e) => {
+      function openPricing(e) {
         e.stopPropagation();
         const url = billingStatus && billingStatus.pricingUrl;
         if (!url) return;
@@ -1146,7 +1252,9 @@ export const HUD_HTML = String.raw `<!doctype html>
           .catch(() => {
             try { window.open(url, "_blank", "noopener"); } catch {}
           });
-      });
+      }
+      if (billingLink) billingLink.addEventListener("click", openPricing);
+      if (quotaManage) quotaManage.addEventListener("click", openPricing);
       function toggleSessionDetails(id) {
         if (!id) return;
         const nextId = lastState && lastState.expandedId === id ? "auto" : id;
@@ -1614,6 +1722,18 @@ export const HUD_HTML = String.raw `<!doctype html>
       const previewExpanded = previewParams.get("expanded") === "1" || previewParams.get("pinned") === "1";
       if (previewParams.get("capture") === "1") hud.classList.add("capture-preview");
       if (previewColor === "green" || previewColor === "amber" || previewColor === "red") {
+        const previewProcessingUsed = previewColor === "red" ? 200000 : previewColor === "amber" ? 163000 : 84000;
+        const previewSearchUsed = previewColor === "red" ? 100 : previewColor === "amber" ? 82 : 32;
+        billingStatus = {
+          ok: true,
+          state: "ok",
+          plan: "pro",
+          paid: true,
+          pricingUrl: "https://yeahecho.com/pricing?source=hud_preview",
+          memoryProcessingQuota: { used: previewProcessingUsed, limit: 200000, remaining: 200000 - previewProcessingUsed, resetAt: new Date(Date.now() + 31 * 60 * 60 * 1000).toISOString() },
+          memorySearchQuota: { used: previewSearchUsed, limit: 100, remaining: 100 - previewSearchUsed, resetAt: new Date(Date.now() + 31 * 60 * 60 * 1000).toISOString() },
+          historicalConversationQuota: { used: 191, limit: 250, remaining: 59 },
+        };
         const sample = {
           client: "codex",
           label: "EchoMem-Chrome",
@@ -1824,25 +1944,96 @@ export const HUD_HTML = String.raw `<!doctype html>
 
       function renderBillingStatus() {
         if (!billingBanner) return;
+        renderQuotaUsage();
         const state = billingStatus && billingStatus.state;
-        const blocked = state === "plan_required" || state === "quota_exceeded" || state === "billing_attention";
+        const blocked = state === "quota_exceeded" || state === "billing_attention";
         billingBanner.style.display = blocked ? "block" : "none";
         billingBanner.classList.toggle("limit", state === "quota_exceeded");
         if (!blocked) return;
-        const title = state === "quota_exceeded"
-          ? "Recall limit reached"
-          : state === "plan_required"
-            ? "Recall paused · Free plan"
-            : billingStatus.message || "Billing needs attention";
-        const detail = state === "quota_exceeded"
-          ? "You used all Pro searches this month. Upgrade or wait for reset."
-          : state === "plan_required"
-            ? "Search memory requires Pro or Power. Saving still works."
-            : billingStatus.detail || "Open pricing to restore memory search.";
+        const title = billingStatus.message || (state === "quota_exceeded" ? "Plan limit reached" : "Billing needs attention");
+        const detail = billingStatus.detail || (state === "quota_exceeded"
+          ? "A weekly limit has been reached. Wait for reset or change your plan."
+          : "Open pricing to review your plan.");
         if (billingTitle) billingTitle.textContent = title;
         if (billingCopy) billingCopy.textContent = detail;
       }
 
+      function renderQuotaUsage() {
+        if (!quotaCard) return;
+        const status = billingStatus || {};
+        const quotaRows = [
+          ["processing", status.memoryProcessingQuota, false],
+          ["searches", status.memorySearchQuota, false],
+          ["historical", status.historicalConversationQuota, true],
+        ];
+        const hasQuota = quotaRows.some((entry) => entry[1] && typeof entry[1] === "object");
+        const visible = hasQuota && status.state !== "not_connected" && status.plan !== "unknown";
+        quotaCard.style.display = visible ? "block" : "none";
+        if (!visible) return;
+        if (quotaPlan) quotaPlan.textContent = planLabel(status.plan || "free");
+        for (const entry of quotaRows) renderQuotaRow(entry[0], entry[1], entry[2]);
+      }
+
+      function renderQuotaRow(key, snapshot, lifetime) {
+        if (!quotaCard) return;
+        const row = quotaCard.querySelector('[data-quota="' + key + '"]');
+        if (!row) return;
+        const valueEl = row.querySelector(".quota-value");
+        const fillEl = row.querySelector(".quota-fill");
+        const resetEl = row.querySelector(".quota-reset");
+        const percentEl = row.querySelector(".quota-percent");
+        const used = quotaNumber(snapshot && snapshot.used);
+        const limit = quotaNumber(snapshot && snapshot.limit);
+        const available = used !== null && limit !== null;
+        const unlimited = available && limit < 0;
+        const percent = available && limit > 0 ? clamp(Math.round(used / limit * 100), 0, 100) : 0;
+
+        row.classList.toggle("is-unavailable", !available);
+        row.classList.toggle("is-warn", available && !unlimited && percent >= 80 && percent < 100);
+        row.classList.toggle("is-limit", available && !unlimited && percent >= 100);
+        if (valueEl) {
+          valueEl.textContent = unlimited
+            ? formatQuotaNumber(used) + " / Unlimited"
+            : (used === null ? "—" : formatQuotaNumber(used)) + " / " + (limit === null ? "—" : formatQuotaNumber(limit));
+        }
+        if (fillEl) fillEl.style.width = unlimited ? "0%" : percent + "%";
+        if (percentEl) percentEl.textContent = !available
+          ? "Usage unavailable"
+          : unlimited
+            ? "Unlimited"
+            : percent >= 100
+              ? "Limit reached"
+              : percent + "%";
+        if (resetEl) resetEl.textContent = lifetime ? "Lifetime limit" : quotaResetLabel(snapshot && snapshot.resetAt);
+        row.setAttribute("aria-label", key + " usage " + (percentEl ? percentEl.textContent : ""));
+      }
+
+      function quotaNumber(value) {
+        return typeof value === "number" && isFinite(value) ? value : null;
+      }
+
+      function formatQuotaNumber(value) {
+        const n = Math.max(0, Number(value) || 0);
+        if (n >= 1000000) return (n / 1000000).toFixed(n < 10000000 ? 1 : 0).replace(/\.0$/, "") + "M";
+        if (n >= 1000) return (n / 1000).toFixed(n < 100000 ? 1 : 0).replace(/\.0$/, "") + "K";
+        return Math.round(n).toLocaleString("en-US");
+      }
+
+      function quotaResetLabel(value) {
+        if (!value) return "Weekly reset";
+        const resetAt = new Date(value);
+        if (!isFinite(resetAt.getTime())) return "Weekly reset";
+        if (resetAt.getTime() <= Date.now()) return "Resetting now";
+        return "Resets " + resetAt.toLocaleString(undefined, {
+          weekday: "short",
+          month: "short",
+          day: "numeric",
+          hour: "numeric",
+          minute: "2-digit",
+          timeZoneName: "short",
+        });
+      }
+
       function renderWhy(score, oldPct, repeatCount, sat, signal, color) {
         const rows = [];
         for (const row of junkBreakdown(score)) rows.push(row);

package/dist/index.js

@@ -22,11 +22,6 @@ class NoTokenError extends Error {
 }
 /** Thrown when an encrypted account has no usable key — the model gets an unlock nudge, never ciphertext. */
 class LockedError extends Error {
-    expired;
-    constructor(expired) {
-        super("EchoMem vault locked");
-        this.expired = expired;
-    }
 }
 function stringifyErrorValue(value) {
     if (value == null) {
@@ -545,10 +540,16 @@ class EchoMemApiClient {
     async fetchMemoryMap() {
         try {
             const enc = await this.encState(); // unencrypted → {enabled:false}; encrypted+locked → throws
-            const today = new Date().toISOString().slice(0, 10);
-            const response = await this.axios.post("/api/extension/memories/time-range", { startDate: "2000-01-01", endDate: today, limit: 200 }, { timeout: 6000 });
+            // Tool-list decoration is not a user-initiated search and must not spend
+            // one of the account's weekly searches. Build the best-effort map from
+            // the ordinary paginated memory listing instead.
+            const response = await this.axios.get("/api/extension/memories?limit=200", { timeout: 6000 });
             const data = enc.enabled ? await this.decryptResult(response.data, enc.key) : response.data;
-            const memories = Array.isArray(data?.memories) ? data.memories : [];
+            const memories = Array.isArray(data?.data)
+                ? data.data
+                : Array.isArray(data?.memories)
+                    ? data.memories
+                    : [];
             const keys = [...new Set(memories.map((m) => String(m?.keys || "").trim()).filter(Boolean))];
             if (!keys.length)
                 return undefined;
@@ -585,7 +586,7 @@ class EchoMemApiClient {
         // No usable key: consult the server to tell "unencrypted" apart from "encrypted but locked/expired".
         const cfg = await this.getEncryptionConfig();
         if (cfg.enabled)
-            throw new LockedError(this.store.isKeyExpired());
+            throw new LockedError("EchoMem vault locked");
         return { enabled: false };
     }
     pruneDeleteConfirmations(now = Date.now()) {
@@ -789,6 +790,7 @@ class EchoMemApiClient {
                 startDate,
                 endDate,
                 limit,
+                requestId: randomUUID(),
             });
             return enc.enabled ? await this.decryptResult(response.data, enc.key) : response.data;
         }
@@ -833,21 +835,41 @@ class EchoMemApiClient {
         // For an encrypted account, hand the server the key transiently in the X-Encryption-Key header
         // so it encrypts at rest (mirrors the extension's write path, spec §3.1a). Locked → LockedError.
         const enc = await this.encState();
-        const config = enc.enabled && enc.key ? { headers: { "X-Encryption-Key": enc.key } } : undefined;
-        const response = await this.axios.post("/api/extension/memories/ingest", {
-            rawData,
-            sourceUrl: parsed.url,
-            source: parsed.source || "mcp_server",
-            title: parsed.title,
-            // Stable per-session id so multiple saves in this coding session group under one context.
-            conversationKey: this.sessionId,
-            passthrough: parsed.passthrough || false,
-            triggerMessage: parsed.triggerMessage ||
-                lastUserMessageFromMessages(parsed.messages) ||
-                lastUserMessageFromConversationText(parsed.conversation),
-            triggerMessageRole: parsed.triggerMessageRole || "user",
-        }, config);
-        return response.data;
+        const config = {
+            headers: {
+                "X-EchoMem-Request-Id": randomUUID(),
+                ...(enc.enabled && enc.key ? { "X-Encryption-Key": enc.key } : {}),
+            },
+        };
+        try {
+            const response = await this.axios.post("/api/extension/memories/ingest", {
+                rawData,
+                sourceUrl: parsed.url,
+                source: parsed.source || "mcp_server",
+                title: parsed.title,
+                // Stable per-session id so multiple saves in this coding session group under one context.
+                conversationKey: this.sessionId,
+                passthrough: parsed.passthrough || false,
+                triggerMessage: parsed.triggerMessage ||
+                    lastUserMessageFromMessages(parsed.messages) ||
+                    lastUserMessageFromConversationText(parsed.conversation),
+                triggerMessageRole: parsed.triggerMessageRole || "user",
+            }, config);
+            return response.data;
+        }
+        catch (error) {
+            if (axios.isAxiosError(error) && error.response?.status === 429) {
+                const data = error.response.data;
+                if (data?.error === "MEMORY_PROCESSING_QUOTA_EXCEEDED") {
+                    const message = typeof data.message === "string"
+                        ? data.message
+                        : "Weekly memory-processing limit reached. This conversation was not saved.";
+                    const upgrade = typeof data.upgradeUrl === "string" ? ` Upgrade: ${data.upgradeUrl}` : "";
+                    throw new McpError(ErrorCode.InvalidRequest, `${message}${upgrade}`);
+                }
+            }
+            throw error;
+        }
     }
     async deleteMemory(args) {
         const parsed = deleteMemorySchema.parse(args ?? {});
@@ -900,6 +922,7 @@ class EchoMemApiClient {
             startDate: parsed.startDate,
             endDate: parsed.endDate,
             limit: parsed.limit,
+            requestId: randomUUID(),
         });
         return enc.enabled ? await this.decryptResult(response.data, enc.key) : response.data;
     }
@@ -918,6 +941,7 @@ class EchoMemApiClient {
         const response = await this.axios.post("/api/extension/memories/keywords", {
             keywords: parsed.keywords,
             limit: parsed.limit,
+            requestId: randomUUID(),
         });
         return enc.enabled ? await this.decryptResult(response.data, enc.key) : response.data;
     }
@@ -1192,9 +1216,13 @@ class EchoMemMCPServer {
                         content: [
                             {
                                 type: "text",
-                                text: error.expired
-                                    ? "🔒 EchoMem vault is locked — your encryption key expired. Run `echomem-mcp unlock` in a terminal, then retry."
-                                    : "🔒 EchoMem vault is locked. Run `echomem-mcp unlock` (or `echomem-mcp login`) to provide your encryption key, then retry.",
+                                text: [
+                                    "🔒 EchoMem vault is locked.",
+                                    "This encrypted account has no usable local decryption key. Once unlocked, this trusted device stays unlocked until you explicitly lock it or log out.",
+                                    "Action required from the user: open Terminal and run `echomem-mcp unlock` yourself. Do not have the agent run this interactive command and do not send your passphrase in chat.",
+                                    "At `Vault passphrase (typing is hidden):`, type the passphrase and press Return. No characters will appear while you type; that is expected.",
+                                    "After the success message, retry this EchoMem action in the current session — no editor restart is needed.",
+                                ].join("\n"),
                             },
                         ],
                     };
@@ -1362,7 +1390,7 @@ Details: ${m.details || "N/A"}`)
             rec.conversation_chars = text.length;
             rec.save_source = typeof a?.source === "string" ? a.source : sourceFallback;
         }
-        const { success, memoriesExtracted, extractedMemories, contextId, capsuleId, passthrough: isPassthrough, error } = await this.client.saveConversation(enrichedArgs);
+        const { success, memoriesExtracted, memoriesDiscarded, extractedMemories, contextId, capsuleId, passthrough: isPassthrough, error } = await this.client.saveConversation(enrichedArgs);
         if (!success)
             throw new Error(`EchoMem API Error: ${error}`);
         if (rec)
@@ -1374,7 +1402,7 @@ Details: ${m.details || "N/A"}`)
                 typeof capsuleId === "string" && capsuleId ? `Capsule ID: ${capsuleId}` : "",
                 typeof contextId === "string" && contextId ? `Context: ${contextId}` : "",
                 "",
-                `To reload this capsule in a fresh session with Pro/Power recall: get_memories_by_context({ contextId: "${contextId}" })`,
+                `To reload this capsule in a fresh session: get_memories_by_context({ contextId: "${contextId}" })`,
             ].filter(Boolean).join("\n");
             return { content: [{ type: "text", text }] };
         }
@@ -1396,9 +1424,12 @@ Details: ${m.details || "N/A"}`)
             .join("\n\n");
         const text = [
             `Successfully ingested conversation. Extracted ${memoriesExtracted} memory distinct events.`,
+            typeof memoriesDiscarded === "number" && memoriesDiscarded > 0
+                ? `${memoriesDiscarded} additional memories were not stored because your active-memory limit was reached.`
+                : "",
             list,
             saved.length
-                ? `Verify these captured the key facts. With Pro/Power recall, re-fetch this exact batch later by searching the ids above${typeof contextId === "string" && contextId ? ` (context ${contextId})` : ""}.`
+                ? `Verify these captured the key facts. Re-fetch this exact batch later by searching the ids above${typeof contextId === "string" && contextId ? ` (context ${contextId})` : ""}.`
                 : "",
         ].filter(Boolean).join("\n\n");
         return { content: [{ type: "text", text }] };

package/dist/keystore.js

@@ -10,13 +10,13 @@
  * Storage posture: a 0600 file in the user's home — the same on-disk trust level as the extension's
  * `chrome.storage.local`. The OS keychain (spec §8's ideal) is a drop-in for `read`/`write` later;
  * it is deliberately deferred because `keytar` is a native build that complicates `npx` distribution.
- * The encryption key carries a TTL (mirrors the extension's 7-day expiry); on expiry the bridge
- * returns LOCKED and the user re-runs `unlock`.
+ * The MCP bridge uses an explicit trusted-device lifecycle: a verified encryption key remains
+ * available until the user runs `lock`/`logout` or removes the local credentials. Interactive app
+ * session TTLs are intentionally separate from this device-bound developer workflow.
  */
 import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
-export const DEFAULT_KEY_TTL_MS = 7 * 24 * 60 * 60 * 1000;
 /** The bridge's local config dir (`~/.echomem` or `$ECHO_CONFIG_DIR`) — home for credentials + telemetry. */
 export function echoConfigDir() {
     return process.env.ECHO_CONFIG_DIR || path.join(os.homedir(), ".echomem");
@@ -55,29 +55,19 @@ export class KeyStore {
     getToken() {
         return process.env.ECHO_API_TOKEN || readFileCreds().token;
     }
-    /** Encryption key (base64), or undefined if absent/expired. Env wins (and never expires). */
+    /** Encryption key (base64), or undefined if absent. Env wins. */
     getKey() {
         if (process.env.ECHO_ENCRYPTION_KEY)
             return process.env.ECHO_ENCRYPTION_KEY;
-        const creds = readFileCreds();
-        if (!creds.key)
-            return undefined;
-        if (creds.keyExpiresAt && Date.now() > creds.keyExpiresAt)
-            return undefined;
-        return creds.key;
-    }
-    /** True when a key is present but past its TTL — used to tell "locked (expired)" from "never set". */
-    isKeyExpired() {
-        if (process.env.ECHO_ENCRYPTION_KEY)
-            return false;
-        const creds = readFileCreds();
-        return !!(creds.key && creds.keyExpiresAt && Date.now() > creds.keyExpiresAt);
+        return readFileCreds().key;
     }
     saveToken(token) {
         writeFileCreds({ ...readFileCreds(), token });
     }
-    saveKey(keyBase64, ttlMs = DEFAULT_KEY_TTL_MS) {
-        writeFileCreds({ ...readFileCreds(), key: keyBase64, keyExpiresAt: Date.now() + ttlMs });
+    saveKey(keyBase64) {
+        const creds = readFileCreds();
+        delete creds.keyExpiresAt;
+        writeFileCreds({ ...creds, key: keyBase64 });
     }
     clearKey() {
         const creds = readFileCreds();