Remove hasMore

Author: stanislavHamara

pkg/api/pagination.go

@@ -41,19 +41,16 @@ func PaginateMessages(messages []session.Message, params PaginationParams) ([]se
 	endIdx := totalCount
 
 	if params.Before != "" {
-		// Get messages before the cursor (older messages)
 		endIdx = beforeIndex
 		if endIdx <= 0 {
 			return []session.Message{}, &PaginationMetadata{
 				TotalMessages: totalCount,
 				Limit:         0,
-				HasMore:       false,
 			}, nil
 		}
 		actualStart := max(endIdx-limit, startIdx)
 		startIdx = actualStart
 	} else {
-		// Default: get most recent messages (for chat infinite scroll)
 		actualStart := max(totalCount-limit, 0)
 		startIdx = actualStart
 		endIdx = totalCount
@@ -64,12 +61,10 @@ func PaginateMessages(messages []session.Message, params PaginationParams) ([]se
 	metadata := &PaginationMetadata{
 		TotalMessages: totalCount,
 		Limit:         len(paginatedMessages),
-		HasMore:       false,
 	}
 
-	metadata.HasMore = startIdx > 0
-
-	if len(paginatedMessages) > 0 {
+	// Only set cursor if there are more (older) messages available
+	if len(paginatedMessages) > 0 && startIdx > 0 {
 		metadata.PrevCursor = strconv.Itoa(startIdx)
 	}
 

pkg/api/pagination_test.go

@@ -44,8 +44,7 @@ func TestPaginateMessages_FirstPage(t *testing.T) {
 	assert.Len(t, paginated, 10)
 	assert.Equal(t, 100, meta.TotalMessages)
 	assert.Equal(t, 10, meta.Limit)
-	assert.True(t, meta.HasMore)
-	assert.NotEmpty(t, meta.PrevCursor)
+	assert.NotEmpty(t, meta.PrevCursor) // More older messages available
 
 	// Should get most recent 10 messages (for chat infinite scroll)
 	// For 100 messages, indices 90-99 should be returned
@@ -83,7 +82,7 @@ func TestPaginateMessages_WithBeforeCursorPagination(t *testing.T) {
 	require.NoError(t, err)
 
 	assert.Len(t, prevPage, 10)
-	assert.False(t, prevMeta.HasMore) // No more older messages
+	assert.Empty(t, prevMeta.PrevCursor) // No more older messages
 
 	// Should get messages 0-9
 	assert.Equal(t, "Message A", prevPage[0].Message.Content) // Index 0 = 'A'
@@ -108,7 +107,7 @@ func TestPaginateMessages_WithBeforeCursor(t *testing.T) {
 	require.NoError(t, err)
 
 	assert.Len(t, paginated, 10)
-	assert.True(t, meta.HasMore) // There are older messages
+	assert.NotEmpty(t, meta.PrevCursor) // There are older messages
 
 	// Should get 10 messages before index 50 (indices 40-49)
 	assert.Equal(t, "Message "+string(rune('A'+40)), paginated[0].Message.Content)
@@ -155,7 +154,7 @@ func TestPaginateMessages_EmptyMessages(t *testing.T) {
 
 	assert.Empty(t, paginated)
 	assert.Equal(t, 0, meta.TotalMessages)
-	assert.False(t, meta.HasMore)
+	assert.Empty(t, meta.PrevCursor) // No messages at all
 }
 
 func TestPaginateMessages_LastPage(t *testing.T) {
@@ -169,8 +168,8 @@ func TestPaginateMessages_LastPage(t *testing.T) {
 	lastPage, lastMeta, err := PaginateMessages(messages, lastPageParams)
 	require.NoError(t, err)
 
-	assert.Len(t, lastPage, 5)        // Only 5 messages (0-4)
-	assert.False(t, lastMeta.HasMore) // No more older messages
+	assert.Len(t, lastPage, 5)           // Only 5 messages (0-4)
+	assert.Empty(t, lastMeta.PrevCursor) // No more older messages
 	assert.Equal(t, 25, lastMeta.TotalMessages)
 
 	// Should get the first 5 messages
@@ -193,7 +192,7 @@ func TestPaginateMessages_BeforeFirstMessage(t *testing.T) {
 	require.NoError(t, err)
 
 	assert.Empty(t, paginated)
-	assert.False(t, meta.HasMore)
+	assert.Empty(t, meta.PrevCursor) // No messages at all
 }
 
 func TestPaginateMessages_InvalidCursor(t *testing.T) {

pkg/api/types.go

@@ -141,8 +141,7 @@ type SessionResponse struct {
 type PaginationMetadata struct {
 	TotalMessages int    `json:"total_messages"`        // Total number of messages in session
 	Limit         int    `json:"limit"`                 // Number of messages in this response
-	HasMore       bool   `json:"has_more"`              // Whether more messages exist
-	PrevCursor    string `json:"prev_cursor,omitempty"` // Cursor for previous page
+	PrevCursor    string `json:"prev_cursor,omitempty"` // Cursor for previous page (empty if no more messages)
 }
 
 // ResumeSessionRequest represents a request to resume a session