diff --git a/commands/service_debug.go b/commands/service_debug.go
index 656c3f6ec11..53baa468254 100644
--- a/commands/service_debug.go
+++ b/commands/service_debug.go
@@ -19,8 +19,11 @@ import (
 	"context"
 	"errors"
 	"os"
+	"path/filepath"
+	"runtime"
 	"sync/atomic"
 
+	"github.com/arduino/arduino-cli/internal/arduino/cores/packagemanager"
 	"github.com/arduino/arduino-cli/internal/i18n"
 	rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
 	"google.golang.org/grpc/metadata"
@@ -178,3 +181,82 @@ func (s *arduinoCoreServerImpl) Debug(stream rpc.ArduinoCoreService_DebugServer)
 	}
 	return sendResult(&rpc.DebugResponse_Result{})
 }
+
+// getCommandLine compose a debug command represented by a core recipe
+func getCommandLine(req *rpc.GetDebugConfigRequest, pme *packagemanager.Explorer) ([]string, error) {
+	debugInfo, err := getDebugProperties(req, pme, false)
+	if err != nil {
+		return nil, err
+	}
+
+	cmdArgs := []string{}
+	add := func(s string) { cmdArgs = append(cmdArgs, s) }
+
+	// Add path to GDB Client to command line
+	var gdbPath *paths.Path
+	switch debugInfo.GetToolchain() {
+	case "gcc":
+		gdbexecutable := debugInfo.GetToolchainPrefix() + "-gdb"
+		if runtime.GOOS == "windows" {
+			gdbexecutable += ".exe"
+		}
+		gdbPath = paths.New(debugInfo.GetToolchainPath()).Join(gdbexecutable)
+	default:
+		return nil, &cmderrors.FailedDebugError{Message: i18n.Tr("Toolchain '%s' is not supported", debugInfo.GetToolchain())}
+	}
+	add(gdbPath.String())
+
+	// Set GDB interpreter (default value should be "console")
+	gdbInterpreter := req.GetInterpreter()
+	if gdbInterpreter == "" {
+		gdbInterpreter = "console"
+	}
+	add("--interpreter=" + gdbInterpreter)
+	if gdbInterpreter != "console" {
+		add("-ex")
+		add("set pagination off")
+	}
+
+	// Add extra GDB execution commands
+	add("-ex")
+	add("set remotetimeout 5")
+
+	// Extract path to GDB Server
+	switch debugInfo.GetServer() {
+	case "openocd":
+		var openocdConf rpc.DebugOpenOCDServerConfiguration
+		if err := debugInfo.GetServerConfiguration().UnmarshalTo(&openocdConf); err != nil {
+			return nil, err
+		}
+
+		serverCmd := fmt.Sprintf(`target extended-remote | "%s"`, debugInfo.GetServerPath())
+
+		if cfg := openocdConf.GetScriptsDir(); cfg != "" {
+			serverCmd += fmt.Sprintf(` -s "%s"`, cfg)
+		}
+
+		for _, script := range openocdConf.GetScripts() {
+			serverCmd += fmt.Sprintf(` --file "%s"`, script)
+		}
+
+		serverCmd += ` -c "gdb_port pipe"`
+		serverCmd += ` -c "telnet_port 0"`
+
+		add("-ex")
+		add(serverCmd)
+
+	default:
+		return nil, &cmderrors.FailedDebugError{Message: i18n.Tr("GDB server '%s' is not supported", debugInfo.GetServer())}
+	}
+
+	// Add executable
+	add(debugInfo.GetExecutable())
+
+	// Transform every path to forward slashes (on Windows some tools further
+	// escapes the command line so the backslash "\" gets in the way).
+	for i, param := range cmdArgs {
+		cmdArgs[i] = filepath.ToSlash(param)
+	}
+
+	return cmdArgs, nil
+}
diff --git a/commands/service_debug_run.go b/commands/service_debug_run.go
deleted file mode 100644
index 65251b9ae60..00000000000
--- a/commands/service_debug_run.go
+++ /dev/null
@@ -1,107 +0,0 @@
-// This file is part of arduino-cli.
-//
-// Copyright 2020 ARDUINO SA (http://www.arduino.cc/)
-//
-// This software is released under the GNU General Public License version 3,
-// which covers the main part of arduino-cli.
-// The terms of this license can be found at:
-// https://www.gnu.org/licenses/gpl-3.0.en.html
-//
-// You can be released from the requirements of the above licenses by purchasing
-// a commercial license. Buying such a license is mandatory if you want to
-// modify or otherwise use the software for commercial activities involving the
-// Arduino software without disclosing the source code of your own applications.
-// To purchase a commercial license, send an email to license@arduino.cc.
-
-package commands
-
-import (
-	"fmt"
-	"path/filepath"
-	"runtime"
-
-	"github.com/arduino/arduino-cli/commands/cmderrors"
-	"github.com/arduino/arduino-cli/internal/arduino/cores/packagemanager"
-	"github.com/arduino/arduino-cli/internal/i18n"
-	rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
-	"github.com/arduino/go-paths-helper"
-)
-
-// getCommandLine compose a debug command represented by a core recipe
-func getCommandLine(req *rpc.GetDebugConfigRequest, pme *packagemanager.Explorer) ([]string, error) {
-	debugInfo, err := getDebugProperties(req, pme, false)
-	if err != nil {
-		return nil, err
-	}
-
-	cmdArgs := []string{}
-	add := func(s string) { cmdArgs = append(cmdArgs, s) }
-
-	// Add path to GDB Client to command line
-	var gdbPath *paths.Path
-	switch debugInfo.GetToolchain() {
-	case "gcc":
-		gdbexecutable := debugInfo.GetToolchainPrefix() + "-gdb"
-		if runtime.GOOS == "windows" {
-			gdbexecutable += ".exe"
-		}
-		gdbPath = paths.New(debugInfo.GetToolchainPath()).Join(gdbexecutable)
-	default:
-		return nil, &cmderrors.FailedDebugError{Message: i18n.Tr("Toolchain '%s' is not supported", debugInfo.GetToolchain())}
-	}
-	add(gdbPath.String())
-
-	// Set GDB interpreter (default value should be "console")
-	gdbInterpreter := req.GetInterpreter()
-	if gdbInterpreter == "" {
-		gdbInterpreter = "console"
-	}
-	add("--interpreter=" + gdbInterpreter)
-	if gdbInterpreter != "console" {
-		add("-ex")
-		add("set pagination off")
-	}
-
-	// Add extra GDB execution commands
-	add("-ex")
-	add("set remotetimeout 5")
-
-	// Extract path to GDB Server
-	switch debugInfo.GetServer() {
-	case "openocd":
-		var openocdConf rpc.DebugOpenOCDServerConfiguration
-		if err := debugInfo.GetServerConfiguration().UnmarshalTo(&openocdConf); err != nil {
-			return nil, err
-		}
-
-		serverCmd := fmt.Sprintf(`target extended-remote | "%s"`, debugInfo.GetServerPath())
-
-		if cfg := openocdConf.GetScriptsDir(); cfg != "" {
-			serverCmd += fmt.Sprintf(` -s "%s"`, cfg)
-		}
-
-		for _, script := range openocdConf.GetScripts() {
-			serverCmd += fmt.Sprintf(` --file "%s"`, script)
-		}
-
-		serverCmd += ` -c "gdb_port pipe"`
-		serverCmd += ` -c "telnet_port 0"`
-
-		add("-ex")
-		add(serverCmd)
-
-	default:
-		return nil, &cmderrors.FailedDebugError{Message: i18n.Tr("GDB server '%s' is not supported", debugInfo.GetServer())}
-	}
-
-	// Add executable
-	add(debugInfo.GetExecutable())
-
-	// Transform every path to forward slashes (on Windows some tools further
-	// escapes the command line so the backslash "\" gets in the way).
-	for i, param := range cmdArgs {
-		cmdArgs[i] = filepath.ToSlash(param)
-	}
-
-	return cmdArgs, nil
-}