@echomem/mcp 1.4.27 → 1.4.28

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

@@ -77,6 +77,32 @@ export const SETUP_PAGE_CLIENT_EXTRACTION = String.raw `      /* ---------- dash
       function renderBridgeIssue() {
         renderReportIssue("BRIDGE_UNREACHABLE", "The local bridge stopped answering before your report was ready. Your terminal may have closed or the process may have stopped.");
       }
+      function renderDiscoveryCheck(slow) {
+        void slow;
+        setCityMode(false);
+        setExtractMode(false);
+        setReadyMode(true);
+        setHead("Loading", "Working");
+        app.className = "discoveryLoader";
+        app.innerHTML = '<div class="discoverySpinner" role="status" aria-label="Loading"><span aria-hidden="true"></span></div>';
+      }
+      function renderDiscoveryCheckIssue(error) {
+        setCityMode(false);
+        setExtractMode(false);
+        setReadyMode(true);
+        setHead("Session refresh paused", "Needs attention");
+        app.className = "loading-panel";
+        app.innerHTML =
+          '<div style="padding:24px"><h2>Echo could not refresh session status</h2>' +
+          '<p class="helper">Keep the terminal open and try the local check again.</p>' +
+          (error ? '<details class="reportTechnical"><summary>Technical details</summary><code>' + esc(error) + '</code></details>' : '') +
+          '<div class="actions"><button id="retryDiscoveryCheck" class="primary">Try again</button></div></div>';
+        var retry = document.getElementById("retryDiscoveryCheck");
+        if (retry) retry.onclick = function () {
+          statsPollStarted = false;
+          void waitForStats();
+        };
+      }
       function renderLogoutPending() {
         setCityMode(false);
         setHead("Signing out locally", "Working");
@@ -96,30 +122,36 @@ export const SETUP_PAGE_CLIENT_EXTRACTION = String.raw `      /* ---------- dash
       }
       async function waitForStats() {
         if (statsPollStarted) return;
+        var statsEpoch = accountStateEpoch;
         statsPollStarted = true;
         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>';
+        renderDiscoveryCheck(false);
         try {
           if (await resumeExistingExtraction()) return;
+          if (statsEpoch !== accountStateEpoch || !connected) return;
           var started = Date.now();
           var lastError = "";
           for (;;) {
-            if (decisionMade) return;
+            if (decisionMade || statsEpoch !== accountStateEpoch || !connected) return;
             try {
               var res = await fetchWithTimeout("/stats?nonce=" + encodeURIComponent(nonce), { credentials: "omit" }, 3000);
+              if (statsEpoch !== accountStateEpoch || !connected) return;
               if (res.status === 200) {
-                stats = await res.json();
-                if (decisionMade) return;
+                var nextStats = await res.json();
+                if (decisionMade || statsEpoch !== accountStateEpoch || !connected) return;
+                stats = nextStats;
                 if (connected && !billingStatus && !billingStatusLoading) {
                   try { await refreshBillingStatus(); } catch (_) {}
-                  if (decisionMade) return;
+                  if (decisionMade || statsEpoch !== accountStateEpoch || !connected) return;
                 }
                 renderDashboard();
-                if (stats && stats.partial) { await sleep(1200); continue; }
+                if (stats && stats.partial) {
+                  await sleep(1200);
+                  if (statsEpoch !== accountStateEpoch || !connected) return;
+                  continue;
+                }
                 return;
               }
               if (res.status !== 202) throw new Error(await res.text() || ("HTTP " + res.status));
@@ -172,7 +204,6 @@ export const SETUP_PAGE_CLIENT_EXTRACTION = String.raw `      /* ---------- dash
         var discovery = stats && stats.discovery ? stats.discovery : {};
         var isPartial = !!(stats && stats.partial);
         var localScanReady = !isPartial || discovery.phase === "exact" || discovery.phase === "full";
-        var eta = migratable && migratable.eta ? migratable.eta : {};
         var skippedActive = typeof migratable.skippedActive === "number" ? migratable.skippedActive : 0;
         var sessions = stats && stats.sessions ? stats.sessions : {};
         // The "quick" phase counts only this device's local ledger; it does not know what the account
@@ -183,25 +214,36 @@ export const SETUP_PAGE_CLIENT_EXTRACTION = String.raw `      /* ---------- dash
         var knownDone = pendingTrusted && pending === 0;
         var canExtract = pendingTrusted && pending > 0;
         var pendN = hasPendingCount ? pending : 0;
-        var etaLabel = eta.estimatedLabel || migratable.estimatedLabel || "a couple of minutes";
         var pendingCodex = typeof migratable.pendingCodex === "number" ? migratable.pendingCodex : null;
         var pendingClaudeCode = typeof migratable.pendingClaudeCode === "number" ? migratable.pendingClaudeCode : null;
         if (connected && !billingStatusLoading && !setupPlanConfirmed()) {
           renderPlanGate();
           return;
         }
+        var importableNow = canExtract ? Math.min(pendN, historicalSelectionLimit()) : 0;
+        var planLimited = canExtract && importableNow < pendN;
+        var deferredByPlan = planLimited ? pendN - importableNow : 0;
+        var currentPlan = String(billingStatus && billingStatus.plan || "").toLowerCase();
+        var currentPlanLabel = paidRecallPlan(currentPlan)
+          ? currentPlan.charAt(0).toUpperCase() + currentPlan.slice(1) + " Echo"
+          : "Original Echo";
         setHead("Turn coding history into memory", pendingTrusted ? (knownDone ? "Done" : "Ready") : (localScanReady ? "Ready" : "Scanning"));
         var headlineHtml = !pendingTrusted
           ? "Counting your <strong>new conversations…</strong>"
           : (knownDone
               ? "You are <strong>all caught up.</strong>"
-              : "<strong>" + esc(number(pendN)) + " sessions</strong> are ready to review.");
+              : (planLimited
+                  ? "<strong>" + esc(number(pendN)) + " sessions</strong> found."
+                  : "<strong>" + esc(number(pendN)) + " sessions</strong> are ready to review."));
         var sub = !pendingTrusted
           ? "Echo is matching your local history against what is already in memory."
-          : (knownDone
+            : (knownDone
             ? (skippedActive ? number(skippedActive) + " active conversation" + (skippedActive === 1 ? " is" : "s are") + " still changing, so Echo will pick them up later." : "Your history is already in EchoMem. Nothing new to extract.")
-            : "Nothing uploads until you confirm.");
-        var extractLabel = !pendingTrusted ? "Counting…" : (canExtract ? "Start memory extraction" : "All caught up");
+            : (planLimited
+                ? (importableNow > 0
+                    ? currentPlanLabel + " can import " + number(importableNow) + " of them. Choose which ones to bring into memory; the other " + number(deferredByPlan) + " stay on this Mac."
+                    : currentPlanLabel + " has no coding-session imports remaining. These sessions stay on this Mac.")
+                : ""));
         // Mount the dashboard shell ONCE so the WebGL plate iframe is never re-created across /stats polls.
         // (Rebuilding app.innerHTML on every partial-scan poll reloaded the iframe → the city flickered.)
         // Later polls only patch the text/counts in place; the iframe stays mounted.
@@ -217,6 +259,10 @@ export const SETUP_PAGE_CLIENT_EXTRACTION = String.raw `      /* ---------- dash
           // not a display-size headline.
           app.innerHTML =
             setupJourney(4) +
+            '<aside class="readyUtilityNav" aria-label="Account and plan settings">' +
+              '<div class="planGateAccount readyAccountNav" aria-label="Connected account"><div class="setupAccountSlot" id="setupAccount"></div></div>' +
+              '<div class="readyPlanNav" aria-label="Current plan"><span class="readyPlanNavLabel">Plan</span><div class="setupPlanSlot" id="setupPlan"></div></div>' +
+            '</aside>' +
             '<div id="exBanner"></div>' +
             '<section class="readyDecision extractionReady">' +
               '<div class="readyHero">' +
@@ -234,10 +280,6 @@ export const SETUP_PAGE_CLIENT_EXTRACTION = String.raw `      /* ---------- dash
                 '</div>' +
                 '<p class="ctaMeta" id="exEta"></p>' +
               '</div>' +
-              '<aside class="readySettings" aria-label="Account and plan settings">' +
-                '<div class="readySetting readyAccountSetting"><span class="readySettingLabel">Account</span><div class="setupAccountSlot" id="setupAccount"></div></div>' +
-                '<div class="readySetting readyPlanSetting"><span class="readySettingLabel">Plan</span><div class="setupPlanSlot" id="setupPlan"></div></div>' +
-              '</aside>' +
             '</section>' +
             '<dialog class="sessionPicker" id="sessionPicker" aria-labelledby="sessionPickerTitle"></dialog>';
           document.getElementById("migrate").onclick = openSessionPicker;
@@ -266,7 +308,7 @@ export const SETUP_PAGE_CLIENT_EXTRACTION = String.raw `      /* ---------- dash
         // Reassurances live at the moment of commitment — right under the button.
         document.getElementById("exEta").innerHTML = pendingTrusted
           ? (canExtract
-              ? '<span class="cm">&asymp; ' + esc(etaLabel) + '</span>'
+              ? ''
               : 'Nothing new to extract right now.')
           : 'Echo is checking local history against saved memory&hellip;';
         renderSetupPlan(canExtract);
@@ -277,9 +319,25 @@ export const SETUP_PAGE_CLIENT_EXTRACTION = String.raw `      /* ---------- dash
         var migrateBtn = document.getElementById("migrate");
         if (pendingTrusted) {
           migrateBtn.style.display = "";
-          if (canExtract) ensureSessionSelection();
-          migrateBtn.disabled = canExtract && (!setupPlanConfirmed() || selectedSessionKeyList().length === 0);
-          migrateBtn.innerHTML = '<span>' + esc(canExtract ? "Review " + number(pendN) + " sessions" : "Finish setup") + '</span>' + (canExtract ? setupIcon("arrow-right") : "");
+          var candidatesReady = !canExtract || candidateSessions().length > 0;
+          if (canExtract && candidatesReady) ensureSessionSelection();
+          // This button opens the picker; zero selected belongs to the picker's Start button.
+          migrateBtn.disabled = canExtract && (
+            !setupPlanConfirmed() ||
+            !candidatesReady ||
+            historicalSelectionLimit() === 0
+          );
+          migrateBtn.innerHTML = '<span>' + esc(
+            canExtract
+              ? (candidatesReady
+                  ? (importableNow === 0
+                      ? "No imports available"
+                      : (planLimited
+                          ? "Choose " + number(importableNow) + " of " + number(pendN) + " sessions"
+                          : "Review " + number(pendN) + " sessions"))
+                  : "Preparing session list…")
+              : "Finish setup"
+          ) + '</span>' + (canExtract && candidatesReady ? setupIcon("arrow-right") : "");
           migrateBtn.onclick = canExtract ? openSessionPicker : skip;
         } else {
           migrateBtn.style.display = "none";
@@ -311,9 +369,14 @@ export const SETUP_PAGE_CLIENT_EXTRACTION = String.raw `      /* ---------- dash
         decisionMade = true;
         extractionEnded = false;
         setCityMode(false);
+        setScanMode(false);
+        setReadyMode(false);
+        setExtractMode(true);
         setHead("Extracting", "Starting");
-        app.className = "";
-        app.innerHTML = '<div class="miniLoad"><h2>Starting extraction…</h2><div class="miniBar"><i></i></div></div>';
+        app.className = "extractionStartStage";
+        app.innerHTML =
+          setupJourney(4) +
+          '<div class="discoverySpinner" role="status" aria-label="Starting import"><span aria-hidden="true"></span></div>';
         var started;
         try {
           started = await postJson("/migrate", { conversationKeys: selectedKeys });
@@ -327,8 +390,34 @@ export const SETUP_PAGE_CLIENT_EXTRACTION = String.raw `      /* ---------- dash
         await pollProgress();
       }
       async function resumeExistingExtraction() {
+        var resumeEpoch = accountStateEpoch;
+        var existing = null;
+        var lastError = "";
+        for (var attempt = 0; attempt < 3; attempt++) {
+          try {
+            var progressResponse = await fetchWithTimeout(
+              "/progress?nonce=" + encodeURIComponent(nonce),
+              { credentials: "omit", cache: "no-store" },
+              3000
+            );
+            if (!progressResponse.ok) throw new Error(await progressResponse.text() || ("HTTP " + progressResponse.status));
+            existing = await progressResponse.json();
+            break;
+          } catch (error) {
+            if (resumeEpoch !== accountStateEpoch || !connected) return false;
+            lastError = error && error.message ? error.message : String(error);
+            if (attempt < 2) {
+              renderDiscoveryCheck(true);
+              await sleep(500 * (attempt + 1));
+            }
+          }
+        }
+        if (!existing) {
+          renderDiscoveryCheckIssue(lastError);
+          return true;
+        }
         try {
-          var existing = await getJson("/progress");
+          if (resumeEpoch !== accountStateEpoch || !connected) return false;
           if (!existing || existing.status === "idle") return false;
           decisionMade = true;
           extractionEnded = false;
@@ -338,21 +427,8 @@ export const SETUP_PAGE_CLIENT_EXTRACTION = String.raw `      /* ---------- dash
             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();
+        } catch (error) {
+          renderDiscoveryCheckIssue(error && error.message ? error.message : String(error));
           return true;
         }
       }
@@ -434,11 +510,11 @@ export const SETUP_PAGE_CLIENT_EXTRACTION = String.raw `      /* ---------- dash
             ? '<p class="exSub">' + esc(progress.latest) + '</p>'
             : "";
           t.innerHTML =
-            '<div class="resultStage ' + (done ? "ok" : "warn") + '">' +
+            '<div class="resultStage ' + (done ? "firstRecallStage ok" : "warn") + '">' +
               '<div class="resultTop">' +
                 '<div>' +
                   (done
-                    ? '<h2 class="savedHeading siteHeadline"><span class="savedMain"><strong>' + esc(number(extracted)) + '</strong> ' + esc(savedMemoryLabel) + '</span></h2>' + completionNote
+                    ? '<h2 class="savedHeading"><span class="savedMain"><strong>' + esc(number(extracted)) + '</strong> ' + esc(savedMemoryLabel) + '</span></h2>' + completionNote
                     : '<h2 class="siteHeadline">Some conversations need <strong>another pass.</strong></h2>' +
                       '<p class="exSub">' + stopDetail + '</p>') +
                 '</div>' +
@@ -714,7 +790,10 @@ export const SETUP_PAGE_CLIENT_EXTRACTION = String.raw `      /* ---------- dash
         var edit = document.getElementById("editSessions");
         if (edit) edit.onclick = openSessionPicker;
         var migrateBtn = document.getElementById("migrate");
-        if (migrateBtn) migrateBtn.disabled = selected.length === 0 || !setupPlanConfirmed();
+        if (migrateBtn) migrateBtn.disabled =
+          candidates.length === 0 ||
+          !setupPlanConfirmed() ||
+          historicalSelectionLimit() === 0;
       }
       function updateSessionPickerSelectionUi(dialog, input, limit) {
         var selectedCount = selectedSessionKeyList().length;
@@ -740,13 +819,46 @@ export const SETUP_PAGE_CLIENT_EXTRACTION = String.raw `      /* ---------- dash
           '<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>' +
+          '<div class="sessionPickerLimitActions"><button type="button" id="upgradeSessionPlan" class="button primary">' + linkLabel + '</button>' +
           (canDismiss ? '<button type="button" class="textButton" id="dismissSessionLimit">Keep editing</button>' : "") + '</div>' +
         '</div>';
       }
+      async function openSessionPickerPlanAction() {
+        var currentPlan = String(billingStatus && billingStatus.plan || "").toLowerCase();
+        if (currentPlan === "power" || currentPlan === "team" || currentPlan === "enterprise") {
+          setSessionPickerStatus("Opening secure plan options…");
+          var portal = await openHostedPlanOptions();
+          setSessionPickerStatus(portal
+            ? "Plan options opened in Stripe. This page will update automatically."
+            : "Could not open plan options. Try again.");
+          return;
+        }
+        var targetPlan = currentPlan === "pro" ? "power" : "pro";
+        setSessionPickerStatus("Opening secure Stripe checkout…");
+        var checkout = await openHostedBilling(
+          "/billing-checkout",
+          { plan: targetPlan, trial: !billingStatus || billingStatus.trialAvailable !== false },
+          "Creating your secure checkout…",
+          "Checkout opened in Stripe. Keep this local page open; Echo will confirm here automatically."
+        );
+        if (!checkout) {
+          setSessionPickerStatus("Could not open Stripe checkout. Try again.");
+          return;
+        }
+        billingActivationPendingPlan = targetPlan;
+        if (typeof checkout.sessionId === "string") {
+          rememberCheckoutSessionId(checkout.sessionId);
+          billingSyncAttempts = 0;
+          billingSyncLastAttemptAt = 0;
+        }
+        document.title = "Finish checkout — Echo setup is waiting";
+        setSessionPickerStatus("Stripe checkout opened. Return here when you finish; this page updates automatically.");
+      }
       function wireSessionPickerUpgrade() {
-        var upgrade = document.getElementById("upgradeSessionPlan");
-        if (upgrade) upgrade.onclick = function () { startBillingPoll(); };
+        ["upgradeSessionPlan", "upgradeSessionPlanInline"].forEach(function (id) {
+          var upgrade = document.getElementById(id);
+          if (upgrade) upgrade.onclick = function () { void openSessionPickerPlanAction(); };
+        });
         var dismiss = document.getElementById("dismissSessionLimit");
         if (dismiss) dismiss.onclick = hideSessionPickerLimitNotice;
       }
@@ -780,6 +892,10 @@ export const SETUP_PAGE_CLIENT_EXTRACTION = String.raw `      /* ---------- dash
         var all = candidateSessions();
         var selected = selectedSessionKeyList();
         var limit = Math.min(all.length, historicalSelectionLimit());
+        var planLimited = all.length > limit;
+        var inlineUpgrade = planLimited && limit > 0
+          ? '<button type="button" id="upgradeSessionPlanInline" class="sessionPickerUpgrade">Upgrade</button>'
+          : "";
         var query = sessionPickerQuery.trim().toLowerCase();
         var filtered = all.filter(function (session) {
           if (sessionPickerSource !== "all" && session.source !== sessionPickerSource) return false;
@@ -805,7 +921,7 @@ export const SETUP_PAGE_CLIENT_EXTRACTION = String.raw `      /* ---------- dash
           : "";
         dialog.innerHTML =
           '<div class="sessionPickerShell">' +
-            '<header class="sessionPickerHead"><div><h2 id="sessionPickerTitle">Choose conversations</h2><p>Up to ' + esc(number(limit)) + ' · newest selected first</p></div><button type="button" class="sessionPickerClose" id="closeSessionPicker" aria-label="Close">×</button></header>' +
+            '<header class="sessionPickerHead"><div><h2 id="sessionPickerTitle">Choose conversations</h2><p class="sessionPickerSummary"><span class="sessionPickerQuota">Up to <strong>' + esc(number(limit)) + '</strong></span>' + inlineUpgrade + '<span class="sessionPickerOrder">&middot; newest selected first</span></p></div><button type="button" class="sessionPickerClose" id="closeSessionPicker" aria-label="Close">×</button></header>' +
             '<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>' +
@@ -866,16 +982,15 @@ export const SETUP_PAGE_CLIENT_EXTRACTION = String.raw `      /* ---------- dash
         else dialog.setAttribute("open", "");
       }
       function accountInitials(account) {
-        var label = String(account && (account.displayName || account.email) || "EchoMem").trim();
-        return label.split(/\s+/).slice(0, 2).map(function (part) { return part.charAt(0).toUpperCase(); }).join("") || "E";
+        var email = String(account && account.email || "").trim();
+        var label = email ? email.split("@")[0] : "EchoMem";
+        return label.split(/[\s._-]+/).slice(0, 2).map(function (part) { return part.charAt(0).toUpperCase(); }).join("") || "E";
       }
       function renderAccountChoice() {
         var slot = document.getElementById("setupAccount");
         if (!slot) return;
         var account = billingStatus && billingStatus.account;
-        var name = account && account.displayName ? account.displayName : "Connected EchoMem account";
-        var email = account && account.email ? account.email : "This import will be saved to the account connected on this device.";
-        var accountLabel = account && account.email ? account.email : name;
+        var accountLabel = account && account.email ? account.email : "Connected account";
         var avatarUrl = account && account.avatarUrl ? String(account.avatarUrl) : "";
         var avatar = '<span class="setupAccountAvatar" aria-hidden="true">' +
           '<span>' + esc(accountInitials(account)) + '</span>' +
@@ -884,7 +999,7 @@ export const SETUP_PAGE_CLIENT_EXTRACTION = String.raw `      /* ---------- dash
         slot.innerHTML =
           '<section class="setupAccountCard" aria-label="Connected EchoMem account">' +
             avatar +
-            '<span class="setupAccountCopy"><small>Logged in as</small><strong>' + esc(accountLabel) + '</strong><span>' + esc(email) + '</span></span>' +
+            '<span class="setupAccountCopy"><small>Logged in as</small><strong>' + esc(accountLabel) + '</strong></span>' +
             '<button type="button" class="textButton setupAccountChange" id="changeSetupAccount">Switch</button>' +
           '</section>';
         var change = document.getElementById("changeSetupAccount");
@@ -892,8 +1007,8 @@ export const SETUP_PAGE_CLIENT_EXTRACTION = String.raw `      /* ---------- dash
       }
       function renderAccountSwitchConfirm() {
         var account = billingStatus && billingStatus.account;
-        var accountLabel = account && (account.email || account.displayName)
-          ? (account.email || account.displayName)
+        var accountLabel = account && account.email
+          ? account.email
           : "the connected account";
         accountSwitchPending = true;
         setCityMode(false);
@@ -921,19 +1036,29 @@ export const SETUP_PAGE_CLIENT_EXTRACTION = String.raw `      /* ---------- dash
       async function switchSetupAccount() {
         var button = document.getElementById("confirmAccountSwitch");
         if (button) { button.disabled = true; button.textContent = "Signing out..."; }
+        accountStateEpoch++;
+        stopBillingPoll();
+        progressPollRunId++;
         try {
-          await postJson("/logout", {}, 12000);
+          var logoutResult = await postJson("/logout", {}, 12000);
+          if (!logoutResult || logoutResult.connected !== false) {
+            throw new Error("Echo did not confirm that this device signed out.");
+          }
           accountSwitchPending = false;
           stats = null;
+          statsSlow = false;
           billingStatus = null;
+          billingStatusLoading = false;
           connected = false;
+          rememberSetupPlanChoice("");
           selectedSessionKeys = Object.create(null);
           sessionSelectionTouched = false;
           localAuthEmail = "";
           localAuthTermsAccepted = false;
           localAuthAgeConfirmed = false;
-          renderLocalLogin("");
+          renderLocalLogin("Signed out. Enter the email for the account you want to use.");
         } catch (error) {
+          if (connected) startBillingPoll();
           if (button) { button.disabled = false; button.textContent = "Sign out & switch"; }
           setLocalAuthStatus(error && error.message ? error.message : "Could not switch accounts.", "error");
         }
@@ -1017,12 +1142,6 @@ export const SETUP_PAGE_CLIENT_EXTRACTION = String.raw `      /* ---------- dash
             '<p>' + esc(lifecycle || "Your paid plan is active.") + '</p>' +
           '</section>';
       }
-      function setupPricingUrl(plan, startTrial) {
-        var paidPlan = plan === "power" ? "power" : "pro";
-        return (billingStatus && billingStatus.pricingUrl)
-          ? billingStatus.pricingUrl + (startTrial ? "&start=" + paidPlan + "&trial=" + (billingStatus.trialAvailable === false ? "0" : "1") : "")
-          : "https://echoknows.com/account?source=mcp_onboarding" + (startTrial ? "&start=" + paidPlan + "&trial=1" : "");
-      }
       function setupPlanConfirmed() {
         return setupPlanChoice === "free" || paidRecallPlan(billingStatus && billingStatus.plan);
       }
@@ -1038,7 +1157,7 @@ export const SETUP_PAGE_CLIENT_EXTRACTION = String.raw `      /* ---------- dash
           sticker: "/hud-assets/echo-pricing-power-sticker.png",
           stickerAlt: "Power Echo arrives with a gold key and a crew of notebook helpers.",
           features: [
-            "2,000 coding sessions",
+            "2,000 past chats",
             "agent-heavy memory",
             "2,000 memory recalls / week"
           ]
@@ -1054,7 +1173,7 @@ export const SETUP_PAGE_CLIENT_EXTRACTION = String.raw `      /* ---------- dash
           stickerAlt: "Pro Echo organizes tabbed notebooks and a daily refresh control.",
           popular: true,
           features: [
-            "500 coding sessions",
+            "500 past chats",
             "daily memory updates",
             "500 memory recalls / week"
           ]
@@ -1272,23 +1391,37 @@ export const SETUP_PAGE_CLIENT_EXTRACTION = String.raw `      /* ---------- dash
         }
       }
       async function refreshBillingStatus() {
-        if (billingStatusLoading) return;
+        if (billingStatusLoading || !connected) return;
+        var billingEpoch = accountStateEpoch;
         billingStatusLoading = true;
         try {
           await maybeSyncPendingCheckout();
-          billingStatus = await getJson("/billing-status");
+          if (billingEpoch !== accountStateEpoch || !connected) return;
+          var nextBillingStatus = await getJson("/billing-status");
+          if (billingEpoch !== accountStateEpoch || !connected) return;
+          billingStatus = nextBillingStatus;
           billingLastCheckedAt = Date.now();
           billingCheckMessage = "";
-          renderSetupPlan(true);
-          renderAccountChoice();
-          renderSessionSelection(true);
+          if (readyStage === "sessions" && setupPlanConfirmed()) {
+            // Keep the visible promise in sync with the authoritative plan/quota response.
+            // renderDashboard patches the mounted shell without recreating the page. If the
+            // picker is already open after an upgrade, refresh its quota/action in place too.
+            renderDashboard();
+            var openPicker = document.getElementById("sessionPicker");
+            if (openPicker && openPicker.open) renderSessionPicker();
+          } else {
+            renderSetupPlan(true);
+            renderAccountChoice();
+            renderSessionSelection(true);
+          }
           if (billingStatus && billingStatus.plan === "unknown") setSetupPlanStatus("Plan check unavailable. Original still works.");
         } catch (_) {
+          if (billingEpoch !== accountStateEpoch || !connected) return;
           billingLastCheckedAt = Date.now();
           billingCheckMessage = "Could not check payment yet. Echo will keep trying automatically.";
           setSetupPlanStatus("Plan check unavailable. Original still works.");
         } finally {
-          billingStatusLoading = false;
+          if (billingEpoch === accountStateEpoch) billingStatusLoading = false;
         }
       }
       function refreshBillingOnFocus() { void refreshBillingStatus(); }
@@ -1348,7 +1481,7 @@ export const SETUP_PAGE_CLIENT_EXTRACTION = String.raw `      /* ---------- dash
         }
       }
       async function openHostedPlanOptions() {
-        await openHostedBilling(
+        return await openHostedBilling(
           "/billing-portal",
           {},
           "Opening secure plan management…",
@@ -1359,9 +1492,9 @@ export const SETUP_PAGE_CLIENT_EXTRACTION = String.raw `      /* ---------- dash
         var questions = recallQuestions();
         var primary = questions[0];
         return '<div class="tryCard">' +
-          '<h3 class="tryTitle">Let Echo prove it remembers</h3>' +
+          '<h3 class="tryTitle">Take it into a fresh session.</h3>' +
           '<article class="recallPrompt recallPromptPrimary" data-recall-prompt="' + esc(primary) + '">' +
-            '<div class="recallPromptHead"><span>Your question</span><button type="button" class="recallCopy" data-recall-copy aria-label="Copy your first recall question">' + setupIcon("copy") + '<span>Copy</span></button></div>' +
+            '<div class="recallPromptHead"><span>Try this</span><button type="button" class="recallCopy" data-recall-copy aria-label="Copy your first recall question">' + setupIcon("copy") + '<span>Copy</span></button></div>' +
             '<p class="recallPromptText">' + esc(primary) + '</p>' +
             '<div class="recallPromptActions" aria-label="Try your first memory recall">' +
               '<button type="button" class="recallAgent recallAgentPrimary" data-recall-codex><span class="recallAgentIcon"><img src="/hud-assets/codex.svg" alt="" /></span><span>Ask in Codex</span></button>' +