@electron-memory/monitor 0.2.3 → 0.2.6

package/dist/index.js

@@ -299,13 +299,13 @@ var DataPersister = class {
       return null;
     }
   }
-  /** 获取所有会话列表 */
+  /** 获取所有会话列表（按 startTime 降序，最新在前；与索引写入顺序无关） */
   getSessions() {
     const indexFile = path.join(this.storageDir, "sessions.json");
     try {
       const content = fs.readFileSync(indexFile, "utf-8");
       const index = JSON.parse(content);
-      return index.sessions;
+      return this.sortSessionsByStartDesc(index.sessions);
     } catch {
       return [];
     }
@@ -408,11 +408,19 @@ var DataPersister = class {
   saveSessionIndex(sessions) {
     const indexFile = path.join(this.storageDir, "sessions.json");
     const index = {
-      sessions,
+      sessions: this.sortSessionsByStartDesc(sessions),
       lastUpdated: Date.now()
     };
     fs.writeFileSync(indexFile, JSON.stringify(index, null, 2), "utf-8");
   }
+  /** 统一排序：startTime 新 → 旧（同毫秒时按 id 稳定排序） */
+  sortSessionsByStartDesc(sessions) {
+    return [...sessions].sort((a, b) => {
+      const t = b.startTime - a.startTime;
+      if (t !== 0) return t;
+      return String(b.id).localeCompare(String(a.id));
+    });
+  }
   ensureDirectory(dir) {
     if (!fs.existsSync(dir)) {
       fs.mkdirSync(dir, { recursive: true });
@@ -475,10 +483,14 @@ var SessionManager = class {
   getCurrentSession() {
     return this.currentSession;
   }
-  /** 开始新会话 */
+  /** 开始新会话；若顶替了上一条进行中的会话，通过 `replaced` 返回以便主进程补写 report.json */
   startSession(label, description) {
+    if (!this.currentSession) {
+      this.reconcileStaleRunningInIndex();
+    }
+    let replaced = null;
     if (this.currentSession && this.currentSession.status === "running") {
-      this.endSession();
+      replaced = this.endSession();
     }
     const sessionId = v4();
     const { dataFile, metaFile } = this.persister.createSessionFiles(sessionId);
@@ -494,7 +506,7 @@ var SessionManager = class {
     };
     this.currentSession = session;
     this.persister.saveSessionMeta(session);
-    return session;
+    return { session, replaced };
   }
   /** 结束当前会话 */
   endSession() {
@@ -522,6 +534,24 @@ var SessionManager = class {
   getSession(sessionId) {
     return this.persister.readSessionMeta(sessionId);
   }
+  /**
+   * 当前内存无活动会话时，将索引中仍为 running 的条目标为 aborted（进程异常退出后残留）
+   */
+  reconcileStaleRunningInIndex() {
+    if (this.currentSession) return;
+    const sessions = this.persister.getSessions();
+    const now = Date.now();
+    for (const s of sessions) {
+      if (s.status !== "running") continue;
+      const fixed = {
+        ...s,
+        status: "aborted",
+        endTime: now,
+        duration: now - s.startTime
+      };
+      this.persister.saveSessionMeta(fixed);
+    }
+  }
 };
 
 // src/core/anomaly.ts
@@ -605,7 +635,18 @@ var AnomalyDetector = class extends import_events2.EventEmitter {
               title: "\u603B\u5185\u5B58\u6301\u7EED\u589E\u957F",
               description: `\u5185\u5B58\u4EE5 ${slope.toFixed(2)} KB/s \u7684\u901F\u7387\u6301\u7EED\u589E\u957F (R\xB2=${r2.toFixed(3)})`,
               value: slope,
-              threshold: 10
+              threshold: 10,
+              suggestions: [
+                "\u5BFC\u51FA\u5806\u5FEB\u7167 (Heap Snapshot)\uFF0C\u4F7F\u7528 Chrome DevTools \u7684 Memory \u9762\u677F\u52A0\u8F7D\u5206\u6790",
+                '\u5BF9\u6BD4\u4E24\u4E2A\u65F6\u95F4\u70B9\u7684\u5806\u5FEB\u7167\uFF0C\u67E5\u627E "Allocated between snapshots" \u4E2D\u65B0\u589E\u7684\u5927\u5BF9\u8C61',
+                "\u68C0\u67E5\u4E3B\u8FDB\u7A0B\u4E2D\u662F\u5426\u6709\u672A\u6E05\u7406\u7684 setInterval / setTimeout \u56DE\u8C03",
+                "\u68C0\u67E5 ipcMain.on \u662F\u5426\u5B58\u5728\u91CD\u590D\u6CE8\u518C\uFF08\u6BCF\u6B21\u7A97\u53E3\u521B\u5EFA\u90FD\u6CE8\u518C\u4F46\u4E0D\u79FB\u9664\uFF09",
+                "\u68C0\u67E5\u662F\u5426\u6709\u6301\u7EED\u589E\u957F\u7684 Map / Set / Array \u7F13\u5B58\u672A\u8BBE\u7F6E\u4E0A\u9650\u6216\u8FC7\u671F\u7B56\u7565"
+              ],
+              actions: [
+                { id: "take-heap-snapshot", label: "\u{1F4F8} \u5BFC\u51FA\u5806\u5FEB\u7167", type: "heap-snapshot" },
+                { id: "trigger-gc", label: "\u{1F5D1}\uFE0F \u89E6\u53D1 GC", type: "trigger-gc" }
+              ]
             };
           }
           return null;
@@ -630,7 +671,18 @@ var AnomalyDetector = class extends import_events2.EventEmitter {
               title: "\u5185\u5B58\u7A81\u589E",
               description: `\u603B\u5185\u5B58\u4ECE ${Math.round(avg)} KB \u7A81\u589E\u5230 ${current} KB (+${((current - avg) / avg * 100).toFixed(1)}%)`,
               value: current,
-              threshold: avg * 1.5
+              threshold: avg * 1.5,
+              suggestions: [
+                "\u7ACB\u5373\u5BFC\u51FA\u5806\u5FEB\u7167\uFF0C\u4E0E\u7A81\u589E\u524D\u7684\u5FEB\u7167\u5BF9\u6BD4\uFF0C\u5B9A\u4F4D\u65B0\u589E\u7684\u5927\u5BF9\u8C61",
+                "\u68C0\u67E5\u662F\u5426\u6709\u5927\u91CF\u65B0\u7A97\u53E3/\u6807\u7B7E\u9875\u540C\u65F6\u521B\u5EFA",
+                "\u68C0\u67E5\u662F\u5426\u52A0\u8F7D\u4E86\u5927\u6587\u4EF6\u6216\u5927\u91CF\u56FE\u7247\u8D44\u6E90",
+                "\u68C0\u67E5 IPC \u901A\u4FE1\u662F\u5426\u4F20\u8F93\u4E86\u8D85\u5927\u6570\u636E\uFF08\u5EFA\u8BAE\u5206\u7247\u6216\u4F7F\u7528 MessagePort\uFF09",
+                "\u89E6\u53D1 GC \u540E\u89C2\u5BDF\u5185\u5B58\u662F\u5426\u56DE\u843D\uFF0C\u5982\u4E0D\u56DE\u843D\u5219\u4E3A\u771F\u5B9E\u6CC4\u6F0F"
+              ],
+              actions: [
+                { id: "take-heap-snapshot", label: "\u{1F4F8} \u5BFC\u51FA\u5806\u5FEB\u7167", type: "heap-snapshot" },
+                { id: "trigger-gc", label: "\u{1F5D1}\uFE0F \u89E6\u53D1 GC", type: "trigger-gc" }
+              ]
             };
           }
           return null;
@@ -652,7 +704,17 @@ var AnomalyDetector = class extends import_events2.EventEmitter {
               title: `\u68C0\u6D4B\u5230 ${detached} \u4E2A\u5206\u79BB\u7684 V8 \u4E0A\u4E0B\u6587`,
               description: "\u5B58\u5728\u672A\u6B63\u786E\u9500\u6BC1\u7684 BrowserWindow \u6216 WebContents\uFF0C\u53EF\u80FD\u5BFC\u81F4\u5185\u5B58\u6CC4\u6F0F",
               value: detached,
-              threshold: 0
+              threshold: 0,
+              suggestions: [
+                '\u5728 Chrome DevTools Memory \u9762\u677F\u5BFC\u51FA\u5806\u5FEB\u7167\uFF0C\u641C\u7D22 "Detached" \u67E5\u627E\u6B8B\u7559\u7684 DOM \u6811\u548C JS \u4E0A\u4E0B\u6587',
+                "\u68C0\u67E5\u6240\u6709 BrowserWindow \u662F\u5426\u5728\u5173\u95ED\u65F6\u8C03\u7528\u4E86 destroy()\uFF08\u800C\u975E\u4EC5 close()\uFF09",
+                '\u68C0\u67E5 BrowserWindow.on("closed", ...) \u56DE\u8C03\u4E2D\u662F\u5426\u5C06\u7A97\u53E3\u5F15\u7528\u7F6E\u4E3A null',
+                "\u68C0\u67E5\u662F\u5426\u6709\u95ED\u5305\uFF08\u5982 ipcMain.on \u56DE\u8C03\uFF09\u6301\u6709\u5DF2\u5173\u95ED\u7A97\u53E3\u7684 webContents \u5F15\u7528",
+                "\u68C0\u67E5 ipcMain.on / ipcMain.handle \u662F\u5426\u5728\u7A97\u53E3\u5173\u95ED\u540E\u6B63\u786E\u79FB\u9664\u76D1\u542C"
+              ],
+              actions: [
+                { id: "take-heap-snapshot", label: "\u{1F4F8} \u5BFC\u51FA\u5806\u5FEB\u7167", type: "heap-snapshot" }
+              ]
             };
           }
           return null;
@@ -676,7 +738,18 @@ var AnomalyDetector = class extends import_events2.EventEmitter {
                 title: `V8 \u5806\u4F7F\u7528\u7387 ${(usagePercent * 100).toFixed(1)}%`,
                 description: `\u4E3B\u8FDB\u7A0B V8 \u5806\u4F7F\u7528 ${Math.round(heapUsed / 1024 / 1024)} MB / ${Math.round(heapTotal / 1024 / 1024)} MB`,
                 value: usagePercent * 100,
-                threshold: 85
+                threshold: 85,
+                suggestions: [
+                  "\u5BFC\u51FA\u5806\u5FEB\u7167 (Heap Snapshot)\uFF0C\u4F7F\u7528 Chrome DevTools \u7684 Memory \u9762\u677F\u5206\u6790\u5BF9\u8C61\u7559\u5B58",
+                  '\u5BF9\u6BD4\u4E24\u4E2A\u65F6\u95F4\u70B9\u7684\u5806\u5FEB\u7167\uFF0C\u67E5\u627E "Allocated between snapshots" \u4E2D\u7684\u6CC4\u6F0F\u5BF9\u8C61',
+                  "\u68C0\u67E5 Event Listeners \u662F\u5426\u6B63\u786E\u6E05\u7406\uFF08\u7279\u522B\u662F ipcMain / EventEmitter \u4E0A\u7684\u76D1\u542C\u5668\uFF09",
+                  "\u68C0\u67E5 Promise \u94FE\u662F\u5426\u6709\u672A\u5904\u7406\u7684 rejection \u5BFC\u81F4\u5F15\u7528\u672A\u91CA\u653E",
+                  "\u89E6\u53D1 GC \u540E\u89C2\u5BDF\u4F7F\u7528\u7387\u662F\u5426\u4E0B\u964D\uFF0C\u82E5\u4E0D\u964D\u5219\u786E\u8BA4\u4E3A\u6CC4\u6F0F"
+                ],
+                actions: [
+                  { id: "take-heap-snapshot", label: "\u{1F4F8} \u5BFC\u51FA\u5806\u5FEB\u7167", type: "heap-snapshot" },
+                  { id: "trigger-gc", label: "\u{1F5D1}\uFE0F \u89E6\u53D1 GC", type: "trigger-gc" }
+                ]
               };
             }
           }
@@ -692,10 +765,38 @@ var os2 = __toESM(require("os"));
 var Analyzer = class {
   /** 生成会话报告 */
   generateReport(sessionId, label, description, startTime, endTime, snapshots, anomalies, dataFile) {
+    const environment = this.collectEnvironment();
+    const eventMarks = this.collectEventMarks(snapshots);
     if (snapshots.length === 0) {
-      throw new Error("No snapshots to analyze");
+      const summary2 = this.emptySummary();
+      const suggestions2 = [
+        {
+          id: "no-snapshots",
+          severity: "info",
+          category: "optimization",
+          title: "\u4F1A\u8BDD\u5185\u6CA1\u6709\u53EF\u7528\u7684\u5185\u5B58\u5FEB\u7167",
+          description: "\u7ED3\u675F\u4F1A\u8BDD\u65F6\u78C1\u76D8\u4E0A\u5C1A\u672A\u5199\u5165\u4EFB\u4F55\u91C7\u6837\u70B9\uFF08\u4F8B\u5982\u521A\u542F\u52A8\u5C31\u7ACB\u523B\u7ED3\u675F\uFF0C\u6216\u91C7\u96C6\u95F4\u9694\u5C1A\u672A\u89E6\u53D1\uFF09\u3002\u62A5\u544A\u4E2D\u7684\u7EDF\u8BA1\u4E0E\u8D8B\u52BF\u65E0\u6CD5\u8BA1\u7B97\u3002",
+          suggestions: [
+            "\u4FDD\u6301\u4F1A\u8BDD\u5F00\u542F\u81F3\u5C11\u4E00\u4E2A\u91C7\u96C6\u5468\u671F\u540E\u518D\u70B9\u300C\u7ED3\u675F\u4F1A\u8BDD\u300D",
+            "\u5728\u914D\u7F6E\u4E2D\u9002\u5F53\u7F29\u77ED\u91C7\u96C6\u95F4\u9694\u4EE5\u4FBF\u66F4\u5FEB\u5F97\u5230\u6570\u636E"
+          ]
+        }
+      ];
+      return {
+        sessionId,
+        label,
+        description,
+        startTime,
+        endTime,
+        duration: endTime - startTime,
+        environment,
+        summary: summary2,
+        anomalies,
+        suggestions: suggestions2,
+        eventMarks,
+        dataFile
+      };
     }
-    const environment = this.collectEnvironment();
     const summary = this.computeSummary(snapshots);
     const suggestions = this.generateSuggestions(snapshots, summary, anomalies);
     return {
@@ -709,6 +810,7 @@ var Analyzer = class {
       summary,
       anomalies,
       suggestions,
+      eventMarks,
       dataFile
     };
   }
@@ -745,6 +847,53 @@ var Analyzer = class {
     };
   }
   // ===== 私有方法 =====
+  emptySummary() {
+    const z = this.computeMetricSummary([]);
+    const stable = { slope: 0, r2: 0, direction: "stable", confidence: "low" };
+    return {
+      totalProcesses: { min: 0, max: 0, avg: 0 },
+      totalMemory: z,
+      byProcessType: {
+        browser: z,
+        renderer: [],
+        gpu: null,
+        utility: null
+      },
+      mainV8Heap: {
+        heapUsed: z,
+        heapTotal: z,
+        external: z,
+        arrayBuffers: z
+      },
+      trends: {
+        totalMemory: stable,
+        browserMemory: stable,
+        rendererMemory: stable
+      }
+    };
+  }
+  /** 从快照展平所有标记，并附上该采样点的分类内存（KB） */
+  collectEventMarks(snapshots) {
+    const out = [];
+    for (const s of snapshots) {
+      if (!s.marks?.length) continue;
+      const browserKB = s.processes.filter((p) => p.type === "Browser").reduce((sum, p) => sum + p.memory.workingSetSize, 0);
+      const rendererKB = s.processes.filter((p) => p.type === "Tab" && !p.isMonitorProcess).reduce((sum, p) => sum + p.memory.workingSetSize, 0);
+      const gpuKB = s.processes.filter((p) => p.type === "GPU").reduce((sum, p) => sum + p.memory.workingSetSize, 0);
+      for (const m of s.marks) {
+        out.push({
+          timestamp: m.timestamp,
+          label: m.label,
+          metadata: m.metadata,
+          totalWorkingSetKB: s.totalWorkingSetSize,
+          browserKB,
+          rendererKB,
+          gpuKB
+        });
+      }
+    }
+    return out;
+  }
   collectEnvironment() {
     const cpus2 = os2.cpus();
     return {
@@ -1434,10 +1583,28 @@ var IPCMainHandler = class {
       return this.monitor.startSession(args.label, args.description);
     });
     import_electron4.ipcMain.handle(IPC_CHANNELS.SESSION_STOP, async () => {
-      return this.monitor.stopSession();
+      try {
+        const report = await this.monitor.stopSession();
+        if (!report) {
+          return { ok: false, reason: "no_active_session" };
+        }
+        return {
+          ok: true,
+          sessionId: report.sessionId,
+          label: report.label,
+          durationMs: report.duration
+        };
+      } catch (err) {
+        console.error("[electron-memory-monitor] SESSION_STOP failed:", err);
+        return {
+          ok: false,
+          reason: "error",
+          message: err instanceof Error ? err.message : String(err)
+        };
+      }
     });
     import_electron4.ipcMain.handle(IPC_CHANNELS.SESSION_LIST, async () => {
-      return this.monitor.getSessions();
+      return this.monitor.getSessionsPayloadForIpc();
     });
     import_electron4.ipcMain.handle(IPC_CHANNELS.SESSION_REPORT, async (_event, sessionId) => {
       return this.monitor.getSessionReport(sessionId);
@@ -1461,7 +1628,7 @@ var IPCMainHandler = class {
       return this.monitor.getConfig();
     });
     import_electron4.ipcMain.handle(IPC_CHANNELS.GET_SESSIONS, async () => {
-      return this.monitor.getSessions();
+      return this.monitor.getSessionsPayloadForIpc();
     });
     import_electron4.ipcMain.handle(IPC_CHANNELS.SESSION_EXPORT, async (_event, sessionId) => {
       return this.monitor.exportSession(sessionId);
@@ -1472,8 +1639,11 @@ var IPCMainHandler = class {
     import_electron4.ipcMain.handle(IPC_CHANNELS.SESSION_DELETE, async (_event, sessionId) => {
       return this.monitor.deleteSession(sessionId);
     });
-    import_electron4.ipcMain.on(IPC_CHANNELS.RENDERER_REPORT, (_event, detail) => {
-      this.monitor.updateRendererDetail(detail);
+    import_electron4.ipcMain.on(IPC_CHANNELS.RENDERER_REPORT, (event, detail) => {
+      this.monitor.updateRendererDetail({
+        ...detail,
+        webContentsId: event.sender.id
+      });
     });
   }
   /** 向监控面板推送快照数据 */
@@ -1503,6 +1673,10 @@ var DEFAULT_CONFIG = {
   enabled: true,
   autoStart: true,
   openDashboardOnStart: true,
+  session: {
+    autoStartOnLaunch: true,
+    autoLabelPrefix: "\u81EA\u52A8\u4F1A\u8BDD"
+  },
   collectInterval: 2e3,
   persistInterval: 60,
   enableRendererDetail: false,
@@ -1528,6 +1702,36 @@ var DEFAULT_CONFIG = {
 };
 
 // src/core/monitor.ts
+function mergeMarksFromExcludedSnapshots(full, sampled) {
+  const marked = full.filter((s) => s.marks && s.marks.length > 0);
+  if (marked.length === 0) return sampled;
+  const sampledRefs = new Set(sampled);
+  const result = sampled.map((s) => ({
+    ...s,
+    marks: s.marks?.length ? [...s.marks] : void 0
+  }));
+  for (const src of marked) {
+    if (sampledRefs.has(src)) continue;
+    let bestIdx = 0;
+    let bestDiff = Infinity;
+    for (let i = 0; i < result.length; i++) {
+      const d = Math.abs(result[i].timestamp - src.timestamp);
+      if (d < bestDiff) {
+        bestDiff = d;
+        bestIdx = i;
+      }
+    }
+    const target = result[bestIdx];
+    target.marks = [...target.marks || [], ...src.marks];
+  }
+  return result;
+}
+function formatAutoSessionLabel(prefix) {
+  const d = /* @__PURE__ */ new Date();
+  const p2 = (n) => String(n).padStart(2, "0");
+  const stamp = `${d.getFullYear()}-${p2(d.getMonth() + 1)}-${p2(d.getDate())} ${p2(d.getHours())}:${p2(d.getMinutes())}:${p2(d.getSeconds())}`;
+  return `${prefix || "\u81EA\u52A8\u4F1A\u8BDD"} ${stamp}`;
+}
 var ElectronMemoryMonitor = class extends import_events3.EventEmitter {
   constructor(config) {
     super();
@@ -1571,11 +1775,20 @@ var ElectronMemoryMonitor = class extends import_events3.EventEmitter {
     });
     this.collector.start();
     this.anomalyDetector.start();
+    this.persister.cleanOldSessions();
+    this.sessionManager.reconcileStaleRunningInIndex();
+    this.started = true;
+    if (this.config.session.autoStartOnLaunch) {
+      try {
+        const label = formatAutoSessionLabel(this.config.session.autoLabelPrefix);
+        this.startSession(label, this.config.session.autoDescription);
+      } catch (err) {
+        console.error("[@electron-memory/monitor] autoStartOnLaunch failed:", err);
+      }
+    }
     if (this.config.openDashboardOnStart) {
       this.openDashboard();
     }
-    this.persister.cleanOldSessions();
-    this.started = true;
   }
   /** 停止监控 */
   async stop() {
@@ -1604,9 +1817,16 @@ var ElectronMemoryMonitor = class extends import_events3.EventEmitter {
     if (!this.started) {
       throw new Error("Monitor is not started");
     }
-    const session = this.sessionManager.startSession(label, description);
+    const anomaliesForReplaced = this.anomalyDetector.getAnomalies();
+    const { session, replaced } = this.sessionManager.startSession(label, description);
+    if (replaced) {
+      void this.persistCompletedSessionReport(replaced, anomaliesForReplaced).catch((err) => {
+        console.error("[@electron-memory/monitor] \u88AB\u9876\u66FF\u4F1A\u8BDD\u7684\u62A5\u544A\u5199\u5165\u5931\u8D25:", err);
+      });
+    }
     this.collector.setSessionId(session.id);
     this.anomalyDetector.clearAnomalies();
+    this.emit("session-start", session);
     return session.id;
   }
   /** 结束当前会话 */
@@ -1617,8 +1837,26 @@ var ElectronMemoryMonitor = class extends import_events3.EventEmitter {
     const completedSession = this.sessionManager.endSession();
     if (!completedSession) return null;
     this.collector.setSessionId(null);
-    const snapshots = this.persister.readSessionSnapshots(completedSession.id);
     const anomalies = this.anomalyDetector.getAnomalies();
+    const report = await this.persistCompletedSessionReport(completedSession, anomalies);
+    return report;
+  }
+  /** 为已落盘元数据的会话生成并写入 report.json（显式结束或被新会话顶替） */
+  async persistCompletedSessionReport(completedSession, anomalies) {
+    const fs2 = await import("fs/promises");
+    const snapshotsPath = path4.join(
+      this.persister.getStorageDir(),
+      completedSession.id,
+      "snapshots.jsonl"
+    );
+    let snapshots = [];
+    try {
+      const content = await fs2.readFile(snapshotsPath, "utf-8");
+      const lines = content.trim().split("\n").filter(Boolean);
+      snapshots = lines.map((line) => JSON.parse(line));
+    } catch {
+      snapshots = this.persister.readSessionSnapshots(completedSession.id);
+    }
     const report = this.analyzer.generateReport(
       completedSession.id,
       completedSession.label,
@@ -1630,8 +1868,7 @@ var ElectronMemoryMonitor = class extends import_events3.EventEmitter {
       completedSession.dataFile
     );
     const reportPath = path4.join(this.persister.getStorageDir(), completedSession.id, "report.json");
-    const fs2 = await import("fs");
-    fs2.writeFileSync(reportPath, JSON.stringify(report, null, 2), "utf-8");
+    await fs2.writeFile(reportPath, JSON.stringify(report, null, 2), "utf-8");
     this.emit("session-end", report);
     return report;
   }
@@ -1656,6 +1893,18 @@ var ElectronMemoryMonitor = class extends import_events3.EventEmitter {
   async getSessions() {
     return this.sessionManager.getSessions();
   }
+  /**
+   * 供监控面板 IPC：列表来自磁盘索引，是否在录制以内存中的 currentSession 为准（避免索引僵尸 running）
+   */
+  getSessionsPayloadForIpc() {
+    if (!this.started) {
+      return { sessions: [], activeSessionId: null };
+    }
+    return {
+      sessions: this.sessionManager.getSessions(),
+      activeSessionId: this.sessionManager.getCurrentSession()?.id ?? null
+    };
+  }
   /** 获取指定会话报告 */
   async getSessionReport(sessionId) {
     const fs2 = await import("fs");
@@ -1667,7 +1916,6 @@ var ElectronMemoryMonitor = class extends import_events3.EventEmitter {
       const session = this.sessionManager.getSession(sessionId);
       if (!session || !session.endTime) return null;
       const snapshots = this.persister.readSessionSnapshots(sessionId);
-      if (snapshots.length === 0) return null;
       return this.analyzer.generateReport(
         session.id,
         session.label,
@@ -1689,17 +1937,18 @@ var ElectronMemoryMonitor = class extends import_events3.EventEmitter {
     if (endTime != null) {
       snapshots = snapshots.filter((s) => s.timestamp <= endTime);
     }
+    const beforeDownsample = snapshots;
     const limit = maxPoints ?? 600;
-    if (snapshots.length > limit) {
-      const step = snapshots.length / limit;
+    if (beforeDownsample.length > limit) {
+      const step = beforeDownsample.length / limit;
       const sampled = [];
       for (let i = 0; i < limit; i++) {
-        sampled.push(snapshots[Math.round(i * step)]);
+        sampled.push(beforeDownsample[Math.round(i * step)]);
       }
-      if (sampled[sampled.length - 1] !== snapshots[snapshots.length - 1]) {
-        sampled[sampled.length - 1] = snapshots[snapshots.length - 1];
+      if (sampled[sampled.length - 1] !== beforeDownsample[beforeDownsample.length - 1]) {
+        sampled[sampled.length - 1] = beforeDownsample[beforeDownsample.length - 1];
       }
-      snapshots = sampled;
+      snapshots = mergeMarksFromExcludedSnapshots(beforeDownsample, sampled);
     }
     return snapshots;
   }
@@ -1850,6 +2099,10 @@ var ElectronMemoryMonitor = class extends import_events3.EventEmitter {
     return {
       ...DEFAULT_CONFIG,
       ...userConfig,
+      session: {
+        ...DEFAULT_CONFIG.session,
+        ...userConfig.session || {}
+      },
       anomaly: {
         ...DEFAULT_CONFIG.anomaly,
         ...userConfig.anomaly || {}