@echomem/mcp 1.4.18 → 1.4.20

package/dist/migrate.js

@@ -25,7 +25,8 @@ import readline from "node:readline";
 import axios from "axios";
 import { KeyStore, echoConfigDir } from "./keystore.js";
 import { fetchEncryptionConfig } from "./encryption.js";
-import { resolveClaudeProjectsDir, resolveCodexSessionsDir } from "./local-data-paths.js";
+import { discoverCodexSessionFiles } from "./codex-session-files.js";
+import { resolveClaudeProjectsDir } from "./local-data-paths.js";
 import { walk, eachLine } from "./report.js";
 const API_BASE = (process.env.ECHO_API_BASE_URL || "https://echo-mem-chrome.vercel.app").replace(/\/$/, "");
 const RATE_MAX = 28; // stay under the import-jobs /run limit of 30 / 60s
@@ -184,20 +185,29 @@ export function normalizeCwd(cwd) {
     const m = cwd.match(/worktrees\/[^/]+\/(.+)$/);
     return m ? m[1] : cwd;
 }
-/** Discover every local session, newest first (by first-turn timestamp). */
-export function discoverSessions() {
+function userCreatedCodexFiles(codexRoot) {
+    return discoverCodexSessionFiles({
+        ...(codexRoot
+            ? { roots: [{ kind: "active", path: codexRoot, priority: 0 }] }
+            : {}),
+        includeArchived: false,
+        userInitiatedOnly: true,
+    }).files.map((file) => file.path);
+}
+function userCreatedClaudeFiles(claudeRoot) {
+    return walk(claudeRoot, (candidate) => candidate.endsWith(".jsonl"), (name) => name === "subagents" || name === "workflows").filter(isUserCreatedClaudeSessionFile);
+}
+/** Discover every user-created local session, newest first (by first-turn timestamp). */
+export function discoverSessions(opts = {}) {
     const out = [];
-    const codexRoot = resolveCodexSessionsDir();
-    if (codexRoot) {
-        for (const f of walk(codexRoot, (p) => /rollout-.*\.jsonl$/.test(p), () => false)) {
-            const s = assembleCodex(f);
-            if (s)
-                out.push(s);
-        }
+    for (const f of userCreatedCodexFiles(opts.codexRoot)) {
+        const s = assembleCodex(f);
+        if (s)
+            out.push(s);
     }
-    const claudeRoot = resolveClaudeProjectsDir();
+    const claudeRoot = opts.claudeRoot ?? resolveClaudeProjectsDir();
     if (claudeRoot) {
-        for (const f of walk(claudeRoot, (p) => p.endsWith(".jsonl"), (name) => name === "subagents" || name === "workflows")) {
+        for (const f of userCreatedClaudeFiles(claudeRoot)) {
             const s = assembleClaude(f);
             if (s)
                 out.push(s);
@@ -250,6 +260,20 @@ function hasClaudeText(content) {
         return false;
     return content.some((block) => isRecord(block) && block.type === "text" && typeof block.text === "string" && block.text.trim().length > 0);
 }
+function isUserCreatedClaudeSessionFile(file) {
+    return initialJsonObjects(file).some((obj) => {
+        if (!isRecord(obj) || obj.type !== "user")
+            return false;
+        if (obj.userType !== "external" || obj.isSidechain !== false || obj.parentUuid !== null)
+            return false;
+        if (obj.isMeta === true || obj.isCompactSummary === true)
+            return false;
+        if (typeof obj.agentId === "string" && obj.agentId.trim())
+            return false;
+        const message = isRecord(obj.message) ? obj.message : {};
+        return hasClaudeText(message.content);
+    });
+}
 function fastSessionInfo(file, source) {
     let conversationKey = `${source === "codex" ? "codex" : "claude-code"}:${sha16(file)}`;
     let hasTextTurn = false;
@@ -287,21 +311,18 @@ function fastSessionInfo(file, source) {
 }
 function fastSessionEntries(opts = {}) {
     const out = [];
-    const codexRoot = opts.codexRoot ?? resolveCodexSessionsDir();
-    if (codexRoot) {
-        for (const filePath of walk(codexRoot, (p) => /rollout-.*\.jsonl$/.test(p), () => false)) {
-            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 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 });
     }
     const claudeRoot = opts.claudeRoot ?? resolveClaudeProjectsDir();
     if (claudeRoot) {
-        for (const filePath of walk(claudeRoot, (p) => p.endsWith(".jsonl"), (name) => name === "subagents" || name === "workflows")) {
+        for (const filePath of userCreatedClaudeFiles(claudeRoot)) {
             const stat = statSafe(filePath);
             const info = fastSessionInfo(filePath, "claude-code");
             // Same rule as codex: include on text OR a real session id so large sessions aren't undercounted,
@@ -499,6 +520,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);
 }
@@ -756,7 +782,7 @@ function authedClient(token) {
     });
 }
 export function discoverMigratableSessions(opts = {}) {
-    let sessions = discoverSessions();
+    let sessions = discoverSessions(opts);
     const since = opts.since;
     if (since)
         sessions = sessions.filter((s) => (s.firstTs || "").slice(0, 10) >= since);
@@ -989,7 +1015,18 @@ export async function startMigration(opts) {
         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();
@@ -1060,7 +1097,7 @@ async function runJobs(args) {
             const message = responseMessage(e);
             const durationMs = Date.now() - jobStartedAt;
             if (status === 422 && errCode === "ENCRYPTION_KEY_REQUIRED") {
-                stoppedReason = "key-expired"; // the vault key expired mid-run — signal workers to stop pulling
+                stoppedReason = "vault-locked"; // no usable local vault key — signal workers to stop pulling
                 done++;
                 recordMetric(buildMigrationMetric({
                     runId: args.runId, importSessionId: args.session.id, jobId: job.id, index: done, total,
@@ -1096,7 +1133,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++;
@@ -1236,12 +1274,12 @@ 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;
-        if (r.stoppedReason === "key-expired") {
-            console.error(c.yellow(`\n⚠ Vault locked mid-run. Run \`echomem-mcp unlock\` and re-run migrate to resume (${r.migrated} done so far).`));
+        if (r.stoppedReason === "vault-locked") {
+            console.error(c.yellow(`\n⚠ Vault locked mid-run. Open Terminal, run \`echomem-mcp unlock\`, and re-run migrate to resume (${r.migrated} done so far).`));
             process.exitCode = 1;
         }
         console.log("");
@@ -1258,10 +1296,7 @@ export async function cmdMigrate(flags) {
         if (code === "NOT_LOGGED_IN")
             console.error("Not logged in. Run `echomem-mcp login` first, then re-run migrate.");
         else if (code === "VAULT_LOCKED") {
-            const store = new KeyStore();
-            console.error(store.isKeyExpired()
-                ? "Vault key expired. Run `echomem-mcp unlock`, then re-run migrate."
-                : "This account is ENCRYPTED but the vault is locked. Run `echomem-mcp unlock`, then re-run migrate.");
+            console.error("This account is encrypted but the local vault is locked. Open Terminal, run `echomem-mcp unlock`, then re-run migrate.");
         }
         else if (code === "FORBIDDEN_SCOPE") {
             console.error("This device token cannot import history. Re-connect this device with `echomem-mcp login`.");
@@ -1283,7 +1318,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();