Add model name normalization and display stripping

Add normalization to configure, list, and unload commands

Signed-off-by: Eric Curtin <eric.curtin@docker.com>

Author: ericcurtin

.gitignore

@@ -15,3 +15,4 @@ vendor/
 # model-distribution
 pkg/distribution/bin/
 /parallelget
+/cli

cmd/cli/commands/configure.go

@@ -33,7 +33,7 @@ func newConfigureCmd() *cobra.Command {
 						argsBeforeDash)
 				}
 			}
-			opts.Model = args[0]
+			opts.Model = normalizeModelName(args[0])
 			opts.RuntimeFlags = args[1:]
 			return nil
 		},

cmd/cli/commands/inspect.go

@@ -47,7 +47,8 @@ func newInspectCmd() *cobra.Command {
 }
 
 func inspectModel(args []string, openai bool, remote bool, desktopClient *desktop.Client) (string, error) {
-	modelName := args[0]
+	// Normalize model name to add default org and tag if missing
+	modelName := normalizeModelName(args[0])
 	if openai {
 		model, err := desktopClient.InspectOpenAI(modelName)
 		if err != nil {

cmd/cli/commands/list.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"fmt"
 	"os"
-	"slices"
 	"strings"
 	"time"
 
@@ -89,12 +88,20 @@ func listModels(openai bool, backend string, desktopClient *desktop.Client, quie
 	}
 
 	if modelFilter != "" {
+		// Normalize the filter to match stored model names
+		normalizedFilter := normalizeModelName(modelFilter)
 		var filteredModels []dmrm.Model
 		for _, m := range models {
 			hasMatchingTag := false
 			for _, tag := range m.Tags {
+				if tag == normalizedFilter {
+					hasMatchingTag = true
+					break
+				}
+				// Also check without the tag part
 				modelName, _, _ := strings.Cut(tag, ":")
-				if slices.Contains([]string{modelName, tag + ":latest", tag}, modelFilter) {
+				filterName, _, _ := strings.Cut(normalizedFilter, ":")
+				if modelName == filterName {
 					hasMatchingTag = true
 					break
 				}
@@ -165,8 +172,10 @@ func appendRow(table *tablewriter.Table, tag string, model dmrm.Model) {
 		fmt.Fprintf(os.Stderr, "invalid model ID for model: %v\n", model)
 		return
 	}
+	// Strip default "ai/" prefix and ":latest" tag for display
+	displayTag := stripDefaultsFromModelName(tag)
 	table.Append([]string{
-		tag,
+		displayTag,
 		model.Config.Parameters,
 		model.Config.Quantization,
 		model.Config.Architecture,

cmd/cli/commands/ps.go

@@ -54,6 +54,9 @@ func psTable(ps []desktop.BackendStatus) string {
 		modelName := status.ModelName
 		if strings.HasPrefix(modelName, "sha256:") {
 			modelName = modelName[7:19]
+		} else {
+			// Strip default "ai/" prefix and ":latest" tag for display
+			modelName = stripDefaultsFromModelName(modelName)
 		}
 		table.Append([]string{
 			modelName,

cmd/cli/commands/pull.go

@@ -41,6 +41,9 @@ func newPullCmd() *cobra.Command {
 }
 
 func pullModel(cmd *cobra.Command, desktopClient *desktop.Client, model string, ignoreRuntimeMemoryCheck bool) error {
+	// Normalize model name to add default org and tag if missing
+	model = normalizeModelName(model)
+	
 	var progress func(string)
 	if isatty.IsTerminal(os.Stdout.Fd()) {
 		progress = TUIProgress

cmd/cli/commands/push.go

@@ -34,6 +34,9 @@ func newPushCmd() *cobra.Command {
 }
 
 func pushModel(cmd *cobra.Command, desktopClient *desktop.Client, model string) error {
+	// Normalize model name to add default org and tag if missing
+	model = normalizeModelName(model)
+	
 	response, progressShown, err := desktopClient.Push(model, TUIProgress)
 
 	// Add a newline before any output (success or error) if progress was shown.

cmd/cli/commands/rm.go

@@ -27,7 +27,12 @@ func newRemoveCmd() *cobra.Command {
 			if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), cmd); err != nil {
 				return fmt.Errorf("unable to initialize standalone model runner: %w", err)
 			}
-			response, err := desktopClient.Remove(args, force)
+			// Normalize model names to add default org and tag if missing
+			normalizedArgs := make([]string, len(args))
+			for i, arg := range args {
+				normalizedArgs[i] = normalizeModelName(arg)
+			}
+			response, err := desktopClient.Remove(normalizedArgs, force)
 			if response != "" {
 				cmd.Print(response)
 			}

cmd/cli/commands/run.go

@@ -561,7 +561,8 @@ func newRunCmd() *cobra.Command {
 				return err
 			}
 
-			model := args[0]
+			// Normalize model name to add default org and tag if missing
+			model := normalizeModelName(args[0])
 			prompt := ""
 			argsLen := len(args)
 			if argsLen > 1 {

cmd/cli/commands/tag.go

@@ -36,6 +36,9 @@ func newTagCmd() *cobra.Command {
 }
 
 func tagModel(cmd *cobra.Command, desktopClient *desktop.Client, source, target string) error {
+	// Normalize source model name to add default org and tag if missing
+	source = normalizeModelName(source)
+	
 	// Ensure tag is valid
 	tag, err := name.NewTag(target)
 	if err != nil {