fix dedup logic

Author: icecrasher321

apps/sim/executor/handlers/agent/agent-handler.ts

@@ -711,28 +711,29 @@ export class AgentBlockHandler implements BlockHandler {
 
     // 2. Handle native memory: seed on first run, then fetch and append new user input
     if (memoryEnabled && ctx.workspaceId) {
-      const hasExisting = await memoryService.hasMemory(ctx.workspaceId, inputs.conversationId!)
-
-      if (!hasExisting && conversationMessages.length > 0) {
-        await memoryService.seedMemory(ctx, inputs, conversationMessages)
-      }
-
       const memoryMessages = await memoryService.fetchMemoryMessages(ctx, inputs)
+      const hasExisting = memoryMessages.length > 0
 
-      messages.push(...memoryMessages)
-
-      // When memory exists, append the new user message from conversationMessages
-      // (the User field in the agent config, e.g. <start.input>)
-      if (hasExisting && conversationMessages.length > 0) {
-        const latestUserFromInput = conversationMessages.filter((m) => m.role === 'user').pop()
-        if (latestUserFromInput) {
-          const lastUserInMemory = memoryMessages.filter((m) => m.role === 'user').pop()
-          const isNewUserMessage =
-            !lastUserInMemory || lastUserInMemory.content !== latestUserFromInput.content
+      if (!hasExisting && conversationMessages.length > 0) {
+        const taggedMessages = conversationMessages.map((m) =>
+          m.role === 'user' ? { ...m, executionId: ctx.executionId } : m
+        )
+        await memoryService.seedMemory(ctx, inputs, taggedMessages)
+        messages.push(...taggedMessages)
+      } else {
+        messages.push(...memoryMessages)
 
-          if (isNewUserMessage) {
-            messages.push(latestUserFromInput)
-            await memoryService.appendToMemory(ctx, inputs, latestUserFromInput)
+        if (hasExisting && conversationMessages.length > 0) {
+          const latestUserFromInput = conversationMessages.filter((m) => m.role === 'user').pop()
+          if (latestUserFromInput) {
+            const userMessageInThisRun = memoryMessages.some(
+              (m) => m.role === 'user' && m.executionId === ctx.executionId
+            )
+            if (!userMessageInThisRun) {
+              const taggedMessage = { ...latestUserFromInput, executionId: ctx.executionId }
+              messages.push(taggedMessage)
+              await memoryService.appendToMemory(ctx, inputs, taggedMessage)
+            }
           }
         }
       }

apps/sim/executor/handlers/agent/memory.ts

@@ -12,16 +12,6 @@ import { PROVIDER_DEFINITIONS } from '@/providers/models'
 const logger = createLogger('Memory')
 
 export class Memory {
-  async hasMemory(workspaceId: string, conversationId: string): Promise<boolean> {
-    const result = await db
-      .select({ id: memory.id })
-      .from(memory)
-      .where(and(eq(memory.workspaceId, workspaceId), eq(memory.key, conversationId)))
-      .limit(1)
-
-    return result.length > 0
-  }
-
   async fetchMemoryMessages(ctx: ExecutionContext, inputs: AgentInputs): Promise<Message[]> {
     if (!inputs.memoryType || inputs.memoryType === 'none') {
       return []

apps/sim/executor/handlers/agent/types.ts

@@ -41,6 +41,7 @@ export interface ToolInput {
 export interface Message {
   role: 'system' | 'user' | 'assistant'
   content: string
+  executionId?: string
   function_call?: any
   tool_calls?: any[]
 }