@echomem/mcp 1.4.27 → 1.4.29

package/dist/codex-session-files.js

@@ -5,6 +5,21 @@ const ROLLOUT_FILE_RE = /^rollout-.*\.jsonl$/;
 const UUID_RE = /([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})/i;
 const FIRST_LINE_CHUNK_BYTES = 64 * 1024;
 const MAX_FIRST_LINE_BYTES = 2 * 1024 * 1024;
+function includesCompleteSessionMetadataLine(buffers) {
+    const text = Buffer.concat(buffers).toString("utf8");
+    const lines = text.split(/\r?\n/);
+    if (!text.endsWith("\n"))
+        lines.pop();
+    return lines.some((line) => {
+        try {
+            const row = JSON.parse(line);
+            return isRecord(row) && row.type === "session_meta" && isRecord(row.payload);
+        }
+        catch {
+            return false;
+        }
+    });
+}
 function initialJsonLines(file) {
     const fd = fs.openSync(file, "r");
     try {
@@ -19,6 +34,11 @@ function initialJsonLines(file) {
             const piece = Buffer.from(chunk.subarray(0, bytesRead));
             buffers.push(piece);
             total += bytesRead;
+            // Normal Codex rollouts put session metadata in the first block. Stop as soon as that
+            // complete row is available, while preserving the old 2MB fallback for unusual/legacy
+            // files whose metadata appears later.
+            if (includesCompleteSessionMetadataLine(buffers))
+                break;
         }
         if (!buffers.length)
             return [];

package/dist/forensics.js

@@ -1391,7 +1391,7 @@ export async function buildForensicReport(opts) {
         return band[0] + (band[1] - band[0]) * ratio;
     };
     const progress = (stage, detail, stageDone = done, stageTotal = total) => {
-        opts?.onProgress?.(done, total, stage, detail, overallFor(stage, stageDone, stageTotal));
+        opts?.onProgress?.(done, total, stage, detail, overallFor(stage, stageDone, stageTotal), stageDone, stageTotal);
     };
     progress("reading-transcripts", "finding local Codex and Claude transcript files");
     const tick = (stage = "reading-transcripts") => {

package/dist/index.js

@@ -12,7 +12,7 @@ import { contextHealthMarkdown, recomposeCapsuleMarkdown } from "./hud/api.js";
 import { createHash, randomUUID } from "node:crypto";
 import { fetchEncryptionConfig, decryptMemoryFields, verifyKeyB64, } from "./encryption.js";
 import { runCli } from "./setup.js";
-import { MCP_PACKAGE_VERSION, MCP_SERVER_INSTRUCTIONS } from "./package-metadata.js";
+import { MCP_PACKAGE_VERSION, MCP_SERVER_INSTRUCTIONS, MEMORY_CITATION_INSTRUCTION, } from "./package-metadata.js";
 import { clearBillingAlert, writeBillingAlert } from "./billing-alert.js";
 import { checkLatestUpdateStatus, formatUpdateNotice, formatUpdateStatusText, startBackgroundUpdateCheck, } from "./update-check.js";
 const ECHO_API_BASE_URL = process.env.ECHO_API_BASE_URL || "https://echo-mem-chrome.vercel.app";
@@ -32,6 +32,9 @@ function memoryMarkdownLink(url, keys, description) {
         .replace(/\]/g, "\\]");
     return `[${label}](${url})`;
 }
+function withMemoryCitationInstruction(text) {
+    return `${text}\n\n${MEMORY_CITATION_INSTRUCTION}`;
+}
 /** Thrown when no API token is present yet — the model gets a "run login" nudge, not a hard error. */
 class NoTokenError extends Error {
 }
@@ -1446,7 +1449,12 @@ class EchoMemMCPServer {
                 ].filter(Boolean).join("\n");
             })
                 .join("\n\n");
-            return { content: [{ type: "text", text: `Retrieved ${memories.length} memories:\n\n${formattedResults}` }] };
+            return {
+                content: [{
+                        type: "text",
+                        text: withMemoryCitationInstruction(`Retrieved ${memories.length} memories:\n\n${formattedResults}`),
+                    }],
+            };
         }
         // Fallback: untuned / time-range shape.
         const { success, memories, error } = result;
@@ -1463,7 +1471,12 @@ Category: ${m.category} | Object: ${m.object} | Emotion: ${m.emotion}
 Description: ${m.description}
 Details: ${m.details || "N/A"}`)
             .join("\n\n");
-        return { content: [{ type: "text", text: `Found ${memories.length} relevant memories:\n\n${formattedResults}` }] };
+        return {
+            content: [{
+                    type: "text",
+                    text: withMemoryCitationInstruction(`Found ${memories.length} relevant memories:\n\n${formattedResults}`),
+                }],
+        };
     }
     async handleSave(args, rec) {
         const sourceFallback = this.getMcpClientAnalytics().platform_source;
@@ -1565,7 +1578,7 @@ Details: ${m.details || "N/A"}`)
             content: [
                 {
                     type: "text",
-                    text: `Found ${memories.length} memories between ${parsed.startDate} and ${parsed.endDate}:\n\n${formattedResults}`,
+                    text: withMemoryCitationInstruction(`Found ${memories.length} memories between ${parsed.startDate} and ${parsed.endDate}:\n\n${formattedResults}`),
                 },
             ],
         };
