@echomem/mcp 1.4.19 → 1.4.21

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

@@ -23,8 +23,6 @@ export const SETUP_PAGE_CLIENT_CORE = String.raw `      var params = new URLSear
       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 billingStatusLoading = false;
@@ -34,8 +32,9 @@ export const SETUP_PAGE_CLIENT_CORE = String.raw `      var params = new URLSear
       var sessionPickerQuery = "";
       var sessionPickerSource = "all";
       var billingPollTimer = null;
-      var authWindow = null;
-      var connectionPollStarted = false;
+      var localAuthEmail = "";
+      var localAuthTermsAccepted = false;
+      var localAuthAgeConfirmed = false;
       var statsPollStarted = false;
       var reportPollStarted = false;
       var NIGHT_HOURS = { 22: 1, 23: 1, 0: 1, 1: 1, 2: 1, 3: 1 };
@@ -142,10 +141,6 @@ export const SETUP_PAGE_CLIENT_CORE = String.raw `      var params = new URLSear
         if (code === "NOT_LOGGED_IN") return "Echo on this machine is not signed in yet. Sign in again and retry.";
         return code || "Something went wrong. Retry in a moment.";
       }
-      function closeAuthWindow() {
-        try { if (authWindow && !authWindow.closed) authWindow.close(); } catch (_) {}
-        authWindow = null;
-      }
       function notifyOpenerConnected() {
         try {
           if (window.opener && window.opener !== window && !window.opener.closed) {
@@ -156,24 +151,197 @@ export const SETUP_PAGE_CLIENT_CORE = String.raw `      var params = new URLSear
         } catch (_) {}
         return false;
       }
