Implement model management for llama.cpp instances

pkg/manager/manager.go

@@ -24,6 +24,8 @@ type InstanceManager interface {
 	EvictLRUInstance() error
 	RestartInstance(name string) (*instance.Instance, error)
 	GetInstanceLogs(name string, numLines int) (string, error)
+	ResolveInstance(modelName string) (string, error)
+	RefreshModelRegistry(inst *instance.Instance) error
 	Shutdown()
 }
 
@@ -34,6 +36,7 @@ type instanceManager struct {
 	db        database.InstanceStore
 	remote    *remoteManager
 	lifecycle *lifecycleManager
+	models    *modelRegistry
 
 	// Configuration
 	globalConfig *config.AppConfig
@@ -60,12 +63,16 @@ func New(globalConfig *config.AppConfig, db database.InstanceStore) InstanceMana
 	// Initialize remote manager
 	remote := newRemoteManager(globalConfig.Nodes, 30*time.Second)
 
+	// Initialize model registry
+	models := newModelRegistry()
+
 	// Create manager instance
 	im := &instanceManager{
 		registry:     registry,
 		ports:        ports,
 		db:           db,
 		remote:       remote,
+		models:       models,
 		globalConfig: globalConfig,
 	}
 
@@ -142,9 +149,27 @@ func (im *instanceManager) loadInstances() error {
 	// Auto-start instances that have auto-restart enabled
 	go im.autoStartInstances()
 
+	// Discover models from all running llama.cpp instances
+	go im.discoverAllModels()
+
 	return nil
 }
 
+// discoverAllModels discovers and registers models for all running llama.cpp instances
+func (im *instanceManager) discoverAllModels() {
+	instances := im.registry.listRunning()
+
+	for _, inst := range instances {
+		if !inst.IsLlamaCpp() {
+			continue
+		}
+
+		if err := im.RefreshModelRegistry(inst); err != nil {
+			log.Printf("Failed to discover models for instance %s: %v", inst.Name, err)
+		}
+	}
+}
+
 // loadInstance loads a single persisted instance and adds it to the registry
 func (im *instanceManager) loadInstance(persistedInst *instance.Instance) error {
 	name := persistedInst.Name

pkg/manager/model_registry.go

@@ -0,0 +1,79 @@
+package manager
+
+import (
+	"fmt"
+	"llamactl/pkg/instance"
+	"sync"
+)
+
+// modelRegistry maintains a global mapping of model names to instance names
+// for llama.cpp instances. Model names must be globally unique across all instances.
+type modelRegistry struct {
+	mu              sync.RWMutex
+	modelToInstance map[string]string   // model name → instance name
+	instanceModels  map[string][]string // instance name → model names
+}
+
+// newModelRegistry creates a new model registry
+func newModelRegistry() *modelRegistry {
+	return &modelRegistry{
+		modelToInstance: make(map[string]string),
+		instanceModels:  make(map[string][]string),
+	}
+}
+
+// registerModels registers models from an instance to the registry.
+// Skips models that conflict with other instances and returns a list of conflicts.
+func (mr *modelRegistry) registerModels(instanceName string, models []instance.Model) []string {
+	mr.mu.Lock()
+	defer mr.mu.Unlock()
+
+	// Unregister any existing models for this instance first
+	mr.removeModels(instanceName)
+
+	// Register models, skipping conflicts
+	var modelNames []string
+	var conflicts []string
+
+	for _, model := range models {
+		// Check if this model conflicts with another instance
+		if existingInstance, exists := mr.modelToInstance[model.ID]; exists && existingInstance != instanceName {
+			conflicts = append(conflicts, fmt.Sprintf("%s (already in %s)", model.ID, existingInstance))
+			continue // Skip this model
+		}
+
+		// Register the model
+		mr.modelToInstance[model.ID] = instanceName
+		modelNames = append(modelNames, model.ID)
+	}
+
+	mr.instanceModels[instanceName] = modelNames
+
+	return conflicts
+}
+
+// unregisterModels removes all models for an instance
+func (mr *modelRegistry) unregisterModels(instanceName string) {
+	mr.mu.Lock()
+	defer mr.mu.Unlock()
+	mr.removeModels(instanceName)
+}
+
+// removeModels removes all models for an instance (caller must hold lock)
+func (mr *modelRegistry) removeModels(instanceName string) {
+	if models, exists := mr.instanceModels[instanceName]; exists {
+		for _, modelName := range models {
+			delete(mr.modelToInstance, modelName)
+		}
+		delete(mr.instanceModels, instanceName)
+	}
+}
+
+// getModelInstance returns the instance name that hosts the given model
+func (mr *modelRegistry) getModelInstance(modelName string) (string, bool) {
+	mr.mu.RLock()
+	defer mr.mu.RUnlock()
+
+	instanceName, exists := mr.modelToInstance[modelName]
+	return instanceName, exists
+}

pkg/manager/operations.go

@@ -337,6 +337,9 @@ func (im *instanceManager) DeleteInstance(name string) error {
 	// Release port (use ReleaseByInstance for proper cleanup)
 	im.ports.releaseByInstance(name)
 
+	// Unregister models when instance is deleted
+	im.onInstanceStopped(name)
+
 	// Remove from registry
 	if err := im.registry.remove(name); err != nil {
 		return fmt.Errorf("failed to remove instance from registry: %w", err)
@@ -396,6 +399,9 @@ func (im *instanceManager) StartInstance(name string) (*instance.Instance, error
 		log.Printf("Warning: failed to persist instance %s: %v", name, err)
 	}
 
+	// Discover and register models for llama.cpp instances
+	go im.onInstanceStarted(name)
+
 	return inst, nil
 }
 
@@ -455,6 +461,9 @@ func (im *instanceManager) StopInstance(name string) (*instance.Instance, error)
 		log.Printf("Warning: failed to persist instance %s: %v", name, err)
 	}
 
+	// Unregister models when instance stops
+	im.onInstanceStopped(name)
+
 	return inst, nil
 }
 
@@ -535,3 +544,73 @@ func (im *instanceManager) setPortInOptions(options *instance.Options, port int)
 func (im *instanceManager) EvictLRUInstance() error {
 	return im.lifecycle.evictLRU()
 }
+
+// ResolveInstance resolves a model name to an instance name.
+// Precedence: instance name > model registry
+func (im *instanceManager) ResolveInstance(modelName string) (string, error) {
+	// Check if it's an instance name first
+	if _, err := im.GetInstance(modelName); err == nil {
+		return modelName, nil
+	}
+
+	// Check if it's a model name in the registry
+	if instanceName, exists := im.models.getModelInstance(modelName); exists {
+		return instanceName, nil
+	}
+
+	return "", fmt.Errorf("model or instance '%s' not found", modelName)
+}
+
+// RefreshModelRegistry refreshes the model registry for the given instance
+func (im *instanceManager) RefreshModelRegistry(inst *instance.Instance) error {
+	if !inst.IsRunning() {
+		return fmt.Errorf("instance %s is not running", inst.Name)
+	}
+
+	// Fetch models from instance and register them
+	models, err := inst.GetModels()
+	if err != nil {
+		return fmt.Errorf("failed to fetch models: %w", err)
+	}
+
+	// Register models, skipping conflicts
+	conflicts := im.models.registerModels(inst.Name, models)
+	if len(conflicts) > 0 {
+		log.Printf("Warning: Model name conflicts for instance %s (skipped): %v", inst.Name, conflicts)
+	}
+
+	// Check if instance name shadows any model names
+	if otherInstance, exists := im.models.getModelInstance(inst.Name); exists && otherInstance != inst.Name {
+		log.Printf("Warning: Instance name '%s' shadows model name from instance '%s'", inst.Name, otherInstance)
+	}
+
+	return nil
+}
+
+// onInstanceStarted is called when an instance successfully starts and becomes healthy
+func (im *instanceManager) onInstanceStarted(name string) {
+	inst, err := im.GetInstance(name)
+	if err != nil {
+		log.Printf("Failed to get instance %s for model discovery: %v", name, err)
+		return
+	}
+
+	// Only discover models for llama.cpp instances
+	if !inst.IsLlamaCpp() {
+		return
+	}
+
+	if err := inst.WaitForHealthy(30); err != nil {
+		log.Printf("Instance %s not healthy, skipping model discovery: %v", name, err)
+		return
+	}
+
+	if err := im.RefreshModelRegistry(inst); err != nil {
+		log.Printf("Failed to discover models for instance %s: %v", name, err)
+	}
+}
+
+// onInstanceStopped is called when an instance stops or is deleted
+func (im *instanceManager) onInstanceStopped(name string) {
+	im.models.unregisterModels(name)
+}