Merge branch 'main' into add-testcontainers

Author: ilopezluna

Makefile

@@ -42,8 +42,12 @@ model-distribution-tool:
 
 # Run the application locally
 run: build
-	LLAMA_ARGS="$(LLAMA_ARGS)" \
-	./$(APP_NAME)
+	@LLAMACPP_BIN="llamacpp/install/bin"; \
+	if [ "$(LOCAL_LLAMA)" = "1" ]; then \
+		echo "Using local llama.cpp build from $${LLAMACPP_BIN}"; \
+		export LLAMA_SERVER_PATH="$$(pwd)/$${LLAMACPP_BIN}"; \
+	fi; \
+	LLAMA_ARGS="$(LLAMA_ARGS)" ./$(APP_NAME)
 
 # Clean build artifacts
 clean:
@@ -160,9 +164,11 @@ help:
 	@echo ""
 	@echo "Backend configuration options:"
 	@echo "  LLAMA_ARGS    - Arguments for llama.cpp (e.g., \"--verbose --jinja -ngl 999 --ctx-size 2048\")"
+	@echo "  LOCAL_LLAMA   - Use local llama.cpp build from llamacpp/install/bin (set to 1 to enable)"
 	@echo ""
 	@echo "Example usage:"
 	@echo "  make run LLAMA_ARGS=\"--verbose --jinja -ngl 999 --ctx-size 2048\""
+	@echo "  make run LOCAL_LLAMA=1"
 	@echo "  make docker-run LLAMA_ARGS=\"--verbose --jinja -ngl 999 --threads 4 --ctx-size 2048\""
 	@echo ""
 	@echo "Model distribution tool examples:"

cmd/cli/commands/integration_test.go

@@ -153,7 +153,7 @@ func TestIntegration_PullModel(t *testing.T) {
 	require.NoError(t, err)
 
 	if len(models) != 0 {
-		t.Fatal("No models found after pull")
+		t.Fatal("Expected no initial models, but found some")
 	}
 
 	// Create and push a test model
@@ -174,7 +174,10 @@ func TestIntegration_PullModel(t *testing.T) {
 		t.Fatal("No models found after pull")
 	}
 
-	if strings.Contains(models, modelID) == false {
-		t.Fatalf("Pulled model ID %s not found in model list", modelID)
+	// Extract truncated ID format (sha256:xxx... -> xxx where xxx is 12 chars)
+	// listModels with quiet=true returns modelID[7:19]
+	truncatedID := modelID[7:19]
+	if strings.Contains(models, truncatedID) == false {
+		t.Fatalf("Pulled model ID %s (truncated: %s) not found in model list:\n%s", modelID, truncatedID, models)
 	}
 }

cmd/cli/commands/list.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"fmt"
 	"os"
+	"sort"
 	"strconv"
 	"strings"
 	"time"
@@ -114,6 +115,68 @@ func listModels(openai bool, desktopClient *desktop.Client, quiet bool, jsonForm
 }
 
 func prettyPrintModels(models []dmrm.Model) string {
+	type displayRow struct {
+		displayName string
+		tag         string
+		model       dmrm.Model
+	}
+
+	var rows []displayRow
+
+	for _, m := range models {
+		if len(m.Tags) == 0 {
+			rows = append(rows, displayRow{
+				displayName: "<none>",
+				tag:         "<none>",
+				model:       m,
+			})
+			continue
+		}
+
+		for _, tag := range m.Tags {
+			displayName := stripDefaultsFromModelName(tag)
+			rows = append(rows, displayRow{
+				displayName: displayName,
+				tag:         tag,
+				model:       m,
+			})
+		}
+	}
+
+	// Helper function to split display name into base and variant
+	splitDisplayName := func(displayName string) (base, variant string) {
+		if idx := strings.LastIndex(displayName, ":"); idx != -1 {
+			return displayName[:idx], displayName[idx+1:]
+		}
+		return displayName, ""
+	}
+
+	// Sort all rows by display name
+	sort.Slice(rows, func(i, j int) bool {
+		displayI := rows[i].displayName
+		displayJ := rows[j].displayName
+
+		// Split on last ':' to get base name and variant
+		baseI, variantI := splitDisplayName(displayI)
+		baseJ, variantJ := splitDisplayName(displayJ)
+
+		baseILower := strings.ToLower(baseI)
+		baseJLower := strings.ToLower(baseJ)
+		if baseILower != baseJLower {
+			return baseILower < baseJLower
+		}
+
+		// If base names are equal, compare variants
+		// Empty variants (no ':' in name) come first
+		if variantI == "" && variantJ != "" {
+			return true
+		}
+		if variantI != "" && variantJ == "" {
+			return false
+		}
+		return strings.ToLower(variantI) < strings.ToLower(variantJ)
+	})
+
 	var buf bytes.Buffer
 	table := tablewriter.NewWriter(&buf)
 
@@ -137,14 +200,8 @@ func prettyPrintModels(models []dmrm.Model) string {
 	})
 	table.SetHeaderAlignment(tablewriter.ALIGN_LEFT)
 
-	for _, m := range models {
-		if len(m.Tags) == 0 {
-			appendRow(table, "<none>", m)
-			continue
-		}
-		for _, tag := range m.Tags {
-			appendRow(table, tag, m)
-		}
+	for _, row := range rows {
+		appendRow(table, row.tag, row.model)
 	}
 
 	table.Render()