feat: connect agent worker to execution bridge
CI / test (push) Failing after 20s
CI / test (pull_request) Failing after 18s

This commit is contained in:
m
2026-08-22 15:53:44 +03:00
parent 7b06cd64a2
commit e935aadc94
11 changed files with 307 additions and 3 deletions
@@ -0,0 +1,52 @@
package application
import (
"context"
"time"
"git.cin.su/m/Assistant/contracts/work"
"git.cin.su/m/Assistant/modules/work/domain"
"git.cin.su/m/Assistant/modules/work/ports"
)
func ExecuteAgentDispatch(ctx context.Context, store ports.ExecutionStore, executor ports.AgentExecutor, intent work.AgentDispatchIntent, workerID string, token work.AgentFencingToken, now time.Time, ttl time.Duration) (work.AgentExecutionResult, error) {
if executor == nil {
return work.AgentExecutionResult{}, ports.ErrAgentExecutorUnavailable
}
if err := domain.ValidateDispatchIntent(intent); err != nil {
return work.AgentExecutionResult{}, err
}
lease, err := domain.AcquireAgentLease(intent.RunID, workerID, token, now, ttl)
if err != nil {
return work.AgentExecutionResult{}, err
}
if err := store.SaveDispatchIntent(ctx, intent); err != nil {
return work.AgentExecutionResult{}, err
}
if err := store.SaveAgentLease(ctx, lease); err != nil {
return work.AgentExecutionResult{}, err
}
heartbeat := work.AgentCallback{RunID: intent.RunID, WorkerID: workerID, FencingToken: token, Sequence: 1, Kind: work.AgentCallbackHeartbeat, ObservedAt: now}
if err := domain.ValidateAgentCallback(heartbeat, lease, 0); err != nil {
return work.AgentExecutionResult{}, err
}
if err := store.AcceptAgentCallback(ctx, heartbeat); err != nil {
return work.AgentExecutionResult{}, err
}
result, err := executor.Execute(ctx, work.AgentExecutionRequest{Intent: intent, WorkerID: workerID, FencingToken: token, LeaseExpiresAt: lease.ExpiresAt})
if err != nil {
return work.AgentExecutionResult{}, err
}
observedAt := time.UnixMilli(result.ObservedAtUnixMillis)
callback := work.AgentCallback{RunID: intent.RunID, WorkerID: workerID, FencingToken: token, Sequence: 2, Kind: work.AgentCallbackResult, ObservedAt: observedAt}
if result.State == work.AgentExecutionWaiting {
callback.Kind = work.AgentCallbackCheckpoint
}
if err := domain.ValidateAgentCallback(callback, lease, heartbeat.Sequence); err != nil {
return work.AgentExecutionResult{}, err
}
if err := store.AcceptAgentCallback(ctx, callback); err != nil {
return work.AgentExecutionResult{}, err
}
return result, nil
}
@@ -0,0 +1,36 @@
package application
import (
"context"
"testing"
"time"
"git.cin.su/m/Assistant/contracts/work"
)
type bridgeStore struct {
callbacks []work.AgentCallback
lease work.AgentLease
}
func (s *bridgeStore) SaveDispatchIntent(context.Context, work.AgentDispatchIntent) error { return nil }
func (s *bridgeStore) SaveAgentLease(_ context.Context, lease work.AgentLease) error { s.lease = lease; return nil }
func (s *bridgeStore) AcceptAgentCallback(_ context.Context, callback work.AgentCallback) error { s.callbacks = append(s.callbacks, callback); return nil }
type bridgeExecutor struct{}
func (bridgeExecutor) Execute(context.Context, work.AgentExecutionRequest) (work.AgentExecutionResult, error) {
return work.AgentExecutionResult{State: work.AgentExecutionCompleted, Summary: "done", ObservedAtUnixMillis: 2}, nil
}
func TestExecuteAgentDispatchPersistsLeaseAndBridgeCallbacks(t *testing.T) {
store := &bridgeStore{}
now := time.UnixMilli(1)
result, err := ExecuteAgentDispatch(context.Background(), store, bridgeExecutor{}, work.AgentDispatchIntent{DispatchID: "d", IdempotencyKey: "i", DelegationID: "del", RunID: "run", ImplementationID: "impl", ImplementationRevision: 1, SourceRevision: "source", WorktreeID: "tree", VerificationPlanRef: "verify", CreatedAtUnixMillis: 1}, "worker", 1, now, time.Minute)
if err != nil || result.State != work.AgentExecutionCompleted {
t.Fatalf("result=%+v err=%v", result, err)
}
if len(store.callbacks) != 2 || store.callbacks[0].Kind != work.AgentCallbackHeartbeat || store.callbacks[1].Kind != work.AgentCallbackResult {
t.Fatalf("callbacks=%+v", store.callbacks)
}
}
+31
View File
@@ -41,3 +41,34 @@ func ExecuteWorkerCycle(ctx context.Context, store ports.WorkerStore, workerID s
}
return WorkerCycleResult{RecoveredClaims: recovered, DispatchID: item.DispatchID, Completed: true}, nil
}
func ExecuteWorkerCycleWithExecutor(ctx context.Context, store ports.WorkerStore, executor ports.AgentExecutor, workerID string, token work.AgentFencingToken, now time.Time, staleAfter, leaseTTL time.Duration) (WorkerCycleResult, error) {
recovered, err := store.RecoverStaleClaims(ctx, now.UnixMilli(), staleAfter.Milliseconds())
if err != nil {
return WorkerCycleResult{}, err
}
item, err := store.ClaimNextDispatch(ctx, workerID, now.UnixMilli())
if err != nil {
return WorkerCycleResult{RecoveredClaims: recovered}, err
}
if item.DispatchID == "" {
return WorkerCycleResult{RecoveredClaims: recovered, Idle: true}, nil
}
intent, err := store.LoadDispatchIntent(ctx, item.DispatchID)
if err != nil {
_ = store.CompleteDispatch(ctx, item.DispatchID, workerID, work.AgentDispatchFailed, now.UnixMilli())
return WorkerCycleResult{RecoveredClaims: recovered, DispatchID: item.DispatchID}, err
}
result, err := ExecuteAgentDispatch(ctx, store, executor, intent, workerID, token, now, leaseTTL)
if err != nil {
_ = store.CompleteDispatch(ctx, item.DispatchID, workerID, work.AgentDispatchFailed, now.UnixMilli())
return WorkerCycleResult{RecoveredClaims: recovered, DispatchID: item.DispatchID}, err
}
if result.State != work.AgentExecutionCompleted {
return WorkerCycleResult{RecoveredClaims: recovered, DispatchID: item.DispatchID}, nil
}
if err := store.CompleteDispatch(ctx, item.DispatchID, workerID, work.AgentDispatchCompleted, now.UnixMilli()); err != nil {
return WorkerCycleResult{RecoveredClaims: recovered, DispatchID: item.DispatchID}, err
}
return WorkerCycleResult{RecoveredClaims: recovered, DispatchID: item.DispatchID, Completed: true}, nil
}
+4
View File
@@ -6,6 +6,10 @@ import (
"git.cin.su/m/Assistant/contracts/work"
)
type AgentExecutor interface {
Execute(context.Context, work.AgentExecutionRequest) (work.AgentExecutionResult, error)
}
type ExecutionStore interface {
SaveDispatchIntent(context.Context, work.AgentDispatchIntent) error
SaveAgentLease(context.Context, work.AgentLease) error
+3
View File
@@ -2,10 +2,13 @@ package ports
import (
"context"
"errors"
"git.cin.su/m/Assistant/contracts/work"
)
var ErrAgentExecutorUnavailable = errors.New("agent executor unavailable")
type WorkerStore interface {
ExecutionStore
LoadDispatchIntent(context.Context, string) (work.AgentDispatchIntent, error)