0743477d48
* feat(orchestrator): persist N-entry FIFO message queue
Replaces the single-slot, latest-wins, in-memory queue with a SQLite-backed
FIFO queue (default cap 10 per session, configurable via
KANDEV_QUEUE_MAX_PER_SESSION). Drain stays one-per-turn so each entry gets its
own user message and `on_turn_*` workflow cycle. Inter-task `message_task_kandev`
returns a structured `queue_full` error with sender attribution when the
target session is saturated, so the calling LLM can decide whether to retry.
Surfaces a new WS action `message.queue.remove` for single-entry deletion;
`message.queue.cancel` now means clear-all. Edit/remove are keyed on the
entry's UUID, returning `entry_not_found` when atomic-take won the drain race.
* feat(web): N-entry queue state, API, and optimistic hook
Replaces the single-slot QueueStatus with an ordered `entries[]` per session
plus capacity meta (`count`, `max`). API exposes typed `QueueFullError` and
`QueueEntryNotFoundError`; the hook surfaces optimistic edit/remove with
drain-race rollback (refetch on `entry_not_found`).
* feat(web): inline ghost-message queue UI with sender chips
Replaces the floating QueuedMessageIndicator overlay with a stack of ghost
messages rendered above the chat input. Each ghost shows a sender chip
(user / agent) and per-entry edit/remove. A small "n/max queued · clear all"
pill summarizes capacity. Inter-task entries are visually distinct and edit
is gated to the original sender.
* fix(queue): address review — auth guard, TOCTOU, error UX
- Add `messagequeue.QueuedByUser` / `QueuedByAgent` constants and centralize
the `queue_full` error code so the WS and MCP handlers stay in sync.
- WS `message.queue.{add,append,update}` default empty user_id to QueuedByUser
so the UpdateContent ownership guard always runs against a non-empty owner;
inter-task entries (`queued_by="agent"`) can no longer be overwritten by
user-initiated edits even when `user_id` is omitted from the payload.
- memoryRepository: hold the mutex through the whole append-or-insert path
(prior split released the lock between tail-check and Insert, allowing two
same-sender callers to race past coalescing). TransferSession now shifts
source positions past the destination's max so transferred entries always
drain after pre-existing destination entries, matching SQLite semantics.
- Frontend: surface edit/clear/remove failures via `sonner` toasts (drain race
→ "message already sent"); exit edit mode on failure instead of leaving the
textarea silently stuck. Hide the remove button on read-only (agent) ghosts.
- `useQueue.clearAll` no longer derives `max` from pre-clear entry count;
resets to `metaMax ?? 0` so the next status_changed event lands authoritative
capacity.
- `senderKindOf` drops the unreachable metadata fallback; route on `queued_by`
alone since `dispatchTaskMessage` always sets it.
- Test loggers now write to stderr per CLAUDE.md "stderr for logs" guideline.
* test(web): align queue e2e selectors with new ghost-message UI
The ghost-message rewrite renamed button titles ("Cancel queued message"
→ "Remove queued message", "Edit message" → "Edit queued message") and
introduced a `data-testid="queued-ghost-list"` container. The
`message-queue.spec.ts` Playwright tests still pointed at the old titles.
* fix(queue): address second review pass — auth, drain race, tests
- WS handlers (`add` / `append` / `update`) now reject `user_id="agent"`
outright, closing the gap a hostile WS client could exploit by
impersonating the inter-task sender identity to overwrite agent
entries (greptile P1).
- WS `update` / `remove` now require `session_id` so the post-mutation
`MessageQueueStatusChanged` broadcast can never be silently skipped.
- `sqliteRepository.TakeHead` checks `RowsAffected()` after DELETE;
when two concurrent take callers race past the busy-timeout the
loser sees 0 affected rows and now returns `nil, nil` instead of
the already-drained message (would otherwise dispatch the same
prompt twice).
- `Service.GetStatus` returns `Entries: []` instead of `nil` on the
error path so the wire shape stays consistent (frontend already
guards but strict consumers wouldn't tolerate the type mismatch).
- New tests: `queue-api.test.ts` covers `rethrowQueueError` mappings
(queue_full / entry_not_found / generic / Error pass-through);
`session-slice.upsert.test.ts` covers `setQueueEntries`,
`removeQueueEntry`, and `clearQueueStatus`. Backend gains an
agent-impersonation handler test.
- `rethrowQueueError` now surfaces `WSError.message` for non-queue
errors instead of stringifying the whole object.
- Cleanup: replace unused `a, c := ...` discards in service_test
with `_, _ = ...`.
* fix(queue): scope update/remove by session_id (cross-session deletion guard)
The MCP `queue_full` error payload deliberately discloses sibling-task
entry IDs (so the calling agent's LLM can reason about the wedge state).
Without a session_id filter on `DeleteByID` / `UpdateContent`, a hostile
agent that received that payload could call `wsRemoveEntry` /
`wsUpdateMessage` against another task's entries and delete or rewrite
them — only the per-entry UUID was being checked.
- `Repository.UpdateContent` and `Repository.DeleteByID` now require
`sessionID` and add `AND session_id = ?` to the SQL guard. The memory
repo mirrors the scope (lookup keyed on session before the entry scan).
- `Service.UpdateMessage` / `Service.RemoveEntry` take `sessionID`; the
WS handlers thread `req.SessionID` through (already validated as
non-empty in the previous fixup).
- TypeScript: `session_id` is now required on `updateQueuedMessage` /
`removeQueuedEntry` params so callers fail at compile time, matching
the backend contract.
- Tests cover the cross-session attack: `RemoveEntry`/`UpdateMessage`
with an attacker-supplied session_id but a real entry id from another
session must return `ErrEntryNotFound` and leave the victim entry
untouched. SQLite repo gets parallel coverage.
* fix(queue): propagate transfer error + tighten WSError narrowing
- `Service.TransferSession` now returns an error so callers can fail
closed instead of silently leaving entries orphaned on the previous
session. The two existing call sites pick the right policy:
`switchSessionForStep` (reusing an existing session) propagates the
error so the workflow switch aborts; the new-session path logs and
continues, since the new session is already committed and rolling
back here would leave a half-switched workflow.
- `asWSError` now also narrows on `message` / `details`, so WS payloads
without a `code` field are still mapped to a meaningful `Error.message`
via `rethrowQueueError` (instead of "[object Object]"). Native
`Error` instances explicitly skip the WS-error branch so they pass
through untouched, preserving the existing pass-through guarantee.
- `queue-api.test.ts`: `expect.assertions(N)` on the catch-only tests
so a missing throw fails the test instead of silently passing.
* fix(queue): check TransferSession error in service tests
The TransferSession signature change in 83abe6d7 broke errcheck on two
test sites that hadn't been updated. Wrap them in require.NoError.
226 lines
8.4 KiB
Go
226 lines
8.4 KiB
Go
// Package messagequeue persists per-session FIFO message queues and deferred
|
|
// workflow moves. The queue lets a user (or another agent via the
|
|
// message_task_kandev MCP tool) enqueue follow-up prompts while the target
|
|
// session is still busy with a turn; handleAgentReady drains one entry per
|
|
// turn after each turn completes.
|
|
//
|
|
// Storage is abstracted behind Repository (SQLite in production, in-memory
|
|
// for tests). The service enforces a per-session cap (default 10) and surfaces
|
|
// overflow as ErrQueueFull rather than silently dropping the new message.
|
|
package messagequeue
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
|
|
"github.com/kandev/kandev/internal/common/logger"
|
|
"go.uber.org/zap"
|
|
)
|
|
|
|
// Service manages queued messages for sessions, backed by Repository.
|
|
type Service struct {
|
|
repo Repository
|
|
maxPerSession int
|
|
logger *logger.Logger
|
|
}
|
|
|
|
// NewService creates a Service backed by the supplied repository. maxPerSession
|
|
// is the per-session cap (entries beyond this return ErrQueueFull on insert);
|
|
// pass 0 to disable the cap.
|
|
func NewService(repo Repository, maxPerSession int, log *logger.Logger) *Service {
|
|
return &Service{
|
|
repo: repo,
|
|
maxPerSession: maxPerSession,
|
|
logger: log.WithFields(zap.String("component", "message-queue")),
|
|
}
|
|
}
|
|
|
|
// NewServiceMemory returns a Service backed by an in-memory repository.
|
|
// Convenience constructor for tests; cap defaults to 10 for parity with prod.
|
|
func NewServiceMemory(log *logger.Logger) *Service {
|
|
return NewService(NewMemoryRepository(), DefaultMaxPerSession, log)
|
|
}
|
|
|
|
// MaxPerSession returns the configured per-session cap.
|
|
func (s *Service) MaxPerSession() int { return s.maxPerSession }
|
|
|
|
// QueueMessage appends a new entry to the session's FIFO queue. Returns
|
|
// ErrQueueFull when the cap is exceeded.
|
|
func (s *Service) QueueMessage(ctx context.Context, sessionID, taskID, content, model, userID string, planMode bool, attachments []MessageAttachment) (*QueuedMessage, error) {
|
|
return s.QueueMessageWithMetadata(ctx, sessionID, taskID, content, model, userID, planMode, attachments, nil)
|
|
}
|
|
|
|
// QueueMessageWithMetadata is like QueueMessage but stores extra metadata that
|
|
// is propagated to the resulting Message row when the queued message is
|
|
// drained (e.g. sender_task_id for messages sent via message_task_kandev).
|
|
func (s *Service) QueueMessageWithMetadata(ctx context.Context, sessionID, taskID, content, model, userID string, planMode bool, attachments []MessageAttachment, metadata map[string]interface{}) (*QueuedMessage, error) {
|
|
msg := &QueuedMessage{
|
|
SessionID: sessionID,
|
|
TaskID: taskID,
|
|
Content: content,
|
|
Model: model,
|
|
PlanMode: planMode,
|
|
Attachments: attachments,
|
|
Metadata: metadata,
|
|
QueuedBy: userID,
|
|
}
|
|
if err := s.repo.Insert(ctx, msg, s.maxPerSession); err != nil {
|
|
if errors.Is(err, ErrQueueFull) {
|
|
s.logger.Info("queue full",
|
|
zap.String("session_id", sessionID),
|
|
zap.Int("max", s.maxPerSession))
|
|
}
|
|
return nil, err
|
|
}
|
|
s.logger.Info("message queued",
|
|
zap.String("session_id", sessionID),
|
|
zap.String("task_id", taskID),
|
|
zap.String("entry_id", msg.ID),
|
|
zap.Int64("position", msg.Position),
|
|
zap.Int("content_length", len(content)))
|
|
return msg, nil
|
|
}
|
|
|
|
// AppendContent appends content onto the session's tail entry when the tail's
|
|
// queued_by matches userID. Otherwise inserts a new entry. Returns
|
|
// ErrQueueFull when an insert would exceed the cap.
|
|
func (s *Service) AppendContent(ctx context.Context, sessionID, taskID, content, model, userID string, planMode bool, attachments []MessageAttachment) (*QueuedMessage, bool, error) {
|
|
msg, appended, err := s.repo.AppendOrInsertTail(ctx, sessionID, taskID, content, model, userID, planMode, attachments, nil, s.maxPerSession)
|
|
if err != nil {
|
|
return nil, false, err
|
|
}
|
|
s.logger.Info("queue append-or-insert",
|
|
zap.String("session_id", sessionID),
|
|
zap.String("entry_id", msg.ID),
|
|
zap.Bool("appended", appended))
|
|
return msg, appended, nil
|
|
}
|
|
|
|
// TakeQueued atomically removes and returns the head entry. Returns nil, false
|
|
// when the queue is empty.
|
|
func (s *Service) TakeQueued(ctx context.Context, sessionID string) (*QueuedMessage, bool) {
|
|
msg, err := s.repo.TakeHead(ctx, sessionID)
|
|
if err != nil {
|
|
s.logger.Error("take head failed",
|
|
zap.String("session_id", sessionID),
|
|
zap.Error(err))
|
|
return nil, false
|
|
}
|
|
if msg == nil {
|
|
return nil, false
|
|
}
|
|
s.logger.Info("message dequeued",
|
|
zap.String("session_id", sessionID),
|
|
zap.String("entry_id", msg.ID))
|
|
return msg, true
|
|
}
|
|
|
|
// UpdateMessage replaces the content (and optionally attachments) of a queued
|
|
// entry. The sessionID scope is mandatory — callers can't update an entry by
|
|
// guessing its UUID across sessions. Returns ErrEntryNotFound when the entry
|
|
// was already drained, the session doesn't own it, or the queuedBy guard
|
|
// rejects the caller.
|
|
func (s *Service) UpdateMessage(ctx context.Context, sessionID, entryID, content string, attachments []MessageAttachment, queuedBy string) error {
|
|
if err := s.repo.UpdateContent(ctx, sessionID, entryID, content, attachments, queuedBy); err != nil {
|
|
return err
|
|
}
|
|
s.logger.Info("queued entry updated",
|
|
zap.String("session_id", sessionID),
|
|
zap.String("entry_id", entryID))
|
|
return nil
|
|
}
|
|
|
|
// RemoveEntry deletes a single entry. The sessionID scope is mandatory — see
|
|
// the rationale on the Repository.DeleteByID contract for why. Returns
|
|
// ErrEntryNotFound when no entry matches.
|
|
func (s *Service) RemoveEntry(ctx context.Context, sessionID, entryID string) error {
|
|
if err := s.repo.DeleteByID(ctx, sessionID, entryID); err != nil {
|
|
return err
|
|
}
|
|
s.logger.Info("queued entry removed",
|
|
zap.String("session_id", sessionID),
|
|
zap.String("entry_id", entryID))
|
|
return nil
|
|
}
|
|
|
|
// CancelAll clears every queued entry for a session. Returns the number of
|
|
// rows removed.
|
|
func (s *Service) CancelAll(ctx context.Context, sessionID string) (int, error) {
|
|
n, err := s.repo.DeleteAllBySession(ctx, sessionID)
|
|
if err != nil {
|
|
return 0, err
|
|
}
|
|
s.logger.Info("queue cancel-all",
|
|
zap.String("session_id", sessionID),
|
|
zap.Int("removed", n))
|
|
return n, nil
|
|
}
|
|
|
|
// GetStatus returns the full pending list and capacity info for a session.
|
|
func (s *Service) GetStatus(ctx context.Context, sessionID string) *QueueStatus {
|
|
entries, err := s.repo.ListBySession(ctx, sessionID)
|
|
if err != nil {
|
|
s.logger.Error("list queued failed",
|
|
zap.String("session_id", sessionID),
|
|
zap.Error(err))
|
|
return &QueueStatus{Entries: []QueuedMessage{}, Count: 0, Max: s.maxPerSession}
|
|
}
|
|
if entries == nil {
|
|
entries = []QueuedMessage{}
|
|
}
|
|
return &QueueStatus{
|
|
Entries: entries,
|
|
Count: len(entries),
|
|
Max: s.maxPerSession,
|
|
}
|
|
}
|
|
|
|
// TransferSession moves any queued messages and pending move from one session
|
|
// to another. Used by workflow session switches. Returns an error so the
|
|
// caller can fail closed instead of silently leaving entries orphaned on the
|
|
// old session — a transfer that no-ops without a signal would let the workflow
|
|
// step move forward while the queue sticks behind.
|
|
func (s *Service) TransferSession(ctx context.Context, oldSessionID, newSessionID string) error {
|
|
if err := s.repo.TransferSession(ctx, oldSessionID, newSessionID); err != nil {
|
|
s.logger.Error("transfer session failed",
|
|
zap.String("from_session_id", oldSessionID),
|
|
zap.String("to_session_id", newSessionID),
|
|
zap.Error(err))
|
|
return err
|
|
}
|
|
s.logger.Info("transferred queue between sessions",
|
|
zap.String("from_session_id", oldSessionID),
|
|
zap.String("to_session_id", newSessionID))
|
|
return nil
|
|
}
|
|
|
|
// SetPendingMove records a pending move for a session (replaces any existing one).
|
|
// The move is applied by handleAgentReady when the agent's current turn completes.
|
|
func (s *Service) SetPendingMove(ctx context.Context, sessionID string, move *PendingMove) {
|
|
if err := s.repo.SetPendingMove(ctx, sessionID, move); err != nil {
|
|
s.logger.Error("set pending move failed",
|
|
zap.String("session_id", sessionID),
|
|
zap.Error(err))
|
|
return
|
|
}
|
|
s.logger.Info("pending move recorded",
|
|
zap.String("session_id", sessionID),
|
|
zap.String("task_id", move.TaskID),
|
|
zap.String("workflow_step_id", move.WorkflowStepID))
|
|
}
|
|
|
|
// TakePendingMove retrieves and removes the pending move for a session.
|
|
func (s *Service) TakePendingMove(ctx context.Context, sessionID string) (*PendingMove, bool) {
|
|
move, err := s.repo.TakePendingMove(ctx, sessionID)
|
|
if err != nil {
|
|
s.logger.Error("take pending move failed",
|
|
zap.String("session_id", sessionID),
|
|
zap.Error(err))
|
|
return nil, false
|
|
}
|
|
if move == nil {
|
|
return nil, false
|
|
}
|
|
return move, true
|
|
}
|