feat: template improvements — image names, description field, wizard steps

- Store image name (not ID) in templates, matching SSH key/startup script
  pattern. resolveImageName() converts name→ID at apply time with backward
  compat for existing templates storing IDs.
- Add Description field to Template struct; AutoDescription() prefers
  custom description, falls back to auto-generated.
- Add hostname-pattern and description wizard steps to template create.
- Template edit: image selector shows names, description field editable,
  "Save & exit" pre-selected with full page size.
- Template show: displays description field.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: hi-lei

internal/verda-cli/cmd/template/create.go

@@ -149,6 +149,8 @@ func vmResultToTemplate(r *vm.TemplateResult) *Template {
 		StartupScript:     r.StartupScriptName,
 		StorageSkip:       r.StorageSkip,
 		StartupScriptSkip: r.StartupScriptSkip,
+		HostnamePattern:   r.HostnamePattern,
+		Description:       r.Description,
 	}
 	if r.StorageSize > 0 {
 		tmpl.Storage = []StorageSpec{{

internal/verda-cli/cmd/template/edit.go

@@ -86,7 +86,7 @@ func runEdit(cmd *cobra.Command, f cmdutil.Factory, ioStreams cmdutil.IOStreams,
 		}
 		labels[len(fields)] = "Save & exit"
 
-		idx, selErr := prompter.Select(ctx, "Edit field", labels)
+		idx, selErr := prompter.Select(ctx, "Edit field", labels, tui.WithSelectDefault(len(fields)), tui.WithPageSize(len(labels)))
 		if selErr != nil {
 			// Ctrl+C — save what we have
 			break
@@ -217,6 +217,18 @@ func buildFieldMenu(tmpl *Template) []editableField {
 				return nil
 			},
 		},
+		{
+			label:   "Description",
+			display: func(t *Template) string { return valueOrDash(t.Description) },
+			edit: func(ctx context.Context, f cmdutil.Factory, t *Template) error {
+				val, err := f.Prompter().TextInput(ctx, "Description", tui.WithDefault(t.Description))
+				if err != nil {
+					return nil //nolint:nilerr // user canceled
+				}
+				t.Description = val
+				return nil
+			},
+		},
 	}
 	return fields
 }
@@ -315,20 +327,18 @@ func editImage(ctx context.Context, f cmdutil.Factory, t *Template) error {
 	}
 
 	choices := make([]string, 0, len(images))
-	values := make([]string, 0, len(images))
 	for _, img := range images {
 		if img.IsCluster {
 			continue
 		}
-		choices = append(choices, img.ID)
-		values = append(values, img.ID)
+		choices = append(choices, img.Name)
 	}
 
 	idx, selErr := f.Prompter().Select(ctx, "Image", choices)
 	if selErr != nil {
 		return nil //nolint:nilerr // user canceled
 	}
-	t.Image = values[idx]
+	t.Image = choices[idx]
 	return nil
 }
 

internal/verda-cli/cmd/template/show.go

@@ -123,6 +123,7 @@ func runShow(f cmdutil.Factory, ioStreams cmdutil.IOStreams, ref string) error {
 	}
 
 	pf("Hostname Pattern:", tmpl.HostnamePattern)
+	pf("Description:", tmpl.Description)
 
 	return nil
 }

internal/verda-cli/cmd/vm/create.go

@@ -79,12 +79,15 @@ type createOptions struct {
 	Wait cmdutil.WaitOptions
 
 	// Internal flags for template/wizard coordination.
-	sshKeyNames       []string // names corresponding to SSHKeyIDs (for template saving)
-	startupScriptName string   // name corresponding to StartupScriptID (for template saving)
-	billingTypeSet    bool     // true when billing type was pre-filled
-	locationSet       bool     // true when location was pre-filled
-	storageSkip       bool     // true when storage was explicitly skipped
-	startupScriptSkip bool     // true when startup script was explicitly skipped
+	sshKeyNames         []string // names corresponding to SSHKeyIDs (for template saving)
+	startupScriptName   string   // name corresponding to StartupScriptID (for template saving)
+	billingTypeSet      bool     // true when billing type was pre-filled
+	locationSet         bool     // true when location was pre-filled
+	storageSkip         bool     // true when storage was explicitly skipped
+	startupScriptSkip   bool     // true when startup script was explicitly skipped
+	imageName           string   // human-readable image name (for template saving)
+	hostnamePattern     string   // template-mode only: hostname pattern
+	templateDescription string   // template-mode only: user description
 }
 
 // NewCmdCreate creates the vm create cobra command.

