mirror of
https://github.com/multica-ai/multica.git
synced 2026-07-05 21:39:54 +02:00
* fix(comments): allow agent self-mention to enqueue cross-issue handoff
The @mention path in CreateComment unconditionally skipped any
self-mention. That dropped the child→parent handoff between issues
assigned to the same agent: the child run posted `@J` on the parent
issue, the guard tripped, and the parent's J was never woken — the chain
silently broke.
Drop the self-trigger `continue` in the agent mention branch. Runtime
ready / private-agent gate / HasPendingTaskForIssueAndAgent dedup all
remain, so a same-issue self-mention while a queued or dispatched task
exists is still deduped; a running task no longer pre-empts a new
follow-up (the existing queue coalescing handles that).
Three regression tests:
- cross-issue self-mention enqueues a task on the target issue
- same-issue self-mention while running queues a follow-up
- same-issue self-mention with a pre-existing queued/dispatched task
is deduped
MUL-2338
Co-authored-by: multica-agent <github@multica.ai>
* test(handler): assign per-workspace issue number in self-mention fixture
The fixture inserts two issues in the same test workspace; without an
explicit number both default to 0 and the second insert violates
uq_issue_workspace_number, taking the backend CI job down on PR #2928.
Mirror the workspace-counter advancement pattern from
issue_scheduled_test.go so each fixture issue gets a unique number.
Co-authored-by: multica-agent <github@multica.ai>
---------
Co-authored-by: multica-agent <github@multica.ai>
244 lines
9.2 KiB
Go
244 lines
9.2 KiB
Go
package handler
|
|
|
|
import (
|
|
"context"
|
|
"testing"
|
|
|
|
"github.com/multica-ai/multica/server/internal/util"
|
|
db "github.com/multica-ai/multica/server/pkg/db/generated"
|
|
)
|
|
|
|
// selfMentionFixture wires the seeded "Handler Test Agent" as J plus two
|
|
// fresh issues so we can exercise the agent-self-mention path on the @mention
|
|
// branch of enqueueMentionedAgentTasks. The three tests below cover the
|
|
// behavior we want post-MUL-2338:
|
|
//
|
|
// - cross-issue self-mention enqueues (child→parent handoff between issues
|
|
// assigned to the same agent must not be swallowed)
|
|
// - same-issue self-mention with an in-flight running task enqueues a
|
|
// follow-up (queue coalescing already allows this — the comment handler
|
|
// must not pre-empt it with an extra in-thread guard)
|
|
// - same-issue self-mention with a queued/dispatched task is deduped
|
|
// (HasPendingTaskForIssueAndAgent still does its job)
|
|
type selfMentionFixture struct {
|
|
JID string
|
|
RuntimeID string
|
|
IssueAID string // primary issue (used for same-issue scenarios)
|
|
IssueA db.Issue
|
|
IssueBID string // a second issue (used for the cross-issue scenario)
|
|
IssueB db.Issue
|
|
CommentAID string // a comment on IssueA authored by J — used as the trigger
|
|
CommentA db.Comment
|
|
CommentBID string // a comment on IssueB authored by J — used as the trigger
|
|
CommentB db.Comment
|
|
}
|
|
|
|
func newSelfMentionFixture(t *testing.T) selfMentionFixture {
|
|
t.Helper()
|
|
ctx := context.Background()
|
|
|
|
// Reuse the seeded workspace-visible agent — it already has a runtime.
|
|
var jID string
|
|
if err := testPool.QueryRow(ctx, `
|
|
SELECT id FROM agent WHERE workspace_id = $1 ORDER BY created_at ASC LIMIT 1
|
|
`, testWorkspaceID).Scan(&jID); err != nil {
|
|
t.Fatalf("load seeded agent: %v", err)
|
|
}
|
|
var runtimeID string
|
|
if err := testPool.QueryRow(ctx, `SELECT runtime_id FROM agent WHERE id = $1`, jID).Scan(&runtimeID); err != nil {
|
|
t.Fatalf("load runtime: %v", err)
|
|
}
|
|
|
|
insertIssue := func(title string) string {
|
|
t.Helper()
|
|
// Pick the next per-workspace issue number; without it both inserts
|
|
// land on the default number=0 and trip uq_issue_workspace_number.
|
|
var number int
|
|
if err := testPool.QueryRow(ctx, `
|
|
UPDATE workspace
|
|
SET issue_counter = GREATEST(issue_counter, (SELECT COALESCE(MAX(number), 0) FROM issue WHERE workspace_id = $1)) + 1
|
|
WHERE id = $1 RETURNING issue_counter
|
|
`, testWorkspaceID).Scan(&number); err != nil {
|
|
t.Fatalf("next issue number: %v", err)
|
|
}
|
|
var id string
|
|
if err := testPool.QueryRow(ctx, `
|
|
INSERT INTO issue (workspace_id, creator_type, creator_id, title, assignee_type, assignee_id, number)
|
|
VALUES ($1, 'member', $2, $3, 'agent', $4, $5)
|
|
RETURNING id
|
|
`, testWorkspaceID, testUserID, title, jID, number).Scan(&id); err != nil {
|
|
t.Fatalf("create issue %q: %v", title, err)
|
|
}
|
|
t.Cleanup(func() {
|
|
testPool.Exec(context.Background(), `DELETE FROM agent_task_queue WHERE issue_id = $1`, id)
|
|
testPool.Exec(context.Background(), `DELETE FROM comment WHERE issue_id = $1`, id)
|
|
testPool.Exec(context.Background(), `DELETE FROM issue WHERE id = $1`, id)
|
|
})
|
|
return id
|
|
}
|
|
|
|
insertJComment := func(issueID, content string) string {
|
|
t.Helper()
|
|
var id string
|
|
if err := testPool.QueryRow(ctx, `
|
|
INSERT INTO comment (workspace_id, issue_id, author_type, author_id, content)
|
|
VALUES ($1, $2, 'agent', $3, $4)
|
|
RETURNING id
|
|
`, testWorkspaceID, issueID, jID, content).Scan(&id); err != nil {
|
|
t.Fatalf("create comment on %s: %v", issueID, err)
|
|
}
|
|
return id
|
|
}
|
|
|
|
issueAID := insertIssue("self-mention test A (same-issue scenarios)")
|
|
issueBID := insertIssue("self-mention test B (parent issue, cross-issue handoff)")
|
|
|
|
commentAID := insertJComment(issueAID, "[@J](mention://agent/"+jID+") follow-up coming")
|
|
commentBID := insertJComment(issueBID, "Child issue done — [@J](mention://agent/"+jID+") please wrap up here")
|
|
|
|
issueA, err := testHandler.Queries.GetIssue(ctx, util.MustParseUUID(issueAID))
|
|
if err != nil {
|
|
t.Fatalf("load issueA: %v", err)
|
|
}
|
|
issueB, err := testHandler.Queries.GetIssue(ctx, util.MustParseUUID(issueBID))
|
|
if err != nil {
|
|
t.Fatalf("load issueB: %v", err)
|
|
}
|
|
commentA, err := testHandler.Queries.GetComment(ctx, util.MustParseUUID(commentAID))
|
|
if err != nil {
|
|
t.Fatalf("load commentA: %v", err)
|
|
}
|
|
commentB, err := testHandler.Queries.GetComment(ctx, util.MustParseUUID(commentBID))
|
|
if err != nil {
|
|
t.Fatalf("load commentB: %v", err)
|
|
}
|
|
|
|
return selfMentionFixture{
|
|
JID: jID,
|
|
RuntimeID: runtimeID,
|
|
IssueAID: issueAID,
|
|
IssueA: issueA,
|
|
IssueBID: issueBID,
|
|
IssueB: issueB,
|
|
CommentAID: commentAID,
|
|
CommentA: commentA,
|
|
CommentBID: commentBID,
|
|
CommentB: commentB,
|
|
}
|
|
}
|
|
|
|
// countQueuedOrDispatched returns the number of queued|dispatched tasks for
|
|
// (agent, issue). Mirrors the predicate used by HasPendingTaskForIssueAndAgent.
|
|
func countQueuedOrDispatched(t *testing.T, agentID, issueID string) int {
|
|
t.Helper()
|
|
var n int
|
|
if err := testPool.QueryRow(context.Background(), `
|
|
SELECT count(*) FROM agent_task_queue
|
|
WHERE issue_id = $1 AND agent_id = $2 AND status IN ('queued', 'dispatched')
|
|
`, issueID, agentID).Scan(&n); err != nil {
|
|
t.Fatalf("count queued/dispatched tasks: %v", err)
|
|
}
|
|
return n
|
|
}
|
|
|
|
// TestEnqueueMentionedAgentTasks_SelfMentionCrossIssueEnqueues is the
|
|
// regression test for the MUL-2338 child→parent handoff. The same agent runs
|
|
// in a child issue, then posts a top-level comment on the parent issue (whose
|
|
// assignee is the same agent) that @mentions itself. The comment handler MUST
|
|
// enqueue a task on the parent issue — silently dropping the trigger was the
|
|
// bug Bohan reported.
|
|
func TestEnqueueMentionedAgentTasks_SelfMentionCrossIssueEnqueues(t *testing.T) {
|
|
if testHandler == nil || testPool == nil {
|
|
t.Skip("database not available")
|
|
}
|
|
ctx := context.Background()
|
|
fx := newSelfMentionFixture(t)
|
|
|
|
if got := countQueuedOrDispatched(t, fx.JID, fx.IssueBID); got != 0 {
|
|
t.Fatalf("before: expected 0 pending tasks on parent issue, got %d", got)
|
|
}
|
|
|
|
testHandler.enqueueMentionedAgentTasks(ctx, fx.IssueB, fx.CommentB, nil, "agent", fx.JID)
|
|
|
|
if got := countQueuedOrDispatched(t, fx.JID, fx.IssueBID); got != 1 {
|
|
t.Fatalf("after self-mention from another issue: expected 1 queued task on parent issue, got %d", got)
|
|
}
|
|
}
|
|
|
|
// TestEnqueueMentionedAgentTasks_SelfMentionWhileRunningQueuesFollowup proves
|
|
// that a self-mention posted in the same issue an agent is currently running
|
|
// in does NOT pre-empt the natural queue-coalescing behavior: a `running`
|
|
// task is not "pending" for dedup purposes, so a new queued follow-up is
|
|
// added and the agent picks it up on its next cycle.
|
|
func TestEnqueueMentionedAgentTasks_SelfMentionWhileRunningQueuesFollowup(t *testing.T) {
|
|
if testHandler == nil || testPool == nil {
|
|
t.Skip("database not available")
|
|
}
|
|
ctx := context.Background()
|
|
fx := newSelfMentionFixture(t)
|
|
|
|
// Seed a running task for J on issue A — this is the agent's current run.
|
|
if _, err := testPool.Exec(ctx, `
|
|
INSERT INTO agent_task_queue (agent_id, runtime_id, issue_id, status)
|
|
VALUES ($1, $2, $3, 'running')
|
|
`, fx.JID, fx.RuntimeID, fx.IssueAID); err != nil {
|
|
t.Fatalf("seed running task: %v", err)
|
|
}
|
|
|
|
if got := countQueuedOrDispatched(t, fx.JID, fx.IssueAID); got != 0 {
|
|
t.Fatalf("before: expected 0 queued/dispatched tasks (only the running task), got %d", got)
|
|
}
|
|
|
|
testHandler.enqueueMentionedAgentTasks(ctx, fx.IssueA, fx.CommentA, nil, "agent", fx.JID)
|
|
|
|
if got := countQueuedOrDispatched(t, fx.JID, fx.IssueAID); got != 1 {
|
|
t.Fatalf("after self-mention while running: expected 1 new queued follow-up, got %d", got)
|
|
}
|
|
}
|
|
|
|
// TestEnqueueMentionedAgentTasks_SelfMentionDedupesAgainstPendingTask locks in
|
|
// that removing the self-trigger `continue` did NOT remove the standard
|
|
// HasPendingTaskForIssueAndAgent dedupe. If a queued or dispatched task
|
|
// already exists for the same agent on the same issue, a fresh self-mention
|
|
// must NOT pile on another duplicate.
|
|
func TestEnqueueMentionedAgentTasks_SelfMentionDedupesAgainstPendingTask(t *testing.T) {
|
|
if testHandler == nil || testPool == nil {
|
|
t.Skip("database not available")
|
|
}
|
|
ctx := context.Background()
|
|
fx := newSelfMentionFixture(t)
|
|
|
|
cases := []struct {
|
|
name string
|
|
status string
|
|
}{
|
|
{name: "queued task blocks duplicate", status: "queued"},
|
|
{name: "dispatched task blocks duplicate", status: "dispatched"},
|
|
}
|
|
for _, tc := range cases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
if _, err := testPool.Exec(ctx, `DELETE FROM agent_task_queue WHERE issue_id = $1`, fx.IssueAID); err != nil {
|
|
t.Fatalf("reset tasks: %v", err)
|
|
}
|
|
if _, err := testPool.Exec(ctx, `
|
|
INSERT INTO agent_task_queue (agent_id, runtime_id, issue_id, status)
|
|
VALUES ($1, $2, $3, $4)
|
|
`, fx.JID, fx.RuntimeID, fx.IssueAID, tc.status); err != nil {
|
|
t.Fatalf("seed %s task: %v", tc.status, err)
|
|
}
|
|
|
|
before := countQueuedOrDispatched(t, fx.JID, fx.IssueAID)
|
|
if before != 1 {
|
|
t.Fatalf("before: expected 1 pre-existing %s task, got %d", tc.status, before)
|
|
}
|
|
|
|
testHandler.enqueueMentionedAgentTasks(ctx, fx.IssueA, fx.CommentA, nil, "agent", fx.JID)
|
|
|
|
after := countQueuedOrDispatched(t, fx.JID, fx.IssueAID)
|
|
if after != 1 {
|
|
t.Fatalf("after self-mention with pre-existing %s task: expected dedupe (still 1), got %d", tc.status, after)
|
|
}
|
|
})
|
|
}
|
|
}
|