Partial ID match and name match

Author: sjmiller609

pkg/cmd/exec.go

@@ -14,6 +14,7 @@ import (
 	"syscall"
 
 	"github.com/gorilla/websocket"
+	"github.com/onkernel/hypeman-go"
 	"github.com/urfave/cli/v3"
 	"golang.org/x/term"
 )
@@ -75,7 +76,13 @@ func handleExec(ctx context.Context, cmd *cli.Command) error {
 		return fmt.Errorf("instance ID required\nUsage: hypeman exec [flags] <instance-id> [-- command...]")
 	}
 
-	instanceID := args[0]
+	// Resolve instance by ID, partial ID, or name
+	client := hypeman.NewClient(getDefaultRequestOptions(cmd)...)
+	instanceID, err := ResolveInstance(ctx, &client, args[0])
+	if err != nil {
+		return err
+	}
+
 	var command []string
 
 	// Parse command after -- separator or remaining args

pkg/cmd/format.go

@@ -1,10 +1,13 @@
 package cmd
 
 import (
+	"context"
 	"fmt"
 	"io"
 	"strings"
 	"time"
+
+	"github.com/onkernel/hypeman-go"
 )
 
 // TableWriter provides simple table formatting for CLI output
@@ -145,4 +148,48 @@ func randomSuffix(n int) string {
 	return string(b)
 }
 
+// ResolveInstance resolves an instance identifier to a full instance ID.
+// It supports:
+// - Full instance ID (exact match)
+// - Partial instance ID (prefix match)
+// - Instance name (exact match)
+// Returns an error if the identifier is ambiguous or not found.
+func ResolveInstance(ctx context.Context, client *hypeman.Client, identifier string) (string, error) {
+	// List all instances
+	instances, err := client.Instances.List(ctx)
+	if err != nil {
+		return "", fmt.Errorf("failed to list instances: %w", err)
+	}
+
+	var matches []hypeman.Instance
+
+	for _, inst := range *instances {
+		// Exact ID match - return immediately
+		if inst.ID == identifier {
+			return inst.ID, nil
+		}
+		// Exact name match - return immediately
+		if inst.Name == identifier {
+			return inst.ID, nil
+		}
+		// Partial ID match (prefix)
+		if strings.HasPrefix(inst.ID, identifier) {
+			matches = append(matches, inst)
+		}
+	}
+
+	switch len(matches) {
+	case 0:
+		return "", fmt.Errorf("no instance found matching %q", identifier)
+	case 1:
+		return matches[0].ID, nil
+	default:
+		// Ambiguous - show matching IDs
+		ids := make([]string, len(matches))
+		for i, m := range matches {
+			ids[i] = TruncateID(m.ID)
+		}
+		return "", fmt.Errorf("ambiguous instance identifier %q matches: %s", identifier, strings.Join(ids, ", "))
+	}
+}
 

pkg/cmd/logs.go

@@ -35,10 +35,14 @@ func handleLogs(ctx context.Context, cmd *cli.Command) error {
 		return fmt.Errorf("instance ID required\nUsage: hypeman logs [flags] <instance>")
 	}
 
-	instanceID := args[0]
-
 	client := hypeman.NewClient(getDefaultRequestOptions(cmd)...)
 
+	// Resolve instance by ID, partial ID, or name
+	instanceID, err := ResolveInstance(ctx, &client, args[0])
+	if err != nil {
+		return err
+	}
+
 	params := hypeman.InstanceStreamLogsParams{}
 	if cmd.IsSet("follow") {
 		params.Follow = hypeman.Opt(cmd.Bool("follow"))

pkg/cmd/rm.go

@@ -34,7 +34,15 @@ func handleRm(ctx context.Context, cmd *cli.Command) error {
 	client := hypeman.NewClient(getDefaultRequestOptions(cmd)...)
 
 	var lastErr error
-	for _, instanceID := range args {
+	for _, identifier := range args {
+		// Resolve instance by ID, partial ID, or name
+		instanceID, err := ResolveInstance(ctx, &client, identifier)
+		if err != nil {
+			fmt.Printf("Error: %v\n", err)
+			lastErr = err
+			continue
+		}
+
 		// Check instance state if not forcing
 		if !force {
 			inst, err := client.Instances.Get(
@@ -56,7 +64,7 @@ func handleRm(ctx context.Context, cmd *cli.Command) error {
 		}
 
 		// Delete the instance
-		err := client.Instances.Delete(
+		err = client.Instances.Delete(
 			ctx,
 			instanceID,
 			option.WithMiddleware(debugMiddleware(cmd.Root().Bool("debug"))),