@echomem/mcp 1.3.2 → 1.4.0

package/dist/setup.js

@@ -20,13 +20,15 @@ import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
 import readline from "node:readline";
+import { fileURLToPath } from "node:url";
 import axios from "axios";
 import { KeyStore } from "./keystore.js";
 import { fetchEncryptionConfig, deriveAndVerifyKey, verifyKeyB64 } from "./encryption.js";
 import { collect, runReport, buildStatsPayload } from "./report.js";
-import { cmdMigrate, applyAccountImportStatus, applyFastAccountImportStatus, discoverMigratableFastDiscovery, discoverMigratableSessions, estimateMigrationEta, fetchProcessedImportKeys, isImportStatusUnsupported, markAccountImportStatusFailed, markAccountImportStatusUnavailable, markFastAccountImportStatusUnavailable, startMigration, summarizeFastMigratableDiscovery, MIGRATE_CONCURRENCY, } from "./migrate.js";
+import { cmdMigrate, applyAccountImportStatus, applyFastAccountImportStatus, discoverMigratableFastDiscovery, discoverMigratableSessions, discoverPendingSessionsTargeted, estimateMigrationEta, fetchProcessedImportKeys, isImportStatusUnsupported, markAccountImportStatusFailed, markAccountImportStatusUnavailable, markFastAccountImportStatusUnavailable, startMigration, summarizeFastMigratableDiscovery, MIGRATE_CONCURRENCY, } from "./migrate.js";
 import { syncCodexUsage } from "./codex-sync.js";
 import { renderSetupPage } from "./setup-page.js";
+import { repoLabel } from "./forensics.js";
 // The hosted connect-device page is now only the account-auth/token courier. The dashboard itself is
 // served by this localhost bridge, where local logs and processed/unprocessed counts never leave the
 // device unless the user explicitly starts migration. Override the hosted auth origin with ECHO_WEB_URL.
@@ -262,6 +264,43 @@ function withTimeout(promise, ms, code, onTimeout) {
 function delay(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));
 }
