@echomem/mcp 1.4.8 → 1.4.9

package/dist/index.js

@@ -1637,8 +1637,12 @@ Details: ${m.details || "N/A"}`;
 async function main() {
     // Subcommands (setup/login/unlock/status/logout/help) run and exit; no subcommand → serve.
     const handled = await runCli(process.argv.slice(2));
-    if (handled)
-        return;
+    if (handled) {
+        // These are one-shot commands: the work is finished here. Force exit so a stray open handle —
+        // e.g. a not-yet-timed-out keep-alive socket from the local setup server, or a detached child's
+        // inherited descriptor — can't leave the terminal hanging after setup/migrate completes.
+        process.exit(process.exitCode ?? 0);
+    }
     const store = new KeyStore();
     // Serve mode is meant to be SPAWNED by the MCP client (editor), which drives us over a piped stdin.
     // A human who runs the bare server in a terminal instead gets a process that blocks forever on stdio
@@ -1657,7 +1661,7 @@ async function main() {
             connected
                 ? "   Your editor launches this for you; you don't need to run it by hand."
                 : "   To connect this device, press Ctrl+C and run:",
-            connected ? "   Press Ctrl+C to stop it." : "       echomem-mcp setup",
+            connected ? "   Press Ctrl+C to stop it." : "       echomem-mcp init",
             "",
         ].join("\n"));
     }

package/dist/local-data-paths.js

@@ -0,0 +1,87 @@
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+function normalizedHomeDir(homeDir) {
+    const value = homeDir.trim();
+    if (!value || !path.isAbsolute(value))
+        return null;
+    return path.normalize(value);
+}
+function expandCurrentUserHome(value, homeDir) {
+    const trimmed = value.trim();
+    if (!trimmed)
+        return null;
+    if (trimmed === "~")
+        return homeDir;
+    if (trimmed.startsWith(`~${path.sep}`) || trimmed.startsWith("~/") || trimmed.startsWith("~\\")) {
+        return path.join(homeDir, trimmed.slice(2));
+    }
+    // Do not guess another user's home (~alice) or resolve a relative path against the MCP process cwd.
+    if (trimmed.startsWith("~") || !path.isAbsolute(trimmed))
+        return null;
+    return path.normalize(trimmed);
+}
+function configuredRoot(envKey, defaultDirName, opts = {}) {
+    const homeDir = normalizedHomeDir(opts.homeDir ?? os.homedir());
+    if (!homeDir)
+        return null;
+    const env = opts.env ?? process.env;
+    const configured = env[envKey];
+    if (typeof configured === "string" && configured.trim()) {
+        // An explicit profile override is authoritative. If it is invalid, callers must not silently
+        // scan the default profile, which may belong to a different account or contain stale history.
+        return expandCurrentUserHome(configured, homeDir);
+    }
+    return path.join(homeDir, defaultDirName);
+}
+/** Resolve an existing directory only after confirming it is a readable/searchable directory. */
+export function resolveReadableDirectory(candidate) {
+    if (!candidate)
+        return null;
+    try {
+        const real = fs.realpathSync(candidate);
+        if (!fs.statSync(real).isDirectory())
+            return null;
+        fs.accessSync(real, fs.constants.R_OK | fs.constants.X_OK);
+        return real;
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * Resolve every readable Codex transcript root under one authoritative CODEX_HOME profile.
+ * Active sessions come first. archived_sessions is additive historical data, not a fallback to a
+ * different profile. If both names resolve to the same directory, keep it once as active.
+ */
+export function resolveCodexSessionRoots(opts = {}) {
+    const root = configuredRoot("CODEX_HOME", ".codex", opts);
+    if (!root)
+        return [];
+    const candidates = [
+        { kind: "active", child: "sessions", priority: 0 },
+        { kind: "archived", child: "archived_sessions", priority: 1 },
+    ];
+    const roots = [];
+    const seenRealpaths = new Set();
+    for (const candidate of candidates) {
+        const resolved = resolveReadableDirectory(path.join(root, candidate.child));
+        if (!resolved || seenRealpaths.has(resolved))
+            continue;
+        seenRealpaths.add(resolved);
+        roots.push({ kind: candidate.kind, path: resolved, priority: candidate.priority });
+    }
+    return roots;
+}
+/**
+ * Backward-compatible active-only resolver. Historical scanners should use
+ * resolveCodexSessionRoots/discoverCodexSessionFiles so archived sessions are not omitted.
+ */
+export function resolveCodexSessionsDir(opts = {}) {
+    return resolveCodexSessionRoots(opts).find((root) => root.kind === "active")?.path ?? null;
+}
+/** Claude Code state lives under CLAUDE_CONFIG_DIR (default ~/.claude); transcripts are in projects. */
+export function resolveClaudeProjectsDir(opts = {}) {
+    const root = configuredRoot("CLAUDE_CONFIG_DIR", ".claude", opts);
+    return resolveReadableDirectory(root ? path.join(root, "projects") : null);
+}

package/dist/migrate.js

@@ -19,13 +19,13 @@
  * NOTE: client-pull — the queue advances only while the bridge runs; there is no server-side worker.
  */
 import fs from "node:fs";
-import os from "node:os";
 import path from "node:path";
 import crypto from "node:crypto";
 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 { 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
@@ -187,17 +187,21 @@ export function normalizeCwd(cwd) {
 /** Discover every local session, newest first (by first-turn timestamp). */
 export function discoverSessions() {
     const out = [];
-    const codexRoot = path.join(os.homedir(), ".codex", "sessions");
-    for (const f of walk(codexRoot, (p) => /rollout-.*\.jsonl$/.test(p), () => false)) {
-        const s = assembleCodex(f);
-        if (s)
-            out.push(s);
+    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);
+        }
     }
-    const claudeRoot = path.join(os.homedir(), ".claude", "projects");
-    for (const f of walk(claudeRoot, (p) => p.endsWith(".jsonl"), (name) => name === "subagents" || name === "workflows")) {
-        const s = assembleClaude(f);
-        if (s)
-            out.push(s);
+    const claudeRoot = resolveClaudeProjectsDir();
+    if (claudeRoot) {
+        for (const f of walk(claudeRoot, (p) => p.endsWith(".jsonl"), (name) => name === "subagents" || name === "workflows")) {
+            const s = assembleClaude(f);
+            if (s)
+                out.push(s);
+        }
     }
     out.sort((a, b) => String(b.firstTs || "").localeCompare(String(a.firstTs || "")));
     return out;
@@ -283,24 +287,28 @@ function fastSessionInfo(file, source) {
 }
 function fastSessionEntries(opts = {}) {
     const out = [];
-    const codexRoot = opts.codexRoot ?? path.join(os.homedir(), ".codex", "sessions");
-    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 });
+    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 });
+        }
     }
-    const claudeRoot = opts.claudeRoot ?? path.join(os.homedir(), ".claude", "projects");
-    for (const filePath of walk(claudeRoot, (p) => p.endsWith(".jsonl"), (name) => name === "subagents" || name === "workflows")) {
-        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,
-        // while keeping the key stable (claude-code sessionId appears on every line, so hasRealKey is reliable).
-        if (info.hasTextTurn || info.hasRealKey)
-            out.push({ filePath, source: "claude-code", 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")) {
+            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,
+            // while keeping the key stable (claude-code sessionId appears on every line, so hasRealKey is reliable).
+            if (info.hasTextTurn || info.hasRealKey)
+                out.push({ filePath, source: "claude-code", conversationKey: info.conversationKey, size: stat.size, mtimeMs: stat.mtimeMs });
+        }
     }
     return out;
 }
@@ -1244,7 +1252,7 @@ export async function cmdMigrate(flags) {
                 : "This account is ENCRYPTED but the vault is locked. 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 setup`.");
