diff --git a/internal/agent/agent.go b/internal/agent/agent.go
index c916cfd886372ab86f6d1fbb0e8b7bde2c87dabb..15aa1c0a840e8aafd2feced6bd4bb580e17be5f8 100644
--- a/internal/agent/agent.go
+++ b/internal/agent/agent.go
@@ -379,6 +379,9 @@ func (a *sessionAgent) Run(ctx context.Context, call SessionAgentCall) (*fantasy
 			}
 			a.updateSessionUsage(largeModel, &updatedSession, stepResult.Usage, a.openrouterCost(stepResult.ProviderMetadata))
 			_, sessionErr := a.sessions.Save(genCtx, updatedSession)
+			if sessionErr == nil {
+				currentSession = updatedSession
+			}
 			sessionLock.Unlock()
 			if sessionErr != nil {
 				return sessionErr