@zintrust/trace 0.5.0 → 0.5.2

package/dist/build-manifest.json

@@ -1,14 +1,14 @@
 {
   "name": "@zintrust/trace",
-  "version": "0.5.0",
-  "buildDate": "2026-04-12T15:38:51.982Z",
+  "version": "0.5.2",
+  "buildDate": "2026-04-12T20:09:35.228Z",
   "buildEnvironment": {
     "node": "v22.22.1",
     "platform": "darwin",
     "arch": "arm64"
   },
   "git": {
-    "commit": "d9f9cf02",
+    "commit": "87ea4893",
     "branch": "release"
   },
   "package": {
@@ -22,8 +22,8 @@
   },
   "files": {
     "build-manifest.json": {
-      "size": 14739,
-      "sha256": "ccb926d22667a613e35b97c316d5924b223b5522c5f7deab259d99343fe4c8d8"
+      "size": 14738,
+      "sha256": "918a0394474d1cc1e3f961b7668f185289398fae336bf853d2e8cf6cb3fca28f"
     },
     "cli-register.d.ts": {
       "size": 255,
@@ -54,8 +54,8 @@
       "sha256": "430f5b294d960e13e2ec39ed5c22f6655f85c46c2de9455c222505c67298ec6a"
     },
     "dashboard/handlers.js": {
-      "size": 9192,
-      "sha256": "ebc592e84772b93c820c76f1834e1131a05c19df3bada7b75cf46bcd5f6732fc"
+      "size": 10011,
+      "sha256": "a5f7f3d624a844df27ddc9d4908e73d91a4aac9b2aac1aefff1f391913353897"
     },
     "dashboard/routes.d.ts": {
       "size": 997,
@@ -70,8 +70,8 @@
       "sha256": "4862b41e0477f01afa0dbb446d4553b65c22ed774cd1e2db3489059ced392f94"
     },
     "dashboard/ui.js": {
-      "size": 75051,
-      "sha256": "941c8647e778f67b8ab3f37b9272b914e5da4f35e07511ff1112287a0620b6da"
+      "size": 80163,
+      "sha256": "bd02523880078843499d751e9ffbbe8e386759456c71c5101a46248a4598f1a6"
     },
     "index.d.ts": {
       "size": 2537,
@@ -79,7 +79,7 @@
     },
     "index.js": {
       "size": 3324,
-      "sha256": "8a10c92829328ecb61fadb66c54768b52d72956fb196ad9a0087ba1ad9b17cbd"
+      "sha256": "37c92f5d7e70dcf214608aed08bfb386b2b6b04bdfb04b8cb4309f4e97136ab7"
     },
     "migrations/20260331000001_create_zin_trace_entries_table.d.ts": {
       "size": 304,
@@ -174,8 +174,8 @@
       "sha256": "c9c215aaa414f7b0c1fec6c82b054fc52bdf97af58f96f35c7f96672fb859c31"
     },
     "storage/TraceStorage.js": {
-      "size": 9089,
-      "sha256": "e4e05dc45411f0b7f0deacd9567d2b83325566cb69b885ebec848bcfcc43b338"
+      "size": 15322,
+      "sha256": "95179a66f0774fb6c1622e7477d6e1420e374116800a6a0c60e14de9bd4c4c5c"
     },
     "storage/TraceWriteDiagnostics.d.ts": {
       "size": 581,
@@ -194,8 +194,8 @@
       "sha256": "d916e8e3abb1b1087f6b184851b0e6265e53380d7857b008e745d566aad15d44"
     },
     "types.d.ts": {
-      "size": 8919,
-      "sha256": "4ff6c7c067fa9d16535e4356181a73325977c6813a13983ae9edb17c5fa3c466"
+      "size": 9433,
+      "sha256": "5b615fa1f89ebd84292e6322193643757bc91c5524068891050b28a9840bd34c"
     },
     "types.js": {
       "size": 696,
@@ -326,8 +326,8 @@
       "sha256": "dfb13bba526d5338e4dcd7a5aa0f72a61a03d9e2f6a250250c0bb8f0054c9712"
     },
     "watchers/HttpClientWatcher.js": {
-      "size": 5829,
-      "sha256": "3921cfb79cd5ff0da8af90ee66a5ad3b76a397e60df808885d6ecc84b5269810"
+      "size": 5787,
+      "sha256": "56ee5d97d1ff13be6f80c0a8517a969d46693ac6b4969a692c4a9261c0a17bc1"
     },
     "watchers/HttpWatcher.d.ts": {
       "size": 96,

package/dist/dashboard/handlers.js

@@ -42,8 +42,20 @@ const DEFAULT_PER_PAGE = 50;
 const MAX_PER_PAGE = 100;
 const DEFAULT_REQUEST_PER_PAGE = 25;
 const MAX_REQUEST_PER_PAGE = 50;
+const DEFAULT_BATCH_PER_PAGE = 10;
+const MAX_BATCH_PER_PAGE = 25;
 const SUMMARY_TEXT_LIMIT = 280;
 const SUMMARY_ARRAY_LIMIT = 10;
+const REQUEST_BATCH_DEFAULT_EXCLUDED_TYPES = [
+    'request',
+    'query',
+    'middleware',
+    'model',
+    'log',
+    'exception',
+    'client_request',
+    'cache',
+];
 const truncateText = (value, limit = SUMMARY_TEXT_LIMIT) => value.length <= limit ? value : `${value.slice(0, Math.max(0, limit - 3))}...`;
 const compactValue = (value) => {
     if (typeof value === 'string') {
@@ -149,6 +161,7 @@ export async function listEntries(req, res) {
             to: getNumericQueryParam(req, 'to'),
             page: Math.max(1, qpInt(req, 'page', 1)),
             perPage: resolvePerPage(req, type),
+            summary: true,
         };
         try {
             const result = await storage.queryEntries(opts);
@@ -194,8 +207,19 @@ export async function getBatch(req, res) {
     const batchId = req.getParam('batchId');
     if (batchId) {
         try {
-            const entries = await storage.getBatch(batchId);
-            res.json({ ok: true, entries });
+            const scope = qp(req, 'scope');
+            const type = qp(req, 'type');
+            const countsOnly = qp(req, 'countsOnly') === 'true';
+            const page = Math.max(1, qpInt(req, 'page', 1));
+            const perPage = Math.max(1, Math.min(qpInt(req, 'perPage', DEFAULT_BATCH_PER_PAGE), MAX_BATCH_PER_PAGE));
+            const result = await storage.queryBatchEntries(batchId, {
+                type,
+                excludeTypes: scope === 'other' ? REQUEST_BATCH_DEFAULT_EXCLUDED_TYPES : undefined,
+                page,
+                perPage,
+                countsOnly,
+            });
+            res.json({ ok: true, ...result });
             return;
         }
         catch (err) {

package/dist/dashboard/ui.js

@@ -163,6 +163,28 @@ const DASHBOARD_DOCUMENT = String.raw `<!DOCTYPE html>
 
     let state = createInitialState();
 
+    const DETAIL_BATCH_PAGE_SIZE = 10;
+    const DETAIL_BATCH_SCOPE_BY_TAB = Object.freeze({
+      queries: { type: 'query' },
+      middleware: { type: 'middleware' },
+      models: { type: 'model' },
+      logs: { type: 'log' },
+      exceptions: { type: 'exception' },
+      http: { type: 'client_request' },
+      cache: { type: 'cache' },
+      other: { scope: 'other' }
+    });
+    const DETAIL_BATCH_COUNT_TYPES = Object.freeze({
+      queries: 'query',
+      middleware: 'middleware',
+      models: 'model',
+      logs: 'log',
+      exceptions: 'exception',
+      http: 'client_request',
+      cache: 'cache'
+    });
+    const DETAIL_BATCH_OTHER_EXCLUDED_TYPES = ['request','query','middleware','model','log','exception','client_request','cache'];
+
     let copySequence = 0;
     const copyPayloads = new Map();
 
@@ -319,9 +341,40 @@ const DASHBOARD_DOCUMENT = String.raw `<!DOCTYPE html>
       return raw === '' ? '-' : escapeHtml(raw.slice(0, 8));
     };
 
-    const batchEntries = () => Array.isArray(state.detailBatch) ? state.detailBatch : [];
-    const batchEntriesByType = (type) => batchEntries().filter((entry) => entry.type === type);
-    const hasRequestTrace = () => Boolean(state.detail && state.detail.type === 'request' && batchEntries().length > 0);
+    const createDetailBatchState = (payload, scope = '', loading = false) => ({
+      counts: payload && typeof payload.counts === 'object' && payload.counts !== null ? payload.counts : {},
+      entries: payload && Array.isArray(payload.entries) ? payload.entries : [],
+      total: payload && Number.isFinite(Number(payload.total)) ? Number(payload.total) : 0,
+      page: payload && Number.isFinite(Number(payload.page)) && Number(payload.page) > 0 ? Number(payload.page) : 1,
+      perPage: payload && Number.isFinite(Number(payload.perPage)) && Number(payload.perPage) > 0 ? Number(payload.perPage) : DETAIL_BATCH_PAGE_SIZE,
+      scope,
+      loading
+    });
+
+    const detailBatchState = () => {
+      const detailBatch = state.detailBatch;
+      if (!detailBatch || typeof detailBatch !== 'object' || Array.isArray(detailBatch)) {
+        return createDetailBatchState(null);
+      }
+      return createDetailBatchState(detailBatch, typeof detailBatch.scope === 'string' ? detailBatch.scope : '', detailBatch.loading === true);
+    };
+
+    const batchEntries = () => detailBatchState().entries;
+    const batchCounts = () => detailBatchState().counts;
+    const batchCount = (type) => {
+      const raw = batchCounts()[type];
+      return Number.isFinite(Number(raw)) ? Number(raw) : 0;
+    };
+    const otherBatchCount = () => Object.entries(batchCounts()).reduce((sum, pair) => {
+      return DETAIL_BATCH_OTHER_EXCLUDED_TYPES.includes(pair[0]) ? sum : sum + Number(pair[1] || 0);
+    }, 0);
+    const resolveDetailBatchQuery = (tab) => DETAIL_BATCH_SCOPE_BY_TAB[tab] || null;
+    const resolveDetailBatchCount = (tab) => {
+      if (tab === 'other') return otherBatchCount();
+      const type = DETAIL_BATCH_COUNT_TYPES[tab];
+      return typeof type === 'string' ? batchCount(type) : 0;
+    };
+    const hasRequestTrace = () => Boolean(state.detail && state.detail.type === 'request');
 
     const prettyJson = (value) => {
       try {
@@ -680,6 +733,27 @@ const DASHBOARD_DOCUMENT = String.raw `<!DOCTYPE html>
       }).join('') + '</div>';
     };
 
+    const renderDetailBatchPanel = (tab) => {
+      const detailBatch = detailBatchState();
+      const count = resolveDetailBatchCount(tab);
+      if (detailBatch.loading && detailBatch.scope === tab) {
+        return '<p class="trace-note">Loading related entries...</p>';
+      }
+      if (count === 0) {
+        return '<p class="trace-note">No related entries captured.</p>';
+      }
+      if (detailBatch.scope !== tab) {
+        return '<p class="trace-note">Open this tab to load the first page of related entries.</p>';
+      }
+
+      const totalPages = Math.max(1, Math.ceil(detailBatch.total / Math.max(1, detailBatch.perPage)));
+
+      return [
+        renderTraceItems(batchEntries()),
+        '<div class="pagination"><span>Page ' + escapeHtml(detailBatch.page) + ' of ' + escapeHtml(totalPages) + ' · ' + escapeHtml(detailBatch.total) + ' related entries</span><div class="pagination-controls"><button type="button" data-action="detail-batch-prev"' + (detailBatch.page <= 1 ? ' disabled' : '') + '>Previous</button><button type="button" data-action="detail-batch-next"' + (detailBatch.page >= totalPages ? ' disabled' : '') + '>Next</button></div></div>'
+      ].join('');
+    };
+
     const renderRequestTrace = (main) => {
       const entry = state.detail;
       const content = entry && entry.content ? entry.content : {};
@@ -688,17 +762,16 @@ const DASHBOARD_DOCUMENT = String.raw `<!DOCTYPE html>
         { id: 'payload', label: 'Payload' },
         { id: 'headers', label: 'Headers' },
         { id: 'response', label: 'Response' },
-        { id: 'queries', label: 'Queries', count: batchEntriesByType('query').length },
-        { id: 'middleware', label: 'Middleware', count: batchEntriesByType('middleware').length },
-        { id: 'models', label: 'Models', count: batchEntriesByType('model').length },
-        { id: 'logs', label: 'Logs', count: batchEntriesByType('log').length },
-        { id: 'exceptions', label: 'Exceptions', count: batchEntriesByType('exception').length },
-        { id: 'http', label: 'HTTP', count: batchEntriesByType('client_request').length },
-        { id: 'cache', label: 'Cache', count: batchEntriesByType('cache').length },
-        { id: 'other', label: 'Other', count: batchEntries().filter((item) => !['request','query','middleware','model','log','exception','client_request','cache'].includes(item.type)).length }
+        { id: 'queries', label: 'Queries', count: resolveDetailBatchCount('queries') },
+        { id: 'middleware', label: 'Middleware', count: resolveDetailBatchCount('middleware') },
+        { id: 'models', label: 'Models', count: resolveDetailBatchCount('models') },
+        { id: 'logs', label: 'Logs', count: resolveDetailBatchCount('logs') },
+        { id: 'exceptions', label: 'Exceptions', count: resolveDetailBatchCount('exceptions') },
+        { id: 'http', label: 'HTTP', count: resolveDetailBatchCount('http') },
+        { id: 'cache', label: 'Cache', count: resolveDetailBatchCount('cache') },
+        { id: 'other', label: 'Other', count: resolveDetailBatchCount('other') }
       ];
       const currentTab = traceTabs.some((tab) => tab.id === state.detailTab) ? state.detailTab : 'summary';
-      const otherEntries = batchEntries().filter((item) => !['request','query','middleware','model','log','exception','client_request','cache'].includes(item.type));
       const panels = {
         summary: [
           '<div class="detail-grid">',
@@ -725,14 +798,14 @@ const DASHBOARD_DOCUMENT = String.raw `<!DOCTYPE html>
         payload: detailJson(content.payload || {}, 'Payload Json'),
         headers: '<div class="detail-stack">' + detailJson(content.headers || {}, 'Request Header Json') + detailJson(content.responseHeaders || {}, 'Response Header Json') + '</div>',
         response: '<div class="detail-stack"><div class="detail-grid">' + renderMetricBox('Status', [{ label: 'Response status', value: escapeHtml(content.responseStatus || '') }, { label: 'Duration', value: escapeHtml(formatDuration(getEntryDuration(entry))) }]) + '</div>' + (content.responseBody === undefined ? '<p class="trace-note">No response body was captured for this request.</p>' : detailJson(content.responseBody, 'Response Body Json')) + detailJson(content.responseHeaders || {}, 'Response Header Json') + '</div>',
-        queries: renderTraceItems(batchEntriesByType('query')),
-        middleware: renderTraceItems(batchEntriesByType('middleware')),
-        models: renderTraceItems(batchEntriesByType('model')),
-        logs: renderTraceItems(batchEntriesByType('log')),
-        exceptions: renderTraceItems(batchEntriesByType('exception')),
-        http: renderTraceItems(batchEntriesByType('client_request')),
-        cache: renderTraceItems(batchEntriesByType('cache')),
-        other: renderTraceItems(otherEntries)
+        queries: renderDetailBatchPanel('queries'),
+        middleware: renderDetailBatchPanel('middleware'),
+        models: renderDetailBatchPanel('models'),
+        logs: renderDetailBatchPanel('logs'),
+        exceptions: renderDetailBatchPanel('exceptions'),
+        http: renderDetailBatchPanel('http'),
+        cache: renderDetailBatchPanel('cache'),
+        other: renderDetailBatchPanel('other')
       };
 
       main.innerHTML = [
@@ -952,8 +1025,8 @@ const DASHBOARD_DOCUMENT = String.raw `<!DOCTYPE html>
         const entry = detailResult.entry;
         let detailBatch = null;
         if (entry.type === 'request' && entry.batchId) {
-          const batch = await api('/batch/' + encodeURIComponent(entry.batchId));
-          detailBatch = batch.entries || [];
+          const batch = await api('/batch/' + encodeURIComponent(entry.batchId) + '?countsOnly=true');
+          detailBatch = createDetailBatchState(batch);
         }
         state = { ...state, detail: entry, detailBatch, detailTab: 'summary', page: 'entries' };
         render();
@@ -962,6 +1035,54 @@ const DASHBOARD_DOCUMENT = String.raw `<!DOCTYPE html>
       }
     };
 
+    const loadDetailBatchTab = async (tab, page = 1) => {
+      const detail = state.detail;
+      if (!detail || detail.type !== 'request' || !detail.batchId) return;
+
+      const query = resolveDetailBatchQuery(tab);
+      if (!query) {
+        state = { ...state, detailTab: tab };
+        render();
+        return;
+      }
+
+      const previous = detailBatchState();
+      state = {
+        ...state,
+        detailTab: tab,
+        detailBatch: {
+          ...previous,
+          scope: tab,
+          page,
+          perPage: DETAIL_BATCH_PAGE_SIZE,
+          loading: true,
+        },
+      };
+      render();
+
+      try {
+        const qs = new URLSearchParams({ page: String(page), perPage: String(DETAIL_BATCH_PAGE_SIZE) });
+        if (query.type) qs.set('type', query.type);
+        if (query.scope) qs.set('scope', query.scope);
+        const batch = await api('/batch/' + encodeURIComponent(detail.batchId) + '?' + qs.toString());
+        state = {
+          ...state,
+          detailTab: tab,
+          detailBatch: createDetailBatchState(batch, tab, false),
+          page: 'entries'
+        };
+        render();
+      } catch (error) {
+        state = {
+          ...state,
+          detailTab: tab,
+          detailBatch: { ...previous, loading: false }
+        };
+        render();
+        window.alert(error.message);
+      }
+    };
+
     const addTag = async () => {
       const input = document.getElementById('new-tag');
       const value = input && 'value' in input ? String(input.value || '').trim() : '';
@@ -1039,10 +1160,27 @@ const DASHBOARD_DOCUMENT = String.raw `<!DOCTYPE html>
         filterByTag(String(target.getAttribute('data-tag') || ''));
         return;
       }
-      if (action === 'detail-tab') { state = { ...state, detailTab: String(target.getAttribute('data-tab') || 'summary') }; render(); return; }
+      if (action === 'detail-tab') {
+        const tab = String(target.getAttribute('data-tab') || 'summary');
+        if (Object.prototype.hasOwnProperty.call(DETAIL_BATCH_SCOPE_BY_TAB, tab)) {
+          loadDetailBatchTab(tab, 1);
+          return;
+        }
+        state = { ...state, detailTab: tab };
+        render();
+        return;
+      }
       if (action === 'clear-all') { clearAll(); return; }
       if (action === 'show-detail') { showDetail(String(target.getAttribute('data-uuid') || '')); return; }
       if (action === 'close-detail') { state = { ...state, detail: null, detailBatch: null, detailTab: 'summary' }; render(); return; }
+      if (action === 'detail-batch-prev' || action === 'detail-batch-next') {
+        const detailBatch = detailBatchState();
+        const nextPage = action === 'detail-batch-prev' ? Math.max(1, detailBatch.page - 1) : detailBatch.page + 1;
+        if (detailBatch.scope !== '') {
+          loadDetailBatchTab(detailBatch.scope, nextPage);
+        }
+        return;
+      }
       if (action === 'page-prev') { state = { ...state, entriesPage: Math.max(1, state.entriesPage - 1) }; render(); return; }
       if (action === 'page-next') { state = { ...state, entriesPage: state.entriesPage + 1 }; render(); return; }
       if (action === 'clear-filters') { state = { ...state, detail: null, detailBatch: null, detailTab: 'summary', entriesPage: 1, entriesFilter: { type: '', tag: '', batchId: '' } }; render(); return; }

package/dist/storage/TraceStorage.js

@@ -3,6 +3,107 @@ const TABLE_ENTRIES = 'zin_trace_entries';
 const TABLE_TAGS = 'zin_trace_entries_tags';
 const TABLE_MONITORING = 'zin_trace_monitoring';
 const generateUuid = () => crypto.randomUUID();
+const decodeJsonStringLiteral = (value) => {
+    try {
+        return JSON.parse(`"${value}"`);
+    }
+    catch {
+        return undefined;
+    }
+};
+const matchJsonStringField = (content, key) => {
+    const match = new RegExp(String.raw `"${key}"\s*:\s*"((?:\\.|[^"\\])*)"`, 's').exec(content);
+    return match ? decodeJsonStringLiteral(match[1]) : undefined;
+};
+const matchJsonNumberField = (content, key) => {
+    const match = new RegExp(String.raw `"${key}"\s*:\s*(-?\d+(?:\.\d+)?)`, 's').exec(content);
+    if (!match)
+        return undefined;
+    const parsed = Number(match[1]);
+    return Number.isFinite(parsed) ? parsed : undefined;
+};
+const matchJsonNullOrNumberField = (content, key) => {
+    const nullMatch = new RegExp(String.raw `"${key}"\s*:\s*null`, 's').exec(content);
+    if (nullMatch)
+        return null;
+    return matchJsonNumberField(content, key);
+};
+const matchJsonStringArrayField = (content, key) => {
+    const match = new RegExp(String.raw `"${key}"\s*:\s*(\[.*?\])`, 's').exec(content);
+    if (!match)
+        return undefined;
+    try {
+        const parsed = JSON.parse(match[1]);
+        return Array.isArray(parsed)
+            ? parsed.filter((value) => typeof value === 'string')
+            : undefined;
+    }
+    catch {
+        return undefined;
+    }
+};
+const compactRequestContent = (content) => {
+    const compact = {};
+    const method = matchJsonStringField(content, 'method');
+    const uri = matchJsonStringField(content, 'uri');
+    const responseStatus = matchJsonNumberField(content, 'responseStatus');
+    const duration = matchJsonNumberField(content, 'duration');
+    const memory = matchJsonNullOrNumberField(content, 'memory');
+    const middleware = matchJsonStringArrayField(content, 'middleware');
+    const hostname = matchJsonStringField(content, 'hostname');
+    const userId = matchJsonStringField(content, 'userId');
+    if (method !== undefined)
+        compact['method'] = method;
+    if (uri !== undefined)
+        compact['uri'] = uri;
+    if (responseStatus !== undefined)
+        compact['responseStatus'] = responseStatus;
+    if (duration !== undefined)
+        compact['duration'] = duration;
+    if (memory !== undefined)
+        compact['memory'] = memory;
+    if (middleware !== undefined)
+        compact['middleware'] = middleware;
+    if (hostname !== undefined)
+        compact['hostname'] = hostname;
+    if (userId !== undefined)
+        compact['userId'] = userId;
+    return Object.keys(compact).length > 0 ? compact : undefined;
+};
+const compactClientRequestContent = (content) => {
+    const compact = {};
+    const source = matchJsonStringField(content, 'source');
+    const method = matchJsonStringField(content, 'method');
+    const url = matchJsonStringField(content, 'url');
+    const responseStatus = matchJsonNumberField(content, 'responseStatus');
+    const error = matchJsonStringField(content, 'error');
+    const duration = matchJsonNumberField(content, 'duration');
+    const hostname = matchJsonStringField(content, 'hostname');
+    if (source !== undefined)
+        compact['source'] = source;
+    if (method !== undefined)
+        compact['method'] = method;
+    if (url !== undefined)
+        compact['url'] = url;
+    if (responseStatus !== undefined)
+        compact['responseStatus'] = responseStatus;
+    if (error !== undefined)
+        compact['error'] = error;
+    if (duration !== undefined)
+        compact['duration'] = duration;
+    if (hostname !== undefined)
+        compact['hostname'] = hostname;
+    return Object.keys(compact).length > 0 ? compact : undefined;
+};
+const summarizeEntryContent = (row) => {
+    if (row.type === 'request') {
+        return compactRequestContent(row.content) ?? JSON.parse(row.content);
+    }
+    if (row.type === 'client_request') {
+        return compactClientRequestContent(row.content) ?? JSON.parse(row.content);
+    }
+    return JSON.parse(row.content);
+};
 const buildIgnoreInsert = (db, table, columns, conflictColumns) => {
     const columnList = columns.join(', ');
     const placeholders = columns.map(() => '?').join(', ');
@@ -35,12 +136,12 @@ const buildIgnoreInsert = (db, table, columns, conflictColumns) => {
     }
     return `INSERT INTO ${table} (${columnList}) VALUES (${placeholders})`;
 };
-const rowToEntry = (row, tags) => ({
+const rowToEntry = (row, tags, summary = false) => ({
     uuid: row.uuid,
     batchId: row.batch_id,
     familyHash: row.family_hash ?? undefined,
     type: row.type,
-    content: JSON.parse(row.content),
+    content: summary ? summarizeEntryContent(row) : JSON.parse(row.content),
     tags,
     isLatest: Boolean(row.is_latest),
     createdAt: row.created_at,
@@ -81,6 +182,29 @@ const buildEntryFilters = (opts) => {
     const countParams = opts.tag ? [opts.tag, ...params.slice(1)] : [...params];
     return { joinClause, whereClause, params, countParams };
 };
+const buildBatchCounts = async (db, batchId) => {
+    const rows = (await db.query(`SELECT type, COUNT(*) as cnt FROM ${TABLE_ENTRIES} WHERE batch_id = ? GROUP BY type`, [batchId]));
+    const counts = {};
+    for (const row of rows) {
+        counts[row.type] = row.cnt;
+    }
+    return counts;
+};
+const buildBatchEntryFilters = (batchId, opts) => {
+    const conditions = ['batch_id = ?'];
+    const params = [batchId];
+    if (opts.type) {
+        conditions.push('type = ?');
+        params.push(opts.type);
+    }
+    const excludeTypes = opts.excludeTypes ?? [];
+    if (excludeTypes.length > 0) {
+        const placeholders = excludeTypes.map(() => '?').join(', ');
+        conditions.push(`type NOT IN (${placeholders})`);
+        params.push(...excludeTypes);
+    }
+    return { whereClause: `WHERE ${conditions.join(' AND ')}`, params };
+};
 const loadTagsByUuid = async (db, uuids) => {
     const tagsByUuid = new Map();
     if (uuids.length === 0)
@@ -143,7 +267,7 @@ const createStorage = (db) => {
        LIMIT ? OFFSET ?`, [...params, perPage, offset]));
         const tagsByUuid = await loadTagsByUuid(db, rows.map((row) => row.uuid));
         return {
-            data: rows.map((row) => rowToEntry(row, tagsByUuid.get(row.uuid) ?? [])),
+            data: rows.map((row) => rowToEntry(row, tagsByUuid.get(row.uuid) ?? [], opts.summary)),
             total,
         };
     };
@@ -168,6 +292,35 @@ const createStorage = (db) => {
         const tagsByUuid = await loadTagsByUuid(db, rows.map((row) => row.uuid));
         return rows.map((row) => rowToEntry(row, tagsByUuid.get(row.uuid) ?? []));
     };
+    const queryBatchEntries = async (batchId, opts = {}) => {
+        const page = opts.page ?? 1;
+        const perPage = opts.perPage ?? 10;
+        const offset = (page - 1) * perPage;
+        const counts = await buildBatchCounts(db, batchId);
+        if (opts.countsOnly) {
+            const total = Object.values(counts).reduce((sum, value) => sum + Number(value ?? 0), 0);
+            return { entries: [], total, counts, page, perPage };
+        }
+        const { whereClause, params } = buildBatchEntryFilters(batchId, opts);
+        const countResult = (await db.queryOne(`SELECT COUNT(*) as cnt FROM ${TABLE_ENTRIES} ${whereClause}`, params));
+        const total = countResult?.cnt ?? 0;
+        if (total === 0) {
+            return { entries: [], total: 0, counts, page, perPage };
+        }
+        const rows = (await db.query(`SELECT id, uuid, batch_id, family_hash, type, content, is_latest, created_at
+       FROM ${TABLE_ENTRIES}
+       ${whereClause}
+       ORDER BY created_at ASC, id ASC
+       LIMIT ? OFFSET ?`, [...params, perPage, offset]));
+        const tagsByUuid = await loadTagsByUuid(db, rows.map((row) => row.uuid));
+        return {
+            entries: rows.map((row) => rowToEntry(row, tagsByUuid.get(row.uuid) ?? [], opts.summary)),
+            total,
+            counts,
+            page,
+            perPage,
+        };
+    };
     const prune = async (olderThanMs, keepExceptions = false) => {
         const countResult = (await db.queryOne(`SELECT COUNT(*) as cnt FROM ${TABLE_ENTRIES}
        WHERE created_at < ?
@@ -208,6 +361,7 @@ const createStorage = (db) => {
         queryEntries,
         getEntry,
         getBatch,
+        queryBatchEntries,
         prune,
         clear,
         getMonitoring,

package/dist/types.d.ts

@@ -231,6 +231,22 @@ export interface QueryEntriesOptions {
     to?: number;
     page?: number;
     perPage?: number;
+    summary?: boolean;
+}
+export interface QueryBatchEntriesOptions {
+    type?: EntryTypeValue;
+    excludeTypes?: EntryTypeValue[];
+    page?: number;
+    perPage?: number;
+    summary?: boolean;
+    countsOnly?: boolean;
+}
+export interface QueryBatchEntriesResult {
+    entries: ITraceEntry[];
+    total: number;
+    counts: Partial<Record<EntryTypeValue, number>>;
+    page: number;
+    perPage: number;
 }
 export interface ITraceStorage {
     writeEntry(entry: ITraceEntry): Promise<void>;
@@ -242,6 +258,7 @@ export interface ITraceStorage {
     }>;
     getEntry(uuid: string): Promise<ITraceEntry | null>;
     getBatch(batchId: string): Promise<ITraceEntry[]>;
+    queryBatchEntries(batchId: string, opts?: QueryBatchEntriesOptions): Promise<QueryBatchEntriesResult>;
     prune(olderThanMs: number, keepExceptions?: boolean): Promise<number>;
     clear(): Promise<void>;
     getMonitoring(): Promise<string[]>;

package/dist/watchers/HttpClientWatcher.js

@@ -1,4 +1,3 @@
-import { generateUuid } from '@zintrust/core';
 import { TraceContext } from '../context.js';
 import { EntryType, } from '../types.js';
 import { AuthTag } from '../utils/authTag.js';
@@ -128,7 +127,7 @@ const emit = ({ source, method, url, requestHeaders, responseStatus, duration, r
     }, sourceRule, normalizedSource);
     _storage
         .writeEntry({
-        uuid: generateUuid(),
+        uuid: crypto.randomUUID(),
         batchId: TraceContext.getBatchId(),
         type: EntryType.CLIENT_REQUEST,
         content,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zintrust/trace",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "description": "Trace assistant for ZinTrust: logs requests, queries, exceptions, jobs, and more.",
   "private": false,
   "type": "module",
@@ -40,7 +40,7 @@
     "node": ">=20.0.0"
   },
   "peerDependencies": {
-    "@zintrust/core": "^0.4.101"
+    "@zintrust/core": "^0.5.1"
   },
   "publishConfig": {
     "access": "public"

package/src/dashboard/handlers.ts

@@ -61,8 +61,20 @@ const DEFAULT_PER_PAGE = 50;
 const MAX_PER_PAGE = 100;
 const DEFAULT_REQUEST_PER_PAGE = 25;
 const MAX_REQUEST_PER_PAGE = 50;
+const DEFAULT_BATCH_PER_PAGE = 10;
+const MAX_BATCH_PER_PAGE = 25;
 const SUMMARY_TEXT_LIMIT = 280;
 const SUMMARY_ARRAY_LIMIT = 10;
+const REQUEST_BATCH_DEFAULT_EXCLUDED_TYPES: EntryTypeValue[] = [
+  'request',
+  'query',
+  'middleware',
+  'model',
+  'log',
+  'exception',
+  'client_request',
+  'cache',
+];
 
 type CompactTraceEntry = ITraceEntry<Record<string, unknown>> & {
   hasDetails: true;
@@ -195,6 +207,7 @@ export async function listEntries(req: IRequest, res: IResponse): Promise<void>
       to: getNumericQueryParam(req, 'to'),
       page: Math.max(1, qpInt(req, 'page', 1)),
       perPage: resolvePerPage(req, type),
+      summary: true,
     };
     try {
       const result = await storage.queryEntries(opts);
@@ -240,8 +253,22 @@ export async function getBatch(req: IRequest, res: IResponse): Promise<void> {
   const batchId = req.getParam('batchId');
   if (batchId) {
     try {
-      const entries = await storage.getBatch(batchId);
-      res.json({ ok: true, entries });
+      const scope = qp(req, 'scope');
+      const type = qp(req, 'type') as EntryTypeValue | undefined;
+      const countsOnly = qp(req, 'countsOnly') === 'true';
+      const page = Math.max(1, qpInt(req, 'page', 1));
+      const perPage = Math.max(
+        1,
+        Math.min(qpInt(req, 'perPage', DEFAULT_BATCH_PER_PAGE), MAX_BATCH_PER_PAGE)
+      );
+      const result = await storage.queryBatchEntries(batchId, {
+        type,
+        excludeTypes: scope === 'other' ? REQUEST_BATCH_DEFAULT_EXCLUDED_TYPES : undefined,
+        page,
+        perPage,
+        countsOnly,
+      });
+      res.json({ ok: true, ...result });
       return;
     } catch (err) {
       res.setStatus(500).json({ error: (err as Error).message });

package/src/dashboard/ui.ts

@@ -169,6 +169,28 @@ const DASHBOARD_DOCUMENT = String.raw`<!DOCTYPE html>
 
     let state = createInitialState();
 
+    const DETAIL_BATCH_PAGE_SIZE = 10;
+    const DETAIL_BATCH_SCOPE_BY_TAB = Object.freeze({
+      queries: { type: 'query' },
+      middleware: { type: 'middleware' },
+      models: { type: 'model' },
+      logs: { type: 'log' },
+      exceptions: { type: 'exception' },
+      http: { type: 'client_request' },
+      cache: { type: 'cache' },
+      other: { scope: 'other' }
+    });
+    const DETAIL_BATCH_COUNT_TYPES = Object.freeze({
+      queries: 'query',
+      middleware: 'middleware',
+      models: 'model',
+      logs: 'log',
+      exceptions: 'exception',
+      http: 'client_request',
+      cache: 'cache'
+    });
+    const DETAIL_BATCH_OTHER_EXCLUDED_TYPES = ['request','query','middleware','model','log','exception','client_request','cache'];
+
     let copySequence = 0;
     const copyPayloads = new Map();
 
@@ -325,9 +347,40 @@ const DASHBOARD_DOCUMENT = String.raw`<!DOCTYPE html>
       return raw === '' ? '-' : escapeHtml(raw.slice(0, 8));
     };
 
-    const batchEntries = () => Array.isArray(state.detailBatch) ? state.detailBatch : [];
-    const batchEntriesByType = (type) => batchEntries().filter((entry) => entry.type === type);
-    const hasRequestTrace = () => Boolean(state.detail && state.detail.type === 'request' && batchEntries().length > 0);
+    const createDetailBatchState = (payload, scope = '', loading = false) => ({
+      counts: payload && typeof payload.counts === 'object' && payload.counts !== null ? payload.counts : {},
+      entries: payload && Array.isArray(payload.entries) ? payload.entries : [],
+      total: payload && Number.isFinite(Number(payload.total)) ? Number(payload.total) : 0,
+      page: payload && Number.isFinite(Number(payload.page)) && Number(payload.page) > 0 ? Number(payload.page) : 1,
+      perPage: payload && Number.isFinite(Number(payload.perPage)) && Number(payload.perPage) > 0 ? Number(payload.perPage) : DETAIL_BATCH_PAGE_SIZE,
+      scope,
+      loading
+    });
+
+    const detailBatchState = () => {
+      const detailBatch = state.detailBatch;
+      if (!detailBatch || typeof detailBatch !== 'object' || Array.isArray(detailBatch)) {
+        return createDetailBatchState(null);
+      }
+      return createDetailBatchState(detailBatch, typeof detailBatch.scope === 'string' ? detailBatch.scope : '', detailBatch.loading === true);
+    };
+
+    const batchEntries = () => detailBatchState().entries;
+    const batchCounts = () => detailBatchState().counts;
+    const batchCount = (type) => {
+      const raw = batchCounts()[type];
+      return Number.isFinite(Number(raw)) ? Number(raw) : 0;
+    };
+    const otherBatchCount = () => Object.entries(batchCounts()).reduce((sum, pair) => {
+      return DETAIL_BATCH_OTHER_EXCLUDED_TYPES.includes(pair[0]) ? sum : sum + Number(pair[1] || 0);
+    }, 0);
+    const resolveDetailBatchQuery = (tab) => DETAIL_BATCH_SCOPE_BY_TAB[tab] || null;
+    const resolveDetailBatchCount = (tab) => {
+      if (tab === 'other') return otherBatchCount();
+      const type = DETAIL_BATCH_COUNT_TYPES[tab];
+      return typeof type === 'string' ? batchCount(type) : 0;
+    };
+    const hasRequestTrace = () => Boolean(state.detail && state.detail.type === 'request');
 
     const prettyJson = (value) => {
       try {
@@ -686,6 +739,27 @@ const DASHBOARD_DOCUMENT = String.raw`<!DOCTYPE html>
       }).join('') + '</div>';
     };
 
+    const renderDetailBatchPanel = (tab) => {
+      const detailBatch = detailBatchState();
+      const count = resolveDetailBatchCount(tab);
+      if (detailBatch.loading && detailBatch.scope === tab) {
+        return '<p class="trace-note">Loading related entries...</p>';
+      }
+      if (count === 0) {
+        return '<p class="trace-note">No related entries captured.</p>';
+      }
+      if (detailBatch.scope !== tab) {
+        return '<p class="trace-note">Open this tab to load the first page of related entries.</p>';
+      }
+
+      const totalPages = Math.max(1, Math.ceil(detailBatch.total / Math.max(1, detailBatch.perPage)));
+
+      return [
+        renderTraceItems(batchEntries()),
+        '<div class="pagination"><span>Page ' + escapeHtml(detailBatch.page) + ' of ' + escapeHtml(totalPages) + ' · ' + escapeHtml(detailBatch.total) + ' related entries</span><div class="pagination-controls"><button type="button" data-action="detail-batch-prev"' + (detailBatch.page <= 1 ? ' disabled' : '') + '>Previous</button><button type="button" data-action="detail-batch-next"' + (detailBatch.page >= totalPages ? ' disabled' : '') + '>Next</button></div></div>'
+      ].join('');
+    };
+
     const renderRequestTrace = (main) => {
       const entry = state.detail;
       const content = entry && entry.content ? entry.content : {};
@@ -694,17 +768,16 @@ const DASHBOARD_DOCUMENT = String.raw`<!DOCTYPE html>
         { id: 'payload', label: 'Payload' },
         { id: 'headers', label: 'Headers' },
         { id: 'response', label: 'Response' },
-        { id: 'queries', label: 'Queries', count: batchEntriesByType('query').length },
-        { id: 'middleware', label: 'Middleware', count: batchEntriesByType('middleware').length },
-        { id: 'models', label: 'Models', count: batchEntriesByType('model').length },
-        { id: 'logs', label: 'Logs', count: batchEntriesByType('log').length },
-        { id: 'exceptions', label: 'Exceptions', count: batchEntriesByType('exception').length },
-        { id: 'http', label: 'HTTP', count: batchEntriesByType('client_request').length },
-        { id: 'cache', label: 'Cache', count: batchEntriesByType('cache').length },
-        { id: 'other', label: 'Other', count: batchEntries().filter((item) => !['request','query','middleware','model','log','exception','client_request','cache'].includes(item.type)).length }
+        { id: 'queries', label: 'Queries', count: resolveDetailBatchCount('queries') },
+        { id: 'middleware', label: 'Middleware', count: resolveDetailBatchCount('middleware') },
+        { id: 'models', label: 'Models', count: resolveDetailBatchCount('models') },
+        { id: 'logs', label: 'Logs', count: resolveDetailBatchCount('logs') },
+        { id: 'exceptions', label: 'Exceptions', count: resolveDetailBatchCount('exceptions') },
+        { id: 'http', label: 'HTTP', count: resolveDetailBatchCount('http') },
+        { id: 'cache', label: 'Cache', count: resolveDetailBatchCount('cache') },
+        { id: 'other', label: 'Other', count: resolveDetailBatchCount('other') }
       ];
       const currentTab = traceTabs.some((tab) => tab.id === state.detailTab) ? state.detailTab : 'summary';
-      const otherEntries = batchEntries().filter((item) => !['request','query','middleware','model','log','exception','client_request','cache'].includes(item.type));
       const panels = {
         summary: [
           '<div class="detail-grid">',
@@ -731,14 +804,14 @@ const DASHBOARD_DOCUMENT = String.raw`<!DOCTYPE html>
         payload: detailJson(content.payload || {}, 'Payload Json'),
         headers: '<div class="detail-stack">' + detailJson(content.headers || {}, 'Request Header Json') + detailJson(content.responseHeaders || {}, 'Response Header Json') + '</div>',
         response: '<div class="detail-stack"><div class="detail-grid">' + renderMetricBox('Status', [{ label: 'Response status', value: escapeHtml(content.responseStatus || '') }, { label: 'Duration', value: escapeHtml(formatDuration(getEntryDuration(entry))) }]) + '</div>' + (content.responseBody === undefined ? '<p class="trace-note">No response body was captured for this request.</p>' : detailJson(content.responseBody, 'Response Body Json')) + detailJson(content.responseHeaders || {}, 'Response Header Json') + '</div>',
-        queries: renderTraceItems(batchEntriesByType('query')),
-        middleware: renderTraceItems(batchEntriesByType('middleware')),
-        models: renderTraceItems(batchEntriesByType('model')),
-        logs: renderTraceItems(batchEntriesByType('log')),
-        exceptions: renderTraceItems(batchEntriesByType('exception')),
-        http: renderTraceItems(batchEntriesByType('client_request')),
-        cache: renderTraceItems(batchEntriesByType('cache')),
-        other: renderTraceItems(otherEntries)
+        queries: renderDetailBatchPanel('queries'),
+        middleware: renderDetailBatchPanel('middleware'),
+        models: renderDetailBatchPanel('models'),
+        logs: renderDetailBatchPanel('logs'),
+        exceptions: renderDetailBatchPanel('exceptions'),
+        http: renderDetailBatchPanel('http'),
+        cache: renderDetailBatchPanel('cache'),
+        other: renderDetailBatchPanel('other')
       };
 
       main.innerHTML = [
@@ -958,8 +1031,8 @@ const DASHBOARD_DOCUMENT = String.raw`<!DOCTYPE html>
         const entry = detailResult.entry;
         let detailBatch = null;
         if (entry.type === 'request' && entry.batchId) {
-          const batch = await api('/batch/' + encodeURIComponent(entry.batchId));
-          detailBatch = batch.entries || [];
+          const batch = await api('/batch/' + encodeURIComponent(entry.batchId) + '?countsOnly=true');
+          detailBatch = createDetailBatchState(batch);
         }
         state = { ...state, detail: entry, detailBatch, detailTab: 'summary', page: 'entries' };
         render();
@@ -968,6 +1041,54 @@ const DASHBOARD_DOCUMENT = String.raw`<!DOCTYPE html>
       }
     };
 
+    const loadDetailBatchTab = async (tab, page = 1) => {
+      const detail = state.detail;
+      if (!detail || detail.type !== 'request' || !detail.batchId) return;
+
+      const query = resolveDetailBatchQuery(tab);
+      if (!query) {
+        state = { ...state, detailTab: tab };
+        render();
+        return;
+      }
+
+      const previous = detailBatchState();
+      state = {
+        ...state,
+        detailTab: tab,
+        detailBatch: {
+          ...previous,
+          scope: tab,
+          page,
+          perPage: DETAIL_BATCH_PAGE_SIZE,
+          loading: true,
+        },
+      };
+      render();
+
+      try {
+        const qs = new URLSearchParams({ page: String(page), perPage: String(DETAIL_BATCH_PAGE_SIZE) });
+        if (query.type) qs.set('type', query.type);
+        if (query.scope) qs.set('scope', query.scope);
+        const batch = await api('/batch/' + encodeURIComponent(detail.batchId) + '?' + qs.toString());
+        state = {
+          ...state,
+          detailTab: tab,
+          detailBatch: createDetailBatchState(batch, tab, false),
+          page: 'entries'
+        };
+        render();
+      } catch (error) {
+        state = {
+          ...state,
+          detailTab: tab,
+          detailBatch: { ...previous, loading: false }
+        };
+        render();
+        window.alert(error.message);
+      }
+    };
+
     const addTag = async () => {
       const input = document.getElementById('new-tag');
       const value = input && 'value' in input ? String(input.value || '').trim() : '';
@@ -1045,10 +1166,27 @@ const DASHBOARD_DOCUMENT = String.raw`<!DOCTYPE html>
         filterByTag(String(target.getAttribute('data-tag') || ''));
         return;
       }
-      if (action === 'detail-tab') { state = { ...state, detailTab: String(target.getAttribute('data-tab') || 'summary') }; render(); return; }
+      if (action === 'detail-tab') {
+        const tab = String(target.getAttribute('data-tab') || 'summary');
+        if (Object.prototype.hasOwnProperty.call(DETAIL_BATCH_SCOPE_BY_TAB, tab)) {
+          loadDetailBatchTab(tab, 1);
+          return;
+        }
+        state = { ...state, detailTab: tab };
+        render();
+        return;
+      }
       if (action === 'clear-all') { clearAll(); return; }
       if (action === 'show-detail') { showDetail(String(target.getAttribute('data-uuid') || '')); return; }
       if (action === 'close-detail') { state = { ...state, detail: null, detailBatch: null, detailTab: 'summary' }; render(); return; }
+      if (action === 'detail-batch-prev' || action === 'detail-batch-next') {
+        const detailBatch = detailBatchState();
+        const nextPage = action === 'detail-batch-prev' ? Math.max(1, detailBatch.page - 1) : detailBatch.page + 1;
+        if (detailBatch.scope !== '') {
+          loadDetailBatchTab(detailBatch.scope, nextPage);
+        }
+        return;
+      }
       if (action === 'page-prev') { state = { ...state, entriesPage: Math.max(1, state.entriesPage - 1) }; render(); return; }
       if (action === 'page-next') { state = { ...state, entriesPage: state.entriesPage + 1 }; render(); return; }
       if (action === 'clear-filters') { state = { ...state, detail: null, detailBatch: null, detailTab: 'summary', entriesPage: 1, entriesFilter: { type: '', tag: '', batchId: '' } }; render(); return; }

package/src/storage/TraceStorage.ts

@@ -4,7 +4,14 @@
  * read/write operations to the trace storage facade.
  */
 import type { IDatabase } from '@zintrust/core';
-import type { EntryTypeValue, ITraceEntry, ITraceStorage, QueryEntriesOptions } from '../types';
+import type {
+  EntryTypeValue,
+  ITraceEntry,
+  ITraceStorage,
+  QueryBatchEntriesOptions,
+  QueryBatchEntriesResult,
+  QueryEntriesOptions,
+} from '../types';
 import { familyHash } from '../utils/familyHash';
 
 const TABLE_ENTRIES = 'zin_trace_entries';
@@ -26,6 +33,102 @@ type EntryRow = {
 
 type TagRow = { entry_uuid: string; tag: string };
 
+const decodeJsonStringLiteral = (value: string): string | undefined => {
+  try {
+    return JSON.parse(`"${value}"`) as string;
+  } catch {
+    return undefined;
+  }
+};
+
+const matchJsonStringField = (content: string, key: string): string | undefined => {
+  const match = new RegExp(String.raw`"${key}"\s*:\s*"((?:\\.|[^"\\])*)"`, 's').exec(content);
+  return match ? decodeJsonStringLiteral(match[1]) : undefined;
+};
+
+const matchJsonNumberField = (content: string, key: string): number | undefined => {
+  const match = new RegExp(String.raw`"${key}"\s*:\s*(-?\d+(?:\.\d+)?)`, 's').exec(content);
+  if (!match) return undefined;
+  const parsed = Number(match[1]);
+  return Number.isFinite(parsed) ? parsed : undefined;
+};
+
+const matchJsonNullOrNumberField = (content: string, key: string): number | null | undefined => {
+  const nullMatch = new RegExp(String.raw`"${key}"\s*:\s*null`, 's').exec(content);
+  if (nullMatch) return null;
+  return matchJsonNumberField(content, key);
+};
+
+const matchJsonStringArrayField = (content: string, key: string): string[] | undefined => {
+  const match = new RegExp(String.raw`"${key}"\s*:\s*(\[.*?\])`, 's').exec(content);
+  if (!match) return undefined;
+
+  try {
+    const parsed = JSON.parse(match[1]) as unknown;
+    return Array.isArray(parsed)
+      ? parsed.filter((value): value is string => typeof value === 'string')
+      : undefined;
+  } catch {
+    return undefined;
+  }
+};
+
+const compactRequestContent = (content: string): Record<string, unknown> | undefined => {
+  const compact: Record<string, unknown> = {};
+  const method = matchJsonStringField(content, 'method');
+  const uri = matchJsonStringField(content, 'uri');
+  const responseStatus = matchJsonNumberField(content, 'responseStatus');
+  const duration = matchJsonNumberField(content, 'duration');
+  const memory = matchJsonNullOrNumberField(content, 'memory');
+  const middleware = matchJsonStringArrayField(content, 'middleware');
+  const hostname = matchJsonStringField(content, 'hostname');
+  const userId = matchJsonStringField(content, 'userId');
+
+  if (method !== undefined) compact['method'] = method;
+  if (uri !== undefined) compact['uri'] = uri;
+  if (responseStatus !== undefined) compact['responseStatus'] = responseStatus;
+  if (duration !== undefined) compact['duration'] = duration;
+  if (memory !== undefined) compact['memory'] = memory;
+  if (middleware !== undefined) compact['middleware'] = middleware;
+  if (hostname !== undefined) compact['hostname'] = hostname;
+  if (userId !== undefined) compact['userId'] = userId;
+
+  return Object.keys(compact).length > 0 ? compact : undefined;
+};
+
+const compactClientRequestContent = (content: string): Record<string, unknown> | undefined => {
+  const compact: Record<string, unknown> = {};
+  const source = matchJsonStringField(content, 'source');
+  const method = matchJsonStringField(content, 'method');
+  const url = matchJsonStringField(content, 'url');
+  const responseStatus = matchJsonNumberField(content, 'responseStatus');
+  const error = matchJsonStringField(content, 'error');
+  const duration = matchJsonNumberField(content, 'duration');
+  const hostname = matchJsonStringField(content, 'hostname');
+
+  if (source !== undefined) compact['source'] = source;
+  if (method !== undefined) compact['method'] = method;
+  if (url !== undefined) compact['url'] = url;
+  if (responseStatus !== undefined) compact['responseStatus'] = responseStatus;
+  if (error !== undefined) compact['error'] = error;
+  if (duration !== undefined) compact['duration'] = duration;
+  if (hostname !== undefined) compact['hostname'] = hostname;
+
+  return Object.keys(compact).length > 0 ? compact : undefined;
+};
+
+const summarizeEntryContent = (row: EntryRow): unknown => {
+  if (row.type === 'request') {
+    return compactRequestContent(row.content) ?? (JSON.parse(row.content) as unknown);
+  }
+
+  if (row.type === 'client_request') {
+    return compactClientRequestContent(row.content) ?? (JSON.parse(row.content) as unknown);
+  }
+
+  return JSON.parse(row.content) as unknown;
+};
+
 type DatabaseWithDriver = IDatabase & {
   getType?: () => string;
 };
@@ -74,12 +177,12 @@ const buildIgnoreInsert = (
   return `INSERT INTO ${table} (${columnList}) VALUES (${placeholders})`;
 };
 
-const rowToEntry = (row: EntryRow, tags: string[]): ITraceEntry => ({
+const rowToEntry = (row: EntryRow, tags: string[], summary = false): ITraceEntry => ({
   uuid: row.uuid,
   batchId: row.batch_id,
   familyHash: row.family_hash ?? undefined,
   type: row.type as EntryTypeValue,
-  content: JSON.parse(row.content) as unknown,
+  content: summary ? summarizeEntryContent(row) : (JSON.parse(row.content) as unknown),
   tags,
   isLatest: Boolean(row.is_latest),
   createdAt: row.created_at,
@@ -132,6 +235,45 @@ const buildEntryFilters = (
   return { joinClause, whereClause, params, countParams };
 };
 
+const buildBatchCounts = async (
+  db: IDatabase,
+  batchId: string
+): Promise<Partial<Record<EntryTypeValue, number>>> => {
+  const rows = (await db.query(
+    `SELECT type, COUNT(*) as cnt FROM ${TABLE_ENTRIES} WHERE batch_id = ? GROUP BY type`,
+    [batchId]
+  )) as Array<{ type: string; cnt: number }>;
+
+  const counts: Partial<Record<EntryTypeValue, number>> = {};
+  for (const row of rows) {
+    counts[row.type as EntryTypeValue] = row.cnt;
+  }
+
+  return counts;
+};
+
+const buildBatchEntryFilters = (
+  batchId: string,
+  opts: QueryBatchEntriesOptions
+): { whereClause: string; params: unknown[] } => {
+  const conditions = ['batch_id = ?'];
+  const params: unknown[] = [batchId];
+
+  if (opts.type) {
+    conditions.push('type = ?');
+    params.push(opts.type);
+  }
+
+  const excludeTypes = opts.excludeTypes ?? [];
+  if (excludeTypes.length > 0) {
+    const placeholders = excludeTypes.map(() => '?').join(', ');
+    conditions.push(`type NOT IN (${placeholders})`);
+    params.push(...excludeTypes);
+  }
+
+  return { whereClause: `WHERE ${conditions.join(' AND ')}`, params };
+};
+
 const loadTagsByUuid = async (db: IDatabase, uuids: string[]): Promise<Map<string, string[]>> => {
   const tagsByUuid = new Map<string, string[]>();
   if (uuids.length === 0) return tagsByUuid;
@@ -230,7 +372,7 @@ const createStorage = (db: IDatabase): ITraceStorage => {
     );
 
     return {
-      data: rows.map((row) => rowToEntry(row, tagsByUuid.get(row.uuid) ?? [])),
+      data: rows.map((row) => rowToEntry(row, tagsByUuid.get(row.uuid) ?? [], opts.summary)),
       total,
     };
   };
@@ -273,6 +415,53 @@ const createStorage = (db: IDatabase): ITraceStorage => {
     return rows.map((row) => rowToEntry(row, tagsByUuid.get(row.uuid) ?? []));
   };
 
+  const queryBatchEntries = async (
+    batchId: string,
+    opts: QueryBatchEntriesOptions = {}
+  ): Promise<QueryBatchEntriesResult> => {
+    const page = opts.page ?? 1;
+    const perPage = opts.perPage ?? 10;
+    const offset = (page - 1) * perPage;
+    const counts = await buildBatchCounts(db, batchId);
+
+    if (opts.countsOnly) {
+      const total = Object.values(counts).reduce((sum, value) => sum + Number(value ?? 0), 0);
+      return { entries: [], total, counts, page, perPage };
+    }
+
+    const { whereClause, params } = buildBatchEntryFilters(batchId, opts);
+    const countResult = (await db.queryOne(
+      `SELECT COUNT(*) as cnt FROM ${TABLE_ENTRIES} ${whereClause}`,
+      params
+    )) as { cnt: number } | undefined;
+    const total = countResult?.cnt ?? 0;
+    if (total === 0) {
+      return { entries: [], total: 0, counts, page, perPage };
+    }
+
+    const rows = (await db.query(
+      `SELECT id, uuid, batch_id, family_hash, type, content, is_latest, created_at
+       FROM ${TABLE_ENTRIES}
+       ${whereClause}
+       ORDER BY created_at ASC, id ASC
+       LIMIT ? OFFSET ?`,
+      [...params, perPage, offset]
+    )) as EntryRow[];
+
+    const tagsByUuid = await loadTagsByUuid(
+      db,
+      rows.map((row) => row.uuid)
+    );
+
+    return {
+      entries: rows.map((row) => rowToEntry(row, tagsByUuid.get(row.uuid) ?? [], opts.summary)),
+      total,
+      counts,
+      page,
+      perPage,
+    };
+  };
+
   const prune = async (olderThanMs: number, keepExceptions = false): Promise<number> => {
     const countResult = (await db.queryOne(
       `SELECT COUNT(*) as cnt FROM ${TABLE_ENTRIES}
@@ -331,6 +520,7 @@ const createStorage = (db: IDatabase): ITraceStorage => {
     queryEntries,
     getEntry,
     getBatch,
+    queryBatchEntries,
     prune,
     clear,
     getMonitoring,

package/src/types.ts

@@ -262,6 +262,24 @@ export interface QueryEntriesOptions {
   to?: number;
   page?: number;
   perPage?: number;
+  summary?: boolean;
+}
+
+export interface QueryBatchEntriesOptions {
+  type?: EntryTypeValue;
+  excludeTypes?: EntryTypeValue[];
+  page?: number;
+  perPage?: number;
+  summary?: boolean;
+  countsOnly?: boolean;
+}
+
+export interface QueryBatchEntriesResult {
+  entries: ITraceEntry[];
+  total: number;
+  counts: Partial<Record<EntryTypeValue, number>>;
+  page: number;
+  perPage: number;
 }
 
 export interface ITraceStorage {
@@ -274,6 +292,10 @@ export interface ITraceStorage {
   queryEntries(opts: QueryEntriesOptions): Promise<{ data: ITraceEntry[]; total: number }>;
   getEntry(uuid: string): Promise<ITraceEntry | null>;
   getBatch(batchId: string): Promise<ITraceEntry[]>;
+  queryBatchEntries(
+    batchId: string,
+    opts?: QueryBatchEntriesOptions
+  ): Promise<QueryBatchEntriesResult>;
   prune(olderThanMs: number, keepExceptions?: boolean): Promise<number>;
   clear(): Promise<void>;
   getMonitoring(): Promise<string[]>;

package/src/watchers/HttpClientWatcher.ts

@@ -1,4 +1,3 @@
-import { generateUuid } from '@zintrust/core';
 import { TraceContext } from '../context';
 import {
   EntryType,
@@ -184,7 +183,7 @@ const emit = ({
   );
   _storage
     .writeEntry({
-      uuid: generateUuid(),
+      uuid: crypto.randomUUID(),
       batchId: TraceContext.getBatchId(),
       type: EntryType.CLIENT_REQUEST,
       content,