@echomem/mcp 1.4.20 → 1.4.21

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 (;;) {
@@ -301,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;
@@ -803,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;
@@ -811,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) {
@@ -884,7 +922,7 @@ export const SETUP_PAGE_CLIENT_EXTRACTION = String.raw `      /* ---------- dash
                 '<div class="setupPlanHead"><strong>Pro</strong><span>$40 / month</span></div>' +
                 '<p>More recall for serious work.</p>' +
                 '<ul><li>' + setupIcon("check") + '<span>250 bulk history imports</span></li><li>' + setupIcon("check") + '<span>200K new-chat tokens each week</span></li><li>' + setupIcon("check") + '<span>100 memory searches each week</span></li><li>' + setupIcon("check") + '<span>No memory-count limit</span></li></ul>' +
-                '<button type="button" class="primary" id="chooseProPlan">' + (trialAvailable ? "Start 7-day trial" : "Choose Pro") + '</button>' +
+                '<button type="button" class="primary" id="chooseProPlan">' + (trialAvailable ? "Start 14-day trial" : "Choose Pro") + '</button>' +
                 '<small>' + (trialAvailable ? "Card required. Cancel anytime." : "Your trial was already used.") + '</small>' +
               '</article>' +
               '<article class="setupPlanCard">' +
@@ -892,7 +930,7 @@ export const SETUP_PAGE_CLIENT_EXTRACTION = String.raw `      /* ---------- dash
                 '<p>Higher limits for people who use Echo every day.</p>' +
                 // Future Power feature: API and automation access.
                 '<ul><li>' + setupIcon("check") + '<span>500 bulk history imports</span></li><li>' + setupIcon("check") + '<span>750K new-chat tokens each week</span></li><li>' + setupIcon("check") + '<span>250 memory searches each week</span></li><li>' + setupIcon("check") + '<span>No memory-count limit</span></li></ul>' +
-                '<button type="button" class="secondary" id="choosePowerPlan">' + (trialAvailable ? "Start 7-day trial" : "Choose Power") + '</button>' +
+                '<button type="button" class="secondary" id="choosePowerPlan">' + (trialAvailable ? "Start 14-day trial" : "Choose Power") + '</button>' +
                 '<small>' + (trialAvailable ? "Card required. Cancel anytime." : "Your trial was already used.") + '</small>' +
               '</article>' +
             '</div>' +

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/styles-extraction.js

@@ -139,6 +139,129 @@ export const SETUP_PAGE_STYLES_EXTRACTION = String.raw `    /* ---- dashboard (p
       font-size: 12px;
       font-weight: 650;
     }
+    .localAuthStage {
+      display: grid;
+      place-items: center;
+      width: min(720px, 100%);
+      min-height: min(660px, calc(100vh - 120px));
+      margin: 0 auto;
+    }
+    .localAuthCard {
+      width: min(680px, 100%);
+      border: 1.5px solid rgba(26,58,143,0.16);
+      border-radius: 20px;
+      background: rgba(255,255,255,0.88);
+      padding: clamp(22px, 4vw, 34px);
+      box-shadow: 0 24px 60px -42px rgba(20,36,84,0.48);
+      text-align: left;
+    }
+    .localAuthLead {
+      display: grid;
+      justify-items: start;
+      gap: 10px;
+    }
+    .localAuthLead img {
+      width: 58px;
+      height: 58px;
+      object-fit: contain;
+      filter: drop-shadow(0 10px 16px rgba(26,58,143,0.18));
+    }
+    .localAuthLead h2 {
+      max-width: 610px;
+      font-size: clamp(30px, 4vw, 46px);
+      line-height: 1;
+    }
+    .localAuthLead p:not(.consentEyebrow) {
+      max-width: 590px;
+      margin: 0;
+      color: var(--echo-ink-mute);
+      font-size: 15px;
+      line-height: 1.55;
+    }
+    .localAuthForm {
+      display: grid;
+      gap: 14px;
+      margin-top: 22px;
+    }
+    .localAuthField {
+      display: grid;
+      gap: 7px;
+    }
+    .localAuthField > span {
+      font-family: var(--echo-font-mono);
+      color: var(--echo-ink-mute);
+      font-size: 11px;
+      font-weight: 800;
+      letter-spacing: 0.06em;
+      text-transform: uppercase;
+    }
+    .localAuthField input {
+      width: 100%;
+      min-height: 50px;
+      border: 1px solid rgba(26,58,143,0.20);
+      border-radius: 10px;
+      background: #fff;
+      color: var(--echo-ink-text);
+      padding: 0 14px;
+      font: inherit;
+      font-size: 16px;
+      outline: none;
+    }
+    .localAuthField input:focus {
+      border-color: var(--echo-ink-primary);
+      box-shadow: 0 0 0 3px rgba(26,58,143,0.12);
+    }
+    .localAuthLegal {
+      display: grid;
+      gap: 10px;
+      border: 1px solid rgba(26,58,143,0.10);
+      border-radius: 14px;
+      background: rgba(240,239,233,0.56);
+      padding: 13px 14px;
+    }
+    .localAuthLegal label {
+      display: grid;
+      grid-template-columns: 18px minmax(0, 1fr);
+      gap: 10px;
+      align-items: start;
+      color: var(--echo-ink-mute);
+      font-size: 12px;
+      line-height: 1.45;
+    }
+    .localAuthLegal input {
+      width: 16px;
+      height: 16px;
+      margin: 2px 0 0;
+      accent-color: var(--echo-ink-primary);
+    }
+    .localAuthLegal a {
+      color: var(--echo-ink-primary);
+      font-weight: 750;
+      text-decoration: underline;
+      text-underline-offset: 2px;
+    }
+    .localAuthActions {
+      display: flex;
+      flex-wrap: wrap;
+      gap: 10px;
+      align-items: center;
+    }
+    .localAuthStatus {
+      min-height: 18px;
+      margin: 0;
+      color: var(--echo-ink-mute);
+      font-size: 13px;
+      line-height: 1.45;
+    }
+    .localAuthStatus:empty { display: none; }
+    .localAuthStatus.is-error {
+      border: 1px solid rgba(139,44,38,0.22);
+      border-radius: 10px;
+      background: #fff4ee;
+      padding: 9px 11px;
+      color: #8b2c26;
+      font-weight: 650;
+    }
     .track { height: 12px; overflow: hidden; border-radius: 999px; background: #e8e8e1; margin: 16px 0 10px; }
     .fill { height: 100%; width: 0%; background: var(--echo-ink-primary); transition: width 180ms ease; }
     /* indeterminate "we're working on it" bar for the prep phase (before job counts move) */
@@ -173,6 +296,8 @@ export const SETUP_PAGE_STYLES_EXTRACTION = String.raw `    /* ---- dashboard (p
       .explainCta .promiseActions { width: 100%; }
       .explainCta .primary, .explainCta .secondary { width: 100%; }
       .consentActions .primary { width: 100%; }
+      .localAuthActions .primary,
+      .localAuthForm > .primary { width: 100%; }
       .cityHero { min-height: auto; }
       .cityShell {
         width: 100vw;

package/dist/setup-page.js

@@ -1,5 +1,6 @@
 import { renderSetupPageDocument } from "./setup-page/document.js";
 import { renderSetupPreviewBootstrap } from "./setup-preview.js";
+export { SETUP_PREVIEW_STATES } from "./setup-preview.js";
 /**
  * Setup page entry point. The implementation is split by product phase under ./setup-page/:
  * core utilities, local report, post-auth extraction, and lifecycle polling.

package/dist/setup-preview.js

@@ -5,7 +5,18 @@ export const SETUP_PREVIEW_STATES = [
     "report",
     "extract-counting",
     "extract-ready",
+    "extract-free-selected",
+    "extract-free-trial-used",
     "extract-limit",
+    "extract-pro-trial",
+    "extract-pro-active",
+    "extract-power-active",
+    "extract-team-active",
+    "extract-enterprise-active",
+    "extract-unknown",
+    "auth-login",
+    "auth-unlock",
+    "auth-setup",
     "extract-run",
     "extract-overdue",
     "extract-done",
@@ -202,6 +213,62 @@ function previewWatermarkScript() {
         document.body.appendChild(previewWatermark);
   `;
 }
