when moving a file make it possible to change the name of the file in the target location

Author: kongoncharuk

internal/actions/move.go

@@ -72,6 +72,58 @@ func Move(ctx context.Context, sources []string, destDir string, progressFn func
 	return nil
 }
 
+// MoveAs moves a single source to destPath (a full path, not a directory).
+// Used for single-item move where the user may have renamed the target.
+// Tries os.Rename first (fast, same device), falls back to copy+delete for
+// cross-device moves.
+func MoveAs(ctx context.Context, source, destPath string, progressFn func(Progress)) error {
+	if err := ctx.Err(); err != nil {
+		return ErrCancelled
+	}
+
+	if absEq(source, destPath) {
+		return fmt.Errorf("source and destination are the same: %s", source)
+	}
+
+	totalFiles, totalBytes := countFilesAndBytes([]string{source})
+	agg := Progress{
+		Op:         OpMove,
+		TotalFiles: totalFiles,
+		TotalBytes: totalBytes,
+	}
+
+	// Try rename first (instant if same filesystem).
+	if err := os.Rename(source, destPath); err == nil {
+		agg.DoneFiles = totalFiles
+		agg.DoneBytes = totalBytes
+		agg.Current = filepath.Base(destPath)
+		if progressFn != nil {
+			progressFn(agg)
+		}
+		return nil
+	}
+
+	// Cross-device: copy then delete. Forward copy progress as a move op so
+	// the dialog keeps showing "Moving".
+	forward := func(p Progress) {
+		agg.Current = p.Current
+		agg.FileTotalBytes = p.FileTotalBytes
+		agg.FileDoneBytes = p.FileDoneBytes
+		agg.DoneFiles = p.DoneFiles
+		agg.DoneBytes = p.DoneBytes
+		if progressFn != nil {
+			progressFn(agg)
+		}
+	}
+	if err := CopyAs(ctx, source, destPath, forward); err != nil {
+		return fmt.Errorf("move (copy phase) %s: %w", source, err)
+	}
+	if err := os.RemoveAll(source); err != nil {
+		return fmt.Errorf("move (delete phase) %s: %w", source, err)
+	}
+	return nil
+}
+
 // Rename renames a single file or directory.
 func Rename(oldPath, newName string) error {
 	dir := filepath.Dir(oldPath)

internal/app/app.go

@@ -43,6 +43,7 @@ const (
 	tagCopy    = "copy"
 	tagCopyAs  = "copyas"
 	tagMove    = "move"
+	tagMoveAs  = "moveas"
 	tagDelete  = "delete"
 	tagMkdir   = "mkdir"
 	tagRename  = "rename"
@@ -721,6 +722,13 @@ func (m Model) startMove() (tea.Model, tea.Cmd) {
 	m.pendingSources = sources
 	m.pendingDest = dest
 
+	if len(sources) == 1 {
+		defaultPath := filepath.Join(dest, filepath.Base(sources[0]))
+		d := dialog.NewInput("Move", "Move to:", defaultPath, tagMoveAs)
+		m.dialog = &d
+		return m, nil
+	}
+
 	msg := fmt.Sprintf("Move %d item(s) to %s?", len(sources), dest)
 	d := dialog.NewConfirm("Move", msg, tagMove)
 	m.dialog = &d
@@ -890,6 +898,18 @@ func (m Model) handleDialogResult(result dialog.Result) (tea.Model, tea.Cmd) {
 				waitForProgress(ch),
 			)
 		}
+	case tagMoveAs:
+		if result.Confirmed && strings.TrimSpace(result.Text) != "" && len(m.pendingSources) == 1 {
+			target := expandHome(result.Text)
+			if !filepath.IsAbs(target) {
+				target = filepath.Join(m.pendingDest, target)
+			}
+			ctx, ch := m.startProgressOp("Moving")
+			return m, tea.Batch(
+				moveAsCmd(ctx, ch, m.pendingSources[0], target),
+				waitForProgress(ch),
+			)
+		}
 	case tagDelete:
 		if result.Confirmed {
 			ctx, ch := m.startProgressOp("Deleting")

internal/app/commands.go

@@ -82,6 +82,14 @@ func moveCmd(ctx context.Context, ch chan actions.Progress, sources []string, de
 	}
 }
 
+func moveAsCmd(ctx context.Context, ch chan actions.Progress, source, destPath string) tea.Cmd {
+	return func() tea.Msg {
+		err := actions.MoveAs(ctx, source, destPath, sendProgress(ctx, ch))
+		close(ch)
+		return moveDoneMsg{err: err}
+	}
+}
+
 func deleteCmd(ctx context.Context, ch chan actions.Progress, paths []string) tea.Cmd {
 	return func() tea.Msg {
 		err := actions.Delete(ctx, paths, sendProgress(ctx, ch))