@echomem/mcp 1.4.8 → 1.4.9

package/dist/hud/adapters.js

@@ -1,5 +1,6 @@
 import fs from "node:fs";
 import path from "node:path";
+import { resolveClaudeProjectsDir, resolveCodexSessionsDir } from "../local-data-paths.js";
 import { homePath, newestFile, readJsonl, walkFiles } from "./fs.js";
 import { bumpTurn, newMetricState, recordEdit, recordRead, recordTool, scoreMetric, shellRead, } from "./metric.js";
 export const adapters = {
@@ -31,8 +32,8 @@ export function adapterList(mode) {
     return [adapters[mode]];
 }
 function listCodex() {
-    const root = process.env.CODEX_HOME ? path.join(process.env.CODEX_HOME, "sessions") : homePath(".codex", "sessions");
-    return walkFiles(root, (file) => /^rollout-.*\.jsonl$/.test(path.basename(file)));
+    const root = resolveCodexSessionsDir();
+    return root ? walkFiles(root, (file) => /^rollout-.*\.jsonl$/.test(path.basename(file))) : [];
 }
 function findActiveCodex() {
     return newestFile(listCodex());
@@ -121,10 +122,13 @@ function scoreCodex(file) {
     return score;
 }
 function listClaudeCode() {
-    return walkFiles(homePath(".claude", "projects"), (file) => file.endsWith(".jsonl"));
+    const root = resolveClaudeProjectsDir();
+    return root ? walkFiles(root, (file) => file.endsWith(".jsonl")) : [];
 }
 function findActiveClaudeCode() {
-    const cache = newestFile(walkFiles(homePath(".claude", "echo-ctx"), (file) => file.endsWith(".json")));
+    const projects = resolveClaudeProjectsDir();
+    const cacheRoot = projects ? path.join(path.dirname(projects), "echo-ctx") : null;
+    const cache = cacheRoot ? newestFile(walkFiles(cacheRoot, (file) => file.endsWith(".json"))) : null;
     if (cache)
         return cache;
     return newestFile(listClaudeCode());

package/dist/hud/metric.js

@@ -1,3 +1,4 @@
+import { calculateContextMetrics } from "../context-metrics/calculate.js";
 export const BUCKETS = {
     rangeRedundant: "range_redundant",
     staleRead: "stale_read",
@@ -72,16 +73,24 @@ export function scoreMetric(params) {
     const ct = Number(params.ctTokens) || 0;
     const modelWindow = Number(params.modelContextWindow) || 0;
     const pollutionTok = Object.values(params.state.buckets).reduce((sum, bucket) => sum + bucket.tokens, 0);
-    const pollution = ct > 0 ? Math.min(0.95, pollutionTok / ct) : 0;
+    const contextMetrics = calculateContextMetrics({
+        latestInputTokens: ct,
+        modelContextLimitTokens: modelWindow || null,
+        currentResidentWasteTokens: pollutionTok,
+    });
+    const pollution = Math.min(0.95, contextMetrics.noisePct);
     const pollutionPct = Math.round(pollution * 100);
-    const saturationPct = modelWindow > 0 ? Math.round((ct / modelWindow) * 100) : null;
+    const saturationPct = contextMetrics.contextFullnessPct !== undefined
+        ? Math.round(contextMetrics.contextFullnessPct * 100)
+        : null;
     return {
         client: params.client,
         sourcePath: params.sourcePath,
         turn: params.state.turn,
         reads: params.state.reads,
         redundantCount: params.state.redundantCount,
-        usefulPct: Math.round((1 - pollution) * 100),
+        usefulPct: Math.round(Math.max(0, Math.min(1, contextMetrics.usefulPct)) * 100),
+        healthScorePct: contextMetrics.healthScorePct,
         pollutionPct,
         pollutionTok,
         ctTokens: ct,
@@ -134,7 +143,7 @@ export function formatTokens(tokens) {
 }
 export function formatGlance(score) {
     const dot = score.color === "amber" ? "◑" : "●";
-    return `${dot} ${score.usefulPct}% clean · ${formatTokens(score.ctTokens)}`;
+    return `${dot} ${score.healthScorePct}% score · ${formatTokens(score.ctTokens)}`;
 }
 function estimateReadTokens(start, end) {
     const boundedEnd = Math.min(end, start + 4000);

package/dist/hud/monitor.js

@@ -18,17 +18,21 @@ export class HudMonitor extends EventEmitter {
     labelCache = new Map();
     missing = [];
     frontmostCheckedAt = 0;
-    frontmostClient = null;
+    frontmostFamily = null;
     lastActiveClient = null;
     threadCounts = {};
     threadCountsAt = 0;
     recentSessions = [];
     codexTitles = new Map();
     codexTitlesSig = "";
+    claudeTitles = new Map();
+    claudeTitlesSig = "";
+    claudeTitlesCheckedAt = 0;
     claudeTitleCache = new Map();
     lastPersistedRecent = "";
     pinnedId = null;
     pinnedScore = null;
+    pinnedFromFamily = null;
     constructor(mode = "auto", pollMs = 750) {
         super();
         this.mode = mode;
@@ -47,8 +51,9 @@ export class HudMonitor extends EventEmitter {
         this.timer = null;
     }
     snapshot() {
-        const focused = this.frontmostPreferredClient();
+        const focusedFamily = this.frontmostPreferredFamily();
         this.refreshRecent();
+        this.releasePinAfterForegroundSwitch(focusedFamily);
         const now = Date.now();
         const sessions = [...this.scores.values()].map((score) => {
             // Liveness uses file mtime (real last write), not score.updatedAt — the Claude cache stamps
@@ -58,7 +63,7 @@ export class HudMonitor extends EventEmitter {
             return {
                 ...score,
                 live: lastActiveMs < LIVE_WINDOW_MS,
-                focused: focused === score.client,
+                focused: focusedFamily === agentFamily(score.client),
                 label: this.labelFor(score),
                 lastActiveMs,
             };
@@ -66,7 +71,8 @@ export class HudMonitor extends EventEmitter {
         // The user's foreground agent is the primary truth. Background agents can keep writing logs, but
         // they should never steal the main HUD away from Codex/Claude while that app is what the user opened.
         sessions.sort((a, b) => hudSelectionRank(a) - hudSelectionRank(b) || a.lastActiveMs - b.lastActiveMs);
-        // A user-pinned tab overrides auto-selection: it becomes the primary and never flips away.
+        // A pin selects one session while the user remains in the same agent. Crossing to the other
+        // foreground agent releases it so Auto can follow the workflow again.
         const pinned = this.pinnedView(now);
         const ordered = pinned ? [pinned, ...sessions.filter((s) => s.sourcePath !== pinned.sourcePath)] : sessions;
         const pinnedId = pinned ? this.pinnedId : null;
@@ -96,6 +102,16 @@ export class HudMonitor extends EventEmitter {
             return;
         this.pinnedId = id;
         this.pinnedScore = null;
+        this.pinnedFromFamily = id ? this.frontmostPreferredFamily() : null;
+    }
+    releasePinAfterForegroundSwitch(focusedFamily) {
+        if (!this.pinnedId || !this.pinnedFromFamily || !focusedFamily)
+            return;
+        if (focusedFamily === this.pinnedFromFamily)
+            return;
+        this.pinnedId = null;
+        this.pinnedScore = null;
+        this.pinnedFromFamily = null;
     }
     // The user-selected tab, scored on demand (cached by file signature). null if nothing is pinned or
     // the pinned session has aged out of the recent list.
@@ -122,21 +138,27 @@ export class HudMonitor extends EventEmitter {
             }
         }
         const lastActiveMs = Math.max(0, now - stat.mtimeMs);
-        return { ...this.pinnedScore.score, live: lastActiveMs < LIVE_WINDOW_MS, focused: true, label: rec.title, lastActiveMs };
+        return { ...this.pinnedScore.score, live: lastActiveMs < LIVE_WINDOW_MS, focused: true, label: rec.label || rec.title, lastActiveMs };
     }
-    frontmostPreferredClient() {
+    frontmostPreferredFamily() {
         if (this.mode !== "auto" && this.mode !== "both")
             return null;
         const now = Date.now();
         if (now - this.frontmostCheckedAt > 1500) {
             this.frontmostCheckedAt = now;
-            const detected = detectFrontmostClient();
+            const detected = detectFrontmostFamily();
             if (detected) {
-                // Positive detection wins immediately (real focus switch, e.g. Codex → Claude Desktop).
-                this.frontmostClient = detected;
+                // Positive detection wins immediately. Claude Code and Claude Desktop share one family;
+                // recency below decides which Claude source is the conversation the user is actually using.
+                this.frontmostFamily = detected;
             }
         }
-        return this.frontmostClient && this.scores.has(this.frontmostClient) ? this.frontmostClient : null;
+        if (this.frontmostFamily === "codex")
+            return this.scores.has("codex") ? "codex" : null;
+        if (this.frontmostFamily === "claude") {
+            return this.scores.has("claude-code") || this.scores.has("claude-desktop") ? "claude" : null;
+        }
+        return null;
     }
     // One throttled walk over every session file per client → both the ongoing-thread counts and the
     // "recent tabs" list (touched in the last RECENT_WINDOW_MS), which is persisted to disk so the tab
@@ -147,6 +169,7 @@ export class HudMonitor extends EventEmitter {
             return;
         this.threadCountsAt = now;
         this.loadCodexTitles();
+        this.loadClaudeTitles();
         const counts = {};
         const recent = [];
         const newestByClient = new Map();
@@ -188,6 +211,7 @@ export class HudMonitor extends EventEmitter {
             id: sessionIdFromPath(file),
             client,
             title: this.titleFor(client, file),
+            label: sessionLabel(file, client),
             sourcePath: file,
             lastActiveMs: age,
             live: age < LIVE_WINDOW_MS,
@@ -201,6 +225,9 @@ export class HudMonitor extends EventEmitter {
                 return title;
         }
         else {
+            const metadataTitle = this.claudeTitles.get(sessionIdFromPath(file));
+            if (metadataTitle)
+                return metadataTitle;
             const cached = this.claudeTitleCache.get(file);
             if (cached !== undefined)
                 return cached;
@@ -245,6 +272,28 @@ export class HudMonitor extends EventEmitter {
         }
         this.codexTitles = map;
     }
+    // Claude Desktop keeps its sidebar titles outside the transcripts. Join those records by
+    // cliSessionId so the HUD can show the same title the user sees in Claude.
+    loadClaudeTitles() {
+        const now = Date.now();
+        if (this.claudeTitlesCheckedAt && now - this.claudeTitlesCheckedAt < 5000)
+            return;
+        this.claudeTitlesCheckedAt = now;
+        const files = listClaudeSessionMetadataFiles();
+        const signature = files.map((file) => {
+            try {
+                const stat = fs.statSync(file);
+                return `${file}:${stat.size}:${stat.mtimeMs}`;
+            }
+            catch {
+                return "";
+            }
+        }).join("|");
+        if (signature === this.claudeTitlesSig)
+            return;
+        this.claudeTitlesSig = signature;
+        this.claudeTitles = claudeSessionTitlesFromFiles(files);
+    }
     persistRecent() {
         const signature = JSON.stringify(this.recentSessions.map((s) => `${s.id}:${s.live}`));
         if (signature === this.lastPersistedRecent)
@@ -315,21 +364,56 @@ export function claudeDisplayTitle(file, client) {
     const stamp = sessionTimeLabel(resolveClaudeTranscript(file) ?? file);
     return label === defaultLabel(client) ? stamp : `${label} · ${stamp}`;
 }
-function detectFrontmostClient() {
+export function claudeSessionTitlesFromFiles(files) {
+    const entries = new Map();
+    for (const file of files) {
+        try {
+            const raw = JSON.parse(fs.readFileSync(file, "utf8"));
+            if (!isRecord(raw))
+                continue;
+            const id = typeof raw.cliSessionId === "string" ? raw.cliSessionId.trim() : "";
+            const title = typeof raw.title === "string" ? raw.title.trim() : "";
+            if (!id || !title)
+                continue;
+            const freshness = Number(raw.lastFocusedAt) || Number(raw.lastActivityAt) || fs.statSync(file).mtimeMs;
+            const previous = entries.get(id);
+            if (!previous || freshness >= previous.freshness)
+                entries.set(id, { title, freshness });
+        }
+        catch {
+            /* Ignore incomplete or disappearing live metadata files. */
+        }
+    }
+    return new Map([...entries].map(([id, entry]) => [id, entry.title]));
+}
+function detectFrontmostFamily() {
     if (process.platform !== "darwin")
         return null;
     try {
-        const name = execFileSync("osascript", ["-e", 'tell application "System Events" to get name of first application process whose frontmost is true'], { encoding: "utf8", timeout: 500, stdio: ["ignore", "pipe", "ignore"] }).trim().toLowerCase();
-        if (name.includes("codex"))
-            return "codex";
-        if (name.includes("claude"))
-            return "claude-desktop";
+        const output = execFileSync("osascript", [
+            "-e",
+            'tell application "System Events" to tell first application process whose frontmost is true to return (name as text) & linefeed & (bundle identifier as text)',
+        ], { encoding: "utf8", timeout: 500, stdio: ["ignore", "pipe", "ignore"] }).trim();
+        const [name = "", bundleId = ""] = output.split("\n");
+        return agentFamilyForApplication(name, bundleId);
     }
     catch {
         /* Accessibility may be unavailable; fall back to newest log. */
     }
     return null;
 }
+export function agentFamilyForApplication(name, bundleId = "") {
+    const appName = name.trim().toLowerCase();
+    const appId = bundleId.trim().toLowerCase();
+    if (appId === "com.openai.codex" || appName.includes("codex"))
+        return "codex";
+    if (appId === "com.anthropic.claudefordesktop" || appName.includes("claude"))
+        return "claude";
+    return null;
+}
+export function agentFamily(client) {
+    return client === "codex" ? "codex" : "claude";
+}
 function isRecord(value) {
     return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -347,6 +431,41 @@ function defaultLabel(client) {
         return "Claude Code";
     return "Claude Desktop";
 }
+function listClaudeSessionMetadataFiles() {
+    const roots = [
+        homePath("Library", "Application Support", "Claude", "claude-code-sessions"),
+        homePath("Library", "Application Support", "Claude", "local-agent-mode-sessions"),
+    ];
+    const files = [];
+    for (const root of roots) {
+        for (const account of childDirectories(root)) {
+            for (const organization of childDirectories(account)) {
+                let entries = [];
+                try {
+                    entries = fs.readdirSync(organization, { withFileTypes: true });
+                }
+                catch {
+                    continue;
+                }
+                for (const entry of entries) {
+                    if (entry.isFile() && /^local_[0-9a-f-]+\.json$/i.test(entry.name))
+                        files.push(path.join(organization, entry.name));
+                }
+            }
+        }
+    }
+    return files.sort();
+}
+function childDirectories(root) {
+    try {
+        return fs.readdirSync(root, { withFileTypes: true })
+            .filter((entry) => entry.isDirectory())
+            .map((entry) => path.join(root, entry.name));
+    }
+    catch {
+        return [];
+    }
+}
 // Recognizable label = basename of the session's cwd. Both Codex rollouts and Claude transcripts
 // carry a "cwd" field; the Claude Code active source is the echo-ctx cache (<sessionId>.json, no cwd),
 // so resolve its transcript by sessionId first. Falls back to the client name when cwd is absent.