@echomem/mcp 1.4.19 → 1.4.20

package/README.md

@@ -25,8 +25,11 @@ For **zero-knowledge accounts**, the key never leaves your machine. The bridge h
 - **writes:** the key is handed to your own backend transiently in the `X-Encryption-Key` header so
   memories are encrypted at rest (the server processes plaintext for the request only — never stores
   the key).
-- **locked state:** if the key is absent or past its TTL (7 days, matching the extension), tools
-  return a `🔒 locked` nudge to run `echomem-mcp unlock` — **ciphertext is never handed to the model**.
+- **trusted-device lifecycle:** after a verified login/unlock, the MCP key remains available until
+  the user runs `echomem-mcp lock`, logs out, or removes the local credentials. If the key is absent,
+  tools tell the user to run `echomem-mcp unlock` in their own terminal. The passphrase prompt is
+  visible while typed characters stay hidden, and the current agent session can retry immediately
+  after unlock — **ciphertext is never handed to the model**.
 
 Unencrypted accounts are unaffected. `search_memories` returns retrieved memories by default so
 your MCP client does the final answer generation; pass `includeAnswer: true` only if you need the
@@ -47,8 +50,11 @@ to the global install, but installing globally avoids the issue entirely). The c
 launch-at-login also runs from the installed path. `init` is the flagship one-liner — it wraps `setup --all --with-hud`: it writes each
 installed agent's MCP config (with **no secret** in it — credentials live in
 `~/.echomem/credentials.json`, mode 0600), adds the EchoMem memory guidance to their global
-`AGENTS.md` / `CLAUDE.md`, opens the browser to approve the device (and unlock the vault for
-encrypted accounts), then launches the context HUD. Reload your editors and you're done.
+`AGENTS.md` / `CLAUDE.md`, installs first-party `echomem-search`, `echomem-save`,
+`echomem-forget`, and `echomem-login` skills for Codex, opens the browser to approve the device
+(and unlock the vault for encrypted accounts), then launches the context HUD. EchoMem updates only
+its own skill folders; other memory-provider skills are detected and reported but never modified.
+Reload your editors and you're done.
 
 Prefer to keep it minimal? `echomem-mcp setup` configures only the auto-detected editor and skips the
 HUD; the granular commands below still work.
@@ -64,7 +70,8 @@ HUD; the granular commands below still work.
 | `npx -y @echomem/mcp@latest update --client codex` | Update one client only |
 | `echomem-mcp setup --with-hud [--client codex]` | Write client config + log in + launch the EchoMem context HUD |
 | `echomem-mcp login` | Approve device in browser (or use `--token` / `--passphrase`) |
-| `echomem-mcp unlock` | Re-derive the encryption key after its TTL (or `--passphrase`) |
+| `echomem-mcp unlock` | Privately unlock the vault on this trusted device |
+| `echomem-mcp lock` | Remove the local vault key while keeping the device login |
 | `echomem-mcp status` | Show token / key / detected clients, configured bridge versions, and update guidance |
 | `echomem-mcp doctor [--no-network]` | Diagnose configured client bridge versions |
 | `echomem-mcp logout` | Remove stored credentials |

package/dist/codex-session-files.js

@@ -35,6 +35,12 @@ function normalizedSessionId(value) {
     const trimmed = value.trim();
     return new RegExp(`^${UUID_RE.source}$`, "i").test(trimmed) ? trimmed.toLowerCase() : trimmed;
 }