@@ -1591,7 +1604,7 @@ Details: ${m.details || "N/A"}`)
             content: [
                 {
                     type: "text",
-                    text: `Recalled ${memories.length} memories from context ${parsed.contextId} (deterministic full batch):\n\n${formattedResults}`,
+                    text: withMemoryCitationInstruction(`Recalled ${memories.length} memories from context ${parsed.contextId} (deterministic full batch):\n\n${formattedResults}`),
                 },
             ],
         };
@@ -1636,7 +1649,10 @@ Details: ${m.details || "N/A"}`)
                 const desc = readString(memory, "description") ?? "";
                 const details = compactOneLine(readString(memory, "details"), 260);
                 const id = readString(memory, "id");
-                lines.push(`- ${title}${id ? ` (${id})` : ""}: ${desc}${details ? ` — ${details}` : ""}`);
+                const linkedTitle = id
+                    ? memoryMarkdownLink(personalMemoryWebUrl(id), title, desc)
+                    : title;
+                lines.push(`- ${linkedTitle}${id ? ` (${id})` : ""}: ${desc}${details ? ` — ${details}` : ""}`);
             }
             lines.push("");
         }
@@ -1645,7 +1661,7 @@ Details: ${m.details || "N/A"}`)
             content: [
                 {
                     type: "text",
-                    text: lines.join("\n"),
+                    text: withMemoryCitationInstruction(lines.join("\n")),
                 },
             ],
         };
@@ -1672,7 +1688,7 @@ Details: ${m.details || "N/A"}`)
             content: [
                 {
                     type: "text",
-                    text: `Found ${memories.length} memories matching keywords:\n\n${formattedResults}`,
+                    text: withMemoryCitationInstruction(`Found ${memories.length} memories matching keywords:\n\n${formattedResults}`),
                 },
             ],
         };
@@ -1729,7 +1745,7 @@ Details: ${m.details || "N/A"}`;
             content: [
                 {
                     type: "text",
-                    text: `Found ${memories.length} others' public memories${metadata ? ` (${metadata})` : ""}:\n\n${formattedResults}`,
+                    text: withMemoryCitationInstruction(`Found ${memories.length} others' public memories${metadata ? ` (${metadata})` : ""}:\n\n${formattedResults}`),
                 },
             ],
         };
