@@ -3,12 +3,19 @@ package store
33 import (
44 "encoding/json"
55 "fmt"
6+ "strings"
67 "time"
78
89 "github.com/rs/zerolog/log"
910 "github.com/xonecas/symb/internal/provider"
1011 )
1112
13+const (
14+ SQLiteBusyMaxRetries = 10
15+ SQLiteBusyBackoffStepMs = 50
16+ SQLiteBusyMaxBackoff = time.Second
17+)
18+
1219 // Session represents a conversation session.
1320 type Session struct {
1421 ID string
@@ -50,28 +57,33 @@ func (c *Cache) CreateSession(id string) error {
5057
5158 // SaveMessage persists a message synchronously.
5259 func (c *Cache) SaveMessage(sessionID string, msg SessionMessage) {
53- if c == nil {
54- return
60+ if err := c.SaveMessages(sessionID, []SessionMessage{msg}); err != nil {
61+ log.Warn().Err(err).Str("session", sessionID).Msg("failed to save message")
5562 }
56- c.mu.Lock()
57- defer c.mu.Unlock()
63+}
5864
59- tc := msg.ToolCalls
60- if tc == nil {
61- tc = json.RawMessage("[]")
65+// SaveMessages persists a batch of messages atomically.
66+func (c *Cache) SaveMessages(sessionID string, msgs []SessionMessage) error {
67+ if c == nil || len(msgs) == 0 {
68+ return nil
6269 }
6370
64- _, err := c.db.Exec(
65- `INSERT INTO messages (session_id, role, content, reasoning, tool_calls, tool_call_id, created, input_tokens, output_tokens)
66- VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`,
67- sessionID, msg.Role, msg.Content, msg.Reasoning, string(tc), msg.ToolCallID, msg.CreatedAt.Unix(),
68- msg.InputTokens, msg.OutputTokens,
69- )
70- if err != nil {
71- log.Warn().Err(err).Str("session", sessionID).Msg("failed to save message")
71+ var err error
72+ for attempt := 0; attempt <= SQLiteBusyMaxRetries; attempt++ {
73+ err = c.saveMessagesOnce(sessionID, msgs)
74+ if err == nil {
75+ return nil
76+ }
77+ if !IsSQLiteBusy(err) || attempt == SQLiteBusyMaxRetries {
78+ return err
79+ }
80+ backoff := time.Duration((attempt+1)*SQLiteBusyBackoffStepMs) * time.Millisecond
81+ if backoff > SQLiteBusyMaxBackoff {
82+ backoff = SQLiteBusyMaxBackoff
83+ }
84+ time.Sleep(backoff)
7285 }
73-
74- c.db.Exec("UPDATE sessions SET updated = ? WHERE id = ?", time.Now().Unix(), sessionID) //nolint:errcheck
86+ return err
7587 }
7688
7789 // SaveMessageSync persists a message synchronously and returns its DB row ID.
@@ -80,29 +92,121 @@ func (c *Cache) SaveMessageSync(sessionID string, msg SessionMessage) (int64, er
8092 if c == nil {
8193 return 0, nil
8294 }
95+
96+ var err error
97+ for attempt := 0; attempt <= SQLiteBusyMaxRetries; attempt++ {
98+ id, attemptErr := c.saveMessageSyncOnce(sessionID, msg)
99+ if attemptErr == nil {
100+ return id, nil
101+ }
102+ err = attemptErr
103+ if !IsSQLiteBusy(err) || attempt == SQLiteBusyMaxRetries {
104+ return 0, err
105+ }
106+ backoff := time.Duration((attempt+1)*SQLiteBusyBackoffStepMs) * time.Millisecond
107+ if backoff > SQLiteBusyMaxBackoff {
108+ backoff = SQLiteBusyMaxBackoff
109+ }
110+ time.Sleep(backoff)
111+ }
112+ return 0, err
113+}
114+
115+func (c *Cache) saveMessagesOnce(sessionID string, msgs []SessionMessage) error {
116+ c.mu.Lock()
117+ defer c.mu.Unlock()
118+
119+ tx, err := c.db.Begin()
120+ if err != nil {
121+ return err
122+ }
123+
124+ for _, msg := range msgs {
125+ tc := msg.ToolCalls
126+ if tc == nil {
127+ tc = json.RawMessage("[]")
128+ }
129+ if _, err := tx.Exec(
130+ `INSERT INTO messages (session_id, role, content, reasoning, tool_calls, tool_call_id, created, input_tokens, output_tokens)
131+ VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`,
132+ sessionID, msg.Role, msg.Content, msg.Reasoning, string(tc), msg.ToolCallID, msg.CreatedAt.Unix(),
133+ msg.InputTokens, msg.OutputTokens,
134+ ); err != nil {
135+ if rbErr := tx.Rollback(); rbErr != nil {
136+ log.Warn().Err(rbErr).Msg("failed to rollback message save")
137+ }
138+ return err
139+ }
140+ }
141+
142+ if _, err := tx.Exec("UPDATE sessions SET updated = ? WHERE id = ?", time.Now().Unix(), sessionID); err != nil {
143+ if rbErr := tx.Rollback(); rbErr != nil {
144+ log.Warn().Err(rbErr).Msg("failed to rollback message save")
145+ }
146+ return err
147+ }
148+
149+ if err := tx.Commit(); err != nil {
150+ if rbErr := tx.Rollback(); rbErr != nil {
151+ log.Warn().Err(rbErr).Msg("failed to rollback message save")
152+ }
153+ return err
154+ }
155+ return nil
156+}
157+
158+func (c *Cache) saveMessageSyncOnce(sessionID string, msg SessionMessage) (int64, error) {
83159 c.mu.Lock()
84160 defer c.mu.Unlock()
85161
162+ tx, err := c.db.Begin()
163+ if err != nil {
164+ return 0, err
165+ }
166+
86167 tc := msg.ToolCalls
87168 if tc == nil {
88169 tc = json.RawMessage("[]")
89170 }
90171
91- res, err := c.db.Exec(
172+ res, err := tx.Exec(
92173 `INSERT INTO messages (session_id, role, content, reasoning, tool_calls, tool_call_id, created, input_tokens, output_tokens)
93174 VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`,
94175 sessionID, msg.Role, msg.Content, msg.Reasoning, string(tc), msg.ToolCallID, msg.CreatedAt.Unix(),
95176 msg.InputTokens, msg.OutputTokens,
96177 )
97178 if err != nil {
179+ if rbErr := tx.Rollback(); rbErr != nil {
180+ log.Warn().Err(rbErr).Msg("failed to rollback message save")
181+ }
182+ return 0, err
183+ }
184+
185+ if _, err := tx.Exec("UPDATE sessions SET updated = ? WHERE id = ?", time.Now().Unix(), sessionID); err != nil {
186+ if rbErr := tx.Rollback(); rbErr != nil {
187+ log.Warn().Err(rbErr).Msg("failed to rollback message save")
188+ }
98189 return 0, err
99190 }
100191
101- c.db.Exec("UPDATE sessions SET updated = ? WHERE id = ?", time.Now().Unix(), sessionID) //nolint:errcheck
192+ if err := tx.Commit(); err != nil {
193+ if rbErr := tx.Rollback(); rbErr != nil {
194+ log.Warn().Err(rbErr).Msg("failed to rollback message save")
195+ }
196+ return 0, err
197+ }
102198
103199 return res.LastInsertId()
104200 }
105201
202+func IsSQLiteBusy(err error) bool {
203+ if err == nil {
204+ return false
205+ }
206+ msg := err.Error()
207+ return strings.Contains(msg, "SQLITE_BUSY") || strings.Contains(msg, "database is locked")
208+}
209+
106210 // DeleteMessagesFrom removes all messages with id >= minID for a session.
107211 func (c *Cache) DeleteMessagesFrom(sessionID string, minID int64) error {
108212 if c == nil {