+function extractionPreviewBootstrap(options) {
+    const candidateCount = options.candidateCount ?? 520;
+    const quotaLimit = options.quotaLimit;
+    const quotaRemaining = options.quotaRemaining;
+    const historicalConversationQuota = quotaLimit == null || quotaRemaining == null
+        ? null
+        : {
+            used: Math.max(0, quotaLimit - quotaRemaining),
+            limit: quotaLimit,
+            remaining: quotaRemaining,
+        };
+    const billingStatus = {
+        plan: options.plan,
+        paid: options.paid,
+        trialAvailable: options.trialAvailable,
+        trialUsed: options.trialUsed,
+        subscriptionStatus: options.subscriptionStatus ?? null,
+        trialEndedAt: options.trialEndedAt ?? null,
+        pricingUrl: "https://echoknows.com/pricing?source=mcp_onboarding",
+        account: {
+            displayName: "Preview User",
+            email: "preview@example.com",
+            avatarUrl: "/hud-assets/echo-face-cutout.png",
+        },
+        historicalConversationQuota,
+    };
+    return `
+        connected = true;
+        billingStatus = ${JSON.stringify(billingStatus)};
+        setupPlanChoice = ${JSON.stringify(options.selectFree ? "free" : "")};
+        stats = {
+          sessions: { total: ${candidateCount}, codex: ${Math.ceil(candidateCount * 0.68)}, claudeCode: ${Math.floor(candidateCount * 0.32)} },
+          migratable: {
+            pending: ${candidateCount}, pendingTotal: ${candidateCount}, pendingCodex: ${Math.ceil(candidateCount * 0.68)}, pendingClaudeCode: ${Math.floor(candidateCount * 0.32)},
+            alreadyMigrated: 108, skippedActive: 0,
+            eta: { estimatedLabel: "under 2 minutes" }, estimatedLabel: "under 2 minutes"
+          },
+          candidateSessions: Array.from({ length: ${candidateCount} }, function (_, index) {
+            var codex = index < ${Math.ceil(candidateCount * 0.68)};
+            return {
+              key: (codex ? "codex:" : "claude-code:") + "preview-" + index,
+              source: codex ? "codex" : "claude-code",
+              title: ["Plan the onboarding flow", "Repair memory extraction", "Review pricing limits", "Polish the EchoMem HUD"][index % 4] + " · " + (index + 1),
+              project: ["EchoMem Chrome", "MCP Server", "Memory Platform"][index % 3],
+              date: new Date(Date.UTC(2026, 6, 18 - (index % 12))).toISOString(),
+              characters: 42000 + index * 2700,
+              approxInputTokens: 10500 + index * 675,
+              turns: 18 + index
+            };
+          }),
+          discovery: { phase: "account", exact: false }
+        };
+        renderDashboard();
+        ${options.showUnknownStatus ? 'setSetupPlanStatus("Plan check unavailable. Free still works.");' : ""}
+        ${options.openSessionPicker ? "window.setTimeout(function () { openSessionPicker(); }, 0);" : ""}`;
+}
 export function renderSetupPreviewBootstrap(state) {
     const watermark = previewWatermarkScript();
     if (state === "consent") {
@@ -236,44 +303,66 @@ export function renderSetupPreviewBootstrap(state) {
         stats = null;
         renderDashboard();`;
     }
-    if (state === "extract-ready" || state === "extract-limit") {
-        const remainingHistory = state === "extract-limit" ? 0 : 28;
-        return `${watermark}
-        connected = true;
-        billingStatus = {
-          plan: "free", paid: false, trialAvailable: true,
-          pricingUrl: "https://echoknows.com/pricing?source=mcp_onboarding",
-          account: {
-            displayName: "Erik Hein",
-            email: "erik@example.com",
-            avatarUrl: "/hud-assets/echo-face-cutout.png"
-          },
-          historicalConversationQuota: { used: ${100 - remainingHistory}, limit: 100, remaining: ${remainingHistory} }
-        };
-        stats = {
-          sessions: { total: 136, codex: 82, claudeCode: 54 },
-          migratable: {
-            pending: 28, pendingTotal: 28, pendingCodex: 19, pendingClaudeCode: 9,
-            alreadyMigrated: 108, skippedActive: 0,
-            eta: { estimatedLabel: "under 2 minutes" }, estimatedLabel: "under 2 minutes"
-          },
-          candidateSessions: Array.from({ length: 28 }, function (_, index) {
-            var codex = index < 19;
-            return {
-              key: (codex ? "codex:" : "claude-code:") + "preview-" + index,
-              source: codex ? "codex" : "claude-code",
-              title: ["Plan the onboarding flow", "Repair memory extraction", "Review pricing limits", "Polish the EchoMem HUD"][index % 4] + " · " + (index + 1),
-              project: ["EchoMem Chrome", "MCP Server", "Memory Platform"][index % 3],
-              date: new Date(Date.UTC(2026, 6, 18 - (index % 12))).toISOString(),
-              characters: 42000 + index * 2700,
-              approxInputTokens: 10500 + index * 675,
-              turns: 18 + index
-            };
-          }),
-          discovery: { phase: "account", exact: false }
-        };
-        renderDashboard();`;
-    }
+    if (state === "extract-ready")
+        return `${watermark}${extractionPreviewBootstrap({
+            plan: "free", paid: false, trialAvailable: true, trialUsed: false,
+            quotaLimit: 100, quotaRemaining: 28, candidateCount: 28,
+        })}`;
+    if (state === "extract-free-selected")
+        return `${watermark}${extractionPreviewBootstrap({
+            plan: "free", paid: false, trialAvailable: true, trialUsed: false,
+            quotaLimit: 100, quotaRemaining: 100, selectFree: true,
+        })}`;
+    if (state === "extract-free-trial-used")
+        return `${watermark}${extractionPreviewBootstrap({
+            plan: "free", paid: false, trialAvailable: false, trialUsed: true,
+            subscriptionStatus: "expired", trialEndedAt: "2026-07-20T00:00:00.000Z",
+            quotaLimit: 100, quotaRemaining: 100,
+        })}`;
+    if (state === "extract-limit")
+        return `${watermark}${extractionPreviewBootstrap({
+            plan: "free", paid: false, trialAvailable: false, trialUsed: true,
+            quotaLimit: 100, quotaRemaining: 0, selectFree: true, openSessionPicker: true,
+        })}`;
+    if (state === "extract-pro-trial")
+        return `${watermark}${extractionPreviewBootstrap({
+            plan: "pro", paid: true, trialAvailable: false, trialUsed: true,
+            subscriptionStatus: "trialing", trialEndedAt: "2026-08-04T00:00:00.000Z",
+            // The server currently grants trialing users Free's lifetime history allowance,
+            // even though recurring processing/search allowances resolve to Pro.
+            quotaLimit: 100, quotaRemaining: 100,
+        })}`;
+    if (state === "extract-pro-active")
+        return `${watermark}${extractionPreviewBootstrap({
+            plan: "pro", paid: true, trialAvailable: false, trialUsed: true,
+            subscriptionStatus: "active", quotaLimit: 250, quotaRemaining: 250,
+        })}`;
+    if (state === "extract-power-active")
+        return `${watermark}${extractionPreviewBootstrap({
+            plan: "power", paid: true, trialAvailable: false, trialUsed: true,
+            subscriptionStatus: "active", quotaLimit: 500, quotaRemaining: 500,
+        })}`;
+    if (state === "extract-team-active")
+        return `${watermark}${extractionPreviewBootstrap({
+            plan: "team", paid: true, trialAvailable: false, trialUsed: true,
+            subscriptionStatus: "active", quotaLimit: 250, quotaRemaining: 250,
+        })}`;
+    if (state === "extract-enterprise-active")
+        return `${watermark}${extractionPreviewBootstrap({
+            plan: "enterprise", paid: true, trialAvailable: false, trialUsed: true,
+            subscriptionStatus: "active", quotaLimit: 500, quotaRemaining: 500,
+        })}`;
+    if (state === "extract-unknown")
+        return `${watermark}${extractionPreviewBootstrap({
+            plan: "unknown", paid: false, trialAvailable: true, trialUsed: false,
+            showUnknownStatus: true,
+        })}`;
+    if (state === "auth-login")
+        return `${watermark}\n        renderLocalLogin("");`;
+    if (state === "auth-unlock")
+        return `${watermark}\n        renderLocalPassphrase("unlock", "preview@example.com");`;
+    if (state === "auth-setup")
+        return `${watermark}\n        renderLocalPassphrase("setup", "preview@example.com");`;
     if (state === "extract-run") {
         return `${watermark}
         renderProgress({ status: "running", total: 28, completed: 4, extracted: 19, failed: 1, latest: "preview session", latestRepo: "Preview Workspace" });`;