diff --git a/src/session/manager.ts b/src/session/manager.ts
index e50d161..f54e935 100644
--- a/src/session/manager.ts
+++ b/src/session/manager.ts
@@ -15,9 +15,14 @@ export class ManagedSession implements Session {
     private history: Message[] = []
   ) {}
 
-  addMessage(message: Message): void {
-    this.history.push(message);
-    this.store.addMessage(this.id, message);
+  addMessage(message: Message): Message {
+    const messageWithTimestamp: Message = {
+      ...message,
+      timestamp: Date.now(),
+    };
+    this.history.push(messageWithTimestamp);
+    this.store.addMessage(this.id, messageWithTimestamp);
+    return messageWithTimestamp;
   }
 
   getHistory(): Message[] {