@zintrust/trace 0.4.81 → 0.4.82

package/dist/watchers/MailWatcher.js

@@ -1,13 +1,14 @@
 /**
- * MailWatcher — records mail dispatch intent.
- * Body is never captured; only to/subject/template.
+ * MailWatcher — records mail dispatch intent and rendered content.
  */
 import { TraceContext } from '../context.js';
 import { EntryType } from '../types.js';
+import { redactUnknown } from '../utils/redact.js';
 import { RequestFilter } from '../utils/requestFilter.js';
 let _storage = null;
+let _redactionFields = [];
 let _ignoreRoutes = [];
-const emit = (to, subject, template) => {
+const emit = (to, subject, template, text, html) => {
     if (!_storage)
         return;
     if (RequestFilter.shouldIgnoreCurrentRequest(_ignoreRoutes))
@@ -16,6 +17,12 @@ const emit = (to, subject, template) => {
         to,
         subject,
         template,
+        ...(typeof text === 'string' && text !== ''
+            ? { text: redactUnknown(text, _redactionFields) }
+            : {}),
+        ...(typeof html === 'string' && html !== ''
+            ? { html: redactUnknown(html, _redactionFields) }
+            : {}),
         hostname: TraceContext.getHostname(),
     };
     _storage
@@ -36,9 +43,11 @@ export const MailWatcher = Object.freeze({
         if (config.watchers.mail === false)
             return () => undefined;
         _storage = storage;
+        _redactionFields = [...config.redaction.keys, ...config.redaction.body];
         _ignoreRoutes = config.ignoreRoutes;
         return () => {
             _storage = null;
+            _redactionFields = [];
             _ignoreRoutes = [];
         };
     },

package/dist/watchers/NotificationWatcher.d.ts

@@ -1,5 +1,5 @@
 import type { ITraceWatcher } from '../types';
-declare const emit: (notification: string, channels: string[], notifiable?: string) => void;
+declare const emit: (notification: string, channels: string[], notifiable?: string, message?: string, payload?: unknown) => void;
 export declare const NotificationWatcher: ITraceWatcher & {
     emit: typeof emit;
 };

package/dist/watchers/NotificationWatcher.js

@@ -1,10 +1,12 @@
 import { TraceContext } from '../context.js';
 import { EntryType } from '../types.js';
 import { AuthTag } from '../utils/authTag.js';
+import { redactUnknown } from '../utils/redact.js';
 import { RequestFilter } from '../utils/requestFilter.js';
 let _storage = null;
+let _redactionFields = [];
 let _ignoreRoutes = [];
-const emit = (notification, channels, notifiable) => {
+const emit = (notification, channels, notifiable, message, payload) => {
     if (!_storage)
         return;
     if (RequestFilter.shouldIgnoreCurrentRequest(_ignoreRoutes))
@@ -13,6 +15,10 @@ const emit = (notification, channels, notifiable) => {
         notification,
         channels,
         notifiable,
+        ...(typeof message === 'string' && message !== ''
+            ? { message: redactUnknown(message, _redactionFields) }
+            : {}),
+        ...(payload === undefined ? {} : { payload: redactUnknown(payload, _redactionFields) }),
         hostname: TraceContext.getHostname(),
     };
     _storage
@@ -33,9 +39,11 @@ export const NotificationWatcher = Object.freeze({
         if (config.watchers.notification === false)
             return () => undefined;
         _storage = storage;
+        _redactionFields = [...config.redaction.keys, ...config.redaction.body];
         _ignoreRoutes = config.ignoreRoutes;
         return () => {
             _storage = null;
+            _redactionFields = [];
             _ignoreRoutes = [];
         };
     },

package/dist/watchers/QueryWatcher.js

@@ -35,13 +35,17 @@ export const QueryWatcher = Object.freeze({
             if (isTraceStorageQuery(query))
                 return;
             const batchId = TraceContext.getBatchId();
-            const sql = bindingsInterpolated(query, params);
+            const includeBindings = config.captureQueryBindings !== false;
+            const sql = includeBindings ? bindingsInterpolated(query, params) : query;
             const roundedDuration = Math.round(duration * 100) / 100;
             const hash = TraceStorage.familyHash(query);
             const slow = roundedDuration >= config.slowQueryThreshold;
             const content = {
                 connection: 'default',
                 sql,
+                statement: query,
+                ...(includeBindings ? { bindings: [...params] } : {}),
+                bindingsIncluded: includeBindings,
                 time: roundedDuration,
                 duration: roundedDuration,
                 slow,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zintrust/trace",
-  "version": "0.4.81",
+  "version": "0.4.82",
   "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.80"
+    "@zintrust/core": "^0.4.81"
   },
   "publishConfig": {
     "access": "public"
@@ -56,4 +56,4 @@
     "build": "tsc -p tsconfig.json && tsc -p tsconfig.migrations.json && node ../../scripts/fix-dist-esm-imports.mjs dist",
     "prepublishOnly": "npm run build"
   }
-}
+}

package/src/config.ts

@@ -109,6 +109,8 @@ const DEFAULTS: ITraceConfig = Object.freeze({
   pruneAfterHours: 24,
   ignoreRoutes: ['/trace', '/health', '/ping'],
   slowQueryThreshold: 100,
+  captureCachePayloads: false,
+  captureQueryBindings: true,
   logMinLevel: 'info',
   watchers: {},
   redaction: {

package/src/dashboard/ui.ts

@@ -47,7 +47,7 @@ const encodeSvgDataUri = (svg: string): string => {
   return `data:image/svg+xml;charset=UTF-8,${encodeURIComponent(compactSvg)}`;
 };
 
-const DASHBOARD_DOCUMENT = `<!DOCTYPE html>
+const DASHBOARD_DOCUMENT = String.raw`<!DOCTYPE html>
 <html lang="en">
 <head>
   <meta charset="UTF-8">
@@ -80,7 +80,7 @@ const DASHBOARD_DOCUMENT = `<!DOCTYPE html>
     .tag{display:inline-flex;align-items:center;gap:6px;padding:4px 10px;border-radius:999px;background:rgba(56,189,248,.12);color:#bae6fd;font-size:.78rem;font-weight:800;margin:0 6px 6px 0;border:1px solid rgba(56,189,248,.18);text-decoration:none}button.tag{cursor:pointer}html[data-theme='light'] .tag{color:#075985}.tag.failed{background:rgba(239,68,68,.14);color:#fecaca;border-color:rgba(239,68,68,.2)}html[data-theme='light'] .tag.failed{color:#b91c1c}.tag.slow{background:rgba(245,158,11,.12);color:#fde68a;border-color:rgba(245,158,11,.18)}html[data-theme='light'] .tag.slow{color:#92400e}.type-pill{display:inline-flex;align-items:center;gap:6px;padding:6px 10px;border-radius:999px;font-size:.74rem;font-weight:900;text-transform:uppercase;letter-spacing:.08em;border:1px solid transparent}.pill-request{background:rgba(56,189,248,.14);color:#93c5fd}.pill-request.method-get{background:rgba(34,197,94,.16);color:#bbf7d0}.pill-request.method-post{background:rgba(59,130,246,.16);color:#bfdbfe}.pill-request.method-other{background:rgba(245,158,11,.16);color:#fde68a}.pill-query{background:rgba(34,197,94,.12);color:#86efac}.pill-exception{background:rgba(239,68,68,.14);color:#fecaca}.pill-log{background:rgba(168,85,247,.14);color:#ddd6fe}.pill-job,.pill-batch{background:rgba(245,158,11,.14);color:#fde68a}.pill-cache{background:rgba(20,184,166,.12);color:#99f6e4}.pill-schedule,.pill-command{background:rgba(14,165,233,.14);color:#bae6fd}.pill-mail,.pill-notification{background:rgba(236,72,153,.14);color:#fbcfe8}.pill-auth{background:rgba(148,163,184,.16);color:#e2e8f0}.pill-event,.pill-model{background:rgba(74,222,128,.14);color:#bbf7d0}.pill-redis{background:rgba(239,68,68,.12);color:#fecaca}.pill-gate{background:rgba(99,102,241,.14);color:#c7d2fe}.pill-middleware{background:rgba(45,212,191,.12);color:#ccfbf1}.pill-dump,.pill-view{background:rgba(148,163,184,.14);color:#e2e8f0}.pill-client-request{background:rgba(59,130,246,.14);color:#bfdbfe}html[data-theme='light'] .pill-request{color:#1d4ed8}html[data-theme='light'] .pill-request.method-get{color:#166534}html[data-theme='light'] .pill-request.method-post{color:#1d4ed8}html[data-theme='light'] .pill-request.method-other{color:#92400e}html[data-theme='light'] .pill-query{color:#166534}html[data-theme='light'] .pill-exception{color:#b91c1c}html[data-theme='light'] .pill-log{color:#6d28d9}html[data-theme='light'] .pill-job,html[data-theme='light'] .pill-batch{color:#92400e}html[data-theme='light'] .pill-cache{color:#115e59}html[data-theme='light'] .pill-schedule,html[data-theme='light'] .pill-command{color:#0c4a6e}html[data-theme='light'] .pill-mail,html[data-theme='light'] .pill-notification{color:#9d174d}html[data-theme='light'] .pill-auth,html[data-theme='light'] .pill-dump,html[data-theme='light'] .pill-view{color:#334155}html[data-theme='light'] .pill-event,html[data-theme='light'] .pill-model{color:#166534}html[data-theme='light'] .pill-redis{color:#991b1b}html[data-theme='light'] .pill-gate{color:#3730a3}html[data-theme='light'] .pill-middleware{color:#155e75}html[data-theme='light'] .pill-client-request{color:#1d4ed8}
     .monitoring-wrap{padding:0 24px 24px}.tag-list{display:flex;flex-wrap:wrap;gap:10px;margin-bottom:18px}.tag-item{display:inline-flex;align-items:center;gap:10px;padding:10px 14px;border-radius:999px;border:1px solid var(--line);background:var(--surface-strong)}.tag-remove{border:none;background:rgba(239,68,68,.14);color:var(--danger);border-radius:999px;width:24px;height:24px;cursor:pointer;font-size:1rem;line-height:1}.helper-text{color:var(--muted);line-height:1.6}
     .duration-chip{display:inline-flex;align-items:center;padding:5px 9px;border-radius:999px;border:1px solid transparent;font-size:.8rem;font-weight:700;color:var(--text);white-space:nowrap}.duration-chip.vfast{background:rgba(34,197,94,.14);border-color:rgba(34,197,94,.28);color:#bbf7d0}.duration-chip.fast{background:rgba(56,189,248,.12);border-color:rgba(56,189,248,.24);color:#bae6fd}.duration-chip.slow{background:rgba(245,158,11,.12);border-color:rgba(245,158,11,.22);color:#fde68a}.duration-chip.vslow{background:rgba(239,68,68,.14);border-color:rgba(239,68,68,.24);color:#fecaca}html[data-theme='light'] .duration-chip.vfast{color:#166534}html[data-theme='light'] .duration-chip.fast{color:#1d4ed8}html[data-theme='light'] .duration-chip.slow{color:#92400e}html[data-theme='light'] .duration-chip.vslow{color:#b91c1c}
-    .code-card{border-radius:16px;border:1px solid var(--code-border);background:var(--surface-soft);overflow:hidden}.code-toolbar{display:flex;align-items:center;justify-content:space-between;gap:12px;padding:12px 14px;border-bottom:1px solid var(--line)}.code-label{font-size:.76rem;letter-spacing:.12em;text-transform:uppercase;color:var(--muted);font-weight:800}.copy-button{display:inline-flex;align-items:center;justify-content:center;gap:8px;width:38px;height:38px;border-radius:12px;border:1px solid var(--line);background:var(--surface-strong);color:var(--text);cursor:pointer;transition:border-color .16s ease,color .16s ease}.copy-button:hover{border-color:rgba(56,189,248,.35);color:var(--accent)}.copy-button[data-copied='true']{color:var(--success);border-color:rgba(34,197,94,.28)}.copy-button svg{width:16px;height:16px;display:block}.code-block{margin:0;padding:18px 20px;background:var(--code-bg);color:#dbeafe;border:0;overflow:auto;white-space:pre;line-height:1.72;font-family:var(--mono);font-size:.92rem}.code-block code{font-family:inherit}.tok-key{color:#93c5fd}.tok-string{color:#86efac}.tok-number{color:#f9a8d4}.tok-boolean{color:#facc15}.tok-null{color:#fb7185}.tok-punctuation{color:#94a3b8}.tok-sql-keyword{color:#f472b6;font-weight:700}.tok-sql-identifier{color:#93c5fd}.tok-sql-string{color:#86efac}.tok-sql-number{color:#facc15}.tok-sql-comment{color:#64748b;font-style:italic}html[data-theme='light'] .code-block{color:#0f172a}html[data-theme='light'] .tok-key{color:#1d4ed8}html[data-theme='light'] .tok-string{color:#15803d}html[data-theme='light'] .tok-number{color:#c026d3}html[data-theme='light'] .tok-boolean{color:#b45309}html[data-theme='light'] .tok-null{color:#dc2626}html[data-theme='light'] .tok-punctuation{color:#64748b}html[data-theme='light'] .tok-sql-keyword{color:#db2777}html[data-theme='light'] .tok-sql-identifier{color:#2563eb}html[data-theme='light'] .tok-sql-string{color:#15803d}html[data-theme='light'] .tok-sql-number{color:#b45309}html[data-theme='light'] .tok-sql-comment{color:#6b7280}
+    .code-card{border-radius:16px;border:1px solid var(--code-border);background:var(--surface-soft);overflow:hidden}.code-toolbar{display:flex;align-items:center;justify-content:space-between;gap:12px;padding:12px 14px;border-bottom:1px solid var(--line)}.code-label{font-size:.76rem;letter-spacing:.12em;text-transform:uppercase;color:var(--muted);font-weight:800}.copy-button{display:inline-flex;align-items:center;justify-content:center;gap:8px;width:38px;height:38px;border-radius:12px;border:1px solid var(--line);background:var(--surface-strong);color:var(--text);cursor:pointer;transition:border-color .16s ease,color .16s ease}.copy-button:hover{border-color:rgba(56,189,248,.35);color:var(--accent)}.copy-button[data-copied='true']{color:var(--success);border-color:rgba(34,197,94,.28)}.copy-button svg{width:16px;height:16px;display:block}.code-block{margin:0;padding:18px 20px;background:var(--code-bg);color:#dbeafe;border:0;overflow:auto;white-space:pre;line-height:1.72;font-family:var(--mono);font-size:.92rem}.code-block code{font-family:inherit}.html-preview-wrap{padding:14px;background:var(--surface-strong);border-top:1px solid var(--line)}.html-preview{display:block;width:100%;min-height:320px;border:1px solid var(--line);border-radius:14px;background:#fff}.tok-key{color:#93c5fd}.tok-string{color:#86efac}.tok-number{color:#f9a8d4}.tok-boolean{color:#facc15}.tok-null{color:#fb7185}.tok-punctuation{color:#94a3b8}.tok-sql-keyword{color:#f472b6;font-weight:700}.tok-sql-identifier{color:#93c5fd}.tok-sql-string{color:#86efac}.tok-sql-number{color:#facc15}.tok-sql-comment{color:#64748b;font-style:italic}html[data-theme='light'] .code-block{color:#0f172a}html[data-theme='light'] .tok-key{color:#1d4ed8}html[data-theme='light'] .tok-string{color:#15803d}html[data-theme='light'] .tok-number{color:#c026d3}html[data-theme='light'] .tok-boolean{color:#b45309}html[data-theme='light'] .tok-null{color:#dc2626}html[data-theme='light'] .tok-punctuation{color:#64748b}html[data-theme='light'] .tok-sql-keyword{color:#db2777}html[data-theme='light'] .tok-sql-identifier{color:#2563eb}html[data-theme='light'] .tok-sql-string{color:#15803d}html[data-theme='light'] .tok-sql-number{color:#b45309}html[data-theme='light'] .tok-sql-comment{color:#6b7280}
     @media (max-width:1120px){.content-grid{grid-template-columns:1fr}}@media (max-width:920px){.layout{grid-template-columns:1fr}.sidebar{position:static;height:auto;border-right:none;border-bottom:1px solid var(--line);padding:20px 16px 18px}.brand-row{padding:0 0 16px}.sidebar-status{margin:0 0 16px}.sidebar-group{padding:0}.main{padding:20px}}@media (max-width:640px){.stats-grid{grid-template-columns:1fr}.detail-card{padding:18px}.toolbar,.section-head,.pagination,.activity-list,.monitoring-wrap{padding-left:18px;padding-right:18px}.table-wrap{padding:0 8px 10px}.brand-row{align-items:stretch;gap:14px;padding:0 0 14px}.brand{width:100%;align-items:flex-start}.brand-copy{min-width:0}.brand-copy h1{font-size:1.18rem;line-height:1.12}.brand-copy p{font-size:.82rem;overflow-wrap:anywhere}.icon-button{align-self:flex-end}.sidebar-status{padding:12px}.nav-button{padding:11px 12px}.nav-title{font-size:.95rem}.nav-meta{font-size:.72rem}}@media (max-width:480px){.brand-row{flex-direction:column}.icon-button{align-self:flex-start}.nav-button{align-items:flex-start;flex-direction:column}.nav-meta{font-size:.7rem}}
   </style>
 </head>
@@ -202,6 +202,8 @@ const DASHBOARD_DOCUMENT = `<!DOCTYPE html>
       .replace(/"/g, '&quot;')
       .replace(/'/g, '&#39;');
 
+    const looksLikeHtml = (value) => new RegExp('</?(?:html|body|div|table)\\b|<!doctype\\b', 'i').test(String(value || ''));
+
     const api = async (path, opts) => {
       const response = await fetch(API + path, opts);
       if (!response.ok) {
@@ -341,6 +343,28 @@ const DASHBOARD_DOCUMENT = `<!DOCTYPE html>
       ].join('');
     };
 
+    const renderTextCard = (label, value) => {
+      const source = String(value ?? '');
+      return renderCodeCard(label, source, escapeHtml(source), 'language-text');
+    };
+
+    const renderHtmlPreview = (label, html) => {
+      const source = String(html ?? '');
+      const copyId = registerCopyPayload(source);
+      return [
+        '<section class="code-card">',
+        '<div class="code-toolbar">',
+        '<span class="code-label">' + escapeHtml(label) + '</span>',
+        '<button type="button" class="copy-button" data-action="copy-code" data-copy-id="' + escapeHtml(copyId) + '" title="Copy ' + escapeHtml(label) + '">',
+        COPY_ICON,
+        '</button>',
+        '</div>',
+        '<pre class="code-block language-html"><code>' + escapeHtml(source) + '</code></pre>',
+        '<div class="html-preview-wrap"><iframe class="html-preview" sandbox="allow-same-origin" srcdoc="' + escapeHtml(source) + '"></iframe></div>',
+        '</section>'
+      ].join('');
+    };
+
     const highlightJson = (value, label = 'JSON') => {
       const source = prettyJson(value);
       let output = '';
@@ -392,6 +416,14 @@ const DASHBOARD_DOCUMENT = `<!DOCTYPE html>
 
     const detailJson = (value, label = 'JSON') => highlightJson(value ?? {}, label);
 
+    const renderPayload = (label, value) => {
+      if (value === undefined) return '<p class="trace-note">No ' + escapeHtml(label.toLowerCase()) + ' was captured.</p>';
+      if (typeof value === 'string') {
+        return looksLikeHtml(value) ? renderHtmlPreview(label, value) : renderTextCard(label, value);
+      }
+      return detailJson(value, label);
+    };
+
     const entrySummaryText = (entry) => {
       const content = entry && entry.content ? entry.content : {};
       if (entry.type === 'request') return [content.responseStatus || '', content.method || '', content.uri || ''].filter(Boolean).join(' ');
@@ -399,20 +431,20 @@ const DASHBOARD_DOCUMENT = `<!DOCTYPE html>
       if (entry.type === 'exception') return [content.class || '', content.message || ''].filter(Boolean).join(': ');
       if (entry.type === 'log') return '[' + String(content.level || 'log') + '] ' + String(content.message || '').slice(0, 160);
       if (entry.type === 'job') return [content.name || '', content.status || 'queued'].filter(Boolean).join(' · ');
-      if (entry.type === 'cache') return [content.operation || '', content.key || ''].filter(Boolean).join(' ');
+      if (entry.type === 'cache') return [content.operation || '', content.key || '', content.payloadLogged ? '' : '(payload off)'].filter(Boolean).join(' ');
       if (entry.type === 'schedule') return [content.name || '', content.status || 'ran'].filter(Boolean).join(' · ');
       if (entry.type === 'mail') return ['To ' + (content.to || 'unknown'), content.subject || 'No subject'].join(' · ');
       if (entry.type === 'auth') return [content.event || 'auth', content.userId ? '#' + content.userId : ''].filter(Boolean).join(' ');
       if (entry.type === 'event') return String(content.name || 'event');
       if (entry.type === 'model') return [content.action || '', content.model || ''].filter(Boolean).join(' ');
-      if (entry.type === 'notification') return [content.notification || '', (content.channels || []).join(', ')].filter(Boolean).join(' -> ');
+      if (entry.type === 'notification') return [content.notification || '', content.message || (content.channels || []).join(', ')].filter(Boolean).join(' -> ');
       if (entry.type === 'redis') return String(content.command || 'redis');
       if (entry.type === 'gate') return [content.ability || '', content.result || ''].filter(Boolean).join(' · ');
       if (entry.type === 'middleware') return [content.name || '', content.event || ''].filter(Boolean).join(' · ');
       if (entry.type === 'command') return [content.name || '', content.exitCode !== undefined ? 'exit=' + content.exitCode : ''].filter(Boolean).join(' ');
       if (entry.type === 'batch') return [content.name || '', 'processed ' + (content.processed || 0) + '/' + (content.total || 0)].join(' · ');
       if (entry.type === 'view') return String(content.template || 'view');
-      if (entry.type === 'client_request') return [content.method || '', content.url || ''].filter(Boolean).join(' ');
+      if (entry.type === 'client_request') return [content.method || '', content.url || '', content.responseStatus ? '[' + content.responseStatus + ']' : content.error ? '[failed]' : ''].filter(Boolean).join(' ');
       return JSON.stringify(content).slice(0, 160);
     };
 
@@ -448,6 +480,7 @@ const DASHBOARD_DOCUMENT = `<!DOCTYPE html>
             { label: 'Connection', value: escapeHtml(content.connection || 'default') },
             { label: 'Duration', value: escapeHtml(formatDuration(getEntryDuration(entry))) },
             { label: 'Slow', value: escapeHtml(content.slow ? 'Yes' : 'No') },
+            { label: 'Bindings', value: escapeHtml(content.bindingsIncluded === false ? 'Hidden' : 'Included') },
             { label: 'Hash', value: '<span class="mono">' + escapeHtml(content.hash || '') + '</span>' }
           ]),
           renderMetricBox('Runtime', [
@@ -455,7 +488,8 @@ const DASHBOARD_DOCUMENT = `<!DOCTYPE html>
             { label: 'Batch', value: '<span class="mono">' + escapeHtml(entry.batchId || '-') + '</span>' }
           ]),
           '</div>',
-          highlightSql(content.sql || '')
+          highlightSql(content.sql || ''),
+          content.bindingsIncluded === false ? '<p class="trace-note">SQL bindings were hidden for this entry.</p>' : (Array.isArray(content.bindings) ? detailJson(content.bindings, 'Bindings Json') : '')
         ].join('');
       }
 
@@ -499,7 +533,34 @@ const DASHBOARD_DOCUMENT = `<!DOCTYPE html>
           renderMetricBox('Request', [
             { label: 'Method', value: escapeHtml(content.method || '') },
             { label: 'URL', value: '<span class="mono">' + escapeHtml(content.url || '') + '</span>' },
-            { label: 'Status', value: escapeHtml(content.responseStatus || '') },
+            { label: 'Status', value: escapeHtml(content.responseStatus || (content.error ? 'Failed' : 'Pending')) },
+            { label: 'Duration', value: escapeHtml(formatDuration(getEntryDuration(entry))) }
+          ]),
+          renderMetricBox('Runtime', [
+            { label: 'Hostname', value: escapeHtml(content.hostname || '') },
+            { label: 'Batch', value: '<span class="mono">' + escapeHtml(entry.batchId || '-') + '</span>' },
+            { label: 'Error', value: escapeHtml(content.error || '-') }
+          ]),
+          '</div>',
+          '<div class="detail-stack">',
+          detailJson(content.requestHeaders || {}, 'Request Header Json'),
+          renderPayload('Request Body', content.requestBody),
+          detailJson(content.responseHeaders || {}, 'Response Header Json'),
+          renderPayload('Response Body', content.responseBody),
+          '</div>'
+        ].join('');
+      }
+
+      if (entry.type === 'cache') {
+        return [
+          '<div class="detail-grid">',
+          renderMetricBox('Cache', [
+            { label: 'Operation', value: escapeHtml(content.operation || '') },
+            { label: 'Key', value: '<span class="mono">' + escapeHtml(content.key || '') + '</span>' },
+            { label: 'Store', value: escapeHtml(content.store || 'default') },
+            { label: 'Hit', value: escapeHtml(content.hit === undefined ? '-' : (content.hit ? 'Yes' : 'No')) },
+            { label: 'Payload', value: escapeHtml(content.payloadLogged ? 'Captured' : 'Disabled') },
+            { label: 'TTL', value: escapeHtml(content.ttl === undefined ? '-' : String(content.ttl)) },
             { label: 'Duration', value: escapeHtml(formatDuration(getEntryDuration(entry))) }
           ]),
           renderMetricBox('Runtime', [
@@ -507,7 +568,41 @@ const DASHBOARD_DOCUMENT = `<!DOCTYPE html>
             { label: 'Batch', value: '<span class="mono">' + escapeHtml(entry.batchId || '-') + '</span>' }
           ]),
           '</div>',
-          detailJson(content.requestHeaders || {})
+          content.payloadLogged ? renderPayload('Cache Payload', content.payload) : '<p class="trace-note">Cache payload logging is disabled. Set TRACE_CACHE_PAYLOADS=true to include values.</p>'
+        ].join('');
+      }
+
+      if (entry.type === 'mail') {
+        return [
+          '<div class="detail-grid">',
+          renderMetricBox('Mail', [
+            { label: 'To', value: escapeHtml(content.to || '') },
+            { label: 'Subject', value: escapeHtml(content.subject || '') },
+            { label: 'Template', value: escapeHtml(content.template || '-') },
+            { label: 'Hostname', value: escapeHtml(content.hostname || '') }
+          ]),
+          '</div>',
+          '<div class="detail-stack">',
+          renderPayload('Mail Text', content.text),
+          renderPayload('Mail Html', content.html),
+          '</div>'
+        ].join('');
+      }
+
+      if (entry.type === 'notification') {
+        return [
+          '<div class="detail-grid">',
+          renderMetricBox('Notification', [
+            { label: 'Notification', value: escapeHtml(content.notification || '') },
+            { label: 'Channels', value: escapeHtml((content.channels || []).join(', ') || '-') },
+            { label: 'Recipient', value: escapeHtml(content.notifiable || '-') },
+            { label: 'Hostname', value: escapeHtml(content.hostname || '') }
+          ]),
+          '</div>',
+          '<div class="detail-stack">',
+          renderPayload('Message', content.message),
+          content.payload === undefined ? '<p class="trace-note">No additional notification payload was captured.</p>' : detailJson(content.payload, 'Notification Payload Json'),
+          '</div>'
         ].join('');
       }
 

package/src/register.ts

@@ -141,6 +141,14 @@ const parseEnvList = (rawValue: string): string[] | undefined => {
     .filter((entry) => entry !== '');
 };
 
+const parseEnvBool = (rawValue: string): boolean | undefined => {
+  const value = rawValue.trim().toLowerCase();
+  if (value === '') return undefined;
+  if (['1', 'true', 'yes', 'on'].includes(value)) return true;
+  if (['0', 'false', 'no', 'off'].includes(value)) return false;
+  return undefined;
+};
+
 const resolveTraceStartupOverrides = (core: CoreApi): TraceConfigOverrides | undefined => {
   const traceConfigFile = core.StartupConfigFile?.Trace;
   if (typeof traceConfigFile !== 'string' || traceConfigFile.trim() === '') return undefined;
@@ -201,6 +209,8 @@ if (!traceAlreadyInitialized && Env) {
     const pruneAfterHoursRaw = Env.get('TRACE_PRUNE_HOURS', '').trim();
     const slowQueryThresholdRaw = Env.get('TRACE_SLOW_QUERY_MS', '').trim();
     const logMinLevelRaw = Env.get('TRACE_LOG_LEVEL', '').trim();
+    const captureCachePayloadsRaw = Env.get('TRACE_CACHE_PAYLOADS', '').trim();
+    const captureQueryBindingsRaw = Env.get('TRACE_QUERY_BINDINGS', '').trim();
     const redactionKeys = parseEnvList(Env.get('TRACE_REDACT_KEYS', ''));
     const redactionHeaders = parseEnvList(Env.get('TRACE_REDACT_HEADERS', ''));
     const redactionBody = parseEnvList(Env.get('TRACE_REDACT_BODY', ''));
@@ -221,6 +231,10 @@ if (!traceAlreadyInitialized && Env) {
       | 'warn'
       | 'error'
       | 'fatal';
+    const captureCachePayloads =
+      parseEnvBool(captureCachePayloadsRaw) ?? startupOverrides?.captureCachePayloads;
+    const captureQueryBindings =
+      parseEnvBool(captureQueryBindingsRaw) ?? startupOverrides?.captureQueryBindings;
     const redaction = buildTraceRedactionOverrides({
       startupOverrides,
       redactionBody,
@@ -239,6 +253,8 @@ if (!traceAlreadyInitialized && Env) {
       ...(typeof slowQueryThreshold === 'number' && Number.isFinite(slowQueryThreshold)
         ? { slowQueryThreshold }
         : {}),
+      ...(typeof captureCachePayloads === 'boolean' ? { captureCachePayloads } : {}),
+      ...(typeof captureQueryBindings === 'boolean' ? { captureQueryBindings } : {}),
       logMinLevel,
       ...(redaction === undefined ? {} : { redaction }),
     });

package/src/types.ts

@@ -55,6 +55,9 @@ export interface RequestContent {
 export interface QueryContent {
   connection: string;
   sql: string;
+  statement?: string;
+  bindings?: unknown[];
+  bindingsIncluded?: boolean;
   time: number;
   duration: number;
   slow: boolean;
@@ -97,6 +100,10 @@ export interface CacheContent {
   operation: 'get' | 'set' | 'delete' | 'clear' | 'has';
   key: string;
   hit?: boolean;
+  store?: string;
+  payload?: unknown;
+  payloadLogged?: boolean;
+  ttl?: number;
   duration: number;
   hostname: string;
 }
@@ -114,6 +121,8 @@ export interface MailContent {
   to: string;
   subject: string;
   template?: string;
+  text?: string;
+  html?: string;
   hostname: string;
 }
 
@@ -142,6 +151,8 @@ export interface NotificationContent {
   channels: string[];
   notifiable?: string;
   notification: string;
+  message?: string;
+  payload?: unknown;
   hostname: string;
 }
 
@@ -201,11 +212,27 @@ export interface ClientRequestContent {
   method: string;
   url: string;
   requestHeaders: Record<string, string>;
-  responseStatus: number;
+  requestBody?: unknown;
+  responseStatus?: number;
+  responseHeaders?: Record<string, string>;
+  responseBody?: unknown;
+  error?: string;
   duration: number;
   hostname: string;
 }
 
+export interface ClientRequestTraceInput {
+  method: string;
+  url: string;
+  requestHeaders: Record<string, string>;
+  responseStatus?: number;
+  duration: number;
+  requestBody?: unknown;
+  responseHeaders?: Record<string, string>;
+  responseBody?: unknown;
+  error?: string;
+}
+
 // ---------------------------------------------------------------------------
 // Core domain records
 // ---------------------------------------------------------------------------
@@ -329,6 +356,8 @@ export interface ITraceConfig {
   pruneAfterHours: number;
   ignoreRoutes: string[];
   slowQueryThreshold: number;
+  captureCachePayloads: boolean;
+  captureQueryBindings: boolean;
   logMinLevel: 'debug' | 'info' | 'warn' | 'error' | 'fatal';
   watchers: WatcherToggles;
   redaction: RedactionConfig;

package/src/watchers/CacheWatcher.ts

@@ -6,10 +6,11 @@ import { TraceContext } from '../context';
 import type { CacheContent, ITraceWatcher, ITraceWatcherConfig } from '../types';
 import { EntryType } from '../types';
 import { AuthTag } from '../utils/authTag';
-import { redactString } from '../utils/redact';
+import { redactString, redactUnknown } from '../utils/redact';
 import { RequestFilter } from '../utils/requestFilter';
 
 let _storage: ITraceWatcherConfig['storage'] | null = null;
+let _config: ITraceWatcherConfig['config'] | null = null;
 let _redactionFields: string[] = [];
 let _ignoreRoutes: string[] = [];
 
@@ -17,15 +18,23 @@ const emit = (
   operation: CacheContent['operation'],
   key: string,
   duration: number,
-  hit?: boolean
+  hit?: boolean,
+  payload?: unknown,
+  store?: string,
+  ttl?: number
 ): void => {
   if (!_storage) return;
   if (RequestFilter.shouldIgnoreCurrentRequest(_ignoreRoutes)) return;
   const safeKey = redactString(key, _redactionFields);
+  const shouldLogPayload = _config?.captureCachePayloads === true;
   const content: CacheContent = {
     operation,
     key: safeKey,
     hit,
+    ...(typeof store === 'string' && store !== '' ? { store } : {}),
+    ...(typeof ttl === 'number' ? { ttl } : {}),
+    payloadLogged: shouldLogPayload,
+    ...(shouldLogPayload ? { payload: redactUnknown(payload, _redactionFields) } : {}),
     duration,
     hostname: TraceContext.getHostname(),
   };
@@ -48,10 +57,12 @@ export const CacheWatcher: ITraceWatcher & { emit: typeof emit } = Object.freeze
   register({ storage, config }: ITraceWatcherConfig): () => void {
     if (config.watchers.cache === false) return () => undefined;
     _storage = storage;
+    _config = config;
     _redactionFields = config.redaction.query;
     _ignoreRoutes = config.ignoreRoutes;
     return () => {
       _storage = null;
+      _config = null;
       _ignoreRoutes = [];
     };
   },

package/src/watchers/HttpClientWatcher.ts

@@ -1,30 +1,50 @@
 import { TraceContext } from '../context';
-import type { ClientRequestContent, ITraceWatcher, ITraceWatcherConfig } from '../types';
+import type {
+  ClientRequestContent,
+  ClientRequestTraceInput,
+  ITraceWatcher,
+  ITraceWatcherConfig,
+} from '../types';
 import { EntryType } from '../types';
 import { AuthTag } from '../utils/authTag';
-import { redactHeaders } from '../utils/redact';
+import { redactHeaders, redactUnknown } from '../utils/redact';
 import { RequestFilter } from '../utils/requestFilter';
 
 let _storage: ITraceWatcherConfig['storage'] | null = null;
 let _redactHeaderNames: string[] = [];
+let _redactBodyFields: string[] = [];
 let _ignoreRoutes: string[] = [];
 
-const emit = (
-  method: string,
-  url: string,
-  requestHeaders: Record<string, string>,
-  responseStatus: number,
-  duration: number
-): void => {
+const emit = ({
+  method,
+  url,
+  requestHeaders,
+  responseStatus,
+  duration,
+  requestBody,
+  responseHeaders,
+  responseBody,
+  error,
+}: ClientRequestTraceInput): void => {
   if (!_storage) return;
   if (RequestFilter.shouldIgnoreCurrentRequest(_ignoreRoutes)) return;
   const tags = AuthTag.append([method.toUpperCase()]);
-  if (responseStatus >= 400) tags.push('failed');
+  if ((responseStatus ?? 0) >= 400 || error) tags.push('failed');
   const content: ClientRequestContent = {
     method: method.toUpperCase(),
     url,
     requestHeaders: redactHeaders(requestHeaders, _redactHeaderNames),
-    responseStatus,
+    ...(requestBody === undefined
+      ? {}
+      : { requestBody: redactUnknown(requestBody, _redactBodyFields) }),
+    ...(responseStatus === undefined ? {} : { responseStatus }),
+    ...(responseHeaders === undefined
+      ? {}
+      : { responseHeaders: redactHeaders(responseHeaders, _redactHeaderNames) }),
+    ...(responseBody === undefined
+      ? {}
+      : { responseBody: redactUnknown(responseBody, _redactBodyFields) }),
+    ...(typeof error === 'string' && error !== '' ? { error } : {}),
     duration,
     hostname: TraceContext.getHostname(),
   };
@@ -47,9 +67,11 @@ export const HttpClientWatcher: ITraceWatcher & { emit: typeof emit } = Object.f
     if (config.watchers.clientRequest === false) return () => undefined;
     _storage = storage;
     _redactHeaderNames = [...(config.redaction?.keys ?? []), ...(config.redaction?.headers ?? [])];
+    _redactBodyFields = [...(config.redaction?.keys ?? []), ...(config.redaction?.body ?? [])];
     _ignoreRoutes = config.ignoreRoutes;
     return () => {
       _storage = null;
+      _redactBodyFields = [];
       _ignoreRoutes = [];
     };
   },

package/src/watchers/MailWatcher.ts

@@ -1,22 +1,35 @@
 /**
- * MailWatcher — records mail dispatch intent.
- * Body is never captured; only to/subject/template.
+ * MailWatcher — records mail dispatch intent and rendered content.
  */
 import { TraceContext } from '../context';
 import type { ITraceWatcher, ITraceWatcherConfig, MailContent } from '../types';
 import { EntryType } from '../types';
+import { redactUnknown } from '../utils/redact';
 import { RequestFilter } from '../utils/requestFilter';
 
 let _storage: ITraceWatcherConfig['storage'] | null = null;
+let _redactionFields: string[] = [];
 let _ignoreRoutes: string[] = [];
 
-const emit = (to: string, subject: string, template?: string): void => {
+const emit = (
+  to: string,
+  subject: string,
+  template?: string,
+  text?: string,
+  html?: string
+): void => {
   if (!_storage) return;
   if (RequestFilter.shouldIgnoreCurrentRequest(_ignoreRoutes)) return;
   const content: MailContent = {
     to,
     subject,
     template,
+    ...(typeof text === 'string' && text !== ''
+      ? { text: redactUnknown(text, _redactionFields) as string }
+      : {}),
+    ...(typeof html === 'string' && html !== ''
+      ? { html: redactUnknown(html, _redactionFields) as string }
+      : {}),
     hostname: TraceContext.getHostname(),
   };
   _storage
@@ -38,9 +51,11 @@ export const MailWatcher: ITraceWatcher & { emit: typeof emit } = Object.freeze(
   register({ storage, config }: ITraceWatcherConfig): () => void {
     if (config.watchers.mail === false) return () => undefined;
     _storage = storage;
+    _redactionFields = [...config.redaction.keys, ...config.redaction.body];
     _ignoreRoutes = config.ignoreRoutes;
     return () => {
       _storage = null;
+      _redactionFields = [];
       _ignoreRoutes = [];
     };
   },