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..c76eb91992 100644 --- a/src/viewer/index.html +++ b/src/viewer/index.html @@ -2322,23 +2322,38 @@

agentmemory

var spec = ENTITY_ENDPOINTS[kind]; if (!spec) return; store.loading[kind] = (async function() { + var memoryRead = null; try { await bootGate; + if (kind === 'memory' && store.loaded.memory) return; var seqAtStart = eventSeq; + var memoryRevisionAtStart = state.memories.facetRevision || 0; + var memorySnapshotAtStart = state.memories.facetSnapshotRevision || 0; + var memoryPageAtStart = state.memories.firstPageRevision || 0; + if (kind === 'memory') memoryRead = startMemoryRead(); var result; if (spec.allPages) { result = await loadAllPages(spec, apiGet); } else { result = await apiGet(spec.path); } + if (kind === 'memory' && memoryPageAtStart !== (state.memories.firstPageRevision || 0)) { + store.loaded[kind] = true; + return; + } if (result === null) { if (kind === 'action') state.actions.loadError = true; return; } - replaceBucket(kind, listOr([], result, spec.key, spec.fallbackKey)); + var rows = listOr([], result, spec.key, spec.fallbackKey); + if (kind === 'memory') rows = memoryReadRows(rows, memoryRead, true); + replaceBucket(kind, rows); if (kind === 'memory') { + mergeMemoryRows(rows); state.memories.nextCursor = result.nextCursor || null; - state.memories.facets = result.facets || null; + var m = state.memories, scope = m.facetScope; + var currentScope = m.facets && scope && scope.project === m.projectFilter && scope.agent === m.agentFilter; + if (memorySnapshotAtStart === (m.facetSnapshotRevision || 0) || !currentScope) setMemoryFacets(result.facets, '', ''); state.memories.fetches = {}; if (memoryFiltersActive() || state.memories.searchIds) setTimeout(applyMemoryFilters, 0); } @@ -2351,12 +2366,14 @@

agentmemory

if ((result[spec.key] || []).length < 100) state.audit.exhausted['|||'] = true; seedFeedFromAudit(); } - replayEventsSince(seqAtStart, kind); + if (kind !== 'memory') replayEventsSince(seqAtStart, kind); + if (kind === 'memory' && memoryRevisionAtStart !== (state.memories.facetRevision || 0)) scheduleMemoryFacetRefresh(); store.loaded[kind] = true; if (kind === 'action') state.actions.loadError = false; } catch { if (kind === 'action') state.actions.loadError = true; } finally { + if (memoryRead) finishMemoryRead(memoryRead); store.loading[kind] = null; } })(); @@ -4192,9 +4209,10 @@

agentmemory

