Add renderOperation helper and migrate mkdir/restore dry-run

cmd/dry_run.go

@@ -48,6 +48,14 @@ func plannedStatus(dryRun bool, realStatus string) string {
 	return realStatus
 }
 
+// renderOperation renders a command's operation output through the shared
+// command output writer: the text closure produces the human-readable form and
+// the JSON form is the standard operation envelope. Dry-run branches use this
+// to avoid duplicating the commandOutput/newJSONCommandOperationOutput glue.
+func renderOperation(cmd *cobra.Command, input any, results []jsonOperationResult, warnings []jsonWarning, text func(io.Writer) error) error {
+	return commandOutput(cmd).Render(text, newJSONCommandOperationOutput(cmd, input, results, warnings))
+}
+
 func writeDryRunLine(w io.Writer, verb, path string) error {
 	_, err := fmt.Fprintf(w, "Would %s %s\n", verb, path)
 	return err

cmd/mkdir.go

@@ -65,9 +65,9 @@ func mkdir(cmd *cobra.Command, args []string) (err error) {
 
 	if opts.dryRun {
 		result := newPlannedMkdirResult(dst, opts)
-		return commandOutput(cmd).Render(func(w io.Writer) error {
+		return renderOperation(cmd, result.Input, []jsonOperationResult{mkdirOperationResult(result)}, nil, func(w io.Writer) error {
 			return writeDryRunLine(w, "create directory", result.displayPath())
-		}, newJSONCommandOperationOutput(cmd, result.Input, []jsonOperationResult{mkdirOperationResult(result)}, nil))
+		})
 	}
 
 	arg := files.NewCreateFolderArg(dst)

cmd/restore.go

@@ -63,9 +63,9 @@ func restore(cmd *cobra.Command, args []string) (err error) {
 	}
 	if opts.dryRun {
 		result := newPlannedRestoreResult(path, rev, opts)
-		return commandOutput(cmd).Render(func(w io.Writer) error {
+		return renderOperation(cmd, result.Input, []jsonOperationResult{restoreOperationResult(result)}, nil, func(w io.Writer) error {
 			return renderPlannedRestoreResult(w, result)
-		}, newJSONCommandOperationOutput(cmd, result.Input, []jsonOperationResult{restoreOperationResult(result)}, nil))
+		})
 	}
 
 	arg := files.NewRestoreArg(path, rev)