Skip to content

AI Agents & MCPs & AI Workflow Automation • (~400 MCP servers for AI agents) • AI Automation / AI Agent with MCPs • AI Workflows & AI Agents • MCPs for AI Agents

fix(chat): removing memories quickly no longer brings deleted ones back (#16989)

Hazem Adelfdcb3f344b36
diff --git a/brain/knowledge/flows-execution/chat.md b/brain/knowledge/flows-execution/chat.md
index abac007c0f2..245eef44e16 100644
--- a/brain/knowledge/flows-execution/chat.md
+++ b/brain/knowledge/flows-execution/chat.md
@@ -12,7 +12,7 @@ The chat LLM loop runs in the **worker**, not the API. Send path: `agent-convers
### Entities & services
- **ChatPersonalization** (`chat_personalization`) — first-run onboarding: role + company, background research, researched empty-state cards. See [chat personalization](./chat-personalization.md).
- **AgentConversation** (`agent_conversation`) — per-user, per-platform, optionally per-project; `status` STREAMING/IDLE/ERROR, `activeRunId`, `messages` (ModelMessage[] JSONB), `uiMessages`, `summary`/`summarizedUpToIndex` for compaction.
-- **UserMemory** (`user_memory`) — one row per (platformId, userId): `instructions` (nullable text) + `memories` (jsonb string[]); capped at 50 facts × 280 chars and 4000 chars of instructions (`agentHelpers.capMemories`).
+- **UserMemory** (`user_memory`) — one row per (platformId, userId): `instructions` (nullable text) + `memories` (jsonb string[]); capped at 50 facts × 280 chars and 4000 chars of instructions (`agentHelpers.capMemories`). Every write to `memories` is `{ next, base }` and goes through a three-way merge under a row lock (`agentHelpers.saveUserMemory`); there is no blind overwrite, so a writer working from a stale list can't resurrect removed facts or wipe ones saved meanwhile.
- Tool logic in `ee/agent/`; shared tool phase/classification in `core/shared/.../ee/agent/`.
### How it works
diff --git a/packages/core/shared/src/lib/ee/agent/index.ts b/packages/core/shared/src/lib/ee/agent/index.ts
index 4d21b34dab3..e82abbffbb5 100644
--- a/packages/core/shared/src/lib/ee/agent/index.ts
+++ b/packages/core/shared/src/lib/ee/agent/index.ts
@@ -286,7 +286,10 @@ export type GetAgentMemoryResponse = z.infer<typeof GetAgentMemoryResponse>
export const UpdateAgentMemoryRequest = z.object({
instructions: Nullable(z.string()),
- memories: z.optional(z.array(z.string())),
+ memories: z.optional(z.object({
+ next: z.array(z.string()),
+ base: z.array(z.string()),
+ })),
})
export type UpdateAgentMemoryRequest = z.infer<typeof UpdateAgentMemoryRequest>
diff --git a/packages/server/api/src/app/ee/agent/agent-conversation-controller.ts b/packages/server/api/src/app/ee/agent/agent-conversation-controller.ts
index a76a7f828e6..ce7983920fc 100644
--- a/packages/server/api/src/app/ee/agent/agent-conversation-controller.ts
+++ b/packages/server/api/src/app/ee/agent/agent-conversation-controller.ts
@@ -304,8 +304,7 @@ export const agentConversationController: FastifyPluginAsyncZod = async (app) =>
return agentHelpers.saveUserMemory({
platformId,
userId,
- memories: [...current.memories, ...draft.memories],
- baseMemories: current.memories,
+ memories: { next: [...current.memories, ...draft.memories], base: current.memories },
})
})
diff --git a/packages/server/api/src/app/ee/agent/agent-helpers.ts b/packages/server/api/src/app/ee/agent/agent-helpers.ts
index 4da07faa4a6..6b5fa9dffff 100644
--- a/packages/server/api/src/app/ee/agent/agent-helpers.ts
+++ b/packages/server/api/src/app/ee/agent/agent-helpers.ts
@@ -386,20 +386,17 @@ function mergeMemories({ base, incoming, current }: { base: string[], incoming:
])
}
-async function saveUserMemory({ platformId, userId, instructions, memories, baseMemories }: {
+async function saveUserMemory({ platformId, userId, instructions, memories }: {
platformId: string
userId: string
instructions?: string | null
- memories?: string[]
- baseMemories?: string[]
+ memories?: { next: string[], base: string[] }
}): Promise<GetAgentMemoryResponse> {
return withLockedMemoryRow({ platformId, userId }, async ({ repo, row }) => {
const lockedMemories = row?.memories ?? []
- const nextMemories = memories === undefined
+ const nextMemories = isNil(memories)
? lockedMemories
- : isNil(baseMemories)
- ? memories
- : mergeMemories({ base: baseMemories, incoming: memories, current: lockedMemories })
+ : mergeMemories({ base: memories.base, incoming: memories.next, current: lockedMemories })
const capped = capMemories({
instructions: instructions === undefined ? row?.instructions ?? null : instructions,
memories: nextMemories,
diff --git a/packages/server/api/src/app/ee/agent/agent-memory-ai.ts b/packages/server/api/src/app/ee/agent/agent-memory-ai.ts
index 47175594ba7..465cc016aa6 100644
--- a/packages/server/api/src/app/ee/agent/agent-memory-ai.ts
+++ b/packages/server/api/src/app/ee/agent/agent-memory-ai.ts
@@ -103,7 +103,7 @@ async function applyInstruction({ platformId, userId, instruction, log }: {
: '(none yet)'
const parsed = await runMemoryLlm({ platformId, instructions: INSTRUCTION_SYSTEM_PROMPT, prompt: `Current memories:\n${currentList}\n\nInput: ${trimmed}`, schema: MemoriesSchema, log })
const nextMemories = isNil(parsed) ? [...current.memories, trimmed] : parsed.memories
- return agentHelpers.saveUserMemory({ platformId, userId, memories: nextMemories, baseMemories: current.memories })
+ return agentHelpers.saveUserMemory({ platformId, userId, memories: { next: nextMemories, base: current.memories } })
}
export const agentMemoryAi = {
diff --git a/packages/server/api/test/integration/ee/agent/agent-controller.test.ts b/packages/server/api/test/integration/ee/agent/agent-controller.test.ts
index 3229daa7e47..820d7b68307 100644
--- a/packages/server/api/test/integration/ee/agent/agent-controller.test.ts
+++ b/packages/server/api/test/integration/ee/agent/agent-controller.test.ts
@@ -1168,3 +1168,35 @@ describe('updating an agent while someone else changes it', () => {
expectKept(stored)
})
})
+
+describe('forgetting memories from a list that is out of date', () => {
+ async function memoryContext(memories: string[]): Promise<TestContext> {
+ const ctx = await createTestContext(app, { plan: { agentsEnabled: true, chatEnabled: true } })
+ expect((await ctx.post('/v1/agents/memory', { memories: { next: memories, base: [] } })).statusCode).toBe(StatusCodes.OK)
+ return ctx
+ }
+
+ it('applies both of two quick forgets made from the same list', async () => {
+ const ctx = await memoryContext(['A', 'B', 'C'])
+
+ await ctx.post('/v1/agents/memory', { memories: { next: ['A', 'C'], base: ['A', 'B', 'C'] } })
+ await ctx.post('/v1/agents/memory', { memories: { next: ['A', 'B'], base: ['A', 'B', 'C'] } })
+
+ expect((await ctx.get('/v1/agents/memory')).json().memories).toEqual(['A'])
+ })
+
+ it('keeps a fact the assistant remembered while the list was open', async () => {
+ const ctx = await memoryContext(['A', 'B'])
+ await ctx.post('/v1/agents/memory', { memories: { next: ['A', 'B', 'D'], base: ['A', 'B'] } })
+
+ await ctx.post('/v1/agents/memory', { memories: { next: ['A'], base: ['A', 'B'] } })
+
+ expect((await ctx.get('/v1/agents/memory')).json().memories).toEqual(['A', 'D'])
+ })
+ it('refuses a bare list, so no client can overwrite memories it never saw', async () => {
+ const ctx = await memoryContext(['A', 'B'])
+
+ expect((await ctx.post('/v1/agents/memory', { memories: ['A'] })).statusCode).toBe(StatusCodes.BAD_REQUEST)
+ expect((await ctx.get('/v1/agents/memory')).json().memories).toEqual(['A', 'B'])
+ })
+})
diff --git a/packages/web/src/app/components/settings-hub/sections/memory/manage-memories-dialog.tsx b/packages/web/src/app/components/settings-hub/sections/memory/manage-memories-dialog.tsx
index a249a17168a..e5c92d3c062 100644
--- a/packages/web/src/app/components/settings-hub/sections/memory/manage-memories-dialog.tsx
+++ b/packages/web/src/app/components/settings-hub/sections/memory/manage-memories-dialog.tsx
@@ -35,7 +35,8 @@ function ManageMemoriesContent() {
});
const forget = useMutation({
- mutationFn: (next: string[]) => chatApi.saveMemory({ memories: next }),
+ mutationFn: ({ next, base }: { next: string[]; base: string[] }) =>
+ chatApi.saveMemory({ memories: { next, base } }),
onSuccess: invalidate,
onError: () => toast.error(t('Could not update memory')),
});
@@ -56,7 +57,10 @@ function ManageMemoriesContent() {
<RememberedFacts
memories={memories}
onForget={(index) =>
- forget.mutate(memories.filter((_, i) => i !== index))
+ forget.mutate({
+ next: memories.filter((_, i) => i !== index),
+ base: memories,
+ })
}
/>
</ScrollArea>