+function isAutomaticCodexSource(source) {
+    if (typeof source !== "string")
+        return false;
+    const normalized = source.trim().toLowerCase().replace(/-/g, "_");
+    return normalized === "auto_review" || normalized === "guardian";
+}
 function metadataFromFile(file) {
     try {
         for (const line of initialJsonLines(file)) {
@@ -63,7 +69,7 @@ function metadataFromFile(file) {
             return {
                 id: rawId || null,
                 startedAtMs: Number.isFinite(timestamp) ? timestamp : null,
-                userInitiated: !isSubagent && !hasParent,
+                userInitiated: !isSubagent && !hasParent && !isAutomaticCodexSource(source),
             };
         }
         return { id: null, startedAtMs: null, userInitiated: null };

package/dist/index.js

@@ -22,11 +22,6 @@ class NoTokenError extends Error {
 }
 /** Thrown when an encrypted account has no usable key — the model gets an unlock nudge, never ciphertext. */
 class LockedError extends Error {
-    expired;
-    constructor(expired) {
-        super("EchoMem vault locked");
-        this.expired = expired;
-    }
 }
 function stringifyErrorValue(value) {
     if (value == null) {
@@ -126,7 +121,7 @@ function formatUpgradeRequiredResult(error) {
         pricingUrl,
     });
     return [
-        "ACTION REQUIRED: tell the user to start a 14-day Pro trial or choose a subscription at this exact URL:",
+        "ACTION REQUIRED: tell the user to start a 7-day Pro trial or choose a subscription at this exact URL:",
         pricingUrl,
         "When replying, include the exact URL above. Do not reply only with \"connect\" or \"upgrade\".",
         "",
@@ -591,7 +586,7 @@ class EchoMemApiClient {
         // No usable key: consult the server to tell "unencrypted" apart from "encrypted but locked/expired".
         const cfg = await this.getEncryptionConfig();
         if (cfg.enabled)
-            throw new LockedError(this.store.isKeyExpired());
+            throw new LockedError("EchoMem vault locked");
         return { enabled: false };
     }
     pruneDeleteConfirmations(now = Date.now()) {
@@ -1221,9 +1216,13 @@ class EchoMemMCPServer {
                         content: [
                             {
                                 type: "text",
-                                text: error.expired
-                                    ? "🔒 EchoMem vault is locked — your encryption key expired. Run `echomem-mcp unlock` in a terminal, then retry."
-                                    : "🔒 EchoMem vault is locked. Run `echomem-mcp unlock` (or `echomem-mcp login`) to provide your encryption key, then retry.",
+                                text: [
+                                    "🔒 EchoMem vault is locked.",
+                                    "This encrypted account has no usable local decryption key. Once unlocked, this trusted device stays unlocked until you explicitly lock it or log out.",
+                                    "Action required from the user: open Terminal and run `echomem-mcp unlock` yourself. Do not have the agent run this interactive command and do not send your passphrase in chat.",
+                                    "At `Vault passphrase (typing is hidden):`, type the passphrase and press Return. No characters will appear while you type; that is expected.",
+                                    "After the success message, retry this EchoMem action in the current session — no editor restart is needed.",
+                                ].join("\n"),
                             },
                         ],
                     };

package/dist/keystore.js

@@ -10,13 +10,13 @@
  * Storage posture: a 0600 file in the user's home — the same on-disk trust level as the extension's
  * `chrome.storage.local`. The OS keychain (spec §8's ideal) is a drop-in for `read`/`write` later;
  * it is deliberately deferred because `keytar` is a native build that complicates `npx` distribution.
- * The encryption key carries a TTL (mirrors the extension's 7-day expiry); on expiry the bridge
- * returns LOCKED and the user re-runs `unlock`.
+ * The MCP bridge uses an explicit trusted-device lifecycle: a verified encryption key remains
+ * available until the user runs `lock`/`logout` or removes the local credentials. Interactive app
+ * session TTLs are intentionally separate from this device-bound developer workflow.
  */
 import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
-export const DEFAULT_KEY_TTL_MS = 7 * 24 * 60 * 60 * 1000;
 /** The bridge's local config dir (`~/.echomem` or `$ECHO_CONFIG_DIR`) — home for credentials + telemetry. */
 export function echoConfigDir() {
     return process.env.ECHO_CONFIG_DIR || path.join(os.homedir(), ".echomem");
@@ -55,29 +55,19 @@ export class KeyStore {
     getToken() {
         return process.env.ECHO_API_TOKEN || readFileCreds().token;
     }
-    /** Encryption key (base64), or undefined if absent/expired. Env wins (and never expires). */
+    /** Encryption key (base64), or undefined if absent. Env wins. */
     getKey() {
         if (process.env.ECHO_ENCRYPTION_KEY)
             return process.env.ECHO_ENCRYPTION_KEY;
-        const creds = readFileCreds();
-        if (!creds.key)
-            return undefined;
-        if (creds.keyExpiresAt && Date.now() > creds.keyExpiresAt)
-            return undefined;
-        return creds.key;
-    }
-    /** True when a key is present but past its TTL — used to tell "locked (expired)" from "never set". */
-    isKeyExpired() {
-        if (process.env.ECHO_ENCRYPTION_KEY)
-            return false;
-        const creds = readFileCreds();
-        return !!(creds.key && creds.keyExpiresAt && Date.now() > creds.keyExpiresAt);
+        return readFileCreds().key;
     }
     saveToken(token) {
         writeFileCreds({ ...readFileCreds(), token });
     }
-    saveKey(keyBase64, ttlMs = DEFAULT_KEY_TTL_MS) {
-        writeFileCreds({ ...readFileCreds(), key: keyBase64, keyExpiresAt: Date.now() + ttlMs });
+    saveKey(keyBase64) {
+        const creds = readFileCreds();
+        delete creds.keyExpiresAt;
+        writeFileCreds({ ...creds, key: keyBase64 });
     }
     clearKey() {
         const creds = readFileCreds();

package/dist/migrate.js

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

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

@@ -214,6 +214,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 +268,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() {
@@ -352,7 +359,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 +633,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 +646,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 +724,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 +750,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;
@@ -832,7 +884,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 14-day trial" : "Choose Pro") + '</button>' +
+                '<button type="button" class="primary" id="chooseProPlan">' + (trialAvailable ? "Start 7-day trial" : "Choose Pro") + '</button>' +
                 '<small>' + (trialAvailable ? "Card required. Cancel anytime." : "Your trial was already used.") + '</small>' +
               '</article>' +
               '<article class="setupPlanCard">' +
@@ -840,7 +892,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 14-day trial" : "Choose Power") + '</button>' +
+                '<button type="button" class="secondary" id="choosePowerPlan">' + (trialAvailable ? "Start 7-day trial" : "Choose Power") + '</button>' +
                 '<small>' + (trialAvailable ? "Card required. Cancel anytime." : "Your trial was already used.") + '</small>' +
               '</article>' +
             '</div>' +

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>';
       }
 

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

@@ -271,6 +271,11 @@ export const SETUP_PAGE_STYLES_EXTRACTION = String.raw `    /* ---- dashboard (p
       border-radius: 14px;
       box-shadow: 0 18px 34px -20px rgba(26,58,143,0.62);
     }
+    .readyDecision .actions .skipHistoryButton {
+      min-height: 58px;
+      padding: 0 22px;
+      border-radius: 14px;
+    }
     .readyDecision .actions .primary:not(:disabled):hover { box-shadow: 0 22px 38px -18px rgba(26,58,143,0.66); }
     .readyDecision .actions .primary .setupGlyph { width: 19px; height: 19px; }
     /* Proof strip: one quiet line of evidence (source split), not stat cards. Centered. */
@@ -1383,6 +1388,7 @@ export const SETUP_PAGE_STYLES_EXTRACTION = String.raw `    /* ---- dashboard (p
 
     .sessionPicker {
       width: min(860px, calc(100vw - 32px));
+      height: min(780px, calc(100vh - 32px));
       max-height: min(780px, calc(100vh - 32px));
       margin: auto;
       border: 0;
@@ -1393,7 +1399,7 @@ export const SETUP_PAGE_STYLES_EXTRACTION = String.raw `    /* ---- dashboard (p
       box-shadow: 0 34px 90px -30px rgba(10,18,46,0.68);
     }
     .sessionPicker::backdrop { background: rgba(13,21,43,0.62); backdrop-filter: blur(4px); }
-    .sessionPickerShell { display: grid; grid-template-rows: auto auto auto minmax(180px, 1fr) auto; max-height: min(780px, calc(100vh - 32px)); background: var(--echo-paper-white); }
+    .sessionPickerShell { display: grid; grid-template-rows: auto auto auto minmax(0, 1fr) auto; height: 100%; min-height: 0; max-height: min(780px, calc(100vh - 32px)); overflow: hidden; background: var(--echo-paper-white); }
     .sessionPickerHead {
       display: flex;
       align-items: flex-start;
@@ -1465,9 +1471,60 @@ export const SETUP_PAGE_STYLES_EXTRACTION = String.raw `    /* ---- dashboard (p
       padding: 9px 24px;
     }
     .sessionPickerActions > strong { margin-right: auto; color: var(--echo-ink-primary); font-size: 13px; font-variant-numeric: tabular-nums; }
-    .sessionPickerActions [role="status"] { color: #9b6612; font-size: 11px; font-weight: 700; }
+    .sessionPickerStatus { position: absolute; width: 1px; height: 1px; overflow: hidden; clip: rect(0 0 0 0); clip-path: inset(50%); white-space: nowrap; }
     .sessionPickerActions .textButton { min-height: 32px; color: var(--echo-ink-primary); }
-    .sessionPickerList { min-height: 0; overflow-y: auto; background: var(--echo-paper-white); padding: 6px 0; }
+    .sessionPickerListWrap { position: relative; min-height: 0; overflow: hidden; background: var(--echo-paper-white); }
+    .sessionPickerList { height: 100%; min-height: 0; overflow-y: auto; overscroll-behavior: contain; scrollbar-gutter: stable; background: var(--echo-paper-white); padding: 6px 0; }
+    .sessionPickerListWrap.is-limit-blocked .sessionPickerList {
+      filter: blur(4px);
+      opacity: 0.36;
+      pointer-events: none;
+      transform: scale(1.012);
+      transition: filter 180ms ease, opacity 180ms ease, transform 180ms ease;
+      user-select: none;
+    }
+    .sessionPickerLimitOverlay {
+      position: absolute;
+      inset: 0;
+      z-index: 3;
+      display: grid;
+      place-items: center;
+      overflow-y: auto;
+      background: rgba(245,247,252,0.38);
+      padding: 20px;
+      backdrop-filter: blur(2px);
+    }
+    .sessionPickerLimitOverlay[hidden] { display: none; }
+    .sessionPickerLimitCard {
+      width: min(470px, 100%);
+      border: 1px solid rgba(26,58,143,0.18);
+      border-radius: 18px;
+      background: rgba(255,255,255,0.92);
+      padding: clamp(24px, 5vw, 36px);
+      text-align: center;
+      box-shadow: 0 24px 56px -28px rgba(20,36,84,0.46), 0 6px 18px rgba(20,24,34,0.10);
+    }
+    .sessionPickerLimitEyebrow {
+      display: inline-block;
+      color: #9b6612;
+      font-family: var(--echo-font-mono);
+      font-size: 10px;
+      font-weight: 900;
+      letter-spacing: 0.1em;
+      text-transform: uppercase;
+    }
+    .sessionPickerLimitCard h3 {
+      margin: 8px 0 0;
+      color: var(--echo-ink-text);
+      font-family: var(--echo-font-brand);
+      font-size: clamp(28px, 5vw, 40px);
+      font-weight: 900;
+      line-height: 1;
+    }
+    .sessionPickerLimitCard p { margin: 13px auto 0; max-width: 360px; color: var(--echo-ink-mute); font-size: 14px; line-height: 1.5; }
+    .sessionPickerLimitActions { display: flex; justify-content: center; align-items: center; gap: 10px; flex-wrap: wrap; margin-top: 22px; }
+    .sessionPickerLimitActions .button { min-height: 46px; padding: 0 20px; }
+    .sessionPickerLimitActions .textButton { color: var(--echo-ink-primary); }
     .sessionPickerRow {
       display: grid;
       grid-template-columns: auto auto minmax(0, 1fr) auto;
@@ -1521,6 +1578,7 @@ export const SETUP_PAGE_STYLES_EXTRACTION = String.raw `    /* ---- dashboard (p
       padding: 14px 24px;
     }
     .sessionPickerFoot p { margin: 0; color: var(--echo-ink-mute); font-size: 12px; }
+    .sessionPickerFootActions { display: flex; justify-content: flex-end; gap: 10px; flex-wrap: wrap; }
     .sessionPickerFoot button { min-width: 170px; }
 
     .pauseStatus {
@@ -1740,6 +1798,10 @@ export const SETUP_PAGE_STYLES_EXTRACTION = String.raw `    /* ---- dashboard (p
       border-radius: 4px;
       box-shadow: none;
     }
+    .readyDecision .actions .skipHistoryButton {
+      min-height: 52px;
+      border-radius: 4px;
+    }
     .readyDecision .actions .primary:not(:disabled):hover { box-shadow: none; }
     .ctaMeta { justify-content: flex-start; }
     .readyFoot {
@@ -1948,7 +2010,8 @@ export const SETUP_PAGE_STYLES_EXTRACTION = String.raw `    /* ---- dashboard (p
       .setupPlanConfirmed { grid-template-columns: auto minmax(0, 1fr); }
       .setupPlanConfirmed .textButton { grid-column: 2; width: fit-content; }
       .readyDecision .actions,
-      .readyDecision .actions .primary { width: 100%; }
+      .readyDecision .actions .primary,
+      .readyDecision .actions .skipHistoryButton { width: 100%; }
       .readyDecision .actions .primary { min-width: 0; }
       .readyGo,
       .readyFoot,
@@ -1965,15 +2028,21 @@ export const SETUP_PAGE_STYLES_EXTRACTION = String.raw `    /* ---- dashboard (p
       .recallPromptActions { display: grid; grid-template-columns: 1fr; }
       .recallAgent { width: 100%; }
       .skipStage { width: calc(100vw - 28px); padding: 26px 20px; }
-      .sessionPicker { width: 100vw; max-height: 100vh; border-radius: 0; border-left-width: 4px; }
-      .sessionPickerShell { max-height: 100vh; min-height: 100vh; }
+      .sessionPicker { width: 100vw; height: 100vh; max-height: 100vh; border-radius: 0; border-left-width: 4px; }
+      .sessionPickerShell { height: 100%; max-height: 100vh; min-height: 0; }
       .sessionPickerHead { padding: 18px 16px 15px; }
       .sessionPickerToolbar { grid-template-columns: 1fr; padding: 12px 16px; }
       .sessionPickerActions { flex-wrap: wrap; padding: 8px 16px; }
       .sessionPickerActions > strong { width: 100%; }
       .sessionPickerRow { grid-template-columns: auto auto minmax(0, 1fr); margin: 0 4px; padding: 10px 8px; }
       .sessionPickerMeta { display: none; }
+      .sessionPickerLimitOverlay { padding: 14px; }
+      .sessionPickerLimitCard { border-radius: 15px; padding: 24px 18px; }
+      .sessionPickerLimitActions { display: grid; }
+      .sessionPickerLimitActions .button,
+      .sessionPickerLimitActions button { width: 100%; }
       .sessionPickerFoot { align-items: stretch; flex-direction: column; padding: 12px 16px; }
+      .sessionPickerFootActions { display: grid; }
       .sessionPickerFoot button { width: 100%; }
     }