-      function openAuthWindow(url) {
-        var targetUrl = url || authUrl;
-        if (!targetUrl) return false;
+      function localAuthLegalHtml() {
+        return '<div class="localAuthLegal">' +
+          '<label><input type="checkbox" id="localAuthAge" ' + (localAuthAgeConfirmed ? "checked" : "") + ' />' +
+            '<span>I confirm that I am at least 18 years old.</span></label>' +
+          '<label><input type="checkbox" id="localAuthTerms" ' + (localAuthTermsAccepted ? "checked" : "") + ' />' +
+            '<span>I have read and agree to the Echo <a href="https://echoknows.com/terms-of-use" target="_blank" rel="noopener noreferrer">Terms of Use</a>, <a href="https://echoknows.com/memory-terms" target="_blank" rel="noopener noreferrer">Memory Usage Terms</a>, and <a href="https://echoknows.com/privacy-policy" target="_blank" rel="noopener noreferrer">Privacy Policy</a>. I understand Echo uses subprocessors listed <a href="https://echoknows.com/subprocessor-list" target="_blank" rel="noopener noreferrer">here</a>.</span></label>' +
+        '</div>';
+      }
+      function captureLocalAuthConsents() {
+        var terms = document.getElementById("localAuthTerms");
+        var age = document.getElementById("localAuthAge");
+        localAuthTermsAccepted = !!(terms && terms.checked);
+        localAuthAgeConfirmed = !!(age && age.checked);
+      }
+      function setLocalAuthStatus(message, tone) {
+        var node = document.getElementById("localAuthStatus");
+        if (!node) return;
+        node.textContent = message || "";
+        node.classList.toggle("is-error", tone === "error");
+      }
+      function updateLocalAuthSendButton() {
+        captureLocalAuthConsents();
+        var email = document.getElementById("localAuthEmail");
+        var button = document.getElementById("localAuthSend");
+        if (!button) return;
+        var value = email && email.value ? String(email.value).trim() : "";
+        button.disabled = !value || !localAuthTermsAccepted || !localAuthAgeConfirmed;
+      }
+      function renderLocalLogin(message) {
+        setCityMode(false);
+        setScanMode(false);
+        setExtractMode(false);
+        setReadyMode(true);
+        setHead("Connect EchoMem", "Local login");
+        app.className = "localAuthStage";
+        app.innerHTML =
+          '<section class="localAuthCard">' +
+            '<div class="localAuthLead">' +
+              '<img src="/hud-assets/echo-face-cutout.png" alt="" />' +
+              '<p class="consentEyebrow">EchoMem account / local login</p>' +
+              '<h2 class="siteHeadline">Sign in without leaving this device.</h2>' +
+              '<p>Echo sends a one-time code to your email. The browser stays on localhost; your device token and encryption key are stored only in the local EchoMem keystore.</p>' +
+            '</div>' +
+            '<form class="localAuthForm" id="localAuthEmailForm">' +
+              '<label class="localAuthField"><span>Email</span><input id="localAuthEmail" type="email" autocomplete="email" placeholder="you@example.com" value="' + esc(localAuthEmail) + '" /></label>' +
+              localAuthLegalHtml() +
+              '<button class="primary" id="localAuthSend" type="submit">Send code</button>' +
+              '<p class="localAuthStatus' + (message ? " is-error" : "") + '" id="localAuthStatus" role="status" aria-live="polite">' + esc(message || "") + '</p>' +
+            '</form>' +
+          '</section>';
+        var form = document.getElementById("localAuthEmailForm");
+        if (form) form.onsubmit = function (event) { event.preventDefault(); void sendLocalOtp(); };
+        var email = document.getElementById("localAuthEmail");
+        if (email) {
+          email.oninput = function () { localAuthEmail = String(email.value || ""); updateLocalAuthSendButton(); };
+          email.focus();
+        }
+        var terms = document.getElementById("localAuthTerms");
+        var age = document.getElementById("localAuthAge");
+        if (terms) terms.onchange = updateLocalAuthSendButton;
+        if (age) age.onchange = updateLocalAuthSendButton;
+        updateLocalAuthSendButton();
+      }
+      async function sendLocalOtp() {
+        var email = document.getElementById("localAuthEmail");
+        localAuthEmail = email && email.value ? String(email.value).trim().toLowerCase() : "";
+        captureLocalAuthConsents();
+        if (!localAuthEmail) { setLocalAuthStatus("Enter your email.", "error"); return; }
+        if (!localAuthAgeConfirmed || !localAuthTermsAccepted) {
+          setLocalAuthStatus("Confirm your age and accept Echo's terms before continuing.", "error");
+          return;
+        }
+        var button = document.getElementById("localAuthSend");
+        if (button) { button.disabled = true; button.textContent = "Sending..."; }
+        setLocalAuthStatus("Sending verification code...");
         try {
-          authWindow = window.open(targetUrl, "echomem-signin-" + nonce, "popup=yes,width=560,height=760");
-          if (!authWindow) return false;
-          authWindow.focus();
-          return true;
-        } catch (_) { return false; }
-      }
-      function showPopupFallback(message, url) {
-        Array.prototype.forEach.call(document.querySelectorAll("[data-signin-help]"), function (hint) {
-          hint.textContent = message || "Your browser blocked the secure sign-in window. Use the button below, then this page will resume when sign-in returns.";
-        });
-        Array.prototype.forEach.call(document.querySelectorAll("[data-signin-fallback]"), function (fallback) {
-          fallback.setAttribute("href", url || authUrl);
-          fallback.classList.remove("hidden");
-        });
+          var data = await postJson("/local-auth/send-otp", {
+            email: localAuthEmail,
+            acceptedTerms: localAuthTermsAccepted,
+            ageConfirmed: localAuthAgeConfirmed
+          }, 12000);
+          localAuthEmail = data.email || localAuthEmail;
+          renderLocalOtp("Code sent. Check your inbox.");
+        } catch (error) {
+          if (button) { button.disabled = false; button.textContent = "Send code"; }
+          setLocalAuthStatus(error && error.message ? error.message : "Could not send the code.", "error");
+        }
+      }
+      function renderLocalOtp(message) {
+        setCityMode(false);
+        setScanMode(false);
+        setExtractMode(false);
+        setReadyMode(true);
+        setHead("Check your email", "Local login");
+        app.className = "localAuthStage";
+        app.innerHTML =
+          '<section class="localAuthCard localAuthCardOtp">' +
+            '<div class="localAuthLead">' +
+              '<img src="/hud-assets/echo-face-cutout.png" alt="" />' +
+              '<p class="consentEyebrow">Verification code</p>' +
+              '<h2 class="siteHeadline">Enter the code sent to <strong>' + esc(localAuthEmail) + '</strong>.</h2>' +
+              '<p>This code signs in this local EchoMem bridge only. The next step asks for your encryption passphrase.</p>' +
+            '</div>' +
+            '<form class="localAuthForm" id="localAuthOtpForm">' +
+              '<label class="localAuthField"><span>6-digit code</span><input id="localAuthOtp" type="text" inputmode="numeric" autocomplete="one-time-code" maxlength="6" placeholder="123456" /></label>' +
+              '<div class="localAuthActions"><button class="primary" id="localAuthVerify" type="submit">Verify code</button><button class="textButton" id="localAuthBack" type="button">Use a different email</button></div>' +
+              '<p class="localAuthStatus" id="localAuthStatus" role="status" aria-live="polite">' + esc(message || "") + '</p>' +
+            '</form>' +
+          '</section>';
+        var form = document.getElementById("localAuthOtpForm");
+        if (form) form.onsubmit = function (event) { event.preventDefault(); void verifyLocalOtp(); };
+        var back = document.getElementById("localAuthBack");
+        if (back) back.onclick = function () { renderLocalLogin(""); };
+        var otp = document.getElementById("localAuthOtp");
+        if (otp) otp.focus();
+      }
+      async function verifyLocalOtp() {
+        var otpInput = document.getElementById("localAuthOtp");
+        var otp = otpInput && otpInput.value ? String(otpInput.value).replace(/\\D/g, "") : "";
+        if (otp.length !== 6) { setLocalAuthStatus("Enter the 6-digit code.", "error"); return; }
+        var button = document.getElementById("localAuthVerify");
+        if (button) { button.disabled = true; button.textContent = "Verifying..."; }
+        setLocalAuthStatus("Verifying code...");
+        try {
+          var data = await postJson("/local-auth/verify-otp", {
+            email: localAuthEmail,
+            otp: otp,
+            acceptedTerms: localAuthTermsAccepted,
+            ageConfirmed: localAuthAgeConfirmed
+          }, 18000);
+          if (data && data.stage === "passphrase") {
+            renderLocalPassphrase(data.mode || "unlock", data.email || localAuthEmail);
+            return;
+          }
+          connected = true;
+          await waitForStats();
+        } catch (error) {
+          if (button) { button.disabled = false; button.textContent = "Verify code"; }
+          setLocalAuthStatus(error && error.message ? error.message : "Could not verify the code.", "error");
+        }
+      }
+      function renderLocalPassphrase(mode, email, message) {
+        localAuthEmail = email || localAuthEmail;
+        var setupMode = mode === "setup";
+        setCityMode(false);
+        setScanMode(false);
+        setExtractMode(false);
+        setReadyMode(true);
+        setHead(setupMode ? "Create encrypted vault" : "Unlock encrypted vault", "Local passphrase");
+        app.className = "localAuthStage";
+        app.innerHTML =
+          '<section class="localAuthCard localAuthCardPassphrase">' +
+            '<div class="localAuthLead">' +
+              '<img src="/hud-assets/echo-face-cutout.png" alt="" />' +
+              '<p class="consentEyebrow">Encryption passphrase</p>' +
+              '<h2 class="siteHeadline">' + (setupMode ? 'Create your local vault passphrase.' : 'Enter your vault passphrase.') + '</h2>' +
+              '<p>' + (setupMode ? 'Echo derives your encryption key on this device. The passphrase and key are never sent to EchoMem. If you forget it, encrypted memories cannot be recovered.' : 'Echo verifies this passphrase locally against your account encryption token. The passphrase is never sent to EchoMem.') + '</p>' +
+            '</div>' +
+            '<form class="localAuthForm" id="localAuthPassphraseForm">' +
+              '<label class="localAuthField"><span>Passphrase</span><input id="localAuthPassphrase" type="password" autocomplete="' + (setupMode ? "new-password" : "current-password") + '" placeholder="Encryption passphrase" /></label>' +
+              (setupMode ? '<label class="localAuthField"><span>Confirm passphrase</span><input id="localAuthPassphraseConfirm" type="password" autocomplete="new-password" placeholder="Confirm passphrase" /></label>' : '') +
+              '<div class="localAuthActions"><button class="primary" id="localAuthUnlock" type="submit">' + (setupMode ? "Create vault" : "Unlock") + '</button><button class="textButton" id="localAuthRestart" type="button">Use a different email</button></div>' +
+              '<p class="localAuthStatus' + (message ? " is-error" : "") + '" id="localAuthStatus" role="status" aria-live="polite">' + esc(message || "") + '</p>' +
+            '</form>' +
+          '</section>';
+        var form = document.getElementById("localAuthPassphraseForm");
+        if (form) form.onsubmit = function (event) { event.preventDefault(); void submitLocalPassphrase(setupMode); };
+        var restart = document.getElementById("localAuthRestart");
+        if (restart) restart.onclick = function () { renderLocalLogin(""); };
+        var pass = document.getElementById("localAuthPassphrase");
+        if (pass) pass.focus();
+      }
+      async function submitLocalPassphrase(setupMode) {
+        var pass = document.getElementById("localAuthPassphrase");
+        var confirm = document.getElementById("localAuthPassphraseConfirm");
+        var passphrase = pass && typeof pass.value === "string" ? pass.value : "";
+        var confirmValue = confirm && typeof confirm.value === "string" ? confirm.value : "";
+        if (passphrase.length < 4) { setLocalAuthStatus("Use at least 4 characters.", "error"); return; }
+        if (setupMode && passphrase !== confirmValue) { setLocalAuthStatus("Passphrases do not match.", "error"); return; }
+        var button = document.getElementById("localAuthUnlock");
+        if (button) { button.disabled = true; button.textContent = setupMode ? "Creating..." : "Unlocking..."; }
+        setLocalAuthStatus(setupMode ? "Creating encrypted vault..." : "Unlocking vault...");
+        try {
+          await postJson("/local-auth/passphrase", { passphrase: passphrase }, 30000);
+          connected = true;
+          await waitForStats();
+        } catch (error) {
+          if (button) { button.disabled = false; button.textContent = setupMode ? "Create vault" : "Unlock"; }
+          var msg = error && error.message ? error.message : "Could not unlock encrypted memory.";
+          renderLocalPassphrase(setupMode ? "setup" : "unlock", localAuthEmail, msg);
+        }
       }
       function onConnectClick() {
         if (!localHistoryConsentGranted) {
@@ -182,8 +350,7 @@ export const SETUP_PAGE_CLIENT_CORE = String.raw `      var params = new URLSear
           return;
         }
         if (connected) { void waitForStats(); return; }
-        if (!openAuthWindow(authUrl)) showPopupFallback("", authUrl);
-        startConnectionPoll();
+        renderLocalLogin("");
       }
       function bindConnect() {
         Array.prototype.forEach.call(document.querySelectorAll("[data-connect-echo]"), function (signin) {

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

@@ -93,30 +93,17 @@ export const SETUP_PAGE_CLIENT_EXTRACTION = String.raw `      /* ---------- dash
           '<div class="actions"><button id="logout" class="secondary">Retry sign out</button></div></div>';
         var lo = document.getElementById("logout"); if (lo) lo.onclick = localLogout;
       }
-      async function waitForConnection() {
-        if (connectionPollStarted) return;
-        connectionPollStarted = true;
-        try {
-          for (;;) {
-            if (decisionMade) return;
-            try {
-              var cfg = await getJson("/config");
-              authUrl = cfg.authUrl || authUrl;
-              switchAccountUrl = cfg.switchAccountUrl || switchAccountUrl || authUrl;
-              if (cfg.connected) { connected = true; closeAuthWindow(); await waitForStats(); return; }
-            } catch (_) {}
-            await sleep(900);
-          }
-        } finally { connectionPollStarted = false; }
-      }
-      function startConnectionPoll() { void waitForConnection(); }
       async function waitForStats() {
         if (statsPollStarted) return;
         statsPollStarted = true;
-        // Use the same one-reading-line stage as the partial scan state. This avoids a jarring
-        // old setup shell between device approval and the ready decision.
-        renderDashboard();
+        setCityMode(false);
+        setExtractMode(false);
+        setReadyMode(true);
+        setHead("Checking extraction", "Working");
+        app.className = "loading-panel";
+        app.innerHTML = '<div style="padding:24px"><h2>Checking for active work</h2><p class="helper">Echo is reconnecting to any extraction already running on this machine.</p></div>';
         try {
+          if (await resumeExistingExtraction()) return;
           var started = Date.now();
           var lastError = "";
           for (;;) {
@@ -214,6 +201,7 @@ export const SETUP_PAGE_CLIENT_EXTRACTION = String.raw `      /* ---------- dash
               '<div class="readyGo">' +
                 '<div class="actions">' +
                   '<button id="migrate" class="primary"></button>' +
+                  '<button type="button" id="skipHistoryImport" class="secondary skipHistoryButton">Skip history import</button>' +
                 '</div>' +
                 '<p class="ctaMeta" id="exEta"></p>' +
               '</div>' +
@@ -267,13 +255,19 @@ export const SETUP_PAGE_CLIENT_EXTRACTION = String.raw `      /* ---------- dash
         // While still counting, hide the primary button entirely; the headline + source split
         // already say it is working, and the ready state should present one clear action.
         var migrateBtn = document.getElementById("migrate");
+        var skipHistoryBtn = document.getElementById("skipHistoryImport");
         if (pendingTrusted) {
           migrateBtn.style.display = "";
           migrateBtn.disabled = canExtract && (!setupPlanConfirmed() || selectedSessionKeyList().length === 0);
           migrateBtn.innerHTML = '<span>' + esc(canExtract ? extractLabel : "Finish setup") + '</span>' + (canExtract ? setupIcon("arrow-right") : "");
           migrateBtn.onclick = canExtract ? startMigrate : skip;
+          if (skipHistoryBtn) {
+            skipHistoryBtn.style.display = canExtract ? "" : "none";
+            skipHistoryBtn.onclick = skip;
+          }
         } else {
           migrateBtn.style.display = "none";
+          if (skipHistoryBtn) skipHistoryBtn.style.display = "none";
         }
       }
       async function startMigrate() {
@@ -294,21 +288,74 @@ export const SETUP_PAGE_CLIENT_EXTRACTION = String.raw `      /* ---------- dash
         setHead("Extracting", "Starting");
         app.className = "";
         app.innerHTML = '<div class="miniLoad"><h2>Starting extraction</h2><p>Echo is sizing the remaining jobs, then imports automatically. Finished work is saved as it goes.</p><div class="miniBar"><i></i></div></div>';
+        var started;
         try {
-          var started = await postJson("/migrate", { conversationKeys: selectedKeys });
-          extractMounted = false;
-          renderProgress(Object.assign({ status: "starting", completed: 0, failed: 0, extracted: 0 }, started));
-          await pollProgress();
+          started = await postJson("/migrate", { conversationKeys: selectedKeys });
         } catch (e) {
           decisionMade = false;
           renderDashboard(routeError(e && e.message));
+          return;
+        }
+        extractMounted = false;
+        renderProgress(Object.assign({ status: "starting", completed: 0, failed: 0, extracted: 0 }, started));
+        await pollProgress();
+      }
+      async function resumeExistingExtraction() {
+        try {
+          var existing = await getJson("/progress");
+          if (!existing || existing.status === "idle") return false;
+          decisionMade = true;
+          extractionEnded = false;
+          extractMounted = false;
+          renderProgress(existing);
+          if (existing.status !== "completed" && existing.status !== "failed") {
+            void pollProgress();
+          }
+          return true;
+        } catch (_) {
+          // Stats cannot prove that no import is running. Stay in the recovery view until
+          // the authoritative progress endpoint answers instead of exposing a second start.
+          decisionMade = true;
+          extractionEnded = false;
+          extractMounted = false;
+          renderProgress({
+            status: "running",
+            total: 0,
+            completed: 0,
+            failed: 0,
+            extracted: 0,
+            latest: "Reconnecting to the active extraction..."
+          });
+          void pollProgress();
+          return true;
         }
       }
       async function pollProgress() {
         var runId = ++progressPollRunId;
+        var failures = 0;
         for (;;) {
           if (extractionEnded || runId !== progressPollRunId) return;
-          var progress = await getJson("/progress");
+          var progress;
+          try {
+            progress = await getJson("/progress");
+            failures = 0;
+          } catch (_) {
+            failures++;
+            var reconnecting = Object.assign({
+              status: "running",
+              total: 0,
+              completed: 0,
+              failed: 0,
+              extracted: 0
+            }, lastExtractionProgress || {});
+            reconnecting.status = reconnecting.status === "completed" || reconnecting.status === "failed"
+              ? "running"
+              : reconnecting.status;
+            reconnecting.latest = "Connection interrupted. Reconnecting to the active extraction...";
+            renderProgress(reconnecting);
+            await sleep(Math.min(5000, 500 * Math.pow(2, Math.min(failures - 1, 3))));
+            continue;
+          }
           if (extractionEnded || runId !== progressPollRunId) return;
           renderProgress(progress);
           if (progress.status === "completed" || progress.status === "failed") return;
@@ -352,7 +399,7 @@ export const SETUP_PAGE_CLIENT_EXTRACTION = String.raw `      /* ---------- dash
           var savedMemoryLabel = extracted === 1 ? "memory saved" : "memories saved";
           var conversationNoun = completed === 1 ? "conversation" : "conversations";
           var timelineUrl = "https://yeahecho.com/memories/timeline";
-          var stopDetail = String(progress.error) === "key-expired"
+          var stopDetail = String(progress.error) === "vault-locked"
             ? "Your encryption key was not accepted. Re-run extraction; if it keeps failing, run <code>echomem-mcp unlock</code> first. Already-done conversations are skipped."
             : esc(progress.error || "Re-run extraction to finish the rest. Already-done conversations are skipped.");
           var completionNote = done && progress.latest && progress.latest !== "Import complete."
@@ -626,6 +673,7 @@ export const SETUP_PAGE_CLIENT_EXTRACTION = String.raw `      /* ---------- dash
       }
       function updateSessionPickerSelectionUi(dialog, input, limit) {
         var selectedCount = selectedSessionKeyList().length;
+        hideSessionPickerLimitNotice();
         var row = input && input.closest ? input.closest(".sessionPickerRow") : null;
         if (row) row.classList.toggle("is-selected", !!input.checked);
         var count = dialog.querySelector(".sessionPickerActions strong");
@@ -638,6 +686,48 @@ export const SETUP_PAGE_CLIENT_EXTRACTION = String.raw `      /* ---------- dash
           confirm.textContent = "Use " + number(selectedCount) + " selected";
         }
       }
+      function sessionPickerLimitNotice(canDismiss) {
+        var plan = String(billingStatus && billingStatus.plan || "").toLowerCase();
+        var linkLabel = plan === "power" || plan === "team" || plan === "enterprise"
+          ? "View plan options"
+          : "Upgrade to import more";
+        return '<div class="sessionPickerLimitCard">' +
+          '<span class="sessionPickerLimitEyebrow">Plan limit</span>' +
+          '<h3>Plan limit reached.</h3>' +
+          '<p>Upgrade your plan to select and import more conversations.</p>' +
+          '<div class="sessionPickerLimitActions"><a id="upgradeSessionPlan" class="button primary" href="' + esc(setupPricingUrl("pro", false)) + '" target="_blank" rel="noopener noreferrer">' + linkLabel + '</a>' +
+          (canDismiss ? '<button type="button" class="textButton" id="dismissSessionLimit">Keep editing</button>' : "") + '</div>' +
+        '</div>';
+      }
+      function wireSessionPickerUpgrade() {
+        var upgrade = document.getElementById("upgradeSessionPlan");
+        if (upgrade) upgrade.onclick = function () { startBillingPoll(); };
+        var dismiss = document.getElementById("dismissSessionLimit");
+        if (dismiss) dismiss.onclick = hideSessionPickerLimitNotice;
+      }
+      function showSessionPickerLimitNotice(canDismiss) {
+        var wrap = document.getElementById("sessionPickerListWrap");
+        var list = wrap && wrap.querySelector ? wrap.querySelector(".sessionPickerList") : null;
+        var overlay = document.getElementById("sessionPickerLimitOverlay");
+        var status = document.getElementById("sessionPickerStatus");
+        if (status) status.textContent = "Plan limit reached. Upgrade to import more.";
+        if (!wrap || !overlay) return;
+        overlay.innerHTML = sessionPickerLimitNotice(canDismiss);
+        overlay.hidden = false;
+        if (list) list.inert = true;
+        wrap.classList.add("is-limit-blocked");
+        wireSessionPickerUpgrade();
+      }
+      function hideSessionPickerLimitNotice() {
+        var wrap = document.getElementById("sessionPickerListWrap");
+        var list = wrap && wrap.querySelector ? wrap.querySelector(".sessionPickerList") : null;
+        var overlay = document.getElementById("sessionPickerLimitOverlay");
+        var status = document.getElementById("sessionPickerStatus");
+        if (status) status.textContent = "";
+        if (overlay) { overlay.hidden = true; overlay.innerHTML = ""; }
+        if (list) list.inert = false;
+        if (wrap) wrap.classList.remove("is-limit-blocked");
+      }
       function renderSessionPicker() {
         var dialog = document.getElementById("sessionPicker");
         if (!dialog) return;
@@ -674,14 +764,17 @@ export const SETUP_PAGE_CLIENT_EXTRACTION = String.raw `      /* ---------- dash
             '<div class="sessionPickerToolbar"><label class="sessionSearch"><span>Search</span><input type="search" id="sessionPickerSearch" placeholder="Title or project" value="' + esc(sessionPickerQuery) + '" /></label>' +
               '<label class="sessionSourceFilter"><span>Source</span><select id="sessionPickerSource"><option value="all"' + (sessionPickerSource === "all" ? " selected" : "") + '>All sources</option><option value="codex"' + (sessionPickerSource === "codex" ? " selected" : "") + '>Codex</option><option value="claude-code"' + (sessionPickerSource === "claude-code" ? " selected" : "") + '>Claude Code</option></select></label>' +
             '</div>' +
-            '<div class="sessionPickerActions"><strong>' + esc(number(selected.length)) + ' / ' + esc(number(limit)) + ' selected</strong><span id="sessionPickerStatus" role="status"></span><button type="button" class="textButton" id="selectNewestSessions">Select newest</button><button type="button" class="textButton" id="clearSessions">Clear</button></div>' +
-            '<div class="sessionPickerList">' + (rows || '<div class="sessionPickerEmpty">No conversations match these filters.</div>') + '</div>' + overflow +
-            '<footer class="sessionPickerFoot"><p>Only selected conversations will be sent for extraction.</p><button type="button" class="primary" id="confirmSessions"' + (selected.length ? "" : " disabled") + '>Use ' + esc(number(selected.length)) + ' selected</button></footer>' +
+            '<div class="sessionPickerActions"><strong>' + esc(number(selected.length)) + ' / ' + esc(number(limit)) + ' selected</strong><span id="sessionPickerStatus" class="sessionPickerStatus" role="status" aria-live="polite">' + (limit === 0 ? "Plan limit reached. Upgrade to import more." : "") + '</span><button type="button" class="textButton" id="selectNewestSessions">Select newest</button><button type="button" class="textButton" id="clearSessions">Clear</button></div>' +
+            '<div class="sessionPickerListWrap' + (limit === 0 ? " is-limit-blocked" : "") + '" id="sessionPickerListWrap"><div class="sessionPickerList"' + (limit === 0 ? " inert" : "") + '>' + (rows || '<div class="sessionPickerEmpty">No conversations match these filters.</div>') + overflow + '</div><div class="sessionPickerLimitOverlay" id="sessionPickerLimitOverlay" role="alert"' + (limit === 0 ? "" : " hidden") + '>' + (limit === 0 ? sessionPickerLimitNotice(false) : "") + '</div></div>' +
+            '<footer class="sessionPickerFoot"><p>Only selected conversations will be sent for extraction.</p><div class="sessionPickerFootActions"><button type="button" class="secondary" id="skipSessionImport">Skip history import</button><button type="button" class="primary" id="confirmSessions"' + (selected.length ? "" : " disabled") + '>Use ' + esc(number(selected.length)) + ' selected</button></div></footer>' +
           '</div>';
         var close = document.getElementById("closeSessionPicker");
         var confirm = document.getElementById("confirmSessions");
+        var skipImport = document.getElementById("skipSessionImport");
         if (close) close.onclick = function () { dialog.close(); renderSessionSelection(true); };
         if (confirm) confirm.onclick = function () { dialog.close(); renderSessionSelection(true); };
+        if (skipImport) skipImport.onclick = skip;
+        wireSessionPickerUpgrade();
         var search = document.getElementById("sessionPickerSearch");
         if (search) search.oninput = function () {
           sessionPickerQuery = search.value || "";
@@ -697,8 +790,7 @@ export const SETUP_PAGE_CLIENT_EXTRACTION = String.raw `      /* ---------- dash
             var count = selectedSessionKeyList().length;
             if (input.checked && !selectedSessionKeys[key] && count >= limit) {
               input.checked = false;
-              var status = document.getElementById("sessionPickerStatus");
-              if (status) status.textContent = "Plan limit reached";
+              showSessionPickerLimitNotice(limit > 0);
               return;
             }
             sessionSelectionTouched = true;
@@ -751,7 +843,7 @@ export const SETUP_PAGE_CLIENT_EXTRACTION = String.raw `      /* ---------- dash
       }
       async function switchSetupAccount() {
         var button = document.getElementById("changeSetupAccount");
-        if (button) { button.disabled = true; button.textContent = "Opening account chooser…"; }
+        if (button) { button.disabled = true; button.textContent = "Signing out..."; }
         try {
           await postJson("/logout", {}, 12000);
           stats = null;
@@ -759,15 +851,13 @@ export const SETUP_PAGE_CLIENT_EXTRACTION = String.raw `      /* ---------- dash
           connected = false;
           selectedSessionKeys = Object.create(null);
           sessionSelectionTouched = false;
-          if (!openAuthWindow(switchAccountUrl || authUrl)) {
-            if (button) { button.disabled = false; button.textContent = "Change account"; }
-            showPopupFallback("Your browser blocked the account chooser. Open it below to continue.", switchAccountUrl || authUrl);
-            return;
-          }
-          startConnectionPoll();
+          localAuthEmail = "";
+          localAuthTermsAccepted = false;
+          localAuthAgeConfirmed = false;
+          renderLocalLogin("");
         } catch (error) {
           if (button) { button.disabled = false; button.textContent = "Change account"; }
-          setSetupPlanStatus(error && error.message ? error.message : "Could not open the account chooser.");
+          setSetupPlanStatus(error && error.message ? error.message : "Could not switch accounts.");
         }
       }
       function paidRecallPlan(plan) {

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

@@ -137,13 +137,11 @@ export const SETUP_PAGE_CLIENT_LIFECYCLE = String.raw `      /* ---------- scan-
         var data = event.data || {};
         if (data.type === "echomem:connected" && data.nonce === nonce) {
           if (!localHistoryConsentGranted) {
-            closeAuthWindow();
             renderLocalScanConsent();
             setConsentStatus("Local history access is required before you can connect EchoMem or continue setup.", "required");
             return;
           }
           connected = true;
-          closeAuthWindow();
           void waitForStats();
         } else if (data.type === "echomem:city-ready" && data.nonce === nonce) {
           scheduleReportToCity();
@@ -159,12 +157,10 @@ export const SETUP_PAGE_CLIENT_LIFECYCLE = String.raw `      /* ---------- scan-
         var configLoaded = false;
         var consentRequired = true;
         var consentGranted = false;
-        // Learn the auth URL, connection state, and server-side consent gate before routing.
+        // Learn the connection state and server-side consent gate before routing.
         try {
           var cfg = await getJson("/config");
           configLoaded = true;
-          authUrl = cfg.authUrl || authUrl;
-          switchAccountUrl = cfg.switchAccountUrl || switchAccountUrl || authUrl;
           connected = !!cfg.connected;
           workspacePath = cfg.workspacePath || workspacePath;
           consentRequired = cfg.consentRequired !== false;

package/dist/setup-page/client-report-city.js

@@ -192,12 +192,21 @@ export const SETUP_PAGE_CLIENT_REPORT_CITY = String.raw `      /* ---------- ful
         app.className = "scanLoading";
         app.innerHTML =
           '<div class="scanLoader" aria-live="polite">' +
-            '<p class="scanEyebrow">Local scan</p>' +
-            '<h2>Reading your local coding history</h2>' +
-            '<div class="scanProgress" role="progressbar" aria-label="Local scan progress" aria-valuemin="0" aria-valuemax="100" aria-valuenow="' + pct + '">' +
-              '<i id="scan-load-fill" class="scanProgressFill" style="width:' + pct + '%"></i>' +
+            '<div class="scanLoaderLead">' +
+              '<span class="scanMascot" aria-hidden="true"><img src="/hud-assets/echo-face-cutout.png" alt="" /></span>' +
+              '<div class="scanLoaderCopy">' +
+                '<p class="scanEyebrow">Local scan</p>' +
+                '<h2 class="siteHeadline">Reading your <strong>local coding history</strong></h2>' +
+                '<p class="scanIntro">Echo is organizing your Codex and Claude Code sessions on this Mac.</p>' +
+              '</div>' +
+            '</div>' +
+            '<div class="scanProgressCard">' +
+              '<div class="scanProgress" role="progressbar" aria-label="Local scan progress" aria-valuemin="0" aria-valuemax="100" aria-valuenow="' + pct + '">' +
+                '<i id="scan-load-fill" class="scanProgressFill" style="width:' + pct + '%"></i>' +
+              '</div>' +
+              '<p id="scan-load-caption" class="scanCaption">' + esc(caption) + '</p>' +
             '</div>' +
-            '<p id="scan-load-caption" class="scanCaption">' + esc(caption) + '</p>' +
+            '<p class="scanPrivacy"><span aria-hidden="true"></span>Transcripts stay on this device during the scan.</p>' +
           '</div>';
       }