@@ -1857,7 +1873,7 @@ Details: ${m.details || "N/A"}`;
                 : "",
         ].filter(Boolean).join("\n");
         return {
-            content: [{ type: "text", text }],
+            content: [{ type: "text", text: withMemoryCitationInstruction(text) }],
         };
     }
     async handleGroupContext(args) {

package/dist/migrate.js

@@ -186,14 +186,17 @@ export function normalizeCwd(cwd) {
     const m = cwd.match(/worktrees\/[^/]+\/(.+)$/);
     return m ? m[1] : cwd;
 }
-function userCreatedCodexFiles(codexRoot) {
+function userCreatedCodexSessionFiles(codexRoot) {
     return discoverCodexSessionFiles({
         ...(codexRoot
             ? { roots: [{ kind: "active", path: codexRoot, priority: 0 }] }
             : {}),
         includeArchived: false,
         userInitiatedOnly: true,
-    }).files.map((file) => file.path);
+    }).files;
+}
+function userCreatedCodexFiles(codexRoot) {
+    return userCreatedCodexSessionFiles(codexRoot).map((file) => file.path);
 }
 function userCreatedClaudeFiles(claudeRoot) {
     return walk(claudeRoot, (candidate) => candidate.endsWith(".jsonl"), (name) => name === "subagents" || name === "workflows").filter(isUserCreatedClaudeSessionFile);
@@ -312,20 +315,30 @@ function fastSessionInfo(file, source) {
 }
 function fastSessionEntries(opts = {}) {
     const out = [];
-    for (const filePath of userCreatedCodexFiles(opts.codexRoot)) {
-        const stat = statSafe(filePath);
-        const info = fastSessionInfo(filePath, "codex");
-        // Include if we found text OR a real session id (big sessions can have their first text turn beyond
-        // the 1MB probe window — gating only on text dropped them entirely; exact discovery refines later).
-        // We require a real key so the fast/exact conversationKey match (no sha16 fallback mismatch).
-        if (info.hasTextTurn || info.hasRealKey)
-            out.push({ filePath, source: "codex", conversationKey: info.conversationKey, size: stat.size, mtimeMs: stat.mtimeMs });
+    for (const file of userCreatedCodexSessionFiles(opts.codexRoot)) {
+        // Codex discovery has already classified the rollout as user-created and resolved its stable
+        // session key. Do not reread another 1MB of transcript just to rediscover the same ID.
+        const stableId = file.sessionKey.startsWith("session:")
+            ? file.sessionKey.slice("session:".length)
+            : null;
+        const fallback = stableId ? null : fastSessionInfo(file.path, "codex");
+        out.push({
+            filePath: file.path,
+            source: "codex",
+            conversationKey: stableId ? `codex:${stableId}` : fallback?.conversationKey || `codex:${sha16(file.path)}`,
+            size: file.size,
+            mtimeMs: Math.round(file.mtimeMs),
+        });
     }
     const claudeRoot = opts.claudeRoot ?? resolveClaudeProjectsDir();
     if (claudeRoot) {
         for (const filePath of userCreatedClaudeFiles(claudeRoot)) {
             const stat = statSafe(filePath);
-            const info = fastSessionInfo(filePath, "claude-code");
+            const filenameId = path.basename(filePath, path.extname(filePath));
+            const filenameHasStableId = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(filenameId);
+            const info = filenameHasStableId
+                ? { conversationKey: `claude-code:${filenameId.toLowerCase()}`, hasTextTurn: true, hasRealKey: true }
+                : fastSessionInfo(filePath, "claude-code");
             // Same rule as codex: include on text OR a real session id so large sessions aren't undercounted,
             // while keeping the key stable (claude-code sessionId appears on every line, so hasRealKey is reliable).
             if (info.hasTextTurn || info.hasRealKey)

package/dist/package-metadata.js

@@ -23,6 +23,7 @@ export const MCP_PACKAGE_DESCRIPTION = stringOrFallback(packageJson.description,
 export const MCP_PACKAGE_LABEL = `${MCP_PACKAGE_NAME}@${MCP_PACKAGE_VERSION}`;
 export const MCP_UPDATE_COMMAND = `npx -y ${MCP_PACKAGE_NAME}@latest update`;
 export const MCP_UPDATE_ALL_COMMAND = `${MCP_UPDATE_COMMAND} --all`;
+export const MEMORY_CITATION_INSTRUCTION = 'If the user-facing answer materially relies on one or more EchoMem memories, end it with a compact "EchoMem sources:" list containing only the memories actually used. Use each memory key as the Markdown label and its canonical https://echoknows.com/memory/<memory-id> URL. Do not cite memories that were merely retrieved, and omit the section when no memory informed the answer.';
 export const MCP_SERVER_INSTRUCTIONS = [
     `${MCP_PACKAGE_DESCRIPTION} (${MCP_PACKAGE_LABEL}).`,
     `If the user or local config expects a newer EchoMem MCP version than ${MCP_PACKAGE_VERSION}, update once with \`${MCP_UPDATE_ALL_COMMAND}\` and start a new MCP session.`,
@@ -34,6 +35,7 @@ export const MCP_SERVER_INSTRUCTIONS = [
     "After joining or when profile fields are missing, use candidate memory evidence to propose a title and responsibility summary. Ask the user to confirm that proposal together with the publication preview, then call update_group_profile and complete_group_publication.",
     "Use one canonical https://echoknows.com/memory/<memory-id> link for private, group, and friend evidence. Label it with the memory key; the site resolves the authorized representation.",
     "Each search result is one memory: preserve its Memory ID and canonical echoknows.com link when citing it.",
+    MEMORY_CITATION_INSTRUCTION,
     "During a publication preview, if an unflagged candidate appears sensitive, proactively ask whether the user wants to mark its exact ID for publication attention first. Explain that marking does not publish or change encryption; it means the agent will call it out and ask for detailed confirmation whenever a later publication includes it. Never auto-flag inferred sensitivity. For sensitive-topic flags, search and preview exact owned memories before confirmed flag_memories_for_publication_attention. Separate already-flagged candidates, state that nothing has been published yet, and offer to exclude them, review them separately, or first search for and mark similar sensitive owned memories.",
     "Never save an inferred group profile. Manual prepared publication requires explicit preview confirmation; flagged memories still require separate exact-memory confirmation. Never store or log an echo_grp_ invite code.",
 ].join(" ");

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

