@agenticmail/enterprise 0.5.169 → 0.5.170

package/dist/cli.js

@@ -50,7 +50,7 @@ Skill Development:
     import("./cli-serve-D5G3XNSI.js").then((m) => m.runServe(args.slice(1))).catch(fatal);
     break;
   case "agent":
-    import("./cli-agent-SHOCSBKU.js").then((m) => m.runAgent(args.slice(1))).catch(fatal);
+    import("./cli-agent-4XXBLRXV.js").then((m) => m.runAgent(args.slice(1))).catch(fatal);
     break;
   case "setup":
   default:

package/dist/dashboard/pages/agent-detail.js

@@ -1529,18 +1529,33 @@ function ActivitySection(props) {
   var _selectedItem = useState(null);
   var selectedItem = _selectedItem[0]; var setSelectedItem = _selectedItem[1];
 
+  // Filtering
+  var _typeFilter = useState('');
+  var typeFilter = _typeFilter[0]; var setTypeFilter = _typeFilter[1];
+  var _searchFilter = useState('');
+  var searchFilter = _searchFilter[0]; var setSearchFilter = _searchFilter[1];
+  var _dateFrom = useState('');
+  var dateFrom = _dateFrom[0]; var setDateFrom = _dateFrom[1];
+  var _dateTo = useState('');
+  var dateTo = _dateTo[0]; var setDateTo = _dateTo[1];
+
+  // Pagination
+  var PAGE_SIZE = 25;
+  var _page = useState(1);
+  var page = _page[0]; var setPage = _page[1];
+
   var loadEvents = function() {
-    engineCall('/activity/events?agentId=' + agentId + '&limit=50')
+    engineCall('/activity/events?agentId=' + agentId + '&limit=200')
       .then(function(d) { setEvents(d.events || []); })
       .catch(function() {});
   };
   var loadToolCalls = function() {
-    engineCall('/activity/tool-calls?agentId=' + agentId + '&limit=50')
+    engineCall('/activity/tool-calls?agentId=' + agentId + '&limit=200')
       .then(function(d) { setToolCalls(d.toolCalls || []); })
       .catch(function() {});
   };
   var loadJournal = function() {
-    engineCall('/journal?agentId=' + agentId + '&orgId=' + getOrgId() + '&limit=50')
+    engineCall('/journal?agentId=' + agentId + '&orgId=' + getOrgId() + '&limit=200')
       .then(function(d) { setJournalEntries(d.entries || []); })
       .catch(function() {});
   };
@@ -1548,27 +1563,22 @@ function ActivitySection(props) {
   var loadAll = function() {
     setLoading(true);
     Promise.all([
-      engineCall('/activity/events?agentId=' + agentId + '&limit=50').then(function(d) { setEvents(d.events || []); }).catch(function() {}),
-      engineCall('/activity/tool-calls?agentId=' + agentId + '&limit=50').then(function(d) { setToolCalls(d.toolCalls || []); }).catch(function() {}),
-      engineCall('/journal?agentId=' + agentId + '&orgId=' + getOrgId() + '&limit=50').then(function(d) { setJournalEntries(d.entries || []); }).catch(function() {}),
+      engineCall('/activity/events?agentId=' + agentId + '&limit=200').then(function(d) { setEvents(d.events || []); }).catch(function() {}),
+      engineCall('/activity/tool-calls?agentId=' + agentId + '&limit=200').then(function(d) { setToolCalls(d.toolCalls || []); }).catch(function() {}),
+      engineCall('/journal?agentId=' + agentId + '&orgId=' + getOrgId() + '&limit=200').then(function(d) { setJournalEntries(d.entries || []); }).catch(function() {}),
     ]).then(function() { setLoading(false); }).catch(function() { setLoading(false); });
   };
 
   useEffect(loadAll, []);
 
+  // Reset page when filters change
+  useEffect(function() { setPage(1); }, [typeFilter, searchFilter, dateFrom, dateTo, activeTab]);
+
   var rollback = function(id) {
-    showConfirm({
-      title: 'Rollback Action',
-      message: 'Are you sure you want to rollback this journal entry? This will attempt to reverse the original action.',
-      warning: true,
-      confirmText: 'Rollback'
-    }).then(function(confirmed) {
-      if (!confirmed) return;
+    showConfirm({ title: 'Rollback Action', message: 'Reverse this journal entry?', warning: true, confirmText: 'Rollback' }).then(function(ok) {
+      if (!ok) return;
       engineCall('/journal/' + id + '/rollback', { method: 'POST', body: JSON.stringify({}) })
-        .then(function(r) {
-          if (r.success) { toast('Action rolled back', 'success'); loadJournal(); }
-          else { toast('Rollback failed: ' + (r.error || 'Unknown'), 'error'); }
-        })
+        .then(function(r) { if (r.success) { toast('Rolled back', 'success'); loadJournal(); } else toast('Failed: ' + (r.error || ''), 'error'); })
         .catch(function(e) { toast(e.message, 'error'); });
     });
   };
@@ -1579,34 +1589,98 @@ function ActivitySection(props) {
     else if (activeTab === 'journal') loadJournal();
   };
 
+  // Filter helper
+  var filterItems = function(items) {
+    var filtered = items;
+    if (typeFilter) {
+      filtered = filtered.filter(function(item) {
+        var t = (item.type || item.eventType || item.tool || item.toolName || item.actionType || '').toLowerCase();
+        return t.includes(typeFilter.toLowerCase());
+      });
+    }
+    if (searchFilter) {
+      var q = searchFilter.toLowerCase();
+      filtered = filtered.filter(function(item) {
+        var text = JSON.stringify(item).toLowerCase();
+        return text.includes(q);
+      });
+    }
+    if (dateFrom) {
+      var fromTs = new Date(dateFrom).getTime();
+      filtered = filtered.filter(function(item) {
+        var ts = new Date(item.timestamp || item.createdAt).getTime();
+        return ts >= fromTs;
+      });
+    }
+    if (dateTo) {
+      var toTs = new Date(dateTo + 'T23:59:59').getTime();
+      filtered = filtered.filter(function(item) {
+        var ts = new Date(item.timestamp || item.createdAt).getTime();
+        return ts <= toTs;
+      });
+    }
+    return filtered;
+  };
+
+  // Get current data source
+  var currentItems = activeTab === 'events' ? events : activeTab === 'tools' ? toolCalls : journalEntries;
+  var filtered = filterItems(currentItems);
+  var totalPages = Math.max(1, Math.ceil(filtered.length / PAGE_SIZE));
+  var paged = filtered.slice((page - 1) * PAGE_SIZE, page * PAGE_SIZE);
+
+  // Extract unique types for filter dropdown
+  var uniqueTypes = [];
+  var typeSet = {};
+  currentItems.forEach(function(item) {
+    var t = item.type || item.eventType || item.tool || item.toolName || item.actionType || '';
+    if (t && !typeSet[t]) { typeSet[t] = true; uniqueTypes.push(t); }
+  });
+  uniqueTypes.sort();
+
+  var filterBarStyle = { display: 'flex', gap: 8, padding: '8px 16px', borderBottom: '1px solid var(--border)', flexWrap: 'wrap', alignItems: 'center' };
+  var filterInputStyle = { padding: '4px 8px', borderRadius: 4, border: '1px solid var(--border)', background: 'var(--bg-secondary)', color: 'var(--text-primary)', fontSize: 12 };
+
   return h('div', { className: 'card' },
     h('div', { className: 'card-header', style: { display: 'flex', alignItems: 'center', justifyContent: 'space-between' } },
       h('h3', { style: { margin: 0, fontSize: 15, fontWeight: 600 } }, 'Activity'),
-      h('button', { className: 'btn btn-ghost btn-sm', onClick: refreshCurrent }, I.refresh(), ' Refresh')
+      h('div', { style: { display: 'flex', gap: 8, alignItems: 'center' } },
+        h('span', { style: { fontSize: 11, color: 'var(--text-muted)' } }, filtered.length + ' items'),
+        h('button', { className: 'btn btn-ghost btn-sm', onClick: refreshCurrent }, I.refresh())
+      )
     ),
     h('div', { style: { borderBottom: '1px solid var(--border)' } },
       h('div', { className: 'tabs', style: { padding: '0 16px' } },
-        h('div', { className: 'tab' + (activeTab === 'events' ? ' active' : ''), onClick: function() { setActiveTab('events'); } }, 'Events'),
-        h('div', { className: 'tab' + (activeTab === 'tools' ? ' active' : ''), onClick: function() { setActiveTab('tools'); } }, 'Tool Calls'),
-        h('div', { className: 'tab' + (activeTab === 'journal' ? ' active' : ''), onClick: function() { setActiveTab('journal'); } }, 'Journal')
+        h('div', { className: 'tab' + (activeTab === 'events' ? ' active' : ''), onClick: function() { setActiveTab('events'); } }, 'Events (' + events.length + ')'),
+        h('div', { className: 'tab' + (activeTab === 'tools' ? ' active' : ''), onClick: function() { setActiveTab('tools'); } }, 'Tool Calls (' + toolCalls.length + ')'),
+        h('div', { className: 'tab' + (activeTab === 'journal' ? ' active' : ''), onClick: function() { setActiveTab('journal'); } }, 'Journal (' + journalEntries.length + ')')
       )
     ),
+
+    // Filter bar
+    h('div', { style: filterBarStyle },
+      h('select', { style: Object.assign({}, filterInputStyle, { width: 140 }), value: typeFilter, onChange: function(e) { setTypeFilter(e.target.value); } },
+        h('option', { value: '' }, 'All types'),
+        uniqueTypes.map(function(t) { return h('option', { key: t, value: t }, t); })
+      ),
+      h('input', { style: Object.assign({}, filterInputStyle, { width: 180 }), type: 'text', placeholder: 'Search...', value: searchFilter, onChange: function(e) { setSearchFilter(e.target.value); } }),
+      h('input', { style: Object.assign({}, filterInputStyle, { width: 130 }), type: 'date', value: dateFrom, onChange: function(e) { setDateFrom(e.target.value); }, title: 'From date' }),
+      h('span', { style: { fontSize: 11, color: 'var(--text-muted)' } }, 'to'),
+      h('input', { style: Object.assign({}, filterInputStyle, { width: 130 }), type: 'date', value: dateTo, onChange: function(e) { setDateTo(e.target.value); }, title: 'To date' }),
+      (typeFilter || searchFilter || dateFrom || dateTo) && h('button', { className: 'btn btn-ghost btn-sm', style: { fontSize: 11 }, onClick: function() { setTypeFilter(''); setSearchFilter(''); setDateFrom(''); setDateTo(''); } }, 'Clear')
+    ),
+
     h('div', { className: 'card-body-flush' },
 
       // Events Tab
       activeTab === 'events' && (
-        events.length === 0
-          ? h('div', { style: { padding: 40, textAlign: 'center', color: 'var(--text-muted)' } }, 'No events recorded for this agent')
+        paged.length === 0
+          ? h('div', { style: { padding: 40, textAlign: 'center', color: 'var(--text-muted)' } }, filtered.length === 0 && events.length > 0 ? 'No events match filters' : 'No events recorded')
           : h('table', { className: 'data-table' },
               h('thead', null,
-                h('tr', null,
-                  h('th', null, 'Time'),
-                  h('th', null, 'Type'),
-                  h('th', null, 'Details')
-                )
+                h('tr', null, h('th', null, 'Time'), h('th', null, 'Type'), h('th', null, 'Details'))
               ),
               h('tbody', null,
-                events.map(function(ev, i) {
+                paged.map(function(ev, i) {
                   var details = typeof ev.data === 'object' ? JSON.stringify(ev.data) : (ev.details || ev.data || '-');
                   return h('tr', { key: ev.id || i, onClick: function() { setSelectedItem(ev); }, style: { cursor: 'pointer' } },
                     h('td', { style: { fontSize: 12, color: 'var(--text-muted)', whiteSpace: 'nowrap' } }, new Date(ev.timestamp || ev.createdAt).toLocaleString()),
@@ -1620,19 +1694,14 @@ function ActivitySection(props) {
 
       // Tool Calls Tab
       activeTab === 'tools' && (
-        toolCalls.length === 0
-          ? h('div', { style: { padding: 40, textAlign: 'center', color: 'var(--text-muted)' } }, 'No tool calls recorded for this agent')
+        paged.length === 0
+          ? h('div', { style: { padding: 40, textAlign: 'center', color: 'var(--text-muted)' } }, filtered.length === 0 && toolCalls.length > 0 ? 'No tool calls match filters' : 'No tool calls recorded')
           : h('table', { className: 'data-table' },
               h('thead', null,
-                h('tr', null,
-                  h('th', null, 'Time'),
-                  h('th', null, 'Tool'),
-                  h('th', null, 'Duration'),
-                  h('th', null, 'Status')
-                )
+                h('tr', null, h('th', null, 'Time'), h('th', null, 'Tool'), h('th', null, 'Duration'), h('th', null, 'Status'))
               ),
               h('tbody', null,
-                toolCalls.map(function(tc, i) {
+                paged.map(function(tc, i) {
                   var statusClass = tc.success === true ? 'badge badge-success' : tc.success === false ? 'badge badge-danger' : 'badge badge-neutral';
                   var statusLabel = tc.success === true ? 'OK' : tc.success === false ? 'Failed' : (tc.status || 'Pending');
                   return h('tr', { key: tc.id || i, onClick: function() { setSelectedItem(tc); }, style: { cursor: 'pointer' } },
@@ -1648,42 +1717,38 @@ function ActivitySection(props) {
 
       // Journal Tab
       activeTab === 'journal' && (
-        journalEntries.length === 0
-          ? h('div', { style: { padding: 40, textAlign: 'center', color: 'var(--text-muted)' } }, 'No journal entries for this agent')
+        paged.length === 0
+          ? h('div', { style: { padding: 40, textAlign: 'center', color: 'var(--text-muted)' } }, filtered.length === 0 && journalEntries.length > 0 ? 'No journal entries match filters' : 'No journal entries')
           : h('table', { className: 'data-table' },
               h('thead', null,
-                h('tr', null,
-                  h('th', null, 'Time'),
-                  h('th', null, 'Tool'),
-                  h('th', null, 'Action Type'),
-                  h('th', null, 'Reversible'),
-                  h('th', null, 'Status'),
-                  h('th', null, 'Actions')
-                )
+                h('tr', null, h('th', null, 'Time'), h('th', null, 'Tool'), h('th', null, 'Action Type'), h('th', null, 'Reversible'), h('th', null, 'Status'), h('th', null, 'Actions'))
               ),
               h('tbody', null,
-                journalEntries.map(function(e) {
+                paged.map(function(e) {
                   return h('tr', { key: e.id, onClick: function(evt) { if (evt.target.tagName === 'BUTTON' || evt.target.closest('button')) return; setSelectedItem(e); }, style: { cursor: 'pointer' } },
                     h('td', { style: { fontSize: 12, color: 'var(--text-muted)', whiteSpace: 'nowrap' } }, new Date(e.createdAt).toLocaleString()),
                     h('td', null, e.toolName || e.toolId || '-'),
                     h('td', null, h('span', { className: 'badge-tag' }, e.actionType || '-')),
                     h('td', null, e.reversible ? '\u2705' : '\u274C'),
-                    h('td', null,
-                      e.reversed
-                        ? h('span', { className: 'status-badge status-warning' }, 'Rolled Back')
-                        : h('span', { className: 'status-badge status-success' }, 'Active')
-                    ),
-                    h('td', null,
-                      e.reversible && !e.reversed && h('button', { className: 'btn btn-ghost btn-sm', onClick: function() { rollback(e.id); } }, I.undo(), ' Rollback')
-                    )
+                    h('td', null, e.reversed ? h('span', { className: 'status-badge status-warning' }, 'Rolled Back') : h('span', { className: 'status-badge status-success' }, 'Active')),
+                    h('td', null, e.reversible && !e.reversed && h('button', { className: 'btn btn-ghost btn-sm', onClick: function() { rollback(e.id); } }, I.undo(), ' Rollback'))
                   );
                 })
               )
             )
+      ),
+
+      // Pagination
+      totalPages > 1 && h('div', { style: { display: 'flex', justifyContent: 'center', alignItems: 'center', gap: 6, padding: '10px 16px', borderTop: '1px solid var(--border)' } },
+        h('button', { className: 'btn btn-ghost btn-sm', disabled: page <= 1, onClick: function() { setPage(1); }, style: { fontSize: 11 } }, '«'),
+        h('button', { className: 'btn btn-ghost btn-sm', disabled: page <= 1, onClick: function() { setPage(page - 1); }, style: { fontSize: 11 } }, '‹'),
+        h('span', { style: { fontSize: 12, color: 'var(--text-muted)', minWidth: 80, textAlign: 'center' } }, 'Page ' + page + ' / ' + totalPages),
+        h('button', { className: 'btn btn-ghost btn-sm', disabled: page >= totalPages, onClick: function() { setPage(page + 1); }, style: { fontSize: 11 } }, '›'),
+        h('button', { className: 'btn btn-ghost btn-sm', disabled: page >= totalPages, onClick: function() { setPage(totalPages); }, style: { fontSize: 11 } }, '»')
       )
     ),
 
-    // ─── Activity Detail Modal ──────────────────────────────
+    // Detail Modal
     selectedItem && (function() {
       var item = selectedItem;
       var typeLabel = item.type || item.eventType || item.tool || item.toolName || item.actionType || 'Detail';
@@ -6553,21 +6618,19 @@ function AutonomySection(props) {
         h(Toggle, { field: 'dailyCatchupEnabled', value: form.dailyCatchupEnabled, label: 'Daily Manager Catchup', desc: 'Email summary to manager each workday' })
       ),
       form.dailyCatchupEnabled && h('div', { style: configRow },
-        h('span', null, 'Send at'),
-        h(TimeSelect, { hour: form.dailyCatchupHour, minute: form.dailyCatchupMinute, hourField: 'dailyCatchupHour', minuteField: 'dailyCatchupMinute' })
+        h('span', { style: { color: 'var(--text-muted)', fontSize: 12 } }, 'Time configured in Manager & Catch-Up tab')
       )
     ),
 
     // Weekly Catchup
     h('div', { className: 'card', style: Object.assign({}, cardStyle, { opacity: form.enabled ? 1 : 0.5 }) },
       h('div', { style: rowStyle },
-        h(Toggle, { field: 'weeklyCatchupEnabled', value: form.weeklyCatchupEnabled, label: 'Weekly Manager Catchup', desc: 'Broader summary + goals, replaces daily on chosen day' })
+        h(Toggle, { field: 'weeklyCatchupEnabled', value: form.weeklyCatchupEnabled, label: 'Weekly Manager Catchup', desc: 'Broader weekly summary + goals, uses same time as daily' })
       ),
       form.weeklyCatchupEnabled && h('div', { style: configRow },
         h('span', null, 'Send on'),
         h(DaySelect, { value: form.weeklyCatchupDay, field: 'weeklyCatchupDay' }),
-        h('span', null, 'at'),
-        h(TimeSelect, { hour: form.weeklyCatchupHour, minute: form.weeklyCatchupMinute, hourField: 'weeklyCatchupHour', minuteField: 'weeklyCatchupMinute' })
+        h('span', { style: { color: 'var(--text-muted)', fontSize: 12 } }, '(same time as daily catchup)')
       )
     ),
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agenticmail/enterprise",
-  "version": "0.5.169",
+  "version": "0.5.170",
   "description": "AgenticMail Enterprise — cloud-hosted AI agent identity, email, auth & compliance for organizations",
   "type": "module",
   "bin": {

package/src/dashboard/pages/agent-detail.js

@@ -1529,18 +1529,33 @@ function ActivitySection(props) {
   var _selectedItem = useState(null);
   var selectedItem = _selectedItem[0]; var setSelectedItem = _selectedItem[1];
 
+  // Filtering
+  var _typeFilter = useState('');
+  var typeFilter = _typeFilter[0]; var setTypeFilter = _typeFilter[1];
+  var _searchFilter = useState('');
+  var searchFilter = _searchFilter[0]; var setSearchFilter = _searchFilter[1];
+  var _dateFrom = useState('');
+  var dateFrom = _dateFrom[0]; var setDateFrom = _dateFrom[1];
+  var _dateTo = useState('');
+  var dateTo = _dateTo[0]; var setDateTo = _dateTo[1];
+
+  // Pagination
+  var PAGE_SIZE = 25;
+  var _page = useState(1);
+  var page = _page[0]; var setPage = _page[1];
+
   var loadEvents = function() {
-    engineCall('/activity/events?agentId=' + agentId + '&limit=50')
+    engineCall('/activity/events?agentId=' + agentId + '&limit=200')
       .then(function(d) { setEvents(d.events || []); })
       .catch(function() {});
   };
   var loadToolCalls = function() {
-    engineCall('/activity/tool-calls?agentId=' + agentId + '&limit=50')
+    engineCall('/activity/tool-calls?agentId=' + agentId + '&limit=200')
       .then(function(d) { setToolCalls(d.toolCalls || []); })
       .catch(function() {});
   };
   var loadJournal = function() {
-    engineCall('/journal?agentId=' + agentId + '&orgId=' + getOrgId() + '&limit=50')
+    engineCall('/journal?agentId=' + agentId + '&orgId=' + getOrgId() + '&limit=200')
       .then(function(d) { setJournalEntries(d.entries || []); })
       .catch(function() {});
   };
@@ -1548,27 +1563,22 @@ function ActivitySection(props) {
   var loadAll = function() {
     setLoading(true);
     Promise.all([
-      engineCall('/activity/events?agentId=' + agentId + '&limit=50').then(function(d) { setEvents(d.events || []); }).catch(function() {}),
-      engineCall('/activity/tool-calls?agentId=' + agentId + '&limit=50').then(function(d) { setToolCalls(d.toolCalls || []); }).catch(function() {}),
-      engineCall('/journal?agentId=' + agentId + '&orgId=' + getOrgId() + '&limit=50').then(function(d) { setJournalEntries(d.entries || []); }).catch(function() {}),
+      engineCall('/activity/events?agentId=' + agentId + '&limit=200').then(function(d) { setEvents(d.events || []); }).catch(function() {}),
+      engineCall('/activity/tool-calls?agentId=' + agentId + '&limit=200').then(function(d) { setToolCalls(d.toolCalls || []); }).catch(function() {}),
+      engineCall('/journal?agentId=' + agentId + '&orgId=' + getOrgId() + '&limit=200').then(function(d) { setJournalEntries(d.entries || []); }).catch(function() {}),
     ]).then(function() { setLoading(false); }).catch(function() { setLoading(false); });
   };
 
   useEffect(loadAll, []);
 
+  // Reset page when filters change
+  useEffect(function() { setPage(1); }, [typeFilter, searchFilter, dateFrom, dateTo, activeTab]);
+
   var rollback = function(id) {
-    showConfirm({
-      title: 'Rollback Action',
-      message: 'Are you sure you want to rollback this journal entry? This will attempt to reverse the original action.',
-      warning: true,
-      confirmText: 'Rollback'
-    }).then(function(confirmed) {
-      if (!confirmed) return;
+    showConfirm({ title: 'Rollback Action', message: 'Reverse this journal entry?', warning: true, confirmText: 'Rollback' }).then(function(ok) {
+      if (!ok) return;
       engineCall('/journal/' + id + '/rollback', { method: 'POST', body: JSON.stringify({}) })
-        .then(function(r) {
-          if (r.success) { toast('Action rolled back', 'success'); loadJournal(); }
-          else { toast('Rollback failed: ' + (r.error || 'Unknown'), 'error'); }
-        })
+        .then(function(r) { if (r.success) { toast('Rolled back', 'success'); loadJournal(); } else toast('Failed: ' + (r.error || ''), 'error'); })
         .catch(function(e) { toast(e.message, 'error'); });
     });
   };
@@ -1579,34 +1589,98 @@ function ActivitySection(props) {
     else if (activeTab === 'journal') loadJournal();
   };
 
+  // Filter helper
+  var filterItems = function(items) {
+    var filtered = items;
+    if (typeFilter) {
+      filtered = filtered.filter(function(item) {
+        var t = (item.type || item.eventType || item.tool || item.toolName || item.actionType || '').toLowerCase();
+        return t.includes(typeFilter.toLowerCase());
+      });
+    }
+    if (searchFilter) {
+      var q = searchFilter.toLowerCase();
+      filtered = filtered.filter(function(item) {
+        var text = JSON.stringify(item).toLowerCase();
+        return text.includes(q);
+      });
+    }
+    if (dateFrom) {
+      var fromTs = new Date(dateFrom).getTime();
+      filtered = filtered.filter(function(item) {
+        var ts = new Date(item.timestamp || item.createdAt).getTime();
+        return ts >= fromTs;
+      });
+    }
+    if (dateTo) {
+      var toTs = new Date(dateTo + 'T23:59:59').getTime();
+      filtered = filtered.filter(function(item) {
+        var ts = new Date(item.timestamp || item.createdAt).getTime();
+        return ts <= toTs;
+      });
+    }
+    return filtered;
+  };
+
+  // Get current data source
+  var currentItems = activeTab === 'events' ? events : activeTab === 'tools' ? toolCalls : journalEntries;
+  var filtered = filterItems(currentItems);
+  var totalPages = Math.max(1, Math.ceil(filtered.length / PAGE_SIZE));
+  var paged = filtered.slice((page - 1) * PAGE_SIZE, page * PAGE_SIZE);
+
+  // Extract unique types for filter dropdown
+  var uniqueTypes = [];
+  var typeSet = {};
+  currentItems.forEach(function(item) {
+    var t = item.type || item.eventType || item.tool || item.toolName || item.actionType || '';
+    if (t && !typeSet[t]) { typeSet[t] = true; uniqueTypes.push(t); }
+  });
+  uniqueTypes.sort();
+
+  var filterBarStyle = { display: 'flex', gap: 8, padding: '8px 16px', borderBottom: '1px solid var(--border)', flexWrap: 'wrap', alignItems: 'center' };
+  var filterInputStyle = { padding: '4px 8px', borderRadius: 4, border: '1px solid var(--border)', background: 'var(--bg-secondary)', color: 'var(--text-primary)', fontSize: 12 };
+
   return h('div', { className: 'card' },
     h('div', { className: 'card-header', style: { display: 'flex', alignItems: 'center', justifyContent: 'space-between' } },
       h('h3', { style: { margin: 0, fontSize: 15, fontWeight: 600 } }, 'Activity'),
-      h('button', { className: 'btn btn-ghost btn-sm', onClick: refreshCurrent }, I.refresh(), ' Refresh')
+      h('div', { style: { display: 'flex', gap: 8, alignItems: 'center' } },
+        h('span', { style: { fontSize: 11, color: 'var(--text-muted)' } }, filtered.length + ' items'),
+        h('button', { className: 'btn btn-ghost btn-sm', onClick: refreshCurrent }, I.refresh())
+      )
     ),
     h('div', { style: { borderBottom: '1px solid var(--border)' } },
       h('div', { className: 'tabs', style: { padding: '0 16px' } },
-        h('div', { className: 'tab' + (activeTab === 'events' ? ' active' : ''), onClick: function() { setActiveTab('events'); } }, 'Events'),
-        h('div', { className: 'tab' + (activeTab === 'tools' ? ' active' : ''), onClick: function() { setActiveTab('tools'); } }, 'Tool Calls'),
-        h('div', { className: 'tab' + (activeTab === 'journal' ? ' active' : ''), onClick: function() { setActiveTab('journal'); } }, 'Journal')
+        h('div', { className: 'tab' + (activeTab === 'events' ? ' active' : ''), onClick: function() { setActiveTab('events'); } }, 'Events (' + events.length + ')'),
+        h('div', { className: 'tab' + (activeTab === 'tools' ? ' active' : ''), onClick: function() { setActiveTab('tools'); } }, 'Tool Calls (' + toolCalls.length + ')'),
+        h('div', { className: 'tab' + (activeTab === 'journal' ? ' active' : ''), onClick: function() { setActiveTab('journal'); } }, 'Journal (' + journalEntries.length + ')')
       )
     ),
+
+    // Filter bar
+    h('div', { style: filterBarStyle },
+      h('select', { style: Object.assign({}, filterInputStyle, { width: 140 }), value: typeFilter, onChange: function(e) { setTypeFilter(e.target.value); } },
+        h('option', { value: '' }, 'All types'),
+        uniqueTypes.map(function(t) { return h('option', { key: t, value: t }, t); })
+      ),
+      h('input', { style: Object.assign({}, filterInputStyle, { width: 180 }), type: 'text', placeholder: 'Search...', value: searchFilter, onChange: function(e) { setSearchFilter(e.target.value); } }),
+      h('input', { style: Object.assign({}, filterInputStyle, { width: 130 }), type: 'date', value: dateFrom, onChange: function(e) { setDateFrom(e.target.value); }, title: 'From date' }),
+      h('span', { style: { fontSize: 11, color: 'var(--text-muted)' } }, 'to'),
+      h('input', { style: Object.assign({}, filterInputStyle, { width: 130 }), type: 'date', value: dateTo, onChange: function(e) { setDateTo(e.target.value); }, title: 'To date' }),
+      (typeFilter || searchFilter || dateFrom || dateTo) && h('button', { className: 'btn btn-ghost btn-sm', style: { fontSize: 11 }, onClick: function() { setTypeFilter(''); setSearchFilter(''); setDateFrom(''); setDateTo(''); } }, 'Clear')
+    ),
+
     h('div', { className: 'card-body-flush' },
 
       // Events Tab
       activeTab === 'events' && (
-        events.length === 0
-          ? h('div', { style: { padding: 40, textAlign: 'center', color: 'var(--text-muted)' } }, 'No events recorded for this agent')
+        paged.length === 0
+          ? h('div', { style: { padding: 40, textAlign: 'center', color: 'var(--text-muted)' } }, filtered.length === 0 && events.length > 0 ? 'No events match filters' : 'No events recorded')
           : h('table', { className: 'data-table' },
               h('thead', null,
-                h('tr', null,
-                  h('th', null, 'Time'),
-                  h('th', null, 'Type'),
-                  h('th', null, 'Details')
-                )
+                h('tr', null, h('th', null, 'Time'), h('th', null, 'Type'), h('th', null, 'Details'))
               ),
               h('tbody', null,
-                events.map(function(ev, i) {
+                paged.map(function(ev, i) {
                   var details = typeof ev.data === 'object' ? JSON.stringify(ev.data) : (ev.details || ev.data || '-');
                   return h('tr', { key: ev.id || i, onClick: function() { setSelectedItem(ev); }, style: { cursor: 'pointer' } },
                     h('td', { style: { fontSize: 12, color: 'var(--text-muted)', whiteSpace: 'nowrap' } }, new Date(ev.timestamp || ev.createdAt).toLocaleString()),
@@ -1620,19 +1694,14 @@ function ActivitySection(props) {
 
       // Tool Calls Tab
       activeTab === 'tools' && (
-        toolCalls.length === 0
-          ? h('div', { style: { padding: 40, textAlign: 'center', color: 'var(--text-muted)' } }, 'No tool calls recorded for this agent')
+        paged.length === 0
+          ? h('div', { style: { padding: 40, textAlign: 'center', color: 'var(--text-muted)' } }, filtered.length === 0 && toolCalls.length > 0 ? 'No tool calls match filters' : 'No tool calls recorded')
           : h('table', { className: 'data-table' },
               h('thead', null,
-                h('tr', null,
-                  h('th', null, 'Time'),
-                  h('th', null, 'Tool'),
-                  h('th', null, 'Duration'),
-                  h('th', null, 'Status')
-                )
+                h('tr', null, h('th', null, 'Time'), h('th', null, 'Tool'), h('th', null, 'Duration'), h('th', null, 'Status'))
               ),
               h('tbody', null,
-                toolCalls.map(function(tc, i) {
+                paged.map(function(tc, i) {
                   var statusClass = tc.success === true ? 'badge badge-success' : tc.success === false ? 'badge badge-danger' : 'badge badge-neutral';
                   var statusLabel = tc.success === true ? 'OK' : tc.success === false ? 'Failed' : (tc.status || 'Pending');
                   return h('tr', { key: tc.id || i, onClick: function() { setSelectedItem(tc); }, style: { cursor: 'pointer' } },
@@ -1648,42 +1717,38 @@ function ActivitySection(props) {
 
       // Journal Tab
       activeTab === 'journal' && (
-        journalEntries.length === 0
-          ? h('div', { style: { padding: 40, textAlign: 'center', color: 'var(--text-muted)' } }, 'No journal entries for this agent')
+        paged.length === 0
+          ? h('div', { style: { padding: 40, textAlign: 'center', color: 'var(--text-muted)' } }, filtered.length === 0 && journalEntries.length > 0 ? 'No journal entries match filters' : 'No journal entries')
           : h('table', { className: 'data-table' },
               h('thead', null,
-                h('tr', null,
-                  h('th', null, 'Time'),
-                  h('th', null, 'Tool'),
-                  h('th', null, 'Action Type'),
-                  h('th', null, 'Reversible'),
-                  h('th', null, 'Status'),
-                  h('th', null, 'Actions')
-                )
+                h('tr', null, h('th', null, 'Time'), h('th', null, 'Tool'), h('th', null, 'Action Type'), h('th', null, 'Reversible'), h('th', null, 'Status'), h('th', null, 'Actions'))
               ),
               h('tbody', null,
-                journalEntries.map(function(e) {
+                paged.map(function(e) {
                   return h('tr', { key: e.id, onClick: function(evt) { if (evt.target.tagName === 'BUTTON' || evt.target.closest('button')) return; setSelectedItem(e); }, style: { cursor: 'pointer' } },
                     h('td', { style: { fontSize: 12, color: 'var(--text-muted)', whiteSpace: 'nowrap' } }, new Date(e.createdAt).toLocaleString()),
                     h('td', null, e.toolName || e.toolId || '-'),
                     h('td', null, h('span', { className: 'badge-tag' }, e.actionType || '-')),
                     h('td', null, e.reversible ? '\u2705' : '\u274C'),
-                    h('td', null,
-                      e.reversed
-                        ? h('span', { className: 'status-badge status-warning' }, 'Rolled Back')
-                        : h('span', { className: 'status-badge status-success' }, 'Active')
-                    ),
-                    h('td', null,
-                      e.reversible && !e.reversed && h('button', { className: 'btn btn-ghost btn-sm', onClick: function() { rollback(e.id); } }, I.undo(), ' Rollback')
-                    )
+                    h('td', null, e.reversed ? h('span', { className: 'status-badge status-warning' }, 'Rolled Back') : h('span', { className: 'status-badge status-success' }, 'Active')),
+                    h('td', null, e.reversible && !e.reversed && h('button', { className: 'btn btn-ghost btn-sm', onClick: function() { rollback(e.id); } }, I.undo(), ' Rollback'))
                   );
                 })
               )
             )
+      ),
+
+      // Pagination
+      totalPages > 1 && h('div', { style: { display: 'flex', justifyContent: 'center', alignItems: 'center', gap: 6, padding: '10px 16px', borderTop: '1px solid var(--border)' } },
+        h('button', { className: 'btn btn-ghost btn-sm', disabled: page <= 1, onClick: function() { setPage(1); }, style: { fontSize: 11 } }, '«'),
+        h('button', { className: 'btn btn-ghost btn-sm', disabled: page <= 1, onClick: function() { setPage(page - 1); }, style: { fontSize: 11 } }, '‹'),
+        h('span', { style: { fontSize: 12, color: 'var(--text-muted)', minWidth: 80, textAlign: 'center' } }, 'Page ' + page + ' / ' + totalPages),
+        h('button', { className: 'btn btn-ghost btn-sm', disabled: page >= totalPages, onClick: function() { setPage(page + 1); }, style: { fontSize: 11 } }, '›'),
+        h('button', { className: 'btn btn-ghost btn-sm', disabled: page >= totalPages, onClick: function() { setPage(totalPages); }, style: { fontSize: 11 } }, '»')
       )
     ),
 
-    // ─── Activity Detail Modal ──────────────────────────────
+    // Detail Modal
     selectedItem && (function() {
       var item = selectedItem;
       var typeLabel = item.type || item.eventType || item.tool || item.toolName || item.actionType || 'Detail';
@@ -6553,21 +6618,19 @@ function AutonomySection(props) {
         h(Toggle, { field: 'dailyCatchupEnabled', value: form.dailyCatchupEnabled, label: 'Daily Manager Catchup', desc: 'Email summary to manager each workday' })
       ),
       form.dailyCatchupEnabled && h('div', { style: configRow },
-        h('span', null, 'Send at'),
-        h(TimeSelect, { hour: form.dailyCatchupHour, minute: form.dailyCatchupMinute, hourField: 'dailyCatchupHour', minuteField: 'dailyCatchupMinute' })
+        h('span', { style: { color: 'var(--text-muted)', fontSize: 12 } }, 'Time configured in Manager & Catch-Up tab')
       )
     ),
 
     // Weekly Catchup
     h('div', { className: 'card', style: Object.assign({}, cardStyle, { opacity: form.enabled ? 1 : 0.5 }) },
       h('div', { style: rowStyle },
-        h(Toggle, { field: 'weeklyCatchupEnabled', value: form.weeklyCatchupEnabled, label: 'Weekly Manager Catchup', desc: 'Broader summary + goals, replaces daily on chosen day' })
+        h(Toggle, { field: 'weeklyCatchupEnabled', value: form.weeklyCatchupEnabled, label: 'Weekly Manager Catchup', desc: 'Broader weekly summary + goals, uses same time as daily' })
       ),
       form.weeklyCatchupEnabled && h('div', { style: configRow },
         h('span', null, 'Send on'),
         h(DaySelect, { value: form.weeklyCatchupDay, field: 'weeklyCatchupDay' }),
-        h('span', null, 'at'),
-        h(TimeSelect, { hour: form.weeklyCatchupHour, minute: form.weeklyCatchupMinute, hourField: 'weeklyCatchupHour', minuteField: 'weeklyCatchupMinute' })
+        h('span', { style: { color: 'var(--text-muted)', fontSize: 12 } }, '(same time as daily catchup)')
       )
     ),