2e108b040f
* feat: session resumption with ACP session ID support - Add useSessionResumption hook for automatic session recovery on page reload - Fix ACPSessionID not being set on AgentInstance in Launch() and createInstance() - Add task.session.status and task.session.resume WebSocket actions - Fix shell terminal retry logic for resumed sessions - Fix taskSessionState reading from Zustand store instead of local state - Remove dead code: unused stream handling functions in lifecycle/manager.go - Fix test mock interfaces (CleanupStaleInstanceByTaskID, NewManager signature) - Add enhanced logging for session resumption debugging - Simplify page-client.tsx state merging logic * refactor: remove unused AgentController (dead code) - Delete agent_controller.go - entirely unused duplicate of Manager methods - Remove agentController field from Manager struct - Remove AgentController initialization in NewManager The AgentController duplicated StartAgentProcess, initializeACPSession, and PromptAgent from Manager but was never called. All agent control operations go through Manager's own methods. * refactor: remove unused MemoryRepository (dead code) - Delete memory.go - entire MemoryRepository implementation unused (replaced by SQLite repository) - Delete memory_test.go - tests for removed MemoryRepository Found via 'deadcode' tool analysis. * refactor: consolidate agentctl packages into server/client structure Reorganize the confusing dual agentctl packages: - internal/agentctl/* → internal/agentctl/server/ - internal/agent/agentctl/* → internal/agentctl/client/ Structure is now: internal/agentctl/ ├── client/ - HTTP client for talking to agentctl servers │ ├── client.go │ ├── standalone.go │ ├── acp.go │ └── launcher/ ├── server/ - agentctl server implementation (runs in containers) │ ├── api/ │ ├── adapter/ │ ├── acp/ │ ├── config/ │ ├── instance/ │ ├── process/ │ └── shell/ └── types/ - Shared types used by both client and server Also consolidated shared types (GitStatusUpdate, FileInfo, etc.) from process/types.go into the shared types/ package. * refactor: rename AgentInstance to AgentExecution for clarity Rename AgentInstance -> AgentExecution across the entire codebase to better reflect what it represents: an agent actively working on a task, not just a generic 'instance'. Changes: - AgentInstance struct -> AgentExecution - InstanceStore -> ExecutionStore (new file: execution_store.go) - RecoveredInstance -> RecoveredExecution - All method names: GetInstance* -> GetExecution*, ListInstances -> ListExecutions, etc. - All parameters: instanceID -> executionID - All local variables: instance -> execution - DTOs and JSON tags: agent_instance_id -> agent_execution_id - Database columns: agent_instance_id -> agent_execution_id Also consolidates duplicate prompt logic: - Merge sendInitialPrompt and SendPrompt into single SendPrompt method - Add validateStatus parameter to differentiate initial vs follow-up prompts Also extracts ACP session management to session.go: - Move initializeACPSession logic to SessionManager.InitializeAndPrompt - Move PromptAgent logic to SessionManager.SendPrompt - Manager now delegates to SessionManager for all prompt operations Also removes duplicate event publishing: - Remove 9 duplicate m.publish*() methods from manager.go - Use existing EventPublisher methods via m.eventPublisher.Publish*() Also extracts types to dedicated file: - Move AgentExecution, LaunchRequest, PromptResult, etc. to types.go Net reduction: ~600 lines removed from manager.go through deduplication and better separation of concerns. * fix(backend): Docker runtime now creates instance via ControlServer The Docker runtime was incorrectly creating an agentctl.Client pointing directly to port 9999 (the ControlServer port), then trying to call instance-specific APIs like /api/v1/agent/configure which only exist on per-instance servers. Fixed by making Docker runtime follow the same flow as standalone mode: - LaunchContainer now uses StandaloneCtl to create an instance via the control API, then creates Client pointing to the instance port - RecoverInstances queries the ControlServer to get the instance port - Added waitForHealth helper to wait for agentctl to be ready Also improved HTTP error handling in agentctl client: - All client methods now check HTTP status codes before JSON decoding - Better error messages include status code and response body * fix: restore session resumption imports and variables * fix: add sessionId prop back to TaskLayout
288 lines
8.5 KiB
Go
288 lines
8.5 KiB
Go
// 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"
|
|
"github.com/kandev/kandev/pkg/agent"
|
|
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"`
|
|
ModelFlag string `json:"model_flag,omitempty"` // CLI flag for model selection (e.g., "--model")
|
|
WorkspaceFlag string `json:"workspace_flag,omitempty"` // CLI flag for workspace path (e.g., "--workspace-root"), empty means use cwd only
|
|
|
|
// Protocol configuration
|
|
Protocol agent.Protocol `json:"protocol,omitempty"` // Communication protocol: "acp", "rest", "mcp"
|
|
ProtocolConfig map[string]string `json:"protocol_config,omitempty"` // Protocol-specific settings (e.g., base_url for REST)
|
|
|
|
// Session resumption configuration
|
|
SessionConfig SessionConfig `json:"session_config,omitempty"` // How to handle session resumption
|
|
}
|
|
|
|
// SessionConfig defines how session resumption is handled for an agent type
|
|
type SessionConfig struct {
|
|
// ResumeViaACP indicates whether session resumption should use the ACP session/load method.
|
|
// If false, session resumption is handled via CLI flags (ResumeFlag).
|
|
ResumeViaACP bool `json:"resume_via_acp"`
|
|
|
|
// ResumeFlag is the CLI flag used for session resumption when ResumeViaACP is false.
|
|
// Example: "--resume" for auggie, empty for agents that use ACP session/load.
|
|
ResumeFlag string `json:"resume_flag,omitempty"`
|
|
|
|
// SessionDirTemplate is a template for the host directory where session data is stored.
|
|
// Supports variables: {home} (user home directory).
|
|
// Example: "{home}/.augment/sessions" for auggie.
|
|
SessionDirTemplate string `json:"session_dir_template,omitempty"`
|
|
|
|
// SessionDirTarget is the container path where the session directory is mounted.
|
|
// Example: "/root/.augment/sessions" for auggie.
|
|
SessionDirTarget string `json:"session_dir_target,omitempty"`
|
|
}
|
|
|
|
// 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
|
|
}
|
|
|
|
// GetAgentType is an alias for Get for backward compatibility
|
|
func (r *Registry) GetAgentType(id string) (*AgentTypeConfig, error) {
|
|
return r.Get(id)
|
|
}
|
|
|
|
// GetDefault returns the default agent type configuration.
|
|
// It tries "augment-agent" first, then falls back to the first enabled agent.
|
|
func (r *Registry) GetDefault() (*AgentTypeConfig, error) {
|
|
r.mu.RLock()
|
|
defer r.mu.RUnlock()
|
|
|
|
// Try augment-agent first
|
|
if config, exists := r.agents["augment-agent"]; exists && config.Enabled {
|
|
return config, nil
|
|
}
|
|
|
|
// Fall back to first enabled agent
|
|
for _, config := range r.agents {
|
|
if config.Enabled {
|
|
return config, nil
|
|
}
|
|
}
|
|
|
|
return nil, fmt.Errorf("no default agent type available")
|
|
}
|
|
|
|
// 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
|
|
}
|
|
|