internal/verda-cli/cmd/vm/template_apply.go

@@ -131,9 +131,7 @@ func applyTemplate(tmpl *template.Template, opts *createOptions) {
 		opts.LocationCode = tmpl.Location
 		opts.locationSet = true
 	}
-	if tmpl.Image != "" {
-		opts.Image = tmpl.Image
-	}
+	// Image name is resolved to ID by resolveTemplateNames, not here.
 	if tmpl.OSVolumeSize != 0 {
 		opts.OSVolumeSize = tmpl.OSVolumeSize
 	}
@@ -156,12 +154,15 @@ func applyTemplate(tmpl *template.Template, opts *createOptions) {
 	// SSH keys and startup script are handled by resolveTemplateNames, not here.
 }
 
-// resolveTemplateNames resolves SSH key names and startup script name to IDs.
-// Prints each warning to ioStreams.ErrOut and returns the collected warnings.
+// resolveTemplateNames resolves image name, SSH key names, and startup script
+// name to IDs. Prints each warning to ioStreams.ErrOut and returns the
+// collected warnings.
 func resolveTemplateNames(ctx context.Context, ioStreams cmdutil.IOStreams, client *verda.Client, tmpl *template.Template, opts *createOptions) []string {
+	imageWarnings := resolveImageName(ctx, client, tmpl.Image, opts)
 	_, sshWarnings := resolveSSHKeyNames(ctx, client, tmpl.SSHKeys, opts)
 	scriptWarnings := resolveStartupScriptName(ctx, client, tmpl.StartupScript, opts)
-	warnings := make([]string, 0, len(sshWarnings)+len(scriptWarnings))
+	warnings := make([]string, 0, len(imageWarnings)+len(sshWarnings)+len(scriptWarnings))
+	warnings = append(warnings, imageWarnings...)
 	warnings = append(warnings, sshWarnings...)
 	warnings = append(warnings, scriptWarnings...)
 	for _, w := range warnings {
@@ -170,6 +171,36 @@ func resolveTemplateNames(ctx context.Context, ioStreams cmdutil.IOStreams, clie
 	return warnings
 }
 
+// resolveImageName resolves an image name to its ID via the API.
+// For backward compatibility, if the name matches an existing image ID directly,
+// it is used as-is (handles templates created before name-based storage).
+func resolveImageName(ctx context.Context, client *verda.Client, name string, opts *createOptions) (warnings []string) {
+	if name == "" {
+		return nil
+	}
+	images, err := client.Images.Get(ctx)
+	if err != nil {
+		return []string{fmt.Sprintf("failed to resolve image name: %v", err)}
+	}
+	// Try matching by name first.
+	for _, img := range images {
+		if img.Name == name {
+			opts.Image = img.ID
+			opts.imageName = img.Name
+			return nil
+		}
+	}
+	// Backward compat: if the value matches an image ID, use it directly.
+	for _, img := range images {
+		if img.ID == name {
+			opts.Image = img.ID
+			opts.imageName = img.Name
+			return nil
+		}
+	}
+	return []string{fmt.Sprintf("image %q not found", name)}
+}
+
 // resolveSSHKeyNames resolves SSH key names to IDs via the API.
 // Returns (resolved IDs, warnings). On API error or name-not-found, a warning
 // is returned so the caller can inform the user.

internal/verda-cli/cmd/vm/template_apply_test.go

@@ -40,8 +40,9 @@ func TestApplyTemplate(t *testing.T) {
 	if opts.LocationCode != "FIN-01" {
 		t.Errorf("LocationCode = %q, want FIN-01", opts.LocationCode)
 	}
-	if opts.Image != "ubuntu-24.04-cuda-12.8" {
-		t.Errorf("Image = %q, want ubuntu-24.04-cuda-12.8", opts.Image)
+	// Image is resolved by resolveTemplateNames, not applyTemplate.
+	if opts.Image != "" {
+		t.Errorf("Image = %q, want empty (resolved later by resolveTemplateNames)", opts.Image)
 	}
 	if opts.OSVolumeSize != 200 {
 		t.Errorf("OSVolumeSize = %d, want 200", opts.OSVolumeSize)

internal/verda-cli/cmd/vm/wizard.go

@@ -43,7 +43,7 @@ type WizardMode int
 const (
 	// WizardModeDeploy includes all steps: config + hostname + description + confirm deploy.
 	WizardModeDeploy WizardMode = iota
-	// WizardModeTemplate includes only config steps (no hostname, description, confirm).
+	// WizardModeTemplate includes config steps + hostname pattern + template description (no deploy hostname, deploy description, or confirm).
 	WizardModeTemplate
 )
 
@@ -63,11 +63,13 @@ type TemplateResult struct {
 	StorageType       string
 	StorageSkip       bool // user explicitly chose "None (skip)"
 	StartupScriptSkip bool // user explicitly chose "None (skip)"
+	HostnamePattern   string
+	Description       string
 }
 
-// RunTemplateWizard runs the VM create wizard in template mode (no hostname,
-// description, or confirm-deploy steps). Returns the wizard results for
-// saving as a template.
+// RunTemplateWizard runs the VM create wizard in template mode. Includes config
+// steps plus hostname-pattern and template description, but no deploy hostname,
+// deploy description, or confirm-deploy steps.
 func RunTemplateWizard(ctx context.Context, f cmdutil.Factory, ioStreams cmdutil.IOStreams) (*TemplateResult, error) {
 	return runTemplateWizardWithOpts(ctx, f, ioStreams, &createOptions{
 		LocationCode: verda.LocationFIN01,
@@ -91,14 +93,16 @@ func optsToTemplateResult(opts *createOptions) *TemplateResult {
 		Kind:              opts.Kind,
 		InstanceType:      opts.InstanceType,
 		Location:          opts.LocationCode,
-		Image:             opts.Image,
+		Image:             opts.imageName,
 		OSVolumeSize:      opts.OSVolumeSize,
 		SSHKeyNames:       opts.sshKeyNames,
 		StartupScriptName: opts.startupScriptName,
 		StorageSize:       opts.StorageSize,
 		StorageType:       opts.StorageType,
 		StorageSkip:       opts.StorageSize == 0 && len(opts.VolumeSpecs) == 0,
 		StartupScriptSkip: opts.StartupScriptID == "" && opts.startupScriptName == "",
+		HostnamePattern:   opts.hostnamePattern,
+		Description:       opts.templateDescription,
 	}
 	if opts.IsSpot {
 		result.BillingType = "spot"
@@ -136,6 +140,12 @@ func buildCreateFlow(ctx context.Context, getClient clientFunc, opts *createOpti
 			stepConfirmDeploy(ctx, errOut, getClient, cache, opts),
 		)
 	}
+	if mode == WizardModeTemplate {
+		steps = append(steps,
+			stepHostnamePattern(opts),
+			stepTemplateDescription(opts),
+		)
+	}
 
 	layout := []wizard.ViewDef{
 		{ID: "hints", View: wizard.NewHintBarView(wizard.WithHintStyle(bubbletea.HintStyle()))},
@@ -404,6 +414,7 @@ func stepLocation(getClient clientFunc, cache *apiCache, opts *createOptions) wi
 // --- Step 6: OS Image ---
 
 func stepImage(getClient clientFunc, opts *createOptions) wizard.Step {
+	var imagesByID map[string]string // ID → Name lookup, built by Loader
 	return wizard.Step{
 		Name:        "image",
 		Description: "Operating system image",
@@ -420,11 +431,13 @@ func stepImage(getClient clientFunc, opts *createOptions) wizard.Step {
 			if err != nil {
 				return nil, fmt.Errorf("fetching images: %w", err)
 			}
+			imagesByID = make(map[string]string, len(images))
 			var choices []wizard.Choice
 			for _, img := range images {
 				if img.IsCluster {
 					continue
 				}
+				imagesByID[img.ID] = img.Name
 				desc := ""
 				if len(img.Details) > 0 {
 					desc = strings.Join(img.Details, ", ")
@@ -437,9 +450,15 @@ func stepImage(getClient clientFunc, opts *createOptions) wizard.Step {
 			}
 			return choices, nil
 		},
-		Default:  func(_ map[string]any) any { return opts.Image },
-		Setter:   func(v any) { opts.Image = v.(string) },
-		Resetter: func() { opts.Image = "" },
+		Default: func(_ map[string]any) any { return opts.Image },
+		Setter: func(v any) {
+			id := v.(string)
+			opts.Image = id
+			if imagesByID != nil {
+				opts.imageName = imagesByID[id]
+			}
+		},
+		Resetter: func() { opts.Image = ""; opts.imageName = "" },
 		IsSet:    func() bool { return opts.Image != "" },
 		Value:    func() any { return opts.Image },
 	}
@@ -719,6 +738,39 @@ func stepStartupScript(getClient clientFunc, opts *createOptions) wizard.Step {
 	}
 }
 
+// --- Template Step: Hostname Pattern ---
+
+func stepHostnamePattern(opts *createOptions) wizard.Step {
+	return wizard.Step{
+		Name:        "hostname-pattern",
+		Description: "Hostname pattern (optional)",
+		Prompt:      wizard.TextInputPrompt,
+		Required:    false,
+		Default: func(_ map[string]any) any {
+			return "{random}-{location}"
+		},
+		Setter:   func(v any) { opts.hostnamePattern = v.(string) },
+		Resetter: func() { opts.hostnamePattern = "" },
+		IsSet:    func() bool { return opts.hostnamePattern != "" },
+		Value:    func() any { return opts.hostnamePattern },
+	}
+}
+
+// --- Template Step: Description ---
+
+func stepTemplateDescription(opts *createOptions) wizard.Step {
+	return wizard.Step{
+		Name:        "template-description",
+		Description: "Description (optional)",
+		Prompt:      wizard.TextInputPrompt,
+		Required:    false,
+		Setter:      func(v any) { opts.templateDescription = v.(string) },
+		Resetter:    func() { opts.templateDescription = "" },
+		IsSet:       func() bool { return opts.templateDescription != "" },
+		Value:       func() any { return opts.templateDescription },
+	}
+}
+
 // --- Step 11: Hostname ---
 
 func stepHostname(opts *createOptions) wizard.Step {

internal/verda-cli/template/template.go

@@ -32,6 +32,7 @@ type Template struct {
 	StartupScript     string        `yaml:"startup_script,omitempty"`
 	StartupScriptSkip bool          `yaml:"startup_script_skip,omitempty"`
 	HostnamePattern   string        `yaml:"hostname_pattern,omitempty"`
+	Description       string        `yaml:"description,omitempty"`
 }
 
 // StorageSpec describes an additional storage volume attached to a template.
@@ -210,9 +211,13 @@ func Delete(baseDir, resource, name string) error {
 	return nil
 }
 
-// AutoDescription returns a human-readable summary by joining non-empty
-// InstanceType, Image, and Location fields with ", ".
+// AutoDescription returns a human-readable summary. If the user provided a
+// custom Description it is returned as-is; otherwise the method falls back to
+// joining non-empty InstanceType, Image, and Location with ", ".
 func (t *Template) AutoDescription() string {
+	if t.Description != "" {
+		return t.Description
+	}
 	var parts []string
 	for _, s := range []string{t.InstanceType, t.Image, t.Location} {
 		if s != "" {