From 7e459f727448a72048e64742bc8e67e98b81185f Mon Sep 17 00:00:00 2001 From: zack-dev-cm <112114097+zack-dev-cm@users.noreply.github.com> Date: Fri, 13 Nov 2026 14:37:10 +0400 Subject: [PATCH 01/11] fix(viewer): scope memory type counts to the selected project Signed-off-by: zack-dev-cm <112114097+zack-dev-cm@users.noreply.github.com> --- src/triggers/api.ts | 7 +- src/viewer/index.html | 88 +++++--- test/api-list-pagination.test.ts | 7 +- test/helpers/project-memory-fixture.ts | 53 +++++ test/memory-project-facets.test.ts | 99 +++++++++ test/viewer-project-type-counts.test.ts | 281 ++++++++++++++++++++++++ 6 files changed, 505 insertions(+), 30 deletions(-) create mode 100644 test/helpers/project-memory-fixture.ts create mode 100644 test/memory-project-facets.test.ts create mode 100644 test/viewer-project-type-counts.test.ts diff --git a/src/triggers/api.ts b/src/triggers/api.ts index 46e318b89d..109bec924c 100644 --- a/src/triggers/api.ts +++ b/src/triggers/api.ts @@ -293,6 +293,7 @@ type FacetCount = { value: string; count: number }; function memoryFacets( memories: Array<{ isLatest?: boolean; project?: string; agentId?: string; type?: string }>, + project?: string, ): { projects: FacetCount[]; agents: FacetCount[]; types: FacetCount[] } { const tally = (pick: (m: (typeof memories)[number]) => string | undefined) => { const counts = new Map(); @@ -308,7 +309,7 @@ function memoryFacets( return { projects: tally((m) => m.project), agents: tally((m) => m.agentId), - types: tally((m) => m.type), + types: tally((m) => !project || m.project === project ? m.type : undefined), }; } @@ -2770,9 +2771,9 @@ export function registerApiTriggers( (includeOrphans && m.agentId === undefined), ); } - const facets = - req.query_params?.["facets"] === "true" ? memoryFacets(filtered) : undefined; const listQuery = parseListQuery(req.query_params); + const facets = + req.query_params?.["facets"] === "true" ? memoryFacets(filtered, listQuery.project) : undefined; if (listQuery.project) filtered = filtered.filter((m) => m.project === listQuery.project); if (listQuery.type) filtered = filtered.filter((m) => m.type === listQuery.type); const fromSession = asNonEmptyString(req.query_params?.["sessionId"]); diff --git a/src/viewer/index.html b/src/viewer/index.html index 407f02303c..5883e37903 100644 --- a/src/viewer/index.html +++ b/src/viewer/index.html @@ -2338,7 +2338,7 @@

agentmemory

replaceBucket(kind, listOr([], result, spec.key, spec.fallbackKey)); if (kind === 'memory') { state.memories.nextCursor = result.nextCursor || null; - state.memories.facets = result.facets || null; + setMemoryFacets(result.facets, '', ''); state.memories.fetches = {}; if (memoryFiltersActive() || state.memories.searchIds) setTimeout(applyMemoryFilters, 0); } @@ -4238,13 +4238,42 @@

agentmemory

return { head: content.slice(0, cut) + '…', excerpt: '…' + content.slice(cut).trim() }; } + function setMemoryFacets(facets, project, agent) { + var m = state.memories; + m.facets = facets || null; + m.facetScope = { project: project || '', agent: agent || '' }; + } + + async function fetchMemoryFacetPage(path, isCurrent) { + var m = state.memories; + for (var attempt = 0; attempt < 2; attempt++) { + var revision = m.facetRevision || 0; + var response = await apiGet(path); + if (!isCurrent()) return null; + if (!response || revision === (m.facetRevision || 0)) return { response: response }; + } + if (m.facetRefreshTimer) clearTimeout(m.facetRefreshTimer); + m.facetRefreshTimer = setTimeout(function() { + m.facetRefreshTimer = null; + if (isCurrent()) applyMemoryFilters(); + }, 100); + return null; + } + function memoryFacetList(dim) { - var f = state.memories.facets; + var m = state.memories; + var f = m.facets; var key = dim === 'project' ? 'projects' : dim === 'agent' ? 'agents' : 'types'; - if (f && f[key]) return f[key]; + if (f && f[key]) { + var scope = m.facetScope || { project: '', agent: '' }; + if (dim === 'type' && (scope.project !== m.projectFilter || scope.agent !== m.agentFilter)) return []; + return f[key]; + } var counts = {}; entityList('memory').forEach(function(x) { if (!x || x.isLatest === false) return; + if (m.agentFilter && m.agentFilter !== '*' && x.agentId !== m.agentFilter) return; + if (dim === 'type' && m.projectFilter && x.project !== m.projectFilter) return; var v = dim === 'project' ? x.project : dim === 'agent' ? x.agentId : x.type; if (v) counts[v] = (counts[v] || 0) + 1; }); @@ -4252,11 +4281,16 @@

agentmemory

} function adjustMemoryFacets(prev, next) { - var f = state.memories.facets; + var m = state.memories; + var f = m.facets; if (!f) return; + var scope = m.facetScope || { project: '', agent: '' }; function bump(row, delta) { if (!row || row.isLatest === false) return; - [['projects', row.project], ['agents', row.agentId], ['types', row.type]].forEach(function(pair) { + if (scope.agent && scope.agent !== '*' && row.agentId !== scope.agent) return; + var dimensions = [['projects', row.project], ['agents', row.agentId]]; + if (!scope.project || row.project === scope.project) dimensions.push(['types', row.type]); + dimensions.forEach(function(pair) { if (!pair[1] || !f[pair[0]]) return; var list = f[pair[0]]; var item = list.filter(function(x) { return x.value === pair[1]; })[0]; @@ -4270,6 +4304,7 @@

agentmemory

function noteMemoryChange(prev, next, id) { var m = state.memories; + m.facetRevision = (m.facetRevision || 0) + 1; adjustMemoryFacets(prev, next); if (m.query && typeof m.query.total === 'number') { m.query.total += (memoryMatchesFilters(next) ? 1 : 0) - (memoryMatchesFilters(prev) ? 1 : 0); @@ -4281,9 +4316,11 @@

agentmemory

var memorySearchSeq = 0; async function runMemorySearch(q) { + memoryFilterSeq++; var query = String(q || '').trim(); state.memories.search = q; var seq = ++memorySearchSeq; + var project = state.memories.projectFilter, agent = state.memories.agentFilter; if (!query) { state.memories.searchIds = null; state.memories.searchMode = ''; @@ -4293,8 +4330,9 @@

agentmemory

} state.memories.searching = true; renderMemories(); - var res = await apiGet(memoryQueryPath('&q=' + encodeURIComponent(query))); - if (seq !== memorySearchSeq) return; + var page = await fetchMemoryFacetPage(memoryQueryPath('&q=' + encodeURIComponent(query)) + '&facets=true', function() { return seq === memorySearchSeq; }); + if (!page) return; + var res = page.response; state.memories.searching = false; if (!res) { state.memories.searchIds = []; @@ -4302,6 +4340,7 @@

agentmemory

} else { var rows = res.memories || []; mergeMemoryRows(rows); + setMemoryFacets(res.facets, project, agent); state.memories.searchIds = rows.map(function(r) { return r.id; }); state.memories.searchMode = (res.search && res.search.mode) || 'keyword'; } @@ -4312,25 +4351,29 @@

agentmemory

async function applyMemoryFilters() { var m = state.memories; m.checked = {}; - if (String(m.search || '').trim()) { - runMemorySearch(m.search); - return; - } var seq = ++memoryFilterSeq; - if (!memoryFiltersActive()) { + if (String(m.search || '').trim()) { m.query = null; - renderMemories(); - return; + return runMemorySearch(m.search); } - m.query = { loading: true, total: null, nextCursor: null }; + memorySearchSeq++; + m.searchIds = null; + m.searchMode = ''; + m.searching = false; + var filtered = memoryFiltersActive(); + var project = m.projectFilter, agent = m.agentFilter; + m.query = filtered ? { loading: true, total: null, nextCursor: null } : null; renderMemories(); - var res = await apiGet(memoryQueryPath()); - if (seq !== memoryFilterSeq) return; + var page = await fetchMemoryFacetPage(memoryQueryPath('&facets=true'), function() { return seq === memoryFilterSeq; }); + if (!page) return; + var res = page.response; if (res) { mergeMemoryRows(res.memories); - m.query = { loading: false, total: typeof res.total === 'number' ? res.total : null, nextCursor: res.nextCursor || null }; + setMemoryFacets(res.facets, project, agent); + if (!filtered) m.nextCursor = res.nextCursor || null; + m.query = filtered ? { loading: false, total: typeof res.total === 'number' ? res.total : null, nextCursor: res.nextCursor || null } : null; } else { - m.query = { loading: false, failed: true, total: null, nextCursor: null }; + m.query = filtered ? { loading: false, failed: true, total: null, nextCursor: null } : null; } renderMemories(); } @@ -4413,12 +4456,7 @@

agentmemory

} function memoryFilterSelect(dim, allLabel, current) { - var list = memoryFacetList(dim).slice(); - if (dim === 'type') { - MEMORY_TYPES.forEach(function(t) { - if (!list.some(function(x) { return x.value === t; })) list.push({ value: t, count: 0 }); - }); - } + var list = memoryFacetList(dim).filter(function(x) { return dim !== 'type' || x.count > 0 || x.value === current; }); if (current && !list.some(function(x) { return x.value === current; })) list.unshift({ value: current, count: 0 }); var none = list.length === 0; var html = '