feat(sidebar): add last activity task sorting (#2762)
This commit is contained in:
@@ -3,6 +3,7 @@ package messagequeue
|
||||
import (
|
||||
"bytes"
|
||||
"encoding/json"
|
||||
"time"
|
||||
|
||||
"github.com/kandev/kandev/internal/entityrefs"
|
||||
"github.com/kandev/kandev/internal/messageconstraints"
|
||||
@@ -13,6 +14,7 @@ type autoMergedValues struct {
|
||||
content string
|
||||
attachments []MessageAttachment
|
||||
metadata map[string]interface{}
|
||||
queuedAt time.Time
|
||||
}
|
||||
|
||||
func buildAutoMergedEntry(target, source *QueuedMessage) (*autoMergedValues, bool) {
|
||||
@@ -31,9 +33,17 @@ func buildAutoMergedEntry(target, source *QueuedMessage) (*autoMergedValues, boo
|
||||
content: joinAutoMergeContent(target.Content, source.Content),
|
||||
attachments: attachments,
|
||||
metadata: metadata,
|
||||
queuedAt: latestQueuedAt(target.QueuedAt, source.QueuedAt),
|
||||
}, true
|
||||
}
|
||||
|
||||
func latestQueuedAt(first, second time.Time) time.Time {
|
||||
if second.After(first) {
|
||||
return second
|
||||
}
|
||||
return first
|
||||
}
|
||||
|
||||
func autoMergeAllowed(target, source *QueuedMessage) bool {
|
||||
if target == nil || source == nil || target.IsDurableLifecycle() || source.IsDurableLifecycle() {
|
||||
return false
|
||||
|
||||
@@ -99,6 +99,9 @@ func TestRepository_AutoMergeIntoAbove_PreservesIdentityAndCombinesAdditiveData(
|
||||
},
|
||||
})
|
||||
targetIdentity := autoMergeIdentity(*target)
|
||||
// The surviving row carries the newest admission timestamp so durable
|
||||
// activity reconstruction does not lose the folded user prompt.
|
||||
targetIdentity.QueuedAt = source.QueuedAt.UTC().Truncate(time.Microsecond)
|
||||
|
||||
merged, didMerge, err := autoRepo.AutoMergeIntoAbove(context.Background(), "session", source.ID)
|
||||
if err != nil || !didMerge {
|
||||
|
||||
@@ -650,6 +650,7 @@ func (r *memoryRepository) MergeIntoAbove(_ context.Context, sessionID, sourceID
|
||||
target.Content = content
|
||||
target.Attachments = attachments
|
||||
target.Metadata = metadata
|
||||
target.QueuedAt = latestQueuedAt(target.QueuedAt, source.QueuedAt)
|
||||
r.entries[sessionID] = append(list[:sourceIndex], list[sourceIndex+1:]...)
|
||||
if len(r.entries[sessionID]) == 0 {
|
||||
delete(r.entries, sessionID)
|
||||
@@ -694,6 +695,7 @@ func (r *memoryRepository) AutoMergeIntoAbove(_ context.Context, sessionID, sour
|
||||
target.Content = values.content
|
||||
target.Attachments = values.attachments
|
||||
target.Metadata = values.metadata
|
||||
target.QueuedAt = values.queuedAt
|
||||
r.entries[sessionID] = append(list[:sourceIndex], list[sourceIndex+1:]...)
|
||||
return cloneQueuedMessage(target), true, nil
|
||||
}
|
||||
@@ -722,6 +724,7 @@ func (r *memoryRepository) AutoMergeCandidateIntoAbove(_ context.Context, candid
|
||||
target.Content = values.content
|
||||
target.Attachments = values.attachments
|
||||
target.Metadata = values.metadata
|
||||
target.QueuedAt = values.queuedAt
|
||||
return cloneQueuedMessage(target), true, nil
|
||||
}
|
||||
|
||||
|
||||
@@ -756,9 +756,17 @@ func TestPostgresRepository_MergeDrainOrdering_DrainWins(t *testing.T) {
|
||||
func TestPostgresRepository_MergeDrainOrdering_MergeWins(t *testing.T) {
|
||||
repo := newTestPostgresRepo(t)
|
||||
ctx := context.Background()
|
||||
targetAt := time.Date(2026, 8, 18, 10, 0, 0, 0, time.UTC)
|
||||
sourceAt := targetAt.Add(time.Minute)
|
||||
|
||||
target := insertTestEntry(t, repo, "s1", "t1", "first", "user", nil, nil)
|
||||
source := insertTestEntry(t, repo, "s1", "t1", "second", "user", nil, nil)
|
||||
sqlRepo := repo.(*sqliteRepository)
|
||||
for id, queuedAt := range map[string]time.Time{target.ID: targetAt, source.ID: sourceAt} {
|
||||
if _, err := sqlRepo.db.ExecContext(ctx, sqlRepo.db.Rebind(`UPDATE queued_messages SET queued_at = ? WHERE id = ?`), queuedAt, id); err != nil {
|
||||
t.Fatalf("set queued_at for %s: %v", id, err)
|
||||
}
|
||||
}
|
||||
|
||||
merged, err := repo.MergeIntoAbove(ctx, "s1", source.ID, "user")
|
||||
if err != nil {
|
||||
@@ -774,6 +782,9 @@ func TestPostgresRepository_MergeDrainOrdering_MergeWins(t *testing.T) {
|
||||
if drained.Content != "first\n\nsecond" {
|
||||
t.Errorf("drained content = %q, want combined content", drained.Content)
|
||||
}
|
||||
if !merged.QueuedAt.Equal(sourceAt) || !drained.QueuedAt.Equal(sourceAt) {
|
||||
t.Errorf("merged queued_at = %s, drained queued_at = %s, want %s", merged.QueuedAt, drained.QueuedAt, sourceAt)
|
||||
}
|
||||
}
|
||||
|
||||
// TestPostgresRepository_MergeIntoAbove_ReferenceOverflow asserts the overflow
|
||||
|
||||
@@ -152,6 +152,7 @@ func (r *sqliteRepository) initSchema() error {
|
||||
queued_by TEXT NOT NULL DEFAULT ''
|
||||
);
|
||||
CREATE INDEX IF NOT EXISTS idx_queued_messages_session_position ON queued_messages(session_id, position);
|
||||
CREATE INDEX IF NOT EXISTS idx_queued_messages_task_activity ON queued_messages(task_id, queued_by, queued_at);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS lifecycle_queue_generations (
|
||||
task_id TEXT PRIMARY KEY,
|
||||
@@ -1562,6 +1563,7 @@ func (r *sqliteRepository) MergeIntoAbove(ctx context.Context, sessionID, source
|
||||
merged.Content = content
|
||||
merged.Attachments = attachments
|
||||
merged.Metadata = metadata
|
||||
merged.QueuedAt = latestQueuedAt(target.QueuedAt, source.QueuedAt)
|
||||
return &merged, nil
|
||||
}
|
||||
|
||||
@@ -1611,6 +1613,7 @@ func (r *sqliteRepository) AutoMergeIntoAbove(ctx context.Context, sessionID, so
|
||||
target.Content = values.content
|
||||
target.Attachments = values.attachments
|
||||
target.Metadata = values.metadata
|
||||
target.QueuedAt = values.queuedAt
|
||||
return target, true, nil
|
||||
}
|
||||
|
||||
@@ -1675,15 +1678,16 @@ func (r *sqliteRepository) AutoMergeCandidateIntoAbove(ctx context.Context, cand
|
||||
// the head), violating FIFO drain order.
|
||||
res, err := tx.ExecContext(ctx, r.db.Rebind(`
|
||||
UPDATE queued_messages
|
||||
SET content = ?, attachments_json = ?, metadata_json = ?
|
||||
SET content = ?, attachments_json = ?, metadata_json = ?, queued_at = ?
|
||||
WHERE id = ? AND session_id = ?
|
||||
AND position = ?
|
||||
AND content = ?
|
||||
AND attachments_json = ?
|
||||
AND metadata_json = ?
|
||||
`), values.content, attachmentsJSON, metadataJSON,
|
||||
AND queued_at = ?
|
||||
`), values.content, attachmentsJSON, metadataJSON, values.queuedAt,
|
||||
target.ID, candidate.SessionID, target.Position,
|
||||
storedContent, storedAttachmentsJSON, storedMetadataJSON)
|
||||
storedContent, storedAttachmentsJSON, storedMetadataJSON, target.QueuedAt)
|
||||
if err != nil {
|
||||
return nil, false, fmt.Errorf("update automatic candidate merge target: %w", err)
|
||||
}
|
||||
@@ -1704,6 +1708,7 @@ func (r *sqliteRepository) AutoMergeCandidateIntoAbove(ctx context.Context, cand
|
||||
target.Content = values.content
|
||||
target.Attachments = values.attachments
|
||||
target.Metadata = values.metadata
|
||||
target.QueuedAt = values.queuedAt
|
||||
return target, true, nil
|
||||
}
|
||||
|
||||
@@ -1869,11 +1874,12 @@ func applyMergeWrites(ctx context.Context, r *sqliteRepository, tx *sqlx.Tx, tar
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
queuedAt := latestQueuedAt(target.QueuedAt, source.QueuedAt)
|
||||
res, err := tx.ExecContext(ctx, r.db.Rebind(`
|
||||
UPDATE queued_messages
|
||||
SET content = ?, attachments_json = ?, metadata_json = ?
|
||||
SET content = ?, attachments_json = ?, metadata_json = ?, queued_at = ?
|
||||
WHERE id = ? AND session_id = ?
|
||||
`), content, attachmentsJSON, metadataJSON, target.ID, sessionID)
|
||||
`), content, attachmentsJSON, metadataJSON, queuedAt, target.ID, sessionID)
|
||||
if err != nil {
|
||||
return fmt.Errorf("update merge target: %w", err)
|
||||
}
|
||||
|
||||
@@ -5,6 +5,7 @@ import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/kandev/kandev/internal/entityrefs"
|
||||
apiv1 "github.com/kandev/kandev/pkg/api/v1"
|
||||
@@ -200,6 +201,8 @@ func TestSQLiteRepository_MergeDrainOrdering_MergeWins(t *testing.T) {
|
||||
func TestSQLiteRepository_MergeIntoAbove_UserMergesIntoUser(t *testing.T) {
|
||||
repo := newTestSQLiteRepo(t)
|
||||
ctx := context.Background()
|
||||
targetAt := time.Date(2026, 8, 18, 10, 0, 0, 0, time.UTC)
|
||||
sourceAt := targetAt.Add(time.Minute)
|
||||
|
||||
target := insertTestEntry(t, repo, "s1", "t1", "first", "user",
|
||||
[]MessageAttachment{{Type: "image", Data: "a", MimeType: "image/png"}},
|
||||
@@ -211,6 +214,12 @@ func TestSQLiteRepository_MergeIntoAbove_UserMergesIntoUser(t *testing.T) {
|
||||
map[string]interface{}{
|
||||
MetadataEntityReferences: entityRefs("1", "2"),
|
||||
})
|
||||
sqliteRepo := repo.(*sqliteRepository)
|
||||
for id, queuedAt := range map[string]time.Time{target.ID: targetAt, source.ID: sourceAt} {
|
||||
if _, err := sqliteRepo.db.ExecContext(ctx, `UPDATE queued_messages SET queued_at = ? WHERE id = ?`, queuedAt, id); err != nil {
|
||||
t.Fatalf("set queued_at for %s: %v", id, err)
|
||||
}
|
||||
}
|
||||
|
||||
merged, err := repo.MergeIntoAbove(ctx, "s1", source.ID, "user")
|
||||
if err != nil {
|
||||
@@ -222,6 +231,9 @@ func TestSQLiteRepository_MergeIntoAbove_UserMergesIntoUser(t *testing.T) {
|
||||
if merged.ID != target.ID {
|
||||
t.Errorf("merged id = %s, want target id %s", merged.ID, target.ID)
|
||||
}
|
||||
if !merged.QueuedAt.Equal(sourceAt) {
|
||||
t.Errorf("merged queued_at = %s, want %s", merged.QueuedAt, sourceAt)
|
||||
}
|
||||
if merged.Content != "first\n\nsecond" {
|
||||
t.Errorf("merged content = %q, want %q", merged.Content, "first\n\nsecond")
|
||||
}
|
||||
@@ -235,6 +247,13 @@ func TestSQLiteRepository_MergeIntoAbove_UserMergesIntoUser(t *testing.T) {
|
||||
if merged.QueuedBy != "user" {
|
||||
t.Errorf("merged queued_by = %q, want user", merged.QueuedBy)
|
||||
}
|
||||
entries, err := repo.ListBySession(ctx, "s1")
|
||||
if err != nil {
|
||||
t.Fatalf("list merged row: %v", err)
|
||||
}
|
||||
if len(entries) != 1 || !entries[0].QueuedAt.Equal(sourceAt) {
|
||||
t.Fatalf("persisted merged queued_at = %#v, want %s", entries, sourceAt)
|
||||
}
|
||||
count, _ := repo.CountBySession(ctx, "s1")
|
||||
if count != 1 {
|
||||
t.Errorf("count after merge = %d, want 1", count)
|
||||
|
||||
@@ -83,6 +83,31 @@ func TestSQLiteRepository_InsertList(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestSQLiteRepository_HasTaskActivityIndex(t *testing.T) {
|
||||
repo := newTestSQLiteRepo(t)
|
||||
sqliteRepo := repo.(*sqliteRepository)
|
||||
rows, err := sqliteRepo.db.Queryx(`PRAGMA index_info('idx_queued_messages_task_activity')`)
|
||||
if err != nil {
|
||||
t.Fatalf("inspect task activity index: %v", err)
|
||||
}
|
||||
defer func() { _ = rows.Close() }()
|
||||
|
||||
wantColumns := []string{"task_id", "queued_by", "queued_at"}
|
||||
for index, want := range wantColumns {
|
||||
if !rows.Next() {
|
||||
t.Fatalf("task activity index ended at column %d, want %q", index, want)
|
||||
}
|
||||
var seqno, columnID int
|
||||
var column string
|
||||
if err := rows.Scan(&seqno, &columnID, &column); err != nil {
|
||||
t.Fatalf("scan task activity index column %d: %v", index, err)
|
||||
}
|
||||
if column != want {
|
||||
t.Fatalf("task activity index column %d = %q, want %q", index, column, want)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestSQLiteRepository_InsertRejectsOverflow(t *testing.T) {
|
||||
repo := newTestSQLiteRepo(t)
|
||||
ctx := context.Background()
|
||||
|
||||
@@ -15,6 +15,7 @@ import (
|
||||
"fmt"
|
||||
"sync"
|
||||
"sync/atomic"
|
||||
"time"
|
||||
|
||||
"github.com/kandev/kandev/internal/common/logger"
|
||||
"go.uber.org/zap"
|
||||
@@ -195,6 +196,7 @@ func (s *Service) queueMessageWithMetadataAdmission(ctx context.Context, session
|
||||
PlanMode: planMode,
|
||||
Attachments: attachments,
|
||||
Metadata: copyMessageMetadata(metadata, 0),
|
||||
QueuedAt: time.Now().UTC(),
|
||||
QueuedBy: userID,
|
||||
}
|
||||
merged, didMerge, mergeErr := s.repo.AutoMergeCandidateIntoAbove(admittedCtx, candidate)
|
||||
|
||||
@@ -991,12 +991,14 @@ func TestMemoryRepository_MergeIntoAbove(t *testing.T) {
|
||||
|
||||
target := &QueuedMessage{
|
||||
SessionID: "s1", TaskID: "t1", Content: "first", QueuedBy: "alice",
|
||||
QueuedAt: time.Date(2026, 8, 18, 10, 0, 0, 0, time.UTC),
|
||||
Attachments: []MessageAttachment{{Type: "image", Data: "a", MimeType: "image/png"}},
|
||||
Metadata: map[string]interface{}{MetadataEntityReferences: []apiv1.EntityReference{ref}},
|
||||
}
|
||||
require.NoError(t, repo.Insert(ctx, target, 0))
|
||||
source := &QueuedMessage{
|
||||
SessionID: "s1", TaskID: "t1", Content: "second", QueuedBy: "alice",
|
||||
QueuedAt: target.QueuedAt.Add(time.Minute),
|
||||
Attachments: []MessageAttachment{{Type: "file", Data: "b", MimeType: "text/plain"}},
|
||||
Metadata: map[string]interface{}{MetadataEntityReferences: []apiv1.EntityReference{ref}},
|
||||
}
|
||||
@@ -1006,6 +1008,7 @@ func TestMemoryRepository_MergeIntoAbove(t *testing.T) {
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, target.ID, merged.ID)
|
||||
assert.Equal(t, "first\n\nsecond", merged.Content)
|
||||
assert.Equal(t, source.QueuedAt, merged.QueuedAt)
|
||||
assert.Len(t, merged.Attachments, 2)
|
||||
assert.Len(t, entityrefs.NormalizePersisted(merged.Metadata[MetadataEntityReferences]), 1)
|
||||
|
||||
@@ -1013,6 +1016,7 @@ func TestMemoryRepository_MergeIntoAbove(t *testing.T) {
|
||||
require.NoError(t, err)
|
||||
assert.Len(t, entries, 1)
|
||||
assert.Equal(t, "first\n\nsecond", entries[0].Content)
|
||||
assert.Equal(t, source.QueuedAt, entries[0].QueuedAt)
|
||||
}
|
||||
|
||||
// TestMemoryRepository_MergeIntoAbove_MixedKindsRejected covers the memory repo
|
||||
|
||||
Reference in New Issue
Block a user