fix: keep start-agent tasks scheduling (#1445)

This commit is contained in:
Carlos Florêncio
2026-06-19 12:31:21 +01:00
committed by GitHub
parent c30d187440
commit ec2b4a294c
2 changed files with 130 additions and 4 deletions
@@ -854,6 +854,14 @@ func (h *TaskHandlers) startAgentForNewTask(
}
sessionID := prepResp.SessionID
response.TaskSessionID = sessionID
if updatedTask, updateErr := h.service.UpdateTaskState(ctx, taskID, v1.TaskStateScheduling); updateErr != nil {
h.logger.Warn("failed to mark task scheduling after preparing start session",
zap.Error(updateErr),
zap.String("task_id", taskID),
zap.String("session_id", sessionID))
} else {
response.State = updatedTask.State
}
// Launch agent asynchronously so the HTTP request can return immediately.
// The frontend will receive WebSocket updates when the agent actually starts.
@@ -2,6 +2,7 @@ package handlers
import (
"context"
"encoding/json"
"errors"
"net/http"
"net/http/httptest"
@@ -27,15 +28,22 @@ import (
// LaunchSession to short-circuit the two-phase create flow before its async
// start goroutine spawns (keeping assertions race-free).
type captureOrchestrator struct {
mu sync.Mutex
requests []*orchestrator.LaunchSessionRequest
prepErr error
mu sync.Mutex
requests []*orchestrator.LaunchSessionRequest
prepErr error
startCreatedCalled chan struct{}
}
func (m *captureOrchestrator) LaunchSession(_ context.Context, req *orchestrator.LaunchSessionRequest) (*orchestrator.LaunchSessionResponse, error) {
m.mu.Lock()
m.requests = append(m.requests, req)
m.mu.Unlock()
if req.Intent == orchestrator.IntentStartCreated && m.startCreatedCalled != nil {
select {
case m.startCreatedCalled <- struct{}{}:
default:
}
}
if m.prepErr != nil {
return nil, m.prepErr
}
@@ -136,7 +144,8 @@ func TestHttpStartConfigChat_SetsDeferredStart(t *testing.T) {
type captureCreateTaskRepo struct {
mockRepository
captured *models.Task
captured *models.Task
updateStateErr error
}
func (m *captureCreateTaskRepo) GetWorkspaceTaskPrefix(_ context.Context, _ string) (string, string, error) {
@@ -148,6 +157,24 @@ func (m *captureCreateTaskRepo) CreateTask(_ context.Context, task *models.Task)
return nil
}
func (m *captureCreateTaskRepo) GetTask(_ context.Context, id string) (*models.Task, error) {
if m.captured == nil || m.captured.ID != id {
return nil, errors.New("task not found")
}
return m.captured, nil
}
func (m *captureCreateTaskRepo) UpdateTaskState(_ context.Context, id string, state v1.TaskState) error {
if m.captured == nil || m.captured.ID != id {
return errors.New("task not found")
}
if m.updateStateErr != nil {
return m.updateStateErr
}
m.captured.State = state
return nil
}
// TestHTTPCreateTask_ProjectIDReachesOfficePath guards the wiring that broke
// the office "New Task" dialog: when the request body sets project_id (and
// omits workflow_id), the handler must forward it to the service so
@@ -186,6 +213,97 @@ func TestHTTPCreateTask_ProjectIDReachesOfficePath(t *testing.T) {
assert.Equal(t, "wf-office", repo.captured.WorkflowID, "office workflow should be auto-resolved")
}
func TestHTTPCreateTask_StartAgentReturnsSchedulingTask(t *testing.T) {
gin.SetMode(gin.TestMode)
log := newTestLogger(t)
repo := &captureCreateTaskRepo{}
svc := service.NewService(service.Repos{
Workspaces: repo, Tasks: repo, TaskRepos: repo,
Workflows: repo, Messages: repo, Turns: repo,
Sessions: repo, GitSnapshots: repo, RepoEntities: repo,
Executors: repo, Environments: repo, TaskEnvironments: repo,
Reviews: repo,
}, nil, log, service.RepositoryDiscoveryConfig{})
startCreatedCalled := make(chan struct{}, 1)
orch := &captureOrchestrator{startCreatedCalled: startCreatedCalled}
h := &TaskHandlers{service: svc, orchestrator: orch, logger: log}
rec := httptest.NewRecorder()
c, _ := gin.CreateTestContext(rec)
c.Request = httptest.NewRequest(http.MethodPost, "/tasks", strings.NewReader(`{
"workspace_id": "ws-1",
"workflow_id": "wf-1",
"workflow_step_id": "step-1",
"title": "Boot an agent",
"description": "Do the thing",
"priority": "medium",
"agent_profile_id": "profile-1",
"start_agent": true
}`))
c.Request.Header.Set("Content-Type", "application/json")
h.httpCreateTask(c)
require.Equal(t, http.StatusOK, rec.Code, "body: %s", rec.Body.String())
var response createTaskResponse
require.NoError(t, json.Unmarshal(rec.Body.Bytes(), &response))
assert.Equal(t, v1.TaskStateScheduling, repo.captured.State)
assert.Equal(t, v1.TaskStateScheduling, response.State)
assert.Equal(t, "sess-1", response.TaskSessionID)
requireStartCreatedLaunch(t, startCreatedCalled)
}
func TestHTTPCreateTask_StartAgentKeepsCreatedStateWhenSchedulingUpdateFails(t *testing.T) {
gin.SetMode(gin.TestMode)
log := newTestLogger(t)
repo := &captureCreateTaskRepo{updateStateErr: errors.New("database locked")}
svc := service.NewService(service.Repos{
Workspaces: repo, Tasks: repo, TaskRepos: repo,
Workflows: repo, Messages: repo, Turns: repo,
Sessions: repo, GitSnapshots: repo, RepoEntities: repo,
Executors: repo, Environments: repo, TaskEnvironments: repo,
Reviews: repo,
}, nil, log, service.RepositoryDiscoveryConfig{})
startCreatedCalled := make(chan struct{}, 1)
orch := &captureOrchestrator{startCreatedCalled: startCreatedCalled}
h := &TaskHandlers{service: svc, orchestrator: orch, logger: log}
rec := httptest.NewRecorder()
c, _ := gin.CreateTestContext(rec)
c.Request = httptest.NewRequest(http.MethodPost, "/tasks", strings.NewReader(`{
"workspace_id": "ws-1",
"workflow_id": "wf-1",
"workflow_step_id": "step-1",
"title": "Boot an agent",
"description": "Do the thing",
"priority": "medium",
"agent_profile_id": "profile-1",
"start_agent": true
}`))
c.Request.Header.Set("Content-Type", "application/json")
h.httpCreateTask(c)
require.Equal(t, http.StatusOK, rec.Code, "body: %s", rec.Body.String())
var response createTaskResponse
require.NoError(t, json.Unmarshal(rec.Body.Bytes(), &response))
assert.Equal(t, v1.TaskStateCreated, repo.captured.State)
assert.Equal(t, v1.TaskStateCreated, response.State)
assert.Equal(t, "sess-1", response.TaskSessionID)
requireStartCreatedLaunch(t, startCreatedCalled)
}
func requireStartCreatedLaunch(t *testing.T, started <-chan struct{}) {
t.Helper()
select {
case <-started:
case <-time.After(1 * time.Second):
t.Fatal("async IntentStartCreated launch did not complete")
}
}
func TestValidateAttachments_DeliveryMode(t *testing.T) {
base := v1.MessageAttachment{
Type: "resource",