@@ -48,8 +48,18 @@ export const SETUP_PAGE_CLIENT_CORE = String.raw `      var params = new URLSear
       var localAuthTermsAccepted = false;
       var localAuthAgeConfirmed = false;
       var accountSwitchPending = false;
+      // Invalidates async work started for a previously connected account.
+      var accountStateEpoch = 0;
       var statsPollStarted = false;
       var reportPollStarted = false;
+      var reportEtaDeadline = 0;
+      var reportEtaDisplaySeconds = 0;
+      var reportEtaUpdatedAt = 0;
+      var reportEtaStage = "";
+      var reportEtaStageDone = 0;
+      var reportEtaStageElapsed = 0;
+      var reportEtaObservedRate = 0;
+      var reportEtaScanId = "";
       var readyStage = "";
       var NIGHT_HOURS = { 22: 1, 23: 1, 0: 1, 1: 1, 2: 1, 3: 1 };
 
@@ -292,14 +302,13 @@ export const SETUP_PAGE_CLIENT_CORE = String.raw `      var params = new URLSear
         setExtractMode(false);
         setReadyMode(true);
         setHead("EchoMem connected", "Done");
-        app.className = "notice";
+        app.className = "localAuthCompleteStage";
         app.innerHTML =
-          '<section class="localAuthCard localAuthComplete">' +
-            '<div class="localAuthLead">' +
-              '<img src="/hud-assets/echo-face-cutout.png" alt="" />' +
-              '<h2 class="siteHeadline">You\'re signed in.</h2>' +
-              '<p>Return to Terminal, or run <code>echomem-mcp init</code> to start onboarding.</p>' +
-            '</div>' +
+          '<section class="localAuthComplete" aria-labelledby="localAuthCompleteTitle">' +
+            '<img src="/hud-assets/echo-face-cutout.png" alt="" />' +
+            '<h2 id="localAuthCompleteTitle">You\'re signed in.</h2>' +
+            '<p>Return to Terminal.</p>' +
+            '<p class="localAuthCompleteNext">Run <code>echomem-mcp init</code> when you\'re ready to start onboarding.</p>' +
           '</section>';
       }
       async function finishLocalLogin() {
@@ -453,8 +462,8 @@ export const SETUP_PAGE_CLIENT_CORE = String.raw `      var params = new URLSear
               (setupMode ? '<label class="localAuthField"><span>Confirm passphrase</span><input id="localAuthPassphraseConfirm" type="password" autocomplete="new-password" placeholder="Confirm passphrase" /></label>' : '') +
               '<button class="primary localAuthPassphraseSubmit" id="localAuthUnlock" type="submit">' + (setupMode ? "Create vault" : "Unlock") + '</button>' +
               (setupMode
-                ? '<p class="localAuthVaultDeferNote">Import won’t start until you create your vault.</p>' +
-                  '<button class="localAuthTextAction" id="localAuthSkipVault" type="button">Skip for now</button>'
+                ? '<p class="localAuthVaultDeferNote">You can turn on encryption later.</p>' +
+                  '<button class="localAuthTextAction" id="localAuthSkipVault" type="button">Skip encryption for now</button>'
                 : '') +
               '<button class="localAuthTextAction localAuthRestartAction" id="localAuthRestart" type="button">Use a different email</button>' +
               '<p class="localAuthStatus' + (message ? " is-error" : "") + '" id="localAuthStatus" role="status" aria-live="polite">' + esc(message || "") + '</p>' +
@@ -471,23 +480,14 @@ export const SETUP_PAGE_CLIENT_CORE = String.raw `      var params = new URLSear
       }
       async function skipLocalVaultSetup() {
         var button = document.getElementById("localAuthSkipVault");
-        if (button) { button.disabled = true; button.textContent = "Leaving setup…"; }
-        setLocalAuthStatus("Leaving setup. Your coding history will stay on this Mac.");
+        if (button) { button.disabled = true; button.textContent = "Continuing…"; }
+        setLocalAuthStatus("Continuing without encryption…");
         try {
-          await postJson("/skip", {});
-          setHead("Setup paused", "Vault deferred");
-          app.className = "localAuthStage localAuthWelcomeStage localAuthPassphraseStage";
-          app.innerHTML =
-            '<section class="localAuthWelcome localAuthDeferred" aria-labelledby="localAuthDeferredTitle">' +
-              '<div class="localAuthWelcomeCopy">' +
-                '<h2 id="localAuthDeferredTitle">Setup paused.</h2>' +
-                '<p>Your coding history is unchanged. Run <code>echomem-mcp init</code> when you’re ready to create your vault and continue.</p>' +
-              '</div>' +
-            '</section>';
-          try { window.close(); } catch (_) {}
+          await postJson("/local-auth/skip-encryption", {});
+          await finishLocalLogin();
         } catch (error) {
-          if (button) { button.disabled = false; button.textContent = "Skip for now"; }
-          setLocalAuthStatus(error && error.message ? error.message : "Could not leave setup safely.", "error");
+          if (button) { button.disabled = false; button.textContent = "Skip encryption for now"; }
+          setLocalAuthStatus(error && error.message ? error.message : "Could not continue without encryption.", "error");
         }
       }
       async function submitLocalPassphrase(setupMode) {