Update based on PR feedback.

Author: marcpopMSFT

src/Cli/dotnet/Commands/CliCommandStrings.resx

@@ -2052,6 +2052,9 @@ If you would like to create a manifest, use the `--create-manifest-if-needed` fl
   <data name="ToolRunCommandDescription" xml:space="preserve">
     <value>Run a local tool. Note that this command cannot be used to run a global tool. </value>
   </data>
+  <data name="ToolRunArguementsDescription" xml:space="preserve">
+    <value>Arguments forwarded to the tool</value>
+  </data>
   <data name="ToolSearchCommandDescription" xml:space="preserve">
     <value>Search dotnet tools in nuget.org</value>
   </data>
@@ -2476,10 +2479,16 @@ To display a value, specify the corresponding command-line option without provid
   <data name="SolutionAddReferencedProjectsOptionDescription" xml:space="preserve">
     <value>Recursively add projects' ReferencedProjects to solution</value>
   </data>
-  <data name="ToolRunFromSourceOptionDescription" xml:space="preserve">
-    <value>Executes a tool from source without permanently installing it. </value>
+  <data name="ToolExecuteCommandDescription" xml:space="preserve">
+    <value>Executes a tool from source without permanently installing it.</value>
+  </data>
+  <data name="ToolExecuteCommandMissingPackageId" xml:space="preserve">
+    <value>Missing package ID</value>
   </data>
   <data name="ToolRunFromSourceUserConfirmationPrompt" xml:space="preserve">
-    <value>Tool not found in the system. Do you want to run it from source? [y/n] </value>
+    <value>Tool not found on the system. Do you want to run it from source? [y/n]</value>
+  </data>
+  <data name="ToolRunFromSourceUserConfirmationFailed" xml:space="preserve">
+    <value>Run from source approval denied by the user</value>
   </data>
 </root>

src/Cli/dotnet/Commands/Tool/Execute/ToolExecuteCommand.cs

@@ -6,6 +6,7 @@
 using Microsoft.DotNet.Cli.CommandFactory.CommandResolution;
 using Microsoft.DotNet.Cli.Commands.Tool.Install;
 using Microsoft.DotNet.Cli.ToolPackage;
+using Microsoft.DotNet.Cli.Utils;
 using NuGet.Common;
 using NuGet.Packaging.Core;
 using NuGet.Versioning;
@@ -28,11 +29,17 @@ internal class ToolExecuteCommand(ParseResult result) : CommandBase(result)
 
         public override int Execute()
         {
-            if (!UserAgreedToRunFromSource() || _packageToolIdentityArgument is null)
+            if (_packageToolIdentityArgument is null)
             {
+                // System.CommandLine will throw an error if the argument is not provided, but we can still check here for clarity.
                 return 1;
             }
 
+            if (!UserAgreedToRunFromSource())
+            {
+                throw new GracefulException(CliCommandStrings.ToolRunFromSourceUserConfirmationFailed, isUserError: true);
+            }
+
             if (_allowRollForward)
             {
                 _forwardArguments.Append("--allow-roll-forward");

src/Cli/dotnet/Commands/Tool/Execute/ToolExecuteCommandParser.cs

@@ -17,7 +17,7 @@ internal static class ToolExecuteCommandParser
 
         public static readonly Argument<IEnumerable<string>> CommandArgument = new("commandArguments")
         {
-            Description = "arguments forwarded to the tool"
+            Description = CliCommandStrings.ToolRunArguementsDescription
         };
 
         public static readonly Option<string> VersionOption = ToolInstallCommandParser.VersionOption;
@@ -40,7 +40,7 @@ public static Command GetCommand()
 
         private static Command ConstructCommand()
         {
-            Command command = new("execute", "Execute a tool command from source");
+            Command command = new("execute", CliCommandStrings.ToolExecuteCommandDescription);
 
             command.Aliases.Add("exec");
 

src/Cli/dotnet/Commands/Tool/Run/ToolRunCommand.cs

@@ -44,6 +44,4 @@ public override int Execute()
         var result = CommandFactoryUsingResolver.Create(commandSpec).Execute();
         return result.ExitCode;
     }
-
-
 }

src/Cli/dotnet/Commands/Tool/Run/ToolRunCommandParser.cs

@@ -4,9 +4,6 @@
 #nullable disable
 
 using System.CommandLine;
-using Microsoft.DotNet.Cli;
-using Microsoft.DotNet.Cli.Commands.Tool.Install;
-using Microsoft.DotNet.Cli.Commands.Tool.Common;
 
 namespace Microsoft.DotNet.Cli.Commands.Tool.Run;
 
@@ -20,7 +17,7 @@ internal static class ToolRunCommandParser
 
     public static readonly Argument<IEnumerable<string>> CommandArgument = new("toolArguments")
     {
-        Description = "arguments forwarded to the tool"
+        Description = CliCommandStrings.ToolRunArguementsDescription
     };
 
     public static readonly Option<bool> RollForwardOption = new("--allow-roll-forward")
@@ -42,7 +39,6 @@ private static Command ConstructCommand()
 
         command.Arguments.Add(CommandNameArgument);
         command.Arguments.Add(CommandArgument);
-
         command.Options.Add(RollForwardOption);
 
         command.SetAction((parseResult) => new ToolRunCommand(parseResult).Execute());