+const CITY_ASSET_TYPES = {
+    ".html": "text/html; charset=utf-8",
+    ".js": "text/javascript; charset=utf-8",
+    ".json": "application/json; charset=utf-8",
+    ".wasm": "application/wasm",
+    ".riv": "application/octet-stream",
+    ".png": "image/png",
+    ".svg": "image/svg+xml",
+};
+function repoCityArtifactsRoot() {
+    // Monorepo/dev: read the city assets live from repo-root /artifacts.
+    const repo = fileURLToPath(new URL("../../../artifacts/", import.meta.url));
+    if (fs.existsSync(repo))
+        return repo;
+    // Published install: fall back to the copy bundled into dist/city by prepack (bundle-city.mjs).
+    return fileURLToPath(new URL("./city/", import.meta.url));
+}
+function serveRepoCityAsset(reqPath, res) {
+    const root = repoCityArtifactsRoot();
+    const rel = reqPath === "/city" || reqPath === "/city/" ? "echo-ai-city-only.html" : decodeURIComponent(reqPath.slice("/city/".length));
+    const filePath = path.resolve(root, rel);
+    const rootWithSep = root.endsWith(path.sep) ? root : root + path.sep;
+    if (!filePath.startsWith(rootWithSep)) {
+        res.writeHead(403).end("forbidden");
+        return true;
+    }
+    if (!fs.existsSync(filePath) || !fs.statSync(filePath).isFile()) {
+        res.writeHead(404).end("not found");
+        return true;
+    }
+    res.writeHead(200, {
+        "Content-Type": CITY_ASSET_TYPES[path.extname(filePath)] || "application/octet-stream",
+        "Cache-Control": "no-store",
+    });
+    fs.createReadStream(filePath).pipe(res);
+    return true;
+}
 function discoverMigratableSessionsOffThread() {
     const migrateUrl = new URL("./migrate.js", import.meta.url).href;
     const code = `
@@ -440,6 +479,10 @@ export function startCallbackServer(opts = {}) {
             const url = new URL(req.url || "/", "http://127.0.0.1");
             const route = url.pathname;
             const run = async () => {
+                if ((route === "/city" || route.startsWith("/city/")) && req.method === "GET") {
+                    serveRepoCityAsset(route, res);
+                    return;
+                }
                 if (route === "/setup" && req.method === "GET") {
                     res.writeHead(200, {
                         "Content-Type": "text/html; charset=utf-8",
@@ -817,12 +860,15 @@ async function cmdLogin(flags) {
     let exactDiscovery = Promise.resolve(null);
     let refreshGeneration = 0;
     let latestPendingEstimate = 0;
+    // The account's already-imported keys, shared so the /migrate sizing can assemble ONLY pending sessions.
+    let lastProcessedImportKeys = null;
     const resetLocalLoginState = () => {
         refreshGeneration++;
         stats = null;
         disc = null;
         exactDiscovery = Promise.resolve(null);
         latestPendingEstimate = 0;
+        lastProcessedImportKeys = null;
         srv.setStats(null);
         srv.setProgress({
             status: "idle",
@@ -836,7 +882,7 @@ async function cmdLogin(flags) {
     };
     const refreshLocalStatsForToken = async (activeToken) => {
         const generation = ++refreshGeneration;
-        let lastProcessedImportKeys = null;
+        lastProcessedImportKeys = null; // shared with /migrate so it can assemble only the pending sessions
         let importStatusUnavailable = false;
         const quickDiscovery = discoverMigratableFastDiscovery();
         const quick = summarizeFastMigratableDiscovery(quickDiscovery);
@@ -1103,8 +1149,19 @@ async function cmdLogin(flags) {
         }
         let exact = disc;
         if (!exact) {
-            // Off-thread sizing normally resolves in ~20s; cap the wait and fall back to an in-process pass so
-            // a stalled/contended worker can never leave extraction stuck at "finishing local job sizing".
+            // The full account-reconciled scan (disc) is not ready yet. Do NOT read the whole local history to
+            // size a few new jobs — assemble ONLY the sessions the fast scan already flagged as pending (using
+            // the account's processed keys when we have them). This is the fast path for "start extraction".
+            try {
+                exact = discoverPendingSessionsTargeted(lastProcessedImportKeys);
+            }
+            catch (e) {
+                console.error(`Targeted local sizing failed: ${e instanceof Error ? e.message : String(e)}`);
+            }
+        }
+        if (!exact) {
+            // Last resort only: the off-thread full scan, then an in-process full scan. Capped so a stalled
+            // worker can never leave extraction stuck at "finishing local job sizing".
             exact = await withTimeout(exactDiscovery, 40_000, "SIZING_TIMEOUT").catch(() => null);
             if (!exact) {
                 srv.setProgress({ status: "starting", total: activeJobCount, completed: 0, running: 0, queued: activeJobCount, failed: 0, extracted: 0, latest: "Sizing your sessions…" });
@@ -1170,15 +1227,18 @@ async function cmdLogin(flags) {
                 pending: exact.pending,
                 signal: controller.signal,
                 onProgress: (ev) => {
+                    let latestRepo;
                     if (ev.error) {
                         progressFailed += 1;
                     }
                     else {
                         progressDone += 1;
                         progressExtracted += ev.memories ?? 0;
+                        latestRepo = repoLabel(ev.session.cwd); // building this completed conversation belongs to
                     }
                     updateProgress({
                         latest: `${ev.session.source} ${(ev.session.firstTs || "").slice(0, 10)}${ev.error ? ` failed: ${ev.error}` : ""}`,
+                        ...(latestRepo ? { latestRepo } : {}),
                     });
                 },
             }), 30_000, "IMPORT_START_TIMEOUT", () => controller.abort());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@echomem/mcp",
-  "version": "1.3.2",
+  "version": "1.4.0",
   "description": "EchoMem Cloud-First MCP Server",
   "main": "dist/index.js",
   "type": "module",
@@ -18,7 +18,7 @@
     "dev": "tsx src/index.ts",
     "smoke": "node smoke.mjs",
     "test": "npm run build && node test/crypto.test.mjs && node test/integration.test.mjs && node test/no-restart.test.mjs && node test/report.test.mjs && node test/tools.test.mjs && node test/delete.test.mjs && node test/migrate.test.mjs",
-    "prepack": "npm run build"
+    "prepack": "npm run build && node scripts/bundle-city.mjs"
   },
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.0.1",