Skip to content

Commit fb5da78

Browse files
committed
fix(a2a): serve exact task reads from the persistent store
Signed-off-by: Evan Rauner <[email protected]>
1 parent bc92b68 commit fb5da78

3 files changed

Lines changed: 137 additions & 9 deletions

File tree

‎go/core/internal/a2a/a2a_handler_mux.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ func NewA2AHttpMux(sandboxPathPrefix string, authenticator auth.AuthProvider, ta
5454
}
5555
}
5656

57-
// newTaskQueryHandler wraps the passthrough handler so ListTasks is served from
58-
// kagent's task store, which is the source of truth for persisted tasks.
57+
// newTaskQueryHandler wraps the passthrough handler so GetTask and ListTasks are
58+
// served from kagent's task store, which is the source of truth for persisted tasks.
5959
func newTaskQueryHandler(requestHandler a2asrv.RequestHandler, store TaskStore) a2asrv.RequestHandler {
6060
if store == nil {
6161
return requestHandler

‎go/core/internal/a2a/task_query_store.go‎

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"cmp"
55
"context"
66
"encoding/base64"
7+
"errors"
78
"fmt"
89
"slices"
910
"strconv"
@@ -19,19 +20,19 @@ const (
1920
maxTaskPageSize = 100
2021
)
2122

22-
// TaskStore is the subset of the persistent store ListTasks reads from.
23+
// TaskStore is the subset of the persistent store task queries read from.
2324
// *database.Client satisfies it. GetSession errors (including a missing or
2425
// other-user session) surface to the caller.
2526
type TaskStore interface {
27+
GetTask(ctx context.Context, taskID, userID string) (*a2atype.Task, error)
2628
GetSession(ctx context.Context, sessionID, userID string) (*dbpkg.Session, error)
2729
ListSessions(ctx context.Context, userID string) ([]dbpkg.Session, error)
2830
ListTasksForSession(ctx context.Context, sessionID, userID string) ([]*a2atype.Task, error)
2931
}
3032

31-
// storeTaskQueryHandler answers ListTasks from kagent's task store, which is
32-
// the source of truth for persisted tasks. Every other method (including
33-
// GetTask, which already resolves to the same store via the passthrough) is
34-
// delegated to the embedded handler unchanged.
33+
// storeTaskQueryHandler answers GetTask and ListTasks from kagent's task
34+
// store, which is the source of truth for persisted tasks. Every other method
35+
// is delegated to the embedded handler unchanged.
3536
type storeTaskQueryHandler struct {
3637
a2asrv.RequestHandler
3738
store TaskStore
@@ -41,6 +42,22 @@ func newStoreTaskQueryHandler(delegate a2asrv.RequestHandler, store TaskStore) *
4142
return &storeTaskQueryHandler{RequestHandler: delegate, store: store}
4243
}
4344

45+
func (h *storeTaskQueryHandler) GetTask(ctx context.Context, req *a2atype.GetTaskRequest) (*a2atype.Task, error) {
46+
userID := callerUserID(ctx)
47+
if userID == "" {
48+
return h.RequestHandler.GetTask(ctx, req)
49+
}
50+
51+
task, err := h.store.GetTask(ctx, string(req.ID), userID)
52+
if err == nil {
53+
return shapeTask(task, req.HistoryLength, true), nil
54+
}
55+
if errors.Is(err, dbpkg.ErrNotFound) {
56+
return h.RequestHandler.GetTask(ctx, req)
57+
}
58+
return nil, err
59+
}
60+
4461
// callerUserID returns the authenticated principal's user id, or "" when the
4562
// request carries no user identity. Task queries are scoped to this id so a
4663
// caller can never read another user's tasks.

‎go/core/internal/a2a/task_query_store_test.go‎

Lines changed: 113 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,10 @@ import (
2020
// fakeTaskStore is an in-memory TaskStore. Sessions are keyed by (id, userID)
2121
// so cross-user isolation is exercised the same way the real store enforces it.
2222
type fakeTaskStore struct {
23-
sessions map[string]dbpkg.Session // key: sessionID -> session (carries UserID)
24-
tasks map[string][]*a2atype.Task
23+
sessions map[string]dbpkg.Session // key: sessionID -> session (carries UserID)
24+
tasks map[string][]*a2atype.Task
25+
getTaskIDs []string
26+
getTaskUsers []string
2527
}
2628

2729
func newFakeStore() *fakeTaskStore {
@@ -39,6 +41,23 @@ func (f *fakeTaskStore) addTask(sessionID string, task *a2atype.Task) {
3941
f.tasks[sessionID] = append(f.tasks[sessionID], task)
4042
}
4143

44+
func (f *fakeTaskStore) GetTask(_ context.Context, taskID, userID string) (*a2atype.Task, error) {
45+
f.getTaskIDs = append(f.getTaskIDs, taskID)
46+
f.getTaskUsers = append(f.getTaskUsers, userID)
47+
for sessionID, tasks := range f.tasks {
48+
session, ok := f.sessions[sessionID]
49+
if !ok || session.UserID != userID {
50+
continue
51+
}
52+
for _, task := range tasks {
53+
if string(task.ID) == taskID {
54+
return task, nil
55+
}
56+
}
57+
}
58+
return nil, fmt.Errorf("task %s for user %s: %w", taskID, userID, dbpkg.ErrNotFound)
59+
}
60+
4261
func (f *fakeTaskStore) GetSession(_ context.Context, sessionID, userID string) (*dbpkg.Session, error) {
4362
s, ok := f.sessions[sessionID]
4463
if !ok || s.UserID != userID {
@@ -101,6 +120,94 @@ func storeWith(t *testing.T, user, session string, tasks ...*a2atype.Task) *stor
101120
return newStoreTaskQueryHandler(&PassthroughRequestHandler{}, store)
102121
}
103122

123+
type recordingGetTaskDelegate struct {
124+
a2asrv.RequestHandler
125+
calls int
126+
task *a2atype.Task
127+
err error
128+
}
129+
130+
func (d *recordingGetTaskDelegate) GetTask(context.Context, *a2atype.GetTaskRequest) (*a2atype.Task, error) {
131+
d.calls++
132+
return d.task, d.err
133+
}
134+
135+
func TestGetTask_PersistentHitShapesHistoryAndIncludesArtifacts(t *testing.T) {
136+
stored := newTask("t1", "s1", a2atype.TaskStateCompleted, 4, 2)
137+
wantStored := newTask("t1", "s1", a2atype.TaskStateCompleted, 4, 2)
138+
store := newFakeStore()
139+
store.addSession("s1", "alice")
140+
store.addTask("s1", stored)
141+
delegate := &recordingGetTaskDelegate{}
142+
h := newStoreTaskQueryHandler(delegate, store)
143+
historyLength := 2
144+
145+
got, err := h.GetTask(userCtx("alice"), &a2atype.GetTaskRequest{ID: "t1", HistoryLength: &historyLength})
146+
require.NoError(t, err)
147+
require.Equal(t, a2atype.TaskID("t1"), got.ID)
148+
require.Len(t, got.History, 2)
149+
require.Equal(t, []string{"t1-msg-2", "t1-msg-3"}, []string{got.History[0].ID, got.History[1].ID})
150+
require.Len(t, got.Artifacts, 2)
151+
require.Equal(t, []a2atype.ArtifactID{"t1-art-0", "t1-art-1"}, []a2atype.ArtifactID{got.Artifacts[0].ID, got.Artifacts[1].ID})
152+
require.Equal(t, []string{"t1"}, store.getTaskIDs)
153+
require.Equal(t, []string{"alice"}, store.getTaskUsers)
154+
require.Zero(t, delegate.calls)
155+
require.Equal(t, wantStored, stored)
156+
}
157+
158+
func TestGetTask_OtherOwnerDelegatesWithoutLeakingPersistedTask(t *testing.T) {
159+
store := newFakeStore()
160+
store.addSession("s1", "alice")
161+
store.addTask("s1", newTask("persisted", "s1", a2atype.TaskStateCompleted, 1, 1))
162+
delegateErr := fmt.Errorf("runtime task not found")
163+
delegate := &recordingGetTaskDelegate{err: delegateErr}
164+
h := newStoreTaskQueryHandler(delegate, store)
165+
req := &a2atype.GetTaskRequest{ID: "persisted"}
166+
167+
got, err := h.GetTask(userCtx("mallory"), req)
168+
require.Nil(t, got)
169+
require.ErrorIs(t, err, delegateErr)
170+
require.Equal(t, []string{"mallory"}, store.getTaskUsers)
171+
require.Equal(t, 1, delegate.calls)
172+
}
173+
174+
func TestGetTask_PersistentMissDelegates(t *testing.T) {
175+
delegatedTask := newTask("runtime", "s1", a2atype.TaskStateWorking, 0, 0)
176+
delegate := &recordingGetTaskDelegate{task: delegatedTask}
177+
h := newStoreTaskQueryHandler(delegate, failingTaskStore{err: fmt.Errorf("lookup: %w", dbpkg.ErrNotFound)})
178+
179+
got, err := h.GetTask(userCtx("alice"), &a2atype.GetTaskRequest{ID: "missing"})
180+
require.NoError(t, err)
181+
require.Same(t, delegatedTask, got)
182+
require.Equal(t, 1, delegate.calls)
183+
}
184+
185+
func TestGetTask_AbsentIdentityDelegatesWithoutStoreRead(t *testing.T) {
186+
store := newFakeStore()
187+
delegatedTask := newTask("runtime", "s1", a2atype.TaskStateWorking, 0, 0)
188+
delegate := &recordingGetTaskDelegate{task: delegatedTask}
189+
h := newStoreTaskQueryHandler(delegate, store)
190+
req := &a2atype.GetTaskRequest{ID: "runtime"}
191+
192+
got, err := h.GetTask(context.Background(), req)
193+
require.NoError(t, err)
194+
require.Same(t, delegatedTask, got)
195+
require.Empty(t, store.getTaskIDs)
196+
require.Empty(t, store.getTaskUsers)
197+
require.Equal(t, 1, delegate.calls)
198+
}
199+
200+
func TestGetTask_BackendFailurePropagatesWithoutDelegation(t *testing.T) {
201+
backendErr := fmt.Errorf("database connection refused")
202+
delegate := &recordingGetTaskDelegate{}
203+
h := newStoreTaskQueryHandler(delegate, failingTaskStore{err: backendErr})
204+
205+
got, err := h.GetTask(userCtx("alice"), &a2atype.GetTaskRequest{ID: "t1"})
206+
require.Nil(t, got)
207+
require.ErrorIs(t, err, backendErr)
208+
require.Zero(t, delegate.calls)
209+
}
210+
104211
func TestListTasks_Pagination(t *testing.T) {
105212
tasks := []*a2atype.Task{
106213
newTask("t1", "s1", a2atype.TaskStateWorking, 0, 0),
@@ -265,6 +372,10 @@ func TestListTasks_AcrossAllUserSessions(t *testing.T) {
265372
// failingTaskStore fails every read with a backend error.
266373
type failingTaskStore struct{ err error }
267374

375+
func (f failingTaskStore) GetTask(context.Context, string, string) (*a2atype.Task, error) {
376+
return nil, f.err
377+
}
378+
268379
func (f failingTaskStore) GetSession(context.Context, string, string) (*dbpkg.Session, error) {
269380
return nil, f.err
270381
}

0 commit comments

Comments
 (0)