+            console.error("This device token cannot import history. Re-connect this device with `echomem-mcp login`.");
         }
         else {
             console.error(c.red(`Could not start the import: ${responseMessage(e)}`));

package/dist/report.js

@@ -16,10 +16,11 @@
  *     labeled — not a measurement on this account.
  */
 import fs from "node:fs";
-import os from "node:os";
 import path from "node:path";
 import { StringDecoder } from "node:string_decoder";
 import axios from "axios";
+import { discoverCodexSessionFiles } from "./codex-session-files.js";
+import { resolveClaudeProjectsDir } from "./local-data-paths.js";
 import { KeyStore } from "./keystore.js";
 const API_BASE = (process.env.ECHO_API_BASE_URL || "https://echo-mem-chrome.vercel.app").replace(/\/$/, "");
 // Early signal from the controlled sub-agent experiment, NOT measured on this account.
@@ -120,6 +121,14 @@ function epochMs(ts) {
     const n = Date.parse(ts);
     return Number.isFinite(n) ? n : null;
 }
+function localDate(ts) {
+    const ms = epochMs(ts);
+    if (ms == null)
+        return null;
+    const d = new Date(ms);
+    const pad = (value) => String(value).padStart(2, "0");
+    return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())}`;
+}
 function durationBetween(startTs, lastTs) {
     const start = epochMs(startTs);
     const last = epochMs(lastTs);
@@ -194,12 +203,21 @@ export function parseCodex(file) {
     let acts = 0;
     eachLine(file, (o) => {
         if (typeof o.timestamp === "string") {
-            if (meta.first === null)
+            const ms = epochMs(o.timestamp);
+            if (ms != null && (meta.first === null || ms < (epochMs(meta.first) ?? Number.POSITIVE_INFINITY)))
                 meta.first = o.timestamp;
-            meta.last = o.timestamp;
+            if (ms != null && (meta.last === null || ms > (epochMs(meta.last) ?? Number.NEGATIVE_INFINITY)))
+                meta.last = o.timestamp;
         }
-        if (o && o.type === "session_meta" && o.payload && typeof o.payload.cwd === "string") {
-            meta.cwd = o.payload.cwd;
+        if (o && o.type === "session_meta" && o.payload && typeof o.payload === "object") {
+            if (typeof o.payload.cwd === "string")
+                meta.cwd = o.payload.cwd;
+            if (typeof o.payload.timestamp === "string") {
+                const launchMs = epochMs(o.payload.timestamp);
+                if (launchMs != null && (meta.first === null || launchMs < (epochMs(meta.first) ?? Number.POSITIVE_INFINITY))) {
+                    meta.first = o.payload.timestamp;
+                }
+            }
             return;
         }
         const p = o && typeof o.payload === "object" && o.payload ? o.payload : o;
@@ -224,8 +242,8 @@ export function parseCodex(file) {
         return null;
     return {
         source: "codex",
-        date: meta.first ? meta.first.slice(0, 10) : null,
-        month: meta.first ? meta.first.slice(0, 7) : null,
+        date: localDate(meta.first),
+        month: localDate(meta.first)?.slice(0, 7) ?? null,
         startTs: meta.first,
         lastTs: meta.last,
         durationSec: durationBetween(meta.first, meta.last),
@@ -240,9 +258,9 @@ export function parseCodex(file) {
 }
 /** Claude Code: usage is PER assistant turn (SUM); tool_use blocks live in message.content. */
 export function parseClaude(file) {
-    let total = 0;
-    let cached = 0;
-    let output = 0;
+    const usageByRequest = new Map();
+    const seenToolUses = new Set();
+    let anonymousRequestSeq = 0;
     let echo = 0;
     let reads = 0;
     let acts = 0;
@@ -253,16 +271,26 @@ export function parseClaude(file) {
         durationSec: 0,
         prevMs: null,
     };
-    let sawUsage = false;
+    const requestKey = (row) => {
+        const messageId = typeof row.message?.id === "string" ? row.message.id.trim() : "";
+        if (messageId)
+            return `message:${messageId}`;
+        const requestId = typeof row.requestId === "string" ? row.requestId.trim() : "";
+        if (requestId)
+            return `request:${requestId}`;
+        const uuid = typeof row.uuid === "string" ? row.uuid.trim() : "";
+        return uuid ? `event:${uuid}` : `anonymous:${++anonymousRequestSeq}`;
+    };
     eachLine(file, (o) => {
         if (!meta.cwd && typeof o.cwd === "string")
             meta.cwd = o.cwd;
         if (typeof o.timestamp === "string") {
-            if (meta.first === null)
-                meta.first = o.timestamp;
-            meta.last = o.timestamp;
             const ms = epochMs(o.timestamp);
             if (ms != null) {
+                if (meta.first === null || ms < (epochMs(meta.first) ?? Number.POSITIVE_INFINITY))
+                    meta.first = o.timestamp;
+                if (meta.last === null || ms > (epochMs(meta.last) ?? Number.NEGATIVE_INFINITY))
+                    meta.last = o.timestamp;
                 if (meta.prevMs != null) {
                     meta.durationSec += Math.min(300, Math.max(0, Math.round((ms - meta.prevMs) / 1000)));
                 }
@@ -271,21 +299,34 @@ export function parseClaude(file) {
         }
         if (o.type !== "assistant" || !o.message)
             return;
+        const key = requestKey(o);
         const u = o.message.usage;
         if (u) {
-            sawUsage = true;
-            const inp = u.input_tokens || 0;
-            const cr = u.cache_read_input_tokens || 0;
-            const cc = u.cache_creation_input_tokens || 0;
-            const out = u.output_tokens || 0;
-            total += inp + cr + cc + out;
-            cached += cr; // re-read only (cache_creation is a first-time write, not a re-read)
-            output += out;
+            const candidate = {
+                input: Math.max(0, Number(u.input_tokens) || 0),
+                cacheRead: Math.max(0, Number(u.cache_read_input_tokens) || 0),
+                cacheCreate: Math.max(0, Number(u.cache_creation_input_tokens) || 0),
+                output: Math.max(0, Number(u.output_tokens) || 0),
+            };
+            const existing = usageByRequest.get(key);
+            if (!existing || candidate.input + candidate.cacheRead + candidate.cacheCreate > existing.input + existing.cacheRead + existing.cacheCreate) {
+                if (existing)
+                    candidate.output = Math.max(candidate.output, existing.output);
+                usageByRequest.set(key, candidate);
+            }
+            else if (candidate.output > existing.output) {
+                existing.output = candidate.output;
+            }
         }
         const content = o.message.content;
         if (Array.isArray(content)) {
-            for (const b of content) {
+            for (let index = 0; index < content.length; index += 1) {
+                const b = content[index];
                 if (b && b.type === "tool_use") {
+                    const toolKey = typeof b.id === "string" && b.id ? `id:${b.id}` : `${key}:${index}:${String(b.name || "")}`;
+                    if (seenToolUses.has(toolKey))
+                        continue;
+                    seenToolUses.add(toolKey);
                     if (String(b.name || "").toLowerCase().includes("echomem"))
                         echo++;
                     else if (classifyClaudeTool(b.name) === "read")
@@ -296,12 +337,16 @@ export function parseClaude(file) {
             }
         }
     });
-    if (!sawUsage || total === 0)
+    const usage = [...usageByRequest.values()];
+    const cached = usage.reduce((sum, row) => sum + row.cacheRead, 0);
+    const output = usage.reduce((sum, row) => sum + row.output, 0);
+    const total = usage.reduce((sum, row) => sum + row.input + row.cacheRead + row.cacheCreate + row.output, 0);
+    if (!usage.length || total === 0)
         return null;
     return {
         source: "claude-code",
-        date: meta.first ? meta.first.slice(0, 10) : null,
-        month: meta.first ? meta.first.slice(0, 7) : null,
+        date: localDate(meta.first),
+        month: localDate(meta.first)?.slice(0, 7) ?? null,
         startTs: meta.first,
         lastTs: meta.last,
         durationSec: meta.durationSec,
@@ -324,11 +369,22 @@ export function walk(dir, match, skipDir, out = []) {
     }
     for (const e of entries) {
         const full = path.join(dir, e.name);
-        if (e.isDirectory()) {
+        let stat;
+        try {
+            // Never follow entries that changed into symlinks/special files after readdir. A validated root
+            // may itself be a user-controlled symlink, but traversal stays inside regular child entries.
+            stat = fs.lstatSync(full);
+        }
+        catch {
+            continue;
+        }
+        if (stat.isSymbolicLink())
+            continue;
+        if (stat.isDirectory()) {
             if (!skipDir(e.name))
                 walk(full, match, skipDir, out);
         }
-        else if (match(full)) {
+        else if (stat.isFile() && match(full)) {
             out.push(full);
         }
     }
@@ -336,18 +392,22 @@ export function walk(dir, match, skipDir, out = []) {
 }
 export function collect() {
     const stats = [];
-    const codexRoot = path.join(os.homedir(), ".codex", "sessions");
-    for (const f of walk(codexRoot, (p) => /rollout-.*\.jsonl$/.test(p), () => false)) {
-        const s = parseCodex(f);
-        if (s)
-            stats.push(s);
+    const codexDiscovery = discoverCodexSessionFiles({ includeArchived: true });
+    if (codexDiscovery.files.length) {
+        for (const { path: f } of codexDiscovery.files) {
+            const s = parseCodex(f);
+            if (s)
+                stats.push(s);
+        }
     }
     // Claude Code: top-level session files only (skip subagent/workflow dirs to avoid double-counting).
-    const claudeRoot = path.join(os.homedir(), ".claude", "projects");
-    for (const f of walk(claudeRoot, (p) => p.endsWith(".jsonl"), (name) => name === "subagents" || name === "workflows")) {
-        const s = parseClaude(f);
-        if (s)
-            stats.push(s);
+    const claudeRoot = resolveClaudeProjectsDir();
+    if (claudeRoot) {
+        for (const f of walk(claudeRoot, (p) => p.endsWith(".jsonl"), (name) => name === "subagents" || name === "workflows")) {
+            const s = parseClaude(f);
+            if (s)
+                stats.push(s);
+        }
     }
     return stats;
 }
@@ -371,6 +431,7 @@ export function aggregate(stats) {
     const fresh = total - cached;
     const noncached = Math.max(0, total - cached - output);
     const dates = stats.map((s) => s.date).filter(Boolean).sort();
+    const lastDates = stats.map((s) => localDate(s.lastTs)).filter(Boolean).sort();
     const byMonth = new Map();
     for (const s of stats) {
         if (!s.month)
@@ -426,7 +487,7 @@ export function aggregate(stats) {
         rereadPct: total ? Math.round((cached / total) * 100) : 0,
         ratio: recalls > 0 ? Math.round(reads / recalls) : null,
         first: dates[0] || null,
-        last: dates[dates.length - 1] || null,
+        last: lastDates[lastDates.length - 1] || dates[dates.length - 1] || null,
         days: new Set(dates).size,
         months,
         busiestDay: { date: busiestDayEntry?.[0] || null, sessions: busiestDayEntry?.[1] || 0 },
@@ -623,7 +684,7 @@ function renderText(a, memCount, useColor) {
         L(c.green(`✓ You're connected — every new session now builds on your ${memCount} memories.`));
     }
     else {
-        L(c.green("→ Start now (no signup wall):  ") + c.bold("npm i -g @echomem/mcp@latest && echomem-mcp setup"));
+        L(c.green("→ Start now (no signup wall):  ") + c.bold("npm i -g @echomem/mcp@latest && echomem-mcp init"));
         L(c.dim(`  ~1 minute. Your next coding session recalls instead of re-reading.`));
     }
     NL();