return true; } - function memoryQueryPath(extra) { + function memoryQueryPath(extra, limit) { var m = state.memories; var path = 'memories?latest=true&limit=100'; + if (limit) path = 'memories?latest=true&limit=' + limit; if (m.projectFilter) path += '&project=' + encodeURIComponent(m.projectFilter); if (m.agentFilter) path += '&agentId=' + encodeURIComponent(m.agentFilter); if (m.typeFilter) path += '&type=' + encodeURIComponent(m.typeFilter); @@ -4203,10 +4221,49 @@

agentmemory

function mergeMemoryRows(rows) { (rows || []).forEach(function(r) { - if (r && r.id) store.entities.memory[r.id] = Object.assign({}, store.entities.memory[r.id] || {}, r); + if (r && r.id) { + store.entities.memory[r.id] = Object.assign({}, store.entities.memory[r.id] || {}, r); + (state.memories.readChanges || []).forEach(function(changes) { changes[r.id] = Object.assign({}, store.entities.memory[r.id]); }); + } }); } + function startMemoryRead() { + var m = state.memories; + var changes = Object.create(null); + if (!m.readChanges) m.readChanges = []; + m.readChanges.push(changes); + return changes; + } + + function finishMemoryRead(changes) { + var reads = state.memories.readChanges || []; + var index = reads.indexOf(changes); + if (index >= 0) reads.splice(index, 1); + } + + function memoryReadRows(rows, changes, includeLive) { + var seen = Object.create(null); + var result = []; + (rows || []).forEach(function(row) { + if (!row || !row.id) return; + if (Object.prototype.hasOwnProperty.call(changes, row.id)) { + var live = changes[row.id]; + if (!live) return; + var serverTime = Date.parse(row.updatedAt || ''); + var liveTime = Date.parse(live.updatedAt || ''); + var serverNewer = Number.isFinite(serverTime) && Number.isFinite(liveTime) && serverTime > liveTime; + row = serverNewer ? Object.assign({}, live, row) : Object.assign({}, row, live); + } + seen[row.id] = true; + result.push(row); + }); + if (includeLive) Object.keys(changes).forEach(function(id) { + if (!seen[id] && changes[id]) result.push(changes[id]); + }); + return result; + } + function strengthScore(m) { var raw = Number(m.strength) || 0; var score = raw <= 1 ? raw * 10 : raw; @@ -4238,13 +4295,79 @@

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 || '' }; + m.facetSnapshotRevision = (m.facetSnapshotRevision || 0) + 1; + } + + function scheduleMemoryFacetRefresh() { + var m = state.memories; + if (m.facetRevalidationTimer) return; + m.facetRevalidationTimer = setTimeout(async function() { + m.facetRevalidationTimer = null; + if (!m.facets) return; + var filterSeq = memoryFilterSeq, searchSeq = memorySearchSeq; + var revision = m.facetRevision || 0; + var snapshotRevision = m.facetSnapshotRevision || 0; + var project = m.projectFilter, agent = m.agentFilter; + var query = m.query; + var response = await apiGet(memoryQueryPath('&facets=true', 1)); + if (filterSeq !== memoryFilterSeq || searchSeq !== memorySearchSeq) return; + if (snapshotRevision !== (m.facetSnapshotRevision || 0)) return; + if (revision !== (m.facetRevision || 0)) { + scheduleMemoryFacetRefresh(); + return; + } + if (response) { + setMemoryFacets(response.facets, project, agent); + if (query && m.query === query && !query.loading && typeof response.total === 'number') query.total = response.total; + renderMemories(); + } + }, 100); + } + + async function fetchMemoryFacetPage(path, isCurrent, adoptResponse) { + var m = state.memories; + for (var attempt = 0; attempt < 2; attempt++) { + var changes = startMemoryRead(); + try { + var revision = m.facetRevision || 0; + var snapshotRevision = m.facetSnapshotRevision || 0; + var response = await apiGet(path); + if (!isCurrent()) return null; + var currentFacets = revision === (m.facetRevision || 0) && snapshotRevision === (m.facetSnapshotRevision || 0); + if (!response || currentFacets || attempt === 1) { + if (response) { + response = Object.assign({}, response, { memories: memoryReadRows(response.memories, changes) }); + } + var scope = m.facetScope; + var initializeScope = !m.facets || !scope || scope.project !== (m.projectFilter || '') || scope.agent !== (m.agentFilter || ''); + adoptResponse(response, currentFacets || initializeScope); + if (response && !currentFacets) scheduleMemoryFacetRefresh(); + return true; + } + } finally { + finishMemoryRead(changes); + } + } + } + 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 +4375,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 +4398,8 @@

agentmemory

function noteMemoryChange(prev, next, id) { var m = state.memories; + m.facetRevision = (m.facetRevision || 0) + 1; + (m.readChanges || []).forEach(function(changes) { changes[id] = next ? Object.assign({}, next) : null; }); adjustMemoryFacets(prev, next); if (m.query && typeof m.query.total === 'number') { m.query.total += (memoryMatchesFilters(next) ? 1 : 0) - (memoryMatchesFilters(prev) ? 1 : 0); @@ -4277,13 +4407,17 @@

agentmemory

if (!next && m.checked[id]) delete m.checked[id]; if (next && next.isLatest === false && m.checked[id]) delete m.checked[id]; if (next && m.pendingId && next.id === m.pendingId) m.pendingId = null; + scheduleMemoryFacetRefresh(); } var memorySearchSeq = 0; async function runMemorySearch(q) { + memoryFilterSeq++; + state.memories.query = null; 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 = ''; @@ -4292,19 +4426,25 @@

agentmemory

return; } state.memories.searching = true; + state.memories.firstPageLoading = true; renderMemories(); - var res = await apiGet(memoryQueryPath('&q=' + encodeURIComponent(query))); - if (seq !== memorySearchSeq) return; - state.memories.searching = false; - if (!res) { - state.memories.searchIds = []; - state.memories.searchMode = 'failed'; - } else { - var rows = res.memories || []; - mergeMemoryRows(rows); - state.memories.searchIds = rows.map(function(r) { return r.id; }); - state.memories.searchMode = (res.search && res.search.mode) || 'keyword'; - } + var received = await fetchMemoryFacetPage(memoryQueryPath('&q=' + encodeURIComponent(query)) + '&facets=true', function() { return seq === memorySearchSeq; }, function(res, adoptFacets) { + state.memories.searching = false; + state.memories.firstPageLoading = false; + if (!res) { + state.memories.searchIds = []; + state.memories.searchMode = 'failed'; + } else { + var rows = res.memories || []; + mergeMemoryRows(rows); + store.loaded.memory = true; + state.memories.firstPageRevision = (state.memories.firstPageRevision || 0) + 1; + if (adoptFacets) setMemoryFacets(res.facets, project, agent); + state.memories.searchIds = rows.map(function(r) { return r.id; }); + state.memories.searchMode = (res.search && res.search.mode) || 'keyword'; + } + }); + if (!received) return; renderMemories(); } @@ -4312,26 +4452,35 @@

agentmemory

async function applyMemoryFilters() { var m = state.memories; m.checked = {}; - if (String(m.search || '').trim()) { - runMemorySearch(m.search); - return; - } + m.firstPageLoading = true; 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; - if (res) { - mergeMemoryRows(res.memories); - m.query = { loading: false, total: typeof res.total === 'number' ? res.total : null, nextCursor: res.nextCursor || null }; - } else { - m.query = { loading: false, failed: true, total: null, nextCursor: null }; - } + var received = await fetchMemoryFacetPage(memoryQueryPath('&facets=true'), function() { return seq === memoryFilterSeq; }, function(res, adoptFacets) { + m.firstPageLoading = false; + if (res) { + mergeMemoryRows(res.memories); + store.loaded.memory = true; + m.firstPageRevision = (m.firstPageRevision || 0) + 1; + if (adoptFacets) 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 { + if (!filtered) m.nextCursor = null; + m.query = { loading: false, failed: true, total: null, nextCursor: null }; + } + }); + if (!received) return; renderMemories(); } @@ -4361,31 +4510,43 @@

agentmemory

async function loadMoreMemories() { var m = state.memories; var cursor = m.query ? m.query.nextCursor : m.nextCursor; - if (!cursor || m.loadingMore) return; + if (!cursor || m.loadingMore || m.firstPageLoading) return; + var filterSeq = memoryFilterSeq, searchSeq = memorySearchSeq, query = m.query; m.loadingMore = true; renderMemories(); - var res = await apiGet(memoryQueryPath('&cursor=' + encodeURIComponent(cursor))); - m.loadingMore = false; - if (res) { - mergeMemoryRows(res.memories); - if (m.query) m.query.nextCursor = res.nextCursor || null; - else m.nextCursor = res.nextCursor || null; + var changes = startMemoryRead(); + try { + var res = await apiGet(memoryQueryPath('&cursor=' + encodeURIComponent(cursor))); + if (res && filterSeq === memoryFilterSeq && searchSeq === memorySearchSeq && query === m.query && cursor === (query ? query.nextCursor : m.nextCursor)) { + mergeMemoryRows(memoryReadRows(res.memories, changes)); + if (query) query.nextCursor = res.nextCursor || null; + else m.nextCursor = res.nextCursor || null; + } + } finally { + finishMemoryRead(changes); + m.loadingMore = false; + renderMemories(); } - renderMemories(); } async function fetchMemoryVersion(id) { var m = state.memories; if (!id || m.fetches[id]) return; m.fetches[id] = 'loading'; - var res = await apiGet('memories/' + encodeURIComponent(id)); - if (res && res.memory) { - mergeMemoryRows([res.memory]); - m.fetches[id] = 'done'; - } else { - m.fetches[id] = 'missing'; + var changes = startMemoryRead(); + try { + var res = await apiGet('memories/' + encodeURIComponent(id)); + var rows = res && res.memory ? memoryReadRows([res.memory], changes) : []; + if (rows.length) { + mergeMemoryRows(rows); + m.fetches[id] = 'done'; + } else { + m.fetches[id] = 'missing'; + } + } finally { + finishMemoryRead(changes); + if (state.activeTab === 'memories') renderMemories(); } - if (state.activeTab === 'memories') renderMemories(); } function renderMemories() { @@ -4413,12 +4574,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 = '