feat: complete acp-go-sdk integration with task state updates
- Use acp-go-sdk for all ACP communication in agentctl - Mark agent as completed when Prompt() returns successfully - Update task state to COMPLETED when agent completes - Update task state to FAILED when agent fails and retries exhausted - Enhanced E2E test to verify agent actually creates files - E2E test now validates full flow: task creation -> agent work -> file creation -> task completion
This commit is contained in:
jcfs
@@ -0,0 +1,231 @@
|
||||
// Package registry manages available agent types and their Docker image configurations.
|
||||
package registry
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"os"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"go.uber.org/zap"
|
||||
|
||||
"github.com/kandev/kandev/internal/common/logger"
|
||||
v1 "github.com/kandev/kandev/pkg/api/v1"
|
||||
)
|
||||
|
||||
// AgentTypeConfig holds configuration for an agent type
|
||||
type AgentTypeConfig struct {
|
||||
ID string `json:"id"`
|
||||
Name string `json:"name"`
|
||||
Description string `json:"description"`
|
||||
Image string `json:"image"` // Docker image
|
||||
Tag string `json:"tag"` // Default tag
|
||||
Cmd []string `json:"cmd,omitempty"` // Override container command
|
||||
Entrypoint []string `json:"entrypoint,omitempty"`
|
||||
WorkingDir string `json:"working_dir"`
|
||||
Env map[string]string `json:"env,omitempty"` // Default env vars
|
||||
RequiredEnv []string `json:"required_env"` // Required env vars (credentials)
|
||||
Mounts []MountTemplate `json:"mounts,omitempty"`
|
||||
ResourceLimits ResourceLimits `json:"resource_limits"`
|
||||
Capabilities []string `json:"capabilities"` // What the agent can do
|
||||
Enabled bool `json:"enabled"`
|
||||
}
|
||||
|
||||
// MountTemplate defines a mount with template support
|
||||
type MountTemplate struct {
|
||||
Source string `json:"source"` // Can use {workspace}, {task_id}
|
||||
Target string `json:"target"`
|
||||
ReadOnly bool `json:"read_only"`
|
||||
}
|
||||
|
||||
// ResourceLimits defines resource constraints
|
||||
type ResourceLimits struct {
|
||||
MemoryMB int64 `json:"memory_mb"`
|
||||
CPUCores float64 `json:"cpu_cores"`
|
||||
TimeoutSeconds int `json:"timeout_seconds"`
|
||||
}
|
||||
|
||||
// Registry manages agent type configurations
|
||||
type Registry struct {
|
||||
agents map[string]*AgentTypeConfig
|
||||
mu sync.RWMutex
|
||||
logger *logger.Logger
|
||||
}
|
||||
|
||||
// NewRegistry creates a new agent registry
|
||||
func NewRegistry(log *logger.Logger) *Registry {
|
||||
return &Registry{
|
||||
agents: make(map[string]*AgentTypeConfig),
|
||||
logger: log,
|
||||
}
|
||||
}
|
||||
|
||||
// LoadFromFile loads agent configurations from a JSON file
|
||||
func (r *Registry) LoadFromFile(path string) error {
|
||||
data, err := os.ReadFile(path)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to read config file: %w", err)
|
||||
}
|
||||
|
||||
var configs []*AgentTypeConfig
|
||||
if err := json.Unmarshal(data, &configs); err != nil {
|
||||
return fmt.Errorf("failed to parse config file: %w", err)
|
||||
}
|
||||
|
||||
r.mu.Lock()
|
||||
defer r.mu.Unlock()
|
||||
|
||||
for _, config := range configs {
|
||||
if err := ValidateConfig(config); err != nil {
|
||||
r.logger.Warn("skipping invalid agent config",
|
||||
zap.String("id", config.ID),
|
||||
zap.Error(err))
|
||||
continue
|
||||
}
|
||||
r.agents[config.ID] = config
|
||||
r.logger.Info("loaded agent type", zap.String("id", config.ID))
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// LoadDefaults loads default agent configurations
|
||||
func (r *Registry) LoadDefaults() {
|
||||
defaults := DefaultAgents()
|
||||
|
||||
r.mu.Lock()
|
||||
defer r.mu.Unlock()
|
||||
|
||||
for _, config := range defaults {
|
||||
r.agents[config.ID] = config
|
||||
r.logger.Info("loaded default agent type", zap.String("id", config.ID))
|
||||
}
|
||||
}
|
||||
|
||||
// Register adds a new agent type
|
||||
func (r *Registry) Register(config *AgentTypeConfig) error {
|
||||
if err := ValidateConfig(config); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
r.mu.Lock()
|
||||
defer r.mu.Unlock()
|
||||
|
||||
if _, exists := r.agents[config.ID]; exists {
|
||||
return fmt.Errorf("agent type %q already registered", config.ID)
|
||||
}
|
||||
|
||||
r.agents[config.ID] = config
|
||||
r.logger.Info("registered agent type", zap.String("id", config.ID))
|
||||
return nil
|
||||
}
|
||||
|
||||
// Unregister removes an agent type
|
||||
func (r *Registry) Unregister(id string) error {
|
||||
r.mu.Lock()
|
||||
defer r.mu.Unlock()
|
||||
|
||||
if _, exists := r.agents[id]; !exists {
|
||||
return fmt.Errorf("agent type %q not found", id)
|
||||
}
|
||||
|
||||
delete(r.agents, id)
|
||||
r.logger.Info("unregistered agent type", zap.String("id", id))
|
||||
return nil
|
||||
}
|
||||
|
||||
// Get returns an agent type configuration
|
||||
func (r *Registry) Get(id string) (*AgentTypeConfig, error) {
|
||||
r.mu.RLock()
|
||||
defer r.mu.RUnlock()
|
||||
|
||||
config, exists := r.agents[id]
|
||||
if !exists {
|
||||
return nil, fmt.Errorf("agent type %q not found", id)
|
||||
}
|
||||
|
||||
return config, nil
|
||||
}
|
||||
|
||||
// List returns all registered agent types
|
||||
func (r *Registry) List() []*AgentTypeConfig {
|
||||
r.mu.RLock()
|
||||
defer r.mu.RUnlock()
|
||||
|
||||
result := make([]*AgentTypeConfig, 0, len(r.agents))
|
||||
for _, config := range r.agents {
|
||||
result = append(result, config)
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
// ListEnabled returns only enabled agent types
|
||||
func (r *Registry) ListEnabled() []*AgentTypeConfig {
|
||||
r.mu.RLock()
|
||||
defer r.mu.RUnlock()
|
||||
|
||||
result := make([]*AgentTypeConfig, 0, len(r.agents))
|
||||
for _, config := range r.agents {
|
||||
if config.Enabled {
|
||||
result = append(result, config)
|
||||
}
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
// Exists checks if an agent type exists
|
||||
func (r *Registry) Exists(id string) bool {
|
||||
r.mu.RLock()
|
||||
defer r.mu.RUnlock()
|
||||
|
||||
_, exists := r.agents[id]
|
||||
return exists
|
||||
}
|
||||
|
||||
// ToAPIType converts to API response type
|
||||
func (c *AgentTypeConfig) ToAPIType() *v1.AgentType {
|
||||
return &v1.AgentType{
|
||||
ID: c.ID,
|
||||
Name: c.Name,
|
||||
Description: c.Description,
|
||||
DockerImage: c.Image,
|
||||
DockerTag: c.Tag,
|
||||
DefaultResources: v1.ResourceLimits{
|
||||
CPULimit: fmt.Sprintf("%.1f", c.ResourceLimits.CPUCores),
|
||||
MemoryLimit: fmt.Sprintf("%dM", c.ResourceLimits.MemoryMB),
|
||||
},
|
||||
EnvironmentVars: c.Env,
|
||||
Capabilities: c.Capabilities,
|
||||
Enabled: c.Enabled,
|
||||
CreatedAt: time.Now(), // These would be set properly when persisted
|
||||
UpdatedAt: time.Now(),
|
||||
}
|
||||
}
|
||||
|
||||
// ValidateConfig validates an agent type configuration
|
||||
func ValidateConfig(config *AgentTypeConfig) error {
|
||||
if config.ID == "" {
|
||||
return fmt.Errorf("agent type ID is required")
|
||||
}
|
||||
if config.Name == "" {
|
||||
return fmt.Errorf("agent type name is required")
|
||||
}
|
||||
if config.Image == "" {
|
||||
return fmt.Errorf("agent type image is required")
|
||||
}
|
||||
if config.Tag == "" {
|
||||
config.Tag = "latest" // Default to latest if not specified
|
||||
}
|
||||
if config.ResourceLimits.MemoryMB <= 0 {
|
||||
return fmt.Errorf("memory limit must be positive")
|
||||
}
|
||||
if config.ResourceLimits.CPUCores <= 0 {
|
||||
return fmt.Errorf("CPU cores must be positive")
|
||||
}
|
||||
if config.ResourceLimits.TimeoutSeconds <= 0 {
|
||||
return fmt.Errorf("timeout must be positive")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user