@@ -1,6 +1,7 @@
11 package store
22
33 import (
4+ "database/sql"
45 "fmt"
56 "time"
67 )
@@ -32,39 +33,26 @@ type Memory struct {
3233 MysisID string
3334 Role MemoryRole
3435 Source MemorySource
36+ SenderID string
3537 Content string
3638 Reasoning string
3739 CreatedAt time.Time
3840 }
3941
4042 // AddMemory adds a memory entry for a mysis.
41-func (s *Store) AddMemory(mysisID string, role MemoryRole, source MemorySource, content string, reasoning string) (*Memory, error) {
43+func (s *Store) AddMemory(mysisID string, role MemoryRole, source MemorySource, content string, reasoning string, senderID string) error {
4244 now := time.Now().UTC()
43-
44- result, err := s.db.Exec(`
45- INSERT INTO memories (mysis_id, role, source, content, reasoning, created_at)
46- VALUES (?, ?, ?, ?, ?, ?)
47- `, mysisID, role, source, content, reasoning, now)
48- if err != nil {
49- return nil, fmt.Errorf("insert memory: %w", err)
50- }
51-
52- id, _ := result.LastInsertId()
53- return &Memory{
54- ID: id,
55- MysisID: mysisID,
56- Role: role,
57- Source: source,
58- Content: content,
59- Reasoning: reasoning,
60- CreatedAt: now,
61- }, nil
45+ _, err := s.db.Exec(`
46+ INSERT INTO memories (mysis_id, role, source, sender_id, content, reasoning, created_at)
47+ VALUES (?, ?, ?, ?, ?, ?, ?)
48+ `, mysisID, role, source, senderID, content, reasoning, now)
49+ return err
6250 }
6351
6452 // GetMemories retrieves all memories for a mysis, ordered by creation time.
6553 func (s *Store) GetMemories(mysisID string) ([]*Memory, error) {
6654 rows, err := s.db.Query(`
67- SELECT id, mysis_id, role, source, content, reasoning, created_at
55+ SELECT id, mysis_id, role, source, sender_id, content, reasoning, created_at
6856 FROM memories
6957 WHERE mysis_id = ?
7058 ORDER BY created_at ASC
@@ -77,9 +65,13 @@ func (s *Store) GetMemories(mysisID string) ([]*Memory, error) {
7765 var memories []*Memory
7866 for rows.Next() {
7967 var m Memory
80- if err := rows.Scan(&m.ID, &m.MysisID, &m.Role, &m.Source, &m.Content, &m.Reasoning, &m.CreatedAt); err != nil {
68+ var senderID sql.NullString
69+ if err := rows.Scan(&m.ID, &m.MysisID, &m.Role, &m.Source, &senderID, &m.Content, &m.Reasoning, &m.CreatedAt); err != nil {
8170 return nil, fmt.Errorf("scan memory: %w", err)
8271 }
72+ if senderID.Valid {
73+ m.SenderID = senderID.String
74+ }
8375 memories = append(memories, &m)
8476 }
8577
@@ -89,23 +81,27 @@ func (s *Store) GetMemories(mysisID string) ([]*Memory, error) {
8981 // GetSystemMemory retrieves the initial system prompt for a mysis.
9082 func (s *Store) GetSystemMemory(mysisID string) (*Memory, error) {
9183 var m Memory
84+ var senderID sql.NullString
9285 err := s.db.QueryRow(`
93- SELECT id, mysis_id, role, source, content, reasoning, created_at
86+ SELECT id, mysis_id, role, source, sender_id, content, reasoning, created_at
9487 FROM memories
9588 WHERE mysis_id = ? AND role = 'system' AND source = 'system'
9689 ORDER BY created_at ASC
9790 LIMIT 1
98- `, mysisID).Scan(&m.ID, &m.MysisID, &m.Role, &m.Source, &m.Content, &m.Reasoning, &m.CreatedAt)
91+ `, mysisID).Scan(&m.ID, &m.MysisID, &m.Role, &m.Source, &senderID, &m.Content, &m.Reasoning, &m.CreatedAt)
9992 if err != nil {
10093 return nil, err
10194 }
95+ if senderID.Valid {
96+ m.SenderID = senderID.String
97+ }
10298 return &m, nil
10399 }
104100
105101 // GetRecentMemories retrieves the most recent N memories for a mysis.
106102 func (s *Store) GetRecentMemories(mysisID string, limit int) ([]*Memory, error) {
107103 rows, err := s.db.Query(`
108- SELECT id, mysis_id, role, source, content, reasoning, created_at
104+ SELECT id, mysis_id, role, source, sender_id, content, reasoning, created_at
109105 FROM memories
110106 WHERE mysis_id = ?
111107 ORDER BY created_at DESC
@@ -119,9 +115,13 @@ func (s *Store) GetRecentMemories(mysisID string, limit int) ([]*Memory, error)
119115 var memories []*Memory
120116 for rows.Next() {
121117 var m Memory
122- if err := rows.Scan(&m.ID, &m.MysisID, &m.Role, &m.Source, &m.Content, &m.Reasoning, &m.CreatedAt); err != nil {
118+ var senderID sql.NullString
119+ if err := rows.Scan(&m.ID, &m.MysisID, &m.Role, &m.Source, &senderID, &m.Content, &m.Reasoning, &m.CreatedAt); err != nil {
123120 return nil, fmt.Errorf("scan memory: %w", err)
124121 }
122+ if senderID.Valid {
123+ m.SenderID = senderID.String
124+ }
125125 memories = append(memories, &m)
126126 }
127127
@@ -151,6 +151,7 @@ func (s *Store) CountMemories(mysisID string) (int, error) {
151151
152152 // BroadcastMessage represents a unique broadcast message across all myses.
153153 type BroadcastMessage struct {
154+ SenderID string
154155 Content string
155156 CreatedAt time.Time
156157 }
@@ -159,10 +160,10 @@ type BroadcastMessage struct {
159160 // Since broadcasts are stored per-mysis, this groups by content to get unique messages.
160161 func (s *Store) GetRecentBroadcasts(limit int) ([]*BroadcastMessage, error) {
161162 rows, err := s.db.Query(`
162- SELECT content, MIN(created_at) as created_at
163+ SELECT sender_id, content, MIN(created_at) as created_at
163164 FROM memories
164165 WHERE source = 'broadcast'
165- GROUP BY content
166+ GROUP BY content, sender_id
166167 ORDER BY created_at DESC
167168 LIMIT ?
168169 `, limit)
@@ -174,7 +175,8 @@ func (s *Store) GetRecentBroadcasts(limit int) ([]*BroadcastMessage, error) {
174175 var messages []*BroadcastMessage
175176 for rows.Next() {
176177 var content, createdAtStr string
177- if err := rows.Scan(&content, &createdAtStr); err != nil {
178+ var senderID sql.NullString
179+ if err := rows.Scan(&senderID, &content, &createdAtStr); err != nil {
178180 return nil, fmt.Errorf("scan broadcast: %w", err)
179181 }
180182 // Parse the time string (SQLite returns aggregated times as strings)
@@ -183,10 +185,14 @@ func (s *Store) GetRecentBroadcasts(limit int) ([]*BroadcastMessage, error) {
183185 // Try alternate format
184186 createdAt, _ = time.Parse(time.RFC3339Nano, createdAtStr)
185187 }
186- messages = append(messages, &BroadcastMessage{
188+ message := &BroadcastMessage{
187189 Content: content,
188190 CreatedAt: createdAt,
189- })
191+ }
192+ if senderID.Valid {
193+ message.SenderID = senderID.String
194+ }
195+ messages = append(messages, message)
190196 }
191197
192198 // Reverse to get chronological order (oldest first)
@@ -201,7 +207,7 @@ func (s *Store) GetRecentBroadcasts(limit int) ([]*BroadcastMessage, error) {
201207 // Returns memories where content contains the query string (case-sensitive).
202208 func (s *Store) SearchMemories(mysisID, query string, limit int) ([]*Memory, error) {
203209 rows, err := s.db.Query(`
204- SELECT id, mysis_id, role, source, content, reasoning, created_at
210+ SELECT id, mysis_id, role, source, sender_id, content, reasoning, created_at
205211 FROM memories
206212 WHERE mysis_id = ? AND content LIKE '%' || ? || '%'
207213 ORDER BY created_at DESC
@@ -215,9 +221,13 @@ func (s *Store) SearchMemories(mysisID, query string, limit int) ([]*Memory, err
215221 var memories []*Memory
216222 for rows.Next() {
217223 var m Memory
218- if err := rows.Scan(&m.ID, &m.MysisID, &m.Role, &m.Source, &m.Content, &m.Reasoning, &m.CreatedAt); err != nil {
224+ var senderID sql.NullString
225+ if err := rows.Scan(&m.ID, &m.MysisID, &m.Role, &m.Source, &senderID, &m.Content, &m.Reasoning, &m.CreatedAt); err != nil {
219226 return nil, fmt.Errorf("scan memory: %w", err)
220227 }
228+ if senderID.Valid {
229+ m.SenderID = senderID.String
230+ }
221231 memories = append(memories, &m)
222232 }
223233
@@ -231,7 +241,7 @@ func (s *Store) SearchMemories(mysisID, query string, limit int) ([]*Memory, err
231241
232242 func (s *Store) SearchReasoning(mysisID, query string, limit int) ([]*Memory, error) {
233243 rows, err := s.db.Query(`
234- SELECT id, mysis_id, role, source, content, reasoning, created_at
244+ SELECT id, mysis_id, role, source, sender_id, content, reasoning, created_at
235245 FROM memories
236246 WHERE mysis_id = ? AND reasoning LIKE '%' || ? || '%'
237247 ORDER BY created_at DESC
@@ -245,9 +255,13 @@ func (s *Store) SearchReasoning(mysisID, query string, limit int) ([]*Memory, er
245255 var memories []*Memory
246256 for rows.Next() {
247257 var m Memory
248- if err := rows.Scan(&m.ID, &m.MysisID, &m.Role, &m.Source, &m.Content, &m.Reasoning, &m.CreatedAt); err != nil {
258+ var senderID sql.NullString
259+ if err := rows.Scan(&m.ID, &m.MysisID, &m.Role, &m.Source, &senderID, &m.Content, &m.Reasoning, &m.CreatedAt); err != nil {
249260 return nil, fmt.Errorf("scan memory: %w", err)
250261 }
262+ if senderID.Valid {
263+ m.SenderID = senderID.String
264+ }
251265 memories = append(memories, &m)
252266 }
253267
@@ -262,10 +276,10 @@ func (s *Store) SearchReasoning(mysisID, query string, limit int) ([]*Memory, er
262276 // Returns broadcasts where content contains the query string (case-sensitive).
263277 func (s *Store) SearchBroadcasts(query string, limit int) ([]*BroadcastMessage, error) {
264278 rows, err := s.db.Query(`
265- SELECT content, MAX(created_at) as created_at
279+ SELECT sender_id, content, MAX(created_at) as created_at
266280 FROM memories
267281 WHERE source = 'broadcast' AND content LIKE '%' || ? || '%'
268- GROUP BY content
282+ GROUP BY content, sender_id
269283 ORDER BY created_at DESC
270284 LIMIT ?
271285 `, query, limit)
@@ -277,17 +291,22 @@ func (s *Store) SearchBroadcasts(query string, limit int) ([]*BroadcastMessage,
277291 var messages []*BroadcastMessage
278292 for rows.Next() {
279293 var content, createdAtStr string
280- if err := rows.Scan(&content, &createdAtStr); err != nil {
294+ var senderID sql.NullString
295+ if err := rows.Scan(&senderID, &content, &createdAtStr); err != nil {
281296 return nil, fmt.Errorf("scan broadcast: %w", err)
282297 }
283298 createdAt, _ := time.Parse("2006-01-02 15:04:05.999999999 -0700 MST", createdAtStr)
284299 if createdAt.IsZero() {
285300 createdAt, _ = time.Parse(time.RFC3339Nano, createdAtStr)
286301 }
287- messages = append(messages, &BroadcastMessage{
302+ message := &BroadcastMessage{
288303 Content: content,
289304 CreatedAt: createdAt,
290- })
305+ }
306+ if senderID.Valid {
307+ message.SenderID = senderID.String
308+ }
309+ messages = append(messages, message)
291310 }
292311
293312 // Reverse to get chronological order (oldest first)