@echomem/mcp 1.4.17 → 1.4.19

package/dist/index.js

@@ -126,7 +126,7 @@ function formatUpgradeRequiredResult(error) {
         pricingUrl,
     });
     return [
-        "ACTION REQUIRED: tell the user to start a 7-day Pro trial or choose a subscription at this exact URL:",
+        "ACTION REQUIRED: tell the user to start a 14-day Pro trial or choose a subscription at this exact URL:",
         pricingUrl,
         "When replying, include the exact URL above. Do not reply only with \"connect\" or \"upgrade\".",
         "",
@@ -545,10 +545,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;
@@ -789,6 +795,7 @@ class EchoMemApiClient {
                 startDate,
                 endDate,
                 limit,
+                requestId: randomUUID(),
             });
             return enc.enabled ? await this.decryptResult(response.data, enc.key) : response.data;
         }
@@ -833,21 +840,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 +927,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 +946,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;
     }
@@ -1362,7 +1391,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 +1403,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 +1425,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/migrate.js

@@ -499,6 +499,11 @@ function parsePositiveIntFlag(value, name) {
         throw new Error(`${name} must be a positive integer.`);
     return n;
 }
+export async function cancelQueuedImportSession(client, sessionId) {
+    if (!sessionId)
+        throw new Error("IMPORT_SESSION_ID_REQUIRED");
+    await client.patch(`/api/extension/import-sessions/${encodeURIComponent(sessionId)}`, { action: "cancel" });
+}
 function isRecord(value) {
     return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -984,29 +989,51 @@ export async function startMigration(opts) {
         userTz: tz,
         encKey,
         onProgress: opts.onProgress,
+        shouldStop: opts.shouldStop,
         runId,
         metricsFile,
         selection: opts.selection,
     });
-    return { sessionId: session.id, runId, jobCount: session.jobs.length, metricsFile, ...(capped ? { capped } : {}), done };
+    const cancelQueued = async () => {
+        await cancelQueuedImportSession(client, session.id);
+    };
+    return {
+        sessionId: session.id,
+        runId,
+        jobCount: session.jobs.length,
+        metricsFile,
+        ...(capped ? { capped } : {}),
+        done,
+        cancelQueued,
+    };
 }
 async function runJobs(args) {
     const ledger = loadLedger();
     const reqTimes = [];
+    let migrated = 0, extracted = 0, failed = 0, done = 0;
+    let stoppedReason;
+    const stopIfRequested = () => {
+        if (args.shouldStop?.()) {
+            stoppedReason = "paused";
+            return true;
+        }
+        return false;
+    };
     const throttle = async () => {
         for (;;) {
+            if (stopIfRequested())
+                return false;
             const now = Date.now();
             while (reqTimes.length && now - reqTimes[0] > RATE_WINDOW_MS)
                 reqTimes.shift();
             if (reqTimes.length < RATE_MAX) {
                 reqTimes.push(Date.now());
-                return;
+                return true;
             }
-            await sleep(RATE_WINDOW_MS - (now - reqTimes[0]) + 100);
+            // Check a pause request promptly instead of making the user wait for the rate window.
+            await sleep(Math.min(250, RATE_WINDOW_MS - (now - reqTimes[0]) + 100));
         }
     };
-    let migrated = 0, extracted = 0, failed = 0, done = 0;
-    let stoppedReason;
     const total = args.session.jobs.length;
     const recordMetric = (metric) => {
         try {
@@ -1021,8 +1048,9 @@ async function runJobs(args) {
     const runOne = async (job, s) => {
         const jobStartedAt = Date.now();
         try {
-            await throttle();
-            if (stoppedReason)
+            if (!await throttle())
+                return;
+            if (stoppedReason || stopIfRequested())
                 return; // an earlier job hit an unrecoverable stop — don't start more work
             const r = await runImportJob(args.client, job.id, s, args.userTz, args.encKey);
             extracted += r.memories;
@@ -1071,7 +1099,7 @@ async function runJobs(args) {
     let next = 0;
     const worker = async () => {
         for (;;) {
-            if (stoppedReason)
+            if (stoppedReason || stopIfRequested())
                 return;
             const myIdx = next++;
             if (myIdx >= total)
@@ -1084,7 +1112,8 @@ async function runJobs(args) {
         }
     };
     try {
-        await Promise.all(Array.from({ length: Math.min(MIGRATE_CONCURRENCY, Math.max(1, total)) }, () => worker()));
+        const workerCount = Math.min(MIGRATE_CONCURRENCY, Math.max(1, args.session.concurrency), Math.max(1, total));
+        await Promise.all(Array.from({ length: workerCount }, () => worker()));
     }
     catch {
         failed++;
@@ -1224,7 +1253,7 @@ export async function cmdMigrate(flags) {
             },
         });
         if (h.capped)
-            console.log(c.yellow(`Your plan imports up to ${h.capped} at a time — importing the newest ${h.capped}; re-run migrate for older sessions.`));
+            console.log(c.yellow(`Your plan has ${h.capped} historical slots remaining — importing the newest ${h.capped}. Upgrade to import more.`));
         console.log(c.dim(`Import session ${h.sessionId} — ${h.jobCount} jobs queued (the web dashboard can watch this live).`));
         console.log(c.dim(`Metrics: ${h.metricsFile}`));
         const r = await h.done;
@@ -1271,7 +1300,14 @@ async function createImportSession(client, sessions, bareId, userTz, signal) {
     }));
     const res = await client.post("/api/extension/import-sessions", { items }, signal ? { signal } : undefined);
     const data = res.data || {};
-    return { id: String(data.session?.id || ""), jobs: Array.isArray(data.jobs) ? data.jobs : [] };
+    const serverConcurrency = Number(data.session?.concurrency);
+    return {
+        id: String(data.session?.id || ""),
+        concurrency: Number.isFinite(serverConcurrency) && serverConcurrency > 0
+            ? Math.min(MIGRATE_CONCURRENCY, Math.floor(serverConcurrency))
+            : MIGRATE_CONCURRENCY,
+        jobs: Array.isArray(data.jobs) ? data.jobs : [],
+    };
 }
 /** Run one queued job: stream its transcript to the server, which extracts it. Retries transient locks/rate limits. */
 async function runImportJob(client, jobId, s, userTz, encKey) {

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

@@ -13,16 +13,27 @@ export const SETUP_PAGE_CLIENT_CORE = String.raw `      var params = new URLSear
       var statsSlow = false;
       var decisionMade = false;
       var connected = false;
+      var localHistoryConsentGranted = false;
       var extractMounted = false;   // WebGL extraction-plate iframe mounted once; persists across /progress polls
+      var lastExtractionProgress = null; // restores the live extraction view if ending fails
+      var extractionRecoveryMessage = ""; // persists pause failures across resumed progress updates
       var exStartAt = 0;            // extraction start (ms) — drives the countdown
       var exDeadline = 0;           // first honest ETA deadline; passing it while running → "taking longer" banner
       var extractionEnded = false;  // user chose to leave the extraction flow before natural completion
+      var progressPollRunId = 0;    // invalidates older progress loops when extraction resumes
       var dashMounted = false;      // dashboard shell (incl. plate iframe) mounted once; persists across /stats polls
       var reportMounted = false;    // report shell (city iframe) mounted once; loading is an overlay on it, not a separate page
       var authUrl = "";
+      var switchAccountUrl = "";
       var workspacePath = "";
       var billingStatus = null;
-      var recallGateSkipped = false;
+      var billingStatusLoading = false;
+      var setupPlanChoice = "";
+      var selectedSessionKeys = Object.create(null);
+      var sessionSelectionTouched = false;
+      var sessionPickerQuery = "";
+      var sessionPickerSource = "all";
+      var billingPollTimer = null;
       var authWindow = null;
       var connectionPollStarted = false;
       var statsPollStarted = false;
@@ -34,6 +45,20 @@ export const SETUP_PAGE_CLIENT_CORE = String.raw `      var params = new URLSear
           return { "&": "&amp;", "<": "&lt;", ">": "&gt;", '"': "&quot;", "'": "&#39;" }[ch];
         });
       }
+      function setupIcon(name) {
+        var paths = {
+          "shield-check": '<path d="M12 3 5 6v5c0 4.6 2.9 8.1 7 10 4.1-1.9 7-5.4 7-10V6l-7-3Z"/><path d="m8.8 12.1 2 2 4.4-4.5"/>',
+          "folder-read": '<path d="M3 7.5h6l2-2h4.5A2.5 2.5 0 0 1 18 8v1"/><path d="M3 7.5V18a2 2 0 0 0 2 2h7"/><circle cx="17" cy="15" r="3.5"/><path d="m19.5 17.5 2 2"/>',
+          "report": '<path d="M5 20V10"/><path d="M12 20V4"/><path d="M19 20v-7"/><path d="M3 20h18"/>',
+          "cloud-off": '<path d="m3 3 18 18"/><path d="M6.7 6.7A5.5 5.5 0 0 0 6.5 17H17"/><path d="M10.7 5.2A7 7 0 0 1 19 12.1 4 4 0 0 1 19.5 19"/>',
+          "list-check": '<rect x="4" y="4" width="16" height="16" rx="3"/><path d="m7.5 9 1.4 1.4L11.5 8"/><path d="M13.5 9h3"/><path d="m7.5 14 1.4 1.4 2.6-2.4"/><path d="M13.5 14h3"/>',
+          "pause": '<path d="M9 7v10"/><path d="M15 7v10"/>',
+          "check": '<path d="m6.5 12.2 3.5 3.5 7.5-7.5"/>',
+          "copy": '<rect x="8" y="8" width="11" height="11" rx="2"/><path d="M16 8V6a2 2 0 0 0-2-2H6a2 2 0 0 0-2 2v8a2 2 0 0 0 2 2h2"/>',
+          "arrow-right": '<path d="M5 12h14"/><path d="m14 7 5 5-5 5"/>'
+        };
+        return '<svg class="setupGlyph" viewBox="0 0 24 24" fill="none" aria-hidden="true" focusable="false"><g stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round">' + (paths[name] || "") + '</g></svg>';
+      }
       function setHead(nextTitle, nextStatus) {
         title.textContent = nextTitle;
         status.textContent = nextStatus;
@@ -151,6 +176,11 @@ export const SETUP_PAGE_CLIENT_CORE = String.raw `      var params = new URLSear
         });
       }
       function onConnectClick() {
+        if (!localHistoryConsentGranted) {
+          renderLocalScanConsent();
+          setConsentStatus("Local history access is required before you can connect EchoMem or continue setup.", "required");
+          return;
+        }
         if (connected) { void waitForStats(); return; }
         if (!openAuthWindow(authUrl)) showPopupFallback("", authUrl);
         startConnectionPoll();