diff --git a/extension/src/views/AspireAppHostTreeProvider.ts b/extension/src/views/AspireAppHostTreeProvider.ts
index 5178b99e7bc..5c6c10af933 100644
--- a/extension/src/views/AspireAppHostTreeProvider.ts
+++ b/extension/src/views/AspireAppHostTreeProvider.ts
@@ -314,7 +314,7 @@ export class AspireAppHostTreeProvider implements vscode.TreeDataProvider<TreeEl
         });
 
         if (selected) {
-            this._terminalProvider.sendAspireCommandToAspireTerminal(`command "${element.resource.name}" "${selected.label}" --apphost "${appHost.appHostPath}"`);
+            this._terminalProvider.sendAspireCommandToAspireTerminal(`resource "${element.resource.name}" "${selected.label}" --apphost "${appHost.appHostPath}"`);
         }
     }
 
@@ -324,7 +324,7 @@ export class AspireAppHostTreeProvider implements vscode.TreeDataProvider<TreeEl
             return;
         }
         const suffix = extraArgs.length > 0 ? ` ${extraArgs.join(' ')}` : '';
-        this._terminalProvider.sendAspireCommandToAspireTerminal(`${command} "${element.resource.name}" --apphost "${appHost.appHostPath}"${suffix}`);
+        this._terminalProvider.sendAspireCommandToAspireTerminal(`resource "${element.resource.name}" ${command} --apphost "${appHost.appHostPath}"${suffix}`);
     }
 
     private _findAppHostForResource(element: ResourceItem): AppHostDisplayInfo | undefined {
diff --git a/src/Aspire.Cli/Commands/ResourceCommand.cs b/src/Aspire.Cli/Commands/ResourceCommand.cs
index 248951a7877..0bb3721671c 100644
--- a/src/Aspire.Cli/Commands/ResourceCommand.cs
+++ b/src/Aspire.Cli/Commands/ResourceCommand.cs
@@ -9,6 +9,7 @@
 using Aspire.Cli.Resources;
 using Aspire.Cli.Telemetry;
 using Aspire.Cli.Utils;
+using Aspire.Hosting.ApplicationModel;
 using Microsoft.Extensions.Logging;
 
 namespace Aspire.Cli.Commands;
@@ -33,6 +34,16 @@ internal sealed class ResourceCommand : BaseCommand
 
     private static readonly OptionWithLegacy<FileInfo?> s_appHostOption = new("--apphost", "--project", SharedCommandStrings.AppHostOptionDescription);
 
+    /// <summary>
+    /// Maps friendly command names to their backchannel equivalents with display metadata.
+    /// </summary>
+    private static readonly Dictionary<string, (string BackchannelCommand, string ProgressVerb, string BaseVerb, string PastTenseVerb)> s_wellKnownCommands = new(StringComparer.OrdinalIgnoreCase)
+    {
+        ["start"] = (KnownResourceCommands.StartCommand, "Starting", "start", "started"),
+        ["stop"] = (KnownResourceCommands.StopCommand, "Stopping", "stop", "stopped"),
+        ["restart"] = (KnownResourceCommands.RestartCommand, "Restarting", "restart", "restarted"),
+    };
+
     public ResourceCommand(
         IInteractionService interactionService,
         IAuxiliaryBackchannelMonitor backchannelMonitor,
@@ -41,7 +52,7 @@ public ResourceCommand(
         CliExecutionContext executionContext,
         ILogger<ResourceCommand> logger,
         AspireCliTelemetry telemetry)
-        : base("command", ResourceCommandStrings.CommandDescription, features, updateNotifier, executionContext, interactionService, telemetry)
+        : base("resource", ResourceCommandStrings.CommandDescription, features, updateNotifier, executionContext, interactionService, telemetry)
     {
         _interactionService = interactionService;
         _connectionResolver = new AppHostConnectionResolver(backchannelMonitor, interactionService, executionContext, logger);
@@ -71,6 +82,21 @@ protected override async Task<int> ExecuteAsync(ParseResult parseResult, Cancell
             return ExitCodeConstants.FailedToFindProject;
         }
 
+        // Map well-known friendly names (start/stop/restart) to their backchannel equivalents
+        if (s_wellKnownCommands.TryGetValue(commandName, out var knownCommand))
+        {
+            return await ResourceCommandHelper.ExecuteResourceCommandAsync(
+                result.Connection!,
+                _interactionService,
+                _logger,
+                resourceName,
+                knownCommand.BackchannelCommand,
+                knownCommand.ProgressVerb,
+                knownCommand.BaseVerb,
+                knownCommand.PastTenseVerb,
+                cancellationToken);
+        }
+
         return await ResourceCommandHelper.ExecuteGenericCommandAsync(
             result.Connection!,
             _interactionService,
diff --git a/src/Aspire.Cli/Commands/ResourceCommandBase.cs b/src/Aspire.Cli/Commands/ResourceCommandBase.cs
deleted file mode 100644
index 3a0484c2bc3..00000000000
--- a/src/Aspire.Cli/Commands/ResourceCommandBase.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.CommandLine;
-using System.Globalization;
-using Aspire.Cli.Backchannel;
-using Aspire.Cli.Configuration;
-using Aspire.Cli.Interaction;
-using Aspire.Cli.Resources;
-using Aspire.Cli.Telemetry;
-using Aspire.Cli.Utils;
-using Microsoft.Extensions.Logging;
-
-namespace Aspire.Cli.Commands;
-
-/// <summary>
-/// Base class for commands that execute resource lifecycle operations (start, restart, etc.).
-/// </summary>
-internal abstract class ResourceCommandBase : BaseCommand
-{
-    protected readonly AppHostConnectionResolver ConnectionResolver;
-    protected readonly ILogger Logger;
-
-    private readonly Argument<string> _resourceArgument;
-
-    protected static readonly OptionWithLegacy<FileInfo?> s_appHostOption = new("--apphost", "--project", SharedCommandStrings.AppHostOptionDescription);
-
-    /// <summary>
-    /// The resource command name to execute (e.g., KnownResourceCommands.StartCommand).
-    /// </summary>
-    protected abstract string CommandName { get; }
-
-    /// <summary>
-    /// The verb to display during progress (e.g., "Starting").
-    /// </summary>
-    protected abstract string ProgressVerb { get; }
-
-    /// <summary>
-    /// The base verb for error messages (e.g., "start").
-    /// </summary>
-    protected abstract string BaseVerb { get; }
-
-    /// <summary>
-    /// The past tense verb for success messages (e.g., "started").
-    /// </summary>
-    protected abstract string PastTenseVerb { get; }
-
-    /// <summary>
-    /// The description for the resource argument.
-    /// </summary>
-    protected abstract string ResourceArgumentDescription { get; }
-
-    protected ResourceCommandBase(
-        string name,
-        string description,
-        IInteractionService interactionService,
-        IAuxiliaryBackchannelMonitor backchannelMonitor,
-        IFeatures features,
-        ICliUpdateNotifier updateNotifier,
-        CliExecutionContext executionContext,
-        ILogger logger,
-        AspireCliTelemetry telemetry)
-        : base(name, description, features, updateNotifier, executionContext, interactionService, telemetry)
-    {
-        ConnectionResolver = new AppHostConnectionResolver(backchannelMonitor, interactionService, executionContext, logger);
-        Logger = logger;
-
-        _resourceArgument = new Argument<string>("resource")
-        {
-            Description = ResourceArgumentDescription
-        };
-
-        Arguments.Add(_resourceArgument);
-        Options.Add(s_appHostOption);
-    }
-
-    protected override async Task<int> ExecuteAsync(ParseResult parseResult, CancellationToken cancellationToken)
-    {
-        var resourceName = parseResult.GetValue(_resourceArgument)!;
-        var passedAppHostProjectFile = parseResult.GetValue(s_appHostOption);
-
-        var result = await ConnectionResolver.ResolveConnectionAsync(
-            passedAppHostProjectFile,
-            SharedCommandStrings.ScanningForRunningAppHosts,
-            string.Format(CultureInfo.CurrentCulture, SharedCommandStrings.SelectAppHost, ResourceCommandStrings.SelectAppHostAction),
-            SharedCommandStrings.AppHostNotRunning,
-            cancellationToken);
-
-        if (!result.Success)
-        {
-            InteractionService.DisplayError(result.ErrorMessage);
-            return ExitCodeConstants.FailedToFindProject;
-        }
-
-        return await ResourceCommandHelper.ExecuteResourceCommandAsync(
-            result.Connection!,
-            InteractionService,
-            Logger,
-            resourceName,
-            CommandName,
-            ProgressVerb,
-            BaseVerb,
-            PastTenseVerb,
-            cancellationToken);
-    }
-}
diff --git a/src/Aspire.Cli/Commands/RestartCommand.cs b/src/Aspire.Cli/Commands/RestartCommand.cs
deleted file mode 100644
index 9979d25241e..00000000000
--- a/src/Aspire.Cli/Commands/RestartCommand.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using Aspire.Cli.Backchannel;
-using Aspire.Cli.Configuration;
-using Aspire.Cli.Interaction;
-using Aspire.Cli.Resources;
-using Aspire.Cli.Telemetry;
-using Aspire.Cli.Utils;
-using Aspire.Hosting.ApplicationModel;
-using Microsoft.Extensions.Logging;
-
-namespace Aspire.Cli.Commands;
-
-internal sealed class RestartCommand : ResourceCommandBase
-{
-    internal override HelpGroup HelpGroup => HelpGroup.ResourceManagement;
-
-    protected override string CommandName => KnownResourceCommands.RestartCommand;
-    protected override string ProgressVerb => "Restarting";
-    protected override string BaseVerb => "restart";
-    protected override string PastTenseVerb => "restarted";
-    protected override string ResourceArgumentDescription => ResourceCommandStrings.RestartResourceArgumentDescription;
-
-    public RestartCommand(
-        IInteractionService interactionService,
-        IAuxiliaryBackchannelMonitor backchannelMonitor,
-        IFeatures features,
-        ICliUpdateNotifier updateNotifier,
-        CliExecutionContext executionContext,
-        ILogger<RestartCommand> logger,
-        AspireCliTelemetry telemetry)
-        : base("restart", ResourceCommandStrings.RestartDescription,
-               interactionService, backchannelMonitor, features, updateNotifier,
-               executionContext, logger, telemetry)
-    {
-    }
-}
diff --git a/src/Aspire.Cli/Commands/RootCommand.cs b/src/Aspire.Cli/Commands/RootCommand.cs
index 1b1148075fc..43fe3bfb7b6 100644
--- a/src/Aspire.Cli/Commands/RootCommand.cs
+++ b/src/Aspire.Cli/Commands/RootCommand.cs
@@ -112,7 +112,6 @@ public RootCommand(
         RunCommand runCommand,
         StopCommand stopCommand,
         StartCommand startCommand,
-        RestartCommand restartCommand,
         WaitCommand waitCommand,
         ResourceCommand commandCommand,
         PsCommand psCommand,
@@ -200,7 +199,6 @@ public RootCommand(
         Subcommands.Add(runCommand);
         Subcommands.Add(stopCommand);
         Subcommands.Add(startCommand);
-        Subcommands.Add(restartCommand);
         Subcommands.Add(waitCommand);
         Subcommands.Add(commandCommand);
         Subcommands.Add(psCommand);
diff --git a/src/Aspire.Cli/Commands/StartCommand.cs b/src/Aspire.Cli/Commands/StartCommand.cs
index 19e82971690..8fc1be7d9f8 100644
--- a/src/Aspire.Cli/Commands/StartCommand.cs
+++ b/src/Aspire.Cli/Commands/StartCommand.cs
@@ -2,32 +2,20 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.CommandLine;
-using System.Globalization;
-using Aspire.Cli.Backchannel;
 using Aspire.Cli.Configuration;
 using Aspire.Cli.Interaction;
 using Aspire.Cli.Resources;
 using Aspire.Cli.Telemetry;
 using Aspire.Cli.Utils;
-using Aspire.Hosting.ApplicationModel;
-using Microsoft.Extensions.Logging;
 
 namespace Aspire.Cli.Commands;
 
 internal sealed class StartCommand : BaseCommand
 {
-    internal override HelpGroup HelpGroup => HelpGroup.ResourceManagement;
+    internal override HelpGroup HelpGroup => HelpGroup.AppCommands;
 
-    private readonly IInteractionService _interactionService;
-    private readonly AppHostConnectionResolver _connectionResolver;
     private readonly AppHostLauncher _appHostLauncher;
-    private readonly ILogger<StartCommand> _logger;
-
-    private static readonly Argument<string?> s_resourceArgument = new("resource")
-    {
-        Description = ResourceCommandStrings.StartResourceArgumentDescription,
-        Arity = ArgumentArity.ZeroOrOne
-    };
+    private readonly IInteractionService _interactionService;
 
     private static readonly Option<bool> s_noBuildOption = new("--no-build")
     {
@@ -36,22 +24,17 @@ internal sealed class StartCommand : BaseCommand
 
     public StartCommand(
         IInteractionService interactionService,
-        IAuxiliaryBackchannelMonitor backchannelMonitor,
         IFeatures features,
         ICliUpdateNotifier updateNotifier,
         CliExecutionContext executionContext,
-        ILogger<StartCommand> logger,
         AspireCliTelemetry telemetry,
         AppHostLauncher appHostLauncher)
-        : base("start", ResourceCommandStrings.StartDescription,
+        : base("start", StartCommandStrings.Description,
                features, updateNotifier, executionContext, interactionService, telemetry)
     {
         _interactionService = interactionService;
-        _connectionResolver = new AppHostConnectionResolver(backchannelMonitor, interactionService, executionContext, logger);
         _appHostLauncher = appHostLauncher;
-        _logger = logger;
 
-        Arguments.Add(s_resourceArgument);
         Options.Add(s_noBuildOption);
         AppHostLauncher.AddLaunchOptions(this);
 
@@ -60,30 +43,10 @@ public StartCommand(
 
     protected override async Task<int> ExecuteAsync(ParseResult parseResult, CancellationToken cancellationToken)
     {
-        var resourceName = parseResult.GetValue(s_resourceArgument);
         var passedAppHostProjectFile = parseResult.GetValue(AppHostLauncher.s_appHostOption);
         var format = parseResult.GetValue(AppHostLauncher.s_formatOption);
         var isolated = parseResult.GetValue(AppHostLauncher.s_isolatedOption);
 
-        // If a resource name is provided, start that specific resource
-        if (!string.IsNullOrEmpty(resourceName))
-        {
-            if (format == OutputFormat.Json)
-            {
-                _interactionService.DisplayError(string.Format(CultureInfo.CurrentCulture, ResourceCommandStrings.OptionNotValidWithResource, "--format"));
-                return ExitCodeConstants.InvalidCommand;
-            }
-
-            if (isolated)
-            {
-                _interactionService.DisplayError(string.Format(CultureInfo.CurrentCulture, ResourceCommandStrings.OptionNotValidWithResource, "--isolated"));
-                return ExitCodeConstants.InvalidCommand;
-            }
-
-            return await StartResourceAsync(passedAppHostProjectFile, resourceName, cancellationToken);
-        }
-
-        // No resource specified — start the AppHost in detached mode
         var noBuild = parseResult.GetValue(s_noBuildOption);
         var isExtensionHost = ExtensionHelper.IsExtensionHost(_interactionService, out _, out _);
         var globalArgs = RootCommand.GetChildProcessArgs(parseResult);
@@ -103,31 +66,4 @@ protected override async Task<int> ExecuteAsync(ParseResult parseResult, Cancell
             additionalArgs,
             cancellationToken);
     }
-
-    private async Task<int> StartResourceAsync(FileInfo? passedAppHostProjectFile, string resourceName, CancellationToken cancellationToken)
-    {
-        var result = await _connectionResolver.ResolveConnectionAsync(
-            passedAppHostProjectFile,
-            SharedCommandStrings.ScanningForRunningAppHosts,
-            string.Format(CultureInfo.CurrentCulture, SharedCommandStrings.SelectAppHost, ResourceCommandStrings.SelectAppHostAction),
-            SharedCommandStrings.AppHostNotRunning,
-            cancellationToken);
-
-        if (!result.Success)
-        {
-            _interactionService.DisplayError(result.ErrorMessage);
-            return ExitCodeConstants.FailedToFindProject;
-        }
-
-        return await ResourceCommandHelper.ExecuteResourceCommandAsync(
-            result.Connection!,
-            _interactionService,
-            _logger,
-            resourceName,
-            KnownResourceCommands.StartCommand,
-            "Starting",
-            "start",
-            "started",
-            cancellationToken);
-    }
 }
diff --git a/src/Aspire.Cli/Commands/StopCommand.cs b/src/Aspire.Cli/Commands/StopCommand.cs
index 2123fb3eea5..9969d0c22a2 100644
--- a/src/Aspire.Cli/Commands/StopCommand.cs
+++ b/src/Aspire.Cli/Commands/StopCommand.cs
@@ -11,7 +11,6 @@
 using Aspire.Cli.Resources;
 using Aspire.Cli.Telemetry;
 using Aspire.Cli.Utils;
-using Aspire.Hosting.ApplicationModel;
 using Microsoft.Extensions.Logging;
 
 namespace Aspire.Cli.Commands;
@@ -26,12 +25,6 @@ internal sealed class StopCommand : BaseCommand
     private readonly ICliHostEnvironment _hostEnvironment;
     private readonly TimeProvider _timeProvider;
 
-    private static readonly Argument<string?> s_resourceArgument = new("resource")
-    {
-        Description = "The name of the resource to stop. If not specified, stops the entire AppHost.",
-        Arity = ArgumentArity.ZeroOrOne
-    };
-
     private static readonly OptionWithLegacy<FileInfo?> s_appHostOption = new("--apphost", "--project", StopCommandStrings.ProjectArgumentDescription);
 
     private static readonly Option<bool> s_allOption = new("--all")
@@ -57,14 +50,12 @@ public StopCommand(
         _logger = logger;
         _timeProvider = timeProvider ?? TimeProvider.System;
 
-        Arguments.Add(s_resourceArgument);
         Options.Add(s_appHostOption);
         Options.Add(s_allOption);
     }
 
     protected override async Task<int> ExecuteAsync(ParseResult parseResult, CancellationToken cancellationToken)
     {
-        var resourceName = parseResult.GetValue(s_resourceArgument);
         var passedAppHostProjectFile = parseResult.GetValue(s_appHostOption);
         var stopAll = parseResult.GetValue(s_allOption);
 
@@ -75,13 +66,6 @@ protected override async Task<int> ExecuteAsync(ParseResult parseResult, Cancell
             return ExitCodeConstants.FailedToFindProject;
         }
 
-        // Validate mutual exclusivity of --all and resource argument
-        if (stopAll && !string.IsNullOrEmpty(resourceName))
-        {
-            _interactionService.DisplayError(string.Format(CultureInfo.InvariantCulture, StopCommandStrings.AllAndResourceMutuallyExclusive, s_allOption.Name));
-            return ExitCodeConstants.FailedToFindProject;
-        }
-
         // Handle --all: stop all running AppHosts
         if (stopAll)
         {
@@ -91,22 +75,22 @@ protected override async Task<int> ExecuteAsync(ParseResult parseResult, Cancell
         // In non-interactive mode, try to auto-resolve without prompting
         if (!_hostEnvironment.SupportsInteractiveInput)
         {
-            return await ExecuteNonInteractiveAsync(passedAppHostProjectFile, resourceName, cancellationToken);
+            return await ExecuteNonInteractiveAsync(passedAppHostProjectFile, cancellationToken);
         }
 
-        return await ExecuteInteractiveAsync(passedAppHostProjectFile, resourceName, cancellationToken);
+        return await ExecuteInteractiveAsync(passedAppHostProjectFile, cancellationToken);
     }
 
     /// <summary>
     /// Handles the stop command in non-interactive mode by auto-resolving a single AppHost
     /// or returning an error when multiple AppHosts are running.
     /// </summary>
-    private async Task<int> ExecuteNonInteractiveAsync(FileInfo? passedAppHostProjectFile, string? resourceName, CancellationToken cancellationToken)
+    private async Task<int> ExecuteNonInteractiveAsync(FileInfo? passedAppHostProjectFile, CancellationToken cancellationToken)
     {
         // If --project is specified, use the standard resolver (no prompting needed)
         if (passedAppHostProjectFile is not null)
         {
-            return await ExecuteInteractiveAsync(passedAppHostProjectFile, resourceName, cancellationToken);
+            return await ExecuteInteractiveAsync(passedAppHostProjectFile, cancellationToken);
         }
 
         // Scan for all running AppHosts
@@ -128,10 +112,6 @@ private async Task<int> ExecuteNonInteractiveAsync(FileInfo? passedAppHostProjec
         if (inScopeConnections.Length == 1)
         {
             var connection = inScopeConnections[0].Connection!;
-            if (!string.IsNullOrEmpty(resourceName))
-            {
-                return await StopResourceAsync(connection, resourceName, cancellationToken);
-            }
             return await StopAppHostAsync(connection, cancellationToken);
         }
 
@@ -143,7 +123,7 @@ private async Task<int> ExecuteNonInteractiveAsync(FileInfo? passedAppHostProjec
     /// <summary>
     /// Handles the stop command in interactive mode, prompting the user to select an AppHost if multiple are running.
     /// </summary>
-    private async Task<int> ExecuteInteractiveAsync(FileInfo? passedAppHostProjectFile, string? resourceName, CancellationToken cancellationToken)
+    private async Task<int> ExecuteInteractiveAsync(FileInfo? passedAppHostProjectFile, CancellationToken cancellationToken)
     {
         var result = await _connectionResolver.ResolveConnectionAsync(
             passedAppHostProjectFile,
@@ -158,14 +138,7 @@ private async Task<int> ExecuteInteractiveAsync(FileInfo? passedAppHostProjectFi
             return ExitCodeConstants.Success;
         }
 
-        var selectedConnection = result.Connection!;
-
-        if (!string.IsNullOrEmpty(resourceName))
-        {
-            return await StopResourceAsync(selectedConnection, resourceName, cancellationToken);
-        }
-
-        return await StopAppHostAsync(selectedConnection, cancellationToken);
+        return await StopAppHostAsync(result.Connection!, cancellationToken);
     }
 
     /// <summary>
@@ -337,20 +310,4 @@ private static void SendStopSignal(int pid)
         }
     }
 
-    /// <summary>
-    /// Stops a specific resource instead of the entire AppHost.
-    /// </summary>
-    private Task<int> StopResourceAsync(IAppHostAuxiliaryBackchannel connection, string resourceName, CancellationToken cancellationToken)
-    {
-        return ResourceCommandHelper.ExecuteResourceCommandAsync(
-            connection,
-            _interactionService,
-            _logger,
-            resourceName,
-            KnownResourceCommands.StopCommand,
-            "Stopping",
-            "stop",
-            "stopped",
-            cancellationToken);
-    }
 }
diff --git a/src/Aspire.Cli/Program.cs b/src/Aspire.Cli/Program.cs
index 1a52021b572..14720b4450f 100644
--- a/src/Aspire.Cli/Program.cs
+++ b/src/Aspire.Cli/Program.cs
@@ -371,7 +371,6 @@ internal static async Task<IHost> BuildApplicationAsync(string[] args, Dictionar
         builder.Services.AddTransient<RunCommand>();
         builder.Services.AddTransient<StopCommand>();
         builder.Services.AddTransient<StartCommand>();
-        builder.Services.AddTransient<RestartCommand>();
         builder.Services.AddTransient<WaitCommand>();
         builder.Services.AddTransient<ResourceCommand>();
         builder.Services.AddTransient<PsCommand>();
diff --git a/src/Aspire.Cli/Resources/ResourceCommandStrings.Designer.cs b/src/Aspire.Cli/Resources/ResourceCommandStrings.Designer.cs
index cf4c27677f3..a8b53222983 100644
--- a/src/Aspire.Cli/Resources/ResourceCommandStrings.Designer.cs
+++ b/src/Aspire.Cli/Resources/ResourceCommandStrings.Designer.cs
@@ -51,30 +51,6 @@ internal static string SelectAppHostAction {
             }
         }
 
-        internal static string StartDescription {
-            get {
-                return ResourceManager.GetString("StartDescription", resourceCulture);
-            }
-        }
-
-        internal static string StartResourceArgumentDescription {
-            get {
-                return ResourceManager.GetString("StartResourceArgumentDescription", resourceCulture);
-            }
-        }
-
-        internal static string RestartDescription {
-            get {
-                return ResourceManager.GetString("RestartDescription", resourceCulture);
-            }
-        }
-
-        internal static string RestartResourceArgumentDescription {
-            get {
-                return ResourceManager.GetString("RestartResourceArgumentDescription", resourceCulture);
-            }
-        }
-
         internal static string CommandDescription {
             get {
                 return ResourceManager.GetString("CommandDescription", resourceCulture);
@@ -93,10 +69,5 @@ internal static string CommandNameArgumentDescription {
             }
         }
 
-        internal static string OptionNotValidWithResource {
-            get {
-                return ResourceManager.GetString("OptionNotValidWithResource", resourceCulture);
-            }
-        }
     }
 }
diff --git a/src/Aspire.Cli/Resources/ResourceCommandStrings.resx b/src/Aspire.Cli/Resources/ResourceCommandStrings.resx
index 12004c39c05..cc889718167 100644
--- a/src/Aspire.Cli/Resources/ResourceCommandStrings.resx
+++ b/src/Aspire.Cli/Resources/ResourceCommandStrings.resx
@@ -61,28 +61,13 @@
   <data name="SelectAppHostAction" xml:space="preserve">
     <value>connect to</value>
   </data>
-  <data name="StartDescription" xml:space="preserve">
-    <value>Start an apphost in the background, or start a stopped resource.</value>
-  </data>
-  <data name="StartResourceArgumentDescription" xml:space="preserve">
-    <value>The name of the resource to start. If not specified, starts the AppHost in the background.</value>
-  </data>
-  <data name="RestartDescription" xml:space="preserve">
-    <value>Restart a running resource.</value>
-  </data>
-  <data name="RestartResourceArgumentDescription" xml:space="preserve">
-    <value>The name of the resource to restart.</value>
-  </data>
   <data name="CommandDescription" xml:space="preserve">
-    <value>Execute a command on a resource.</value>
+    <value>Execute a command on a resource (e.g. start, stop, restart).</value>
   </data>
   <data name="CommandResourceArgumentDescription" xml:space="preserve">
     <value>The name of the resource to execute the command on.</value>
   </data>
   <data name="CommandNameArgumentDescription" xml:space="preserve">
-    <value>The name of the command to execute.</value>
-  </data>
-  <data name="OptionNotValidWithResource" xml:space="preserve">
-    <value>The '{0}' option is not valid when starting a resource.</value>
+    <value>The name of the command to execute (e.g. start, stop, restart).</value>
   </data>
 </root>
diff --git a/src/Aspire.Cli/Resources/StartCommandStrings.Designer.cs b/src/Aspire.Cli/Resources/StartCommandStrings.Designer.cs
new file mode 100644
index 00000000000..3c9d761e05f
--- /dev/null
+++ b/src/Aspire.Cli/Resources/StartCommandStrings.Designer.cs
@@ -0,0 +1,55 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Aspire.Cli.Resources {
+    using System;
+
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class StartCommandStrings {
+
+        private static System.Resources.ResourceManager resourceMan;
+
+        private static System.Globalization.CultureInfo resourceCulture;
+
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal StartCommandStrings() {
+        }
+
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.Equals(null, resourceMan)) {
+                    System.Resources.ResourceManager temp = new System.Resources.ResourceManager("Aspire.Cli.Resources.StartCommandStrings", typeof(StartCommandStrings).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+
+        internal static string Description {
+            get {
+                return ResourceManager.GetString("Description", resourceCulture);
+            }
+        }
+
+    }
+}
diff --git a/src/Aspire.Cli/Resources/StartCommandStrings.resx b/src/Aspire.Cli/Resources/StartCommandStrings.resx
new file mode 100644
index 00000000000..adc1fd53064
--- /dev/null
+++ b/src/Aspire.Cli/Resources/StartCommandStrings.resx
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="0" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Description" xml:space="preserve">
+    <value>Start an apphost in the background.</value>
+  </data>
+</root>
diff --git a/src/Aspire.Cli/Resources/StopCommandStrings.Designer.cs b/src/Aspire.Cli/Resources/StopCommandStrings.Designer.cs
index c4e6da1a2d1..453094bd7bf 100644
--- a/src/Aspire.Cli/Resources/StopCommandStrings.Designer.cs
+++ b/src/Aspire.Cli/Resources/StopCommandStrings.Designer.cs
@@ -105,10 +105,5 @@ public static string AllAndProjectMutuallyExclusive {
             }
         }
 
-        public static string AllAndResourceMutuallyExclusive {
-            get {
-                return ResourceManager.GetString("AllAndResourceMutuallyExclusive", resourceCulture);
-            }
-        }
     }
 }
diff --git a/src/Aspire.Cli/Resources/StopCommandStrings.resx b/src/Aspire.Cli/Resources/StopCommandStrings.resx
index 77ab8659ac2..ac2fed6a225 100644
--- a/src/Aspire.Cli/Resources/StopCommandStrings.resx
+++ b/src/Aspire.Cli/Resources/StopCommandStrings.resx
@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="Description" xml:space="preserve">
-    <value>Stop a running apphost or the specified resource.</value>
+    <value>Stop a running apphost.</value>
   </data>
   <data name="ProjectArgumentDescription" xml:space="preserve">
     <value>The path to the Aspire AppHost project file.</value>
@@ -147,7 +147,4 @@
   <data name="AllAndProjectMutuallyExclusive" xml:space="preserve">
     <value>The {0} and {1} options cannot be used together.</value>
   </data>
-  <data name="AllAndResourceMutuallyExclusive" xml:space="preserve">
-    <value>The {0} option cannot be used with a resource argument.</value>
-  </data>
 </root>
diff --git a/src/Aspire.Cli/Resources/xlf/ResourceCommandStrings.cs.xlf b/src/Aspire.Cli/Resources/xlf/ResourceCommandStrings.cs.xlf
index 73bdcd553dc..a33d68d0fc9 100644
--- a/src/Aspire.Cli/Resources/xlf/ResourceCommandStrings.cs.xlf
+++ b/src/Aspire.Cli/Resources/xlf/ResourceCommandStrings.cs.xlf
@@ -3,12 +3,12 @@
   <file datatype="xml" source-language="en" target-language="cs" original="../ResourceCommandStrings.resx">
     <body>
       <trans-unit id="CommandDescription">
-        <source>Execute a command on a resource.</source>
+        <source>Execute a command on a resource (e.g. start, stop, restart).</source>
         <target state="translated">Spusťte příkaz pro prostředek.</target>
         <note />
       </trans-unit>
       <trans-unit id="CommandNameArgumentDescription">
-        <source>The name of the command to execute.</source>
+        <source>The name of the command to execute (e.g. start, stop, restart).</source>
         <target state="translated">Název příkazu, který se má spustit</target>
         <note />
       </trans-unit>
@@ -17,36 +17,11 @@
         <target state="translated">Název prostředku, na kterém se má příkaz provést</target>
         <note />
       </trans-unit>
-      <trans-unit id="OptionNotValidWithResource">
-        <source>The '{0}' option is not valid when starting a resource.</source>
-        <target state="new">The '{0}' option is not valid when starting a resource.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="RestartDescription">
-        <source>Restart a running resource.</source>
-        <target state="translated">Restartujte spuštěný prostředek.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="RestartResourceArgumentDescription">
-        <source>The name of the resource to restart.</source>
-        <target state="translated">Název prostředku, který se má restartovat</target>
-        <note />
-      </trans-unit>
       <trans-unit id="SelectAppHostAction">
         <source>connect to</source>
         <target state="new">connect to</target>
         <note />
       </trans-unit>
-      <trans-unit id="StartDescription">
-        <source>Start an apphost in the background, or start a stopped resource.</source>
-        <target state="translated">Spusťte zastavený prostředek.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="StartResourceArgumentDescription">
-        <source>The name of the resource to start. If not specified, starts the AppHost in the background.</source>
-        <target state="translated">Název prostředku, který se má spustit</target>
-        <note />
-      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Aspire.Cli/Resources/xlf/ResourceCommandStrings.de.xlf b/src/Aspire.Cli/Resources/xlf/ResourceCommandStrings.de.xlf
index d3c7fba709b..f45a6f53b27 100644
--- a/src/Aspire.Cli/Resources/xlf/ResourceCommandStrings.de.xlf
+++ b/src/Aspire.Cli/Resources/xlf/ResourceCommandStrings.de.xlf
@@ -3,12 +3,12 @@
   <file datatype="xml" source-language="en" target-language="de" original="../ResourceCommandStrings.resx">
     <body>
       <trans-unit id="CommandDescription">
-        <source>Execute a command on a resource.</source>
+        <source>Execute a command on a resource (e.g. start, stop, restart).</source>
         <target state="translated">Führen Sie einen Befehl auf einer Ressource aus.</target>
         <note />
       </trans-unit>
       <trans-unit id="CommandNameArgumentDescription">
-        <source>The name of the command to execute.</source>
+        <source>The name of the command to execute (e.g. start, stop, restart).</source>
         <target state="translated">Der Name des auszuführenden Befehls.</target>
         <note />
       </trans-unit>
@@ -17,36 +17,11 @@
         <target state="translated">Der Name der Ressource, für die der Befehl ausgeführt werden soll.</target>
         <note />
       </trans-unit>
-      <trans-unit id="OptionNotValidWithResource">
-        <source>The '{0}' option is not valid when starting a resource.</source>
-        <target state="new">The '{0}' option is not valid when starting a resource.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="RestartDescription">
-        <source>Restart a running resource.</source>
-        <target state="translated">Starten Sie eine laufende Ressource neu.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="RestartResourceArgumentDescription">
-        <source>The name of the resource to restart.</source>
-        <target state="translated">Der Name der Ressource, die neu gestartet werden soll.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="SelectAppHostAction">
         <source>connect to</source>
         <target state="new">connect to</target>
         <note />
       </trans-unit>
-      <trans-unit id="StartDescription">
-        <source>Start an apphost in the background, or start a stopped resource.</source>
-        <target state="translated">Starten Sie eine gestoppte Ressource.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="StartResourceArgumentDescription">
-        <source>The name of the resource to start. If not specified, starts the AppHost in the background.</source>
-        <target state="translated">Der Name der Ressource, die gestartet werden soll.</target>
-        <note />
-      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Aspire.Cli/Resources/xlf/ResourceCommandStrings.es.xlf b/src/Aspire.Cli/Resources/xlf/ResourceCommandStrings.es.xlf
index 1b2e4fe4b0c..9dbb8134797 100644
--- a/src/Aspire.Cli/Resources/xlf/ResourceCommandStrings.es.xlf
+++ b/src/Aspire.Cli/Resources/xlf/ResourceCommandStrings.es.xlf
@@ -3,12 +3,12 @@
   <file datatype="xml" source-language="en" target-language="es" original="../ResourceCommandStrings.resx">
     <body>
       <trans-unit id="CommandDescription">
-        <source>Execute a command on a resource.</source>
+        <source>Execute a command on a resource (e.g. start, stop, restart).</source>
         <target state="translated">Ejecute un comando en un recurso.</target>
         <note />
       </trans-unit>
       <trans-unit id="CommandNameArgumentDescription">
-        <source>The name of the command to execute.</source>
+        <source>The name of the command to execute (e.g. start, stop, restart).</source>
         <target state="translated">Nombre del comando que se va a ejecutar.</target>
         <note />
       </trans-unit>
@@ -17,36 +17,11 @@
         <target state="translated">El nombre del recurso de destino en el que se ejecutará el comando.</target>
         <note />
       </trans-unit>
-      <trans-unit id="OptionNotValidWithResource">
-        <source>The '{0}' option is not valid when starting a resource.</source>
-        <target state="new">The '{0}' option is not valid when starting a resource.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="RestartDescription">
-        <source>Restart a running resource.</source>
-        <target state="translated">Reinicie un recurso en ejecución.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="RestartResourceArgumentDescription">
-        <source>The name of the resource to restart.</source>
-        <target state="translated">Nombre del recurso que se va a reiniciar.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="SelectAppHostAction">
         <source>connect to</source>
         <target state="new">connect to</target>
         <note />
       </trans-unit>
-      <trans-unit id="StartDescription">
-        <source>Start an apphost in the background, or start a stopped resource.</source>
-        <target state="translated">Inicie un recurso detenido.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="StartResourceArgumentDescription">
-        <source>The name of the resource to start. If not specified, starts the AppHost in the background.</source>
-        <target state="translated">Nombre del recurso que se va a iniciar.</target>
-        <note />
-      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Aspire.Cli/Resources/xlf/ResourceCommandStrings.fr.xlf b/src/Aspire.Cli/Resources/xlf/ResourceCommandStrings.fr.xlf
index 70b7be80431..24a6d646115 100644
--- a/src/Aspire.Cli/Resources/xlf/ResourceCommandStrings.fr.xlf
+++ b/src/Aspire.Cli/Resources/xlf/ResourceCommandStrings.fr.xlf
@@ -3,12 +3,12 @@
   <file datatype="xml" source-language="en" target-language="fr" original="../ResourceCommandStrings.resx">
     <body>
       <trans-unit id="CommandDescription">
-        <source>Execute a command on a resource.</source>
+        <source>Execute a command on a resource (e.g. start, stop, restart).</source>
         <target state="translated">Exécuter une commande sur une ressource.</target>
         <note />
       </trans-unit>
       <trans-unit id="CommandNameArgumentDescription">
-        <source>The name of the command to execute.</source>
+        <source>The name of the command to execute (e.g. start, stop, restart).</source>
         <target state="translated">Le nom de la commande à exécuter.</target>
         <note />
       </trans-unit>
@@ -17,36 +17,11 @@
         <target state="translated">Nom de la ressource sur laquelle exécuter la commande.</target>
         <note />
       </trans-unit>
-      <trans-unit id="OptionNotValidWithResource">
-        <source>The '{0}' option is not valid when starting a resource.</source>
-        <target state="new">The '{0}' option is not valid when starting a resource.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="RestartDescription">
-        <source>Restart a running resource.</source>
-        <target state="translated">Redémarrer une ressource en cours d’exécution.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="RestartResourceArgumentDescription">
-        <source>The name of the resource to restart.</source>
-        <target state="translated">Le nom de la ressource à redémarrer.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="SelectAppHostAction">
         <source>connect to</source>
         <target state="new">connect to</target>
         <note />
       </trans-unit>
-      <trans-unit id="StartDescription">
-        <source>Start an apphost in the background, or start a stopped resource.</source>
-        <target state="translated">Démarrer une ressource arrêtée.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="StartResourceArgumentDescription">
-        <source>The name of the resource to start. If not specified, starts the AppHost in the background.</source>
-        <target state="translated">Le nom de la ressource à commencer.</target>
-        <note />
-      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Aspire.Cli/Resources/xlf/ResourceCommandStrings.it.xlf b/src/Aspire.Cli/Resources/xlf/ResourceCommandStrings.it.xlf
index d69449f3e5e..607d2b38095 100644
--- a/src/Aspire.Cli/Resources/xlf/ResourceCommandStrings.it.xlf
+++ b/src/Aspire.Cli/Resources/xlf/ResourceCommandStrings.it.xlf
@@ -3,12 +3,12 @@
   <file datatype="xml" source-language="en" target-language="it" original="../ResourceCommandStrings.resx">
     <body>
       <trans-unit id="CommandDescription">
-        <source>Execute a command on a resource.</source>
+        <source>Execute a command on a resource (e.g. start, stop, restart).</source>
         <target state="translated">Eseguire un comando su una risorsa.</target>
         <note />
       </trans-unit>
       <trans-unit id="CommandNameArgumentDescription">
-        <source>The name of the command to execute.</source>
+        <source>The name of the command to execute (e.g. start, stop, restart).</source>
         <target state="translated">Nome del comando da eseguire.</target>
         <note />
       </trans-unit>
@@ -17,36 +17,11 @@
         <target state="translated">Nome della risorsa di destinazione rispetto al quale eseguire il comando.</target>
         <note />
       </trans-unit>
-      <trans-unit id="OptionNotValidWithResource">
-        <source>The '{0}' option is not valid when starting a resource.</source>
-        <target state="new">The '{0}' option is not valid when starting a resource.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="RestartDescription">
-        <source>Restart a running resource.</source>
-        <target state="translated">Riavviare una risorsa in esecuzione.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="RestartResourceArgumentDescription">
-        <source>The name of the resource to restart.</source>
-        <target state="translated">Nome della risorsa da riavviare.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="SelectAppHostAction">
         <source>connect to</source>
         <target state="new">connect to</target>
         <note />
       </trans-unit>
-      <trans-unit id="StartDescription">
-        <source>Start an apphost in the background, or start a stopped resource.</source>
-        <target state="translated">Avviare una risorsa arrestata.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="StartResourceArgumentDescription">
-        <source>The name of the resource to start. If not specified, starts the AppHost in the background.</source>
-        <target state="translated">Nome della risorsa da avviare.</target>
-        <note />
-      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Aspire.Cli/Resources/xlf/ResourceCommandStrings.ja.xlf b/src/Aspire.Cli/Resources/xlf/ResourceCommandStrings.ja.xlf
index cb5b024e9c7..1911bb6937f 100644
--- a/src/Aspire.Cli/Resources/xlf/ResourceCommandStrings.ja.xlf
+++ b/src/Aspire.Cli/Resources/xlf/ResourceCommandStrings.ja.xlf
@@ -3,12 +3,12 @@
   <file datatype="xml" source-language="en" target-language="ja" original="../ResourceCommandStrings.resx">
     <body>
       <trans-unit id="CommandDescription">
-        <source>Execute a command on a resource.</source>
+        <source>Execute a command on a resource (e.g. start, stop, restart).</source>
         <target state="translated">リソースでコマンドを実行します。</target>
         <note />
       </trans-unit>
       <trans-unit id="CommandNameArgumentDescription">
-        <source>The name of the command to execute.</source>
+        <source>The name of the command to execute (e.g. start, stop, restart).</source>
         <target state="translated">実行するコマンドの名前。</target>
         <note />
       </trans-unit>
@@ -17,36 +17,11 @@
         <target state="translated">コマンドを実行する対象のリソースの名前。</target>
         <note />
       </trans-unit>
-      <trans-unit id="OptionNotValidWithResource">
-        <source>The '{0}' option is not valid when starting a resource.</source>
-        <target state="new">The '{0}' option is not valid when starting a resource.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="RestartDescription">
-        <source>Restart a running resource.</source>
-        <target state="translated">実行中のリソースを再起動します。</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="RestartResourceArgumentDescription">
-        <source>The name of the resource to restart.</source>
-        <target state="translated">再起動するリソースの名前。</target>
-        <note />
-      </trans-unit>
       <trans-unit id="SelectAppHostAction">
         <source>connect to</source>
         <target state="new">connect to</target>
         <note />
       </trans-unit>
-      <trans-unit id="StartDescription">
-        <source>Start an apphost in the background, or start a stopped resource.</source>
-        <target state="translated">停止しているリソースを開始します。</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="StartResourceArgumentDescription">
-        <source>The name of the resource to start. If not specified, starts the AppHost in the background.</source>
-        <target state="translated">開始するリソースの名前。</target>
-        <note />
-      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Aspire.Cli/Resources/xlf/ResourceCommandStrings.ko.xlf b/src/Aspire.Cli/Resources/xlf/ResourceCommandStrings.ko.xlf
index ffd945c2525..af92d629efd 100644
--- a/src/Aspire.Cli/Resources/xlf/ResourceCommandStrings.ko.xlf
+++ b/src/Aspire.Cli/Resources/xlf/ResourceCommandStrings.ko.xlf
@@ -3,12 +3,12 @@
   <file datatype="xml" source-language="en" target-language="ko" original="../ResourceCommandStrings.resx">
     <body>
       <trans-unit id="CommandDescription">
-        <source>Execute a command on a resource.</source>
+        <source>Execute a command on a resource (e.g. start, stop, restart).</source>
         <target state="translated">리소스에서 명령을 실행합니다.</target>
         <note />
       </trans-unit>
       <trans-unit id="CommandNameArgumentDescription">
-        <source>The name of the command to execute.</source>
+        <source>The name of the command to execute (e.g. start, stop, restart).</source>
         <target state="translated">실행할 명령의 이름입니다.</target>
         <note />
       </trans-unit>
@@ -17,36 +17,11 @@
         <target state="translated">명령을 실행할 대상 리소스의 이름입니다.</target>
         <note />
       </trans-unit>
-      <trans-unit id="OptionNotValidWithResource">
-        <source>The '{0}' option is not valid when starting a resource.</source>
-        <target state="new">The '{0}' option is not valid when starting a resource.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="RestartDescription">
-        <source>Restart a running resource.</source>
-        <target state="translated">실행 중인 리소스를 다시 시작합니다.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="RestartResourceArgumentDescription">
-        <source>The name of the resource to restart.</source>
-        <target state="translated">다시 시작할 리소스의 이름입니다.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="SelectAppHostAction">
         <source>connect to</source>
         <target state="new">connect to</target>
         <note />
       </trans-unit>
-      <trans-unit id="StartDescription">
-        <source>Start an apphost in the background, or start a stopped resource.</source>
-        <target state="translated">중지된 리소스를 시작합니다.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="StartResourceArgumentDescription">
-        <source>The name of the resource to start. If not specified, starts the AppHost in the background.</source>
-        <target state="translated">시작할 리소스의 이름입니다.</target>
-        <note />
-      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Aspire.Cli/Resources/xlf/ResourceCommandStrings.pl.xlf b/src/Aspire.Cli/Resources/xlf/ResourceCommandStrings.pl.xlf
index 7661fc8b71b..1e3f31ad1a4 100644
--- a/src/Aspire.Cli/Resources/xlf/ResourceCommandStrings.pl.xlf
+++ b/src/Aspire.Cli/Resources/xlf/ResourceCommandStrings.pl.xlf
@@ -3,12 +3,12 @@
   <file datatype="xml" source-language="en" target-language="pl" original="../ResourceCommandStrings.resx">
     <body>
       <trans-unit id="CommandDescription">
-        <source>Execute a command on a resource.</source>
+        <source>Execute a command on a resource (e.g. start, stop, restart).</source>
         <target state="translated">Wykonaj polecenie dla zasobu.</target>
         <note />
       </trans-unit>
       <trans-unit id="CommandNameArgumentDescription">
-        <source>The name of the command to execute.</source>
+        <source>The name of the command to execute (e.g. start, stop, restart).</source>
         <target state="translated">Nazwa polecenia do wykonania.</target>
         <note />
       </trans-unit>
@@ -17,36 +17,11 @@
         <target state="translated">Nazwa zasobu, na którym ma zostać wykonane polecenie.</target>
         <note />
       </trans-unit>
-      <trans-unit id="OptionNotValidWithResource">
-        <source>The '{0}' option is not valid when starting a resource.</source>
-        <target state="new">The '{0}' option is not valid when starting a resource.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="RestartDescription">
-        <source>Restart a running resource.</source>
-        <target state="translated">Uruchom ponownie uruchomiony zasób.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="RestartResourceArgumentDescription">
-        <source>The name of the resource to restart.</source>
-        <target state="translated">Nazwa zasobu do ponownego uruchomienia.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="SelectAppHostAction">
         <source>connect to</source>
         <target state="new">connect to</target>
         <note />
       </trans-unit>
-      <trans-unit id="StartDescription">
-        <source>Start an apphost in the background, or start a stopped resource.</source>
-        <target state="translated">Uruchom zatrzymany zasób.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="StartResourceArgumentDescription">
-        <source>The name of the resource to start. If not specified, starts the AppHost in the background.</source>
-        <target state="translated">Nazwa zasobu do uruchomienia.</target>
-        <note />
-      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Aspire.Cli/Resources/xlf/ResourceCommandStrings.pt-BR.xlf b/src/Aspire.Cli/Resources/xlf/ResourceCommandStrings.pt-BR.xlf
index 626d0e685d3..07914dd8374 100644
--- a/src/Aspire.Cli/Resources/xlf/ResourceCommandStrings.pt-BR.xlf
+++ b/src/Aspire.Cli/Resources/xlf/ResourceCommandStrings.pt-BR.xlf
@@ -3,12 +3,12 @@
   <file datatype="xml" source-language="en" target-language="pt-BR" original="../ResourceCommandStrings.resx">
     <body>
       <trans-unit id="CommandDescription">
-        <source>Execute a command on a resource.</source>
+        <source>Execute a command on a resource (e.g. start, stop, restart).</source>
         <target state="translated">Execute um comando em um recurso.</target>
         <note />
       </trans-unit>
       <trans-unit id="CommandNameArgumentDescription">
-        <source>The name of the command to execute.</source>
+        <source>The name of the command to execute (e.g. start, stop, restart).</source>
         <target state="translated">O nome do comando a ser executado.</target>
         <note />
       </trans-unit>
@@ -17,36 +17,11 @@
         <target state="translated">O nome do recurso no qual executar o comando.</target>
         <note />
       </trans-unit>
-      <trans-unit id="OptionNotValidWithResource">
-        <source>The '{0}' option is not valid when starting a resource.</source>
-        <target state="new">The '{0}' option is not valid when starting a resource.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="RestartDescription">
-        <source>Restart a running resource.</source>
-        <target state="translated">Reinicie um recurso em execução.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="RestartResourceArgumentDescription">
-        <source>The name of the resource to restart.</source>
-        <target state="translated">O nome do recurso a ser reiniciado.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="SelectAppHostAction">
         <source>connect to</source>
         <target state="new">connect to</target>
         <note />
       </trans-unit>
-      <trans-unit id="StartDescription">
-        <source>Start an apphost in the background, or start a stopped resource.</source>
-        <target state="translated">Inicie um recurso parado.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="StartResourceArgumentDescription">
-        <source>The name of the resource to start. If not specified, starts the AppHost in the background.</source>
-        <target state="translated">O nome do recurso a ser iniciado.</target>
-        <note />
-      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Aspire.Cli/Resources/xlf/ResourceCommandStrings.ru.xlf b/src/Aspire.Cli/Resources/xlf/ResourceCommandStrings.ru.xlf
index d909cd81c47..a99fdf50ddb 100644
--- a/src/Aspire.Cli/Resources/xlf/ResourceCommandStrings.ru.xlf
+++ b/src/Aspire.Cli/Resources/xlf/ResourceCommandStrings.ru.xlf
@@ -3,12 +3,12 @@
   <file datatype="xml" source-language="en" target-language="ru" original="../ResourceCommandStrings.resx">
     <body>
       <trans-unit id="CommandDescription">
-        <source>Execute a command on a resource.</source>
+        <source>Execute a command on a resource (e.g. start, stop, restart).</source>
         <target state="translated">Выполнить команду на ресурсе.</target>
         <note />
       </trans-unit>
       <trans-unit id="CommandNameArgumentDescription">
-        <source>The name of the command to execute.</source>
+        <source>The name of the command to execute (e.g. start, stop, restart).</source>
         <target state="translated">Имя команды, которую нужно выполнить.</target>
         <note />
       </trans-unit>
@@ -17,36 +17,11 @@
         <target state="translated">Имя целевого ресурса, на котором будет выполняться команда.</target>
         <note />
       </trans-unit>
-      <trans-unit id="OptionNotValidWithResource">
-        <source>The '{0}' option is not valid when starting a resource.</source>
-        <target state="new">The '{0}' option is not valid when starting a resource.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="RestartDescription">
-        <source>Restart a running resource.</source>
-        <target state="translated">Перезапустить уже запущенный ресурс.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="RestartResourceArgumentDescription">
-        <source>The name of the resource to restart.</source>
-        <target state="translated">Имя ресурса, который нужно перезапустить.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="SelectAppHostAction">
         <source>connect to</source>
         <target state="new">connect to</target>
         <note />
       </trans-unit>
-      <trans-unit id="StartDescription">
-        <source>Start an apphost in the background, or start a stopped resource.</source>
-        <target state="translated">Запустить остановленный ресурс.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="StartResourceArgumentDescription">
-        <source>The name of the resource to start. If not specified, starts the AppHost in the background.</source>
-        <target state="translated">Имя ресурса, который нужно запустить.</target>
-        <note />
-      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Aspire.Cli/Resources/xlf/ResourceCommandStrings.tr.xlf b/src/Aspire.Cli/Resources/xlf/ResourceCommandStrings.tr.xlf
index 0c268825148..16f5c3f7898 100644
--- a/src/Aspire.Cli/Resources/xlf/ResourceCommandStrings.tr.xlf
+++ b/src/Aspire.Cli/Resources/xlf/ResourceCommandStrings.tr.xlf
@@ -3,12 +3,12 @@
   <file datatype="xml" source-language="en" target-language="tr" original="../ResourceCommandStrings.resx">
     <body>
       <trans-unit id="CommandDescription">
-        <source>Execute a command on a resource.</source>
+        <source>Execute a command on a resource (e.g. start, stop, restart).</source>
         <target state="translated">Bir kaynak üzerinde bir komut çalıştırın.</target>
         <note />
       </trans-unit>
       <trans-unit id="CommandNameArgumentDescription">
-        <source>The name of the command to execute.</source>
+        <source>The name of the command to execute (e.g. start, stop, restart).</source>
         <target state="translated">Yürütülecek komutun adı.</target>
         <note />
       </trans-unit>
@@ -17,36 +17,11 @@
         <target state="translated">Komutu yürütecek kaynağın adı.</target>
         <note />
       </trans-unit>
-      <trans-unit id="OptionNotValidWithResource">
-        <source>The '{0}' option is not valid when starting a resource.</source>
-        <target state="new">The '{0}' option is not valid when starting a resource.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="RestartDescription">
-        <source>Restart a running resource.</source>
-        <target state="translated">Çalışan bir kaynağı yeniden başlatın.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="RestartResourceArgumentDescription">
-        <source>The name of the resource to restart.</source>
-        <target state="translated">Yeniden başlatılacak kaynağın adı.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="SelectAppHostAction">
         <source>connect to</source>
         <target state="new">connect to</target>
         <note />
       </trans-unit>
-      <trans-unit id="StartDescription">
-        <source>Start an apphost in the background, or start a stopped resource.</source>
-        <target state="translated">Durdurulmuş bir kaynağı başlatın.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="StartResourceArgumentDescription">
-        <source>The name of the resource to start. If not specified, starts the AppHost in the background.</source>
-        <target state="translated">Başlatılacak kaynağın adı.</target>
-        <note />
-      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Aspire.Cli/Resources/xlf/ResourceCommandStrings.zh-Hans.xlf b/src/Aspire.Cli/Resources/xlf/ResourceCommandStrings.zh-Hans.xlf
index ddc589c2e40..c70a3525732 100644
--- a/src/Aspire.Cli/Resources/xlf/ResourceCommandStrings.zh-Hans.xlf
+++ b/src/Aspire.Cli/Resources/xlf/ResourceCommandStrings.zh-Hans.xlf
@@ -3,12 +3,12 @@
   <file datatype="xml" source-language="en" target-language="zh-Hans" original="../ResourceCommandStrings.resx">
     <body>
       <trans-unit id="CommandDescription">
-        <source>Execute a command on a resource.</source>
+        <source>Execute a command on a resource (e.g. start, stop, restart).</source>
         <target state="translated">在资源上执行命令。</target>
         <note />
       </trans-unit>
       <trans-unit id="CommandNameArgumentDescription">
-        <source>The name of the command to execute.</source>
+        <source>The name of the command to execute (e.g. start, stop, restart).</source>
         <target state="translated">要执行的命令的名称。</target>
         <note />
       </trans-unit>
@@ -17,36 +17,11 @@
         <target state="translated">要在其上执行命令的资源的名称。</target>
         <note />
       </trans-unit>
-      <trans-unit id="OptionNotValidWithResource">
-        <source>The '{0}' option is not valid when starting a resource.</source>
-        <target state="new">The '{0}' option is not valid when starting a resource.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="RestartDescription">
-        <source>Restart a running resource.</source>
-        <target state="translated">重启正在运行的资源。</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="RestartResourceArgumentDescription">
-        <source>The name of the resource to restart.</source>
-        <target state="translated">要重启的资源的名称。</target>
-        <note />
-      </trans-unit>
       <trans-unit id="SelectAppHostAction">
         <source>connect to</source>
         <target state="new">connect to</target>
         <note />
       </trans-unit>
-      <trans-unit id="StartDescription">
-        <source>Start an apphost in the background, or start a stopped resource.</source>
-        <target state="translated">启动已停止的资源。</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="StartResourceArgumentDescription">
-        <source>The name of the resource to start. If not specified, starts the AppHost in the background.</source>
-        <target state="translated">要启动的资源的名称。</target>
-        <note />
-      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Aspire.Cli/Resources/xlf/ResourceCommandStrings.zh-Hant.xlf b/src/Aspire.Cli/Resources/xlf/ResourceCommandStrings.zh-Hant.xlf
index 00fff5633e8..5b7ad66f13e 100644
--- a/src/Aspire.Cli/Resources/xlf/ResourceCommandStrings.zh-Hant.xlf
+++ b/src/Aspire.Cli/Resources/xlf/ResourceCommandStrings.zh-Hant.xlf
@@ -3,12 +3,12 @@
   <file datatype="xml" source-language="en" target-language="zh-Hant" original="../ResourceCommandStrings.resx">
     <body>
       <trans-unit id="CommandDescription">
-        <source>Execute a command on a resource.</source>
+        <source>Execute a command on a resource (e.g. start, stop, restart).</source>
         <target state="translated">在資源上執行命令。</target>
         <note />
       </trans-unit>
       <trans-unit id="CommandNameArgumentDescription">
-        <source>The name of the command to execute.</source>
+        <source>The name of the command to execute (e.g. start, stop, restart).</source>
         <target state="translated">所要執行命令的名稱。</target>
         <note />
       </trans-unit>
@@ -17,36 +17,11 @@
         <target state="translated">要執行命令的資源名稱。</target>
         <note />
       </trans-unit>
-      <trans-unit id="OptionNotValidWithResource">
-        <source>The '{0}' option is not valid when starting a resource.</source>
-        <target state="new">The '{0}' option is not valid when starting a resource.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="RestartDescription">
-        <source>Restart a running resource.</source>
-        <target state="translated">重新啟動正在執行的資源。</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="RestartResourceArgumentDescription">
-        <source>The name of the resource to restart.</source>
-        <target state="translated">要重新啟動的資源名稱。</target>
-        <note />
-      </trans-unit>
       <trans-unit id="SelectAppHostAction">
         <source>connect to</source>
         <target state="new">connect to</target>
         <note />
       </trans-unit>
-      <trans-unit id="StartDescription">
-        <source>Start an apphost in the background, or start a stopped resource.</source>
-        <target state="translated">啟動已停止的資源。</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="StartResourceArgumentDescription">
-        <source>The name of the resource to start. If not specified, starts the AppHost in the background.</source>
-        <target state="translated">要啟動的資源名稱。</target>
-        <note />
-      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Aspire.Cli/Resources/xlf/StartCommandStrings.cs.xlf b/src/Aspire.Cli/Resources/xlf/StartCommandStrings.cs.xlf
new file mode 100644
index 00000000000..147c6bfc7ef
--- /dev/null
+++ b/src/Aspire.Cli/Resources/xlf/StartCommandStrings.cs.xlf
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" target-language="cs" original="../StartCommandStrings.resx">
+    <body>
+      <trans-unit id="Description">
+        <source>Start an apphost in the background.</source>
+        <target state="new">Start an apphost in the background.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
diff --git a/src/Aspire.Cli/Resources/xlf/StartCommandStrings.de.xlf b/src/Aspire.Cli/Resources/xlf/StartCommandStrings.de.xlf
new file mode 100644
index 00000000000..17f0a4aac54
--- /dev/null
+++ b/src/Aspire.Cli/Resources/xlf/StartCommandStrings.de.xlf
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" target-language="de" original="../StartCommandStrings.resx">
+    <body>
+      <trans-unit id="Description">
+        <source>Start an apphost in the background.</source>
+        <target state="new">Start an apphost in the background.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
diff --git a/src/Aspire.Cli/Resources/xlf/StartCommandStrings.es.xlf b/src/Aspire.Cli/Resources/xlf/StartCommandStrings.es.xlf
new file mode 100644
index 00000000000..d6f3c308e84
--- /dev/null
+++ b/src/Aspire.Cli/Resources/xlf/StartCommandStrings.es.xlf
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" target-language="es" original="../StartCommandStrings.resx">
+    <body>
+      <trans-unit id="Description">
+        <source>Start an apphost in the background.</source>
+        <target state="new">Start an apphost in the background.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
diff --git a/src/Aspire.Cli/Resources/xlf/StartCommandStrings.fr.xlf b/src/Aspire.Cli/Resources/xlf/StartCommandStrings.fr.xlf
new file mode 100644
index 00000000000..4d1ecc2883a
--- /dev/null
+++ b/src/Aspire.Cli/Resources/xlf/StartCommandStrings.fr.xlf
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" target-language="fr" original="../StartCommandStrings.resx">
+    <body>
+      <trans-unit id="Description">
+        <source>Start an apphost in the background.</source>
+        <target state="new">Start an apphost in the background.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
diff --git a/src/Aspire.Cli/Resources/xlf/StartCommandStrings.it.xlf b/src/Aspire.Cli/Resources/xlf/StartCommandStrings.it.xlf
new file mode 100644
index 00000000000..8cc171ceeef
--- /dev/null
+++ b/src/Aspire.Cli/Resources/xlf/StartCommandStrings.it.xlf
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" target-language="it" original="../StartCommandStrings.resx">
+    <body>
+      <trans-unit id="Description">
+        <source>Start an apphost in the background.</source>
+        <target state="new">Start an apphost in the background.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
diff --git a/src/Aspire.Cli/Resources/xlf/StartCommandStrings.ja.xlf b/src/Aspire.Cli/Resources/xlf/StartCommandStrings.ja.xlf
new file mode 100644
index 00000000000..248c2d08b17
--- /dev/null
+++ b/src/Aspire.Cli/Resources/xlf/StartCommandStrings.ja.xlf
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" target-language="ja" original="../StartCommandStrings.resx">
+    <body>
+      <trans-unit id="Description">
+        <source>Start an apphost in the background.</source>
+        <target state="new">Start an apphost in the background.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
diff --git a/src/Aspire.Cli/Resources/xlf/StartCommandStrings.ko.xlf b/src/Aspire.Cli/Resources/xlf/StartCommandStrings.ko.xlf
new file mode 100644
index 00000000000..9a1175fd687
--- /dev/null
+++ b/src/Aspire.Cli/Resources/xlf/StartCommandStrings.ko.xlf
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" target-language="ko" original="../StartCommandStrings.resx">
+    <body>
+      <trans-unit id="Description">
+        <source>Start an apphost in the background.</source>
+        <target state="new">Start an apphost in the background.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
diff --git a/src/Aspire.Cli/Resources/xlf/StartCommandStrings.pl.xlf b/src/Aspire.Cli/Resources/xlf/StartCommandStrings.pl.xlf
new file mode 100644
index 00000000000..a919d1ee3df
--- /dev/null
+++ b/src/Aspire.Cli/Resources/xlf/StartCommandStrings.pl.xlf
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" target-language="pl" original="../StartCommandStrings.resx">
+    <body>
+      <trans-unit id="Description">
+        <source>Start an apphost in the background.</source>
+        <target state="new">Start an apphost in the background.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
diff --git a/src/Aspire.Cli/Resources/xlf/StartCommandStrings.pt-BR.xlf b/src/Aspire.Cli/Resources/xlf/StartCommandStrings.pt-BR.xlf
new file mode 100644
index 00000000000..e48f0a6ad9a
--- /dev/null
+++ b/src/Aspire.Cli/Resources/xlf/StartCommandStrings.pt-BR.xlf
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" target-language="pt-BR" original="../StartCommandStrings.resx">
+    <body>
+      <trans-unit id="Description">
+        <source>Start an apphost in the background.</source>
+        <target state="new">Start an apphost in the background.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
diff --git a/src/Aspire.Cli/Resources/xlf/StartCommandStrings.ru.xlf b/src/Aspire.Cli/Resources/xlf/StartCommandStrings.ru.xlf
new file mode 100644
index 00000000000..4cf60b12a69
--- /dev/null
+++ b/src/Aspire.Cli/Resources/xlf/StartCommandStrings.ru.xlf
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" target-language="ru" original="../StartCommandStrings.resx">
+    <body>
+      <trans-unit id="Description">
+        <source>Start an apphost in the background.</source>
+        <target state="new">Start an apphost in the background.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
diff --git a/src/Aspire.Cli/Resources/xlf/StartCommandStrings.tr.xlf b/src/Aspire.Cli/Resources/xlf/StartCommandStrings.tr.xlf
new file mode 100644
index 00000000000..3c08449a7aa
--- /dev/null
+++ b/src/Aspire.Cli/Resources/xlf/StartCommandStrings.tr.xlf
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" target-language="tr" original="../StartCommandStrings.resx">
+    <body>
+      <trans-unit id="Description">
+        <source>Start an apphost in the background.</source>
+        <target state="new">Start an apphost in the background.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
diff --git a/src/Aspire.Cli/Resources/xlf/StartCommandStrings.zh-Hans.xlf b/src/Aspire.Cli/Resources/xlf/StartCommandStrings.zh-Hans.xlf
new file mode 100644
index 00000000000..262dce60017
--- /dev/null
+++ b/src/Aspire.Cli/Resources/xlf/StartCommandStrings.zh-Hans.xlf
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" target-language="zh-Hans" original="../StartCommandStrings.resx">
+    <body>
+      <trans-unit id="Description">
+        <source>Start an apphost in the background.</source>
+        <target state="new">Start an apphost in the background.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
diff --git a/src/Aspire.Cli/Resources/xlf/StartCommandStrings.zh-Hant.xlf b/src/Aspire.Cli/Resources/xlf/StartCommandStrings.zh-Hant.xlf
new file mode 100644
index 00000000000..15b5f3aee34
--- /dev/null
+++ b/src/Aspire.Cli/Resources/xlf/StartCommandStrings.zh-Hant.xlf
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" target-language="zh-Hant" original="../StartCommandStrings.resx">
+    <body>
+      <trans-unit id="Description">
+        <source>Start an apphost in the background.</source>
+        <target state="new">Start an apphost in the background.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
diff --git a/src/Aspire.Cli/Resources/xlf/StopCommandStrings.cs.xlf b/src/Aspire.Cli/Resources/xlf/StopCommandStrings.cs.xlf
index f80b25b8447..8e5e95cbc0c 100644
--- a/src/Aspire.Cli/Resources/xlf/StopCommandStrings.cs.xlf
+++ b/src/Aspire.Cli/Resources/xlf/StopCommandStrings.cs.xlf
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
   <file datatype="xml" source-language="en" target-language="cs" original="../StopCommandStrings.resx">
     <body>
@@ -13,7 +13,7 @@
         <note />
       </trans-unit>
       <trans-unit id="Description">
-        <source>Stop a running apphost or the specified resource.</source>
+        <source>Stop a running apphost.</source>
         <target state="translated">Zastavte spuštěného hostitele aplikací Aspire.</target>
         <note />
       </trans-unit>
@@ -52,11 +52,6 @@
         <target state="new">The {0} and {1} options cannot be used together.</target>
         <note />
       </trans-unit>
-      <trans-unit id="AllAndResourceMutuallyExclusive">
-        <source>The {0} option cannot be used with a resource argument.</source>
-        <target state="new">The {0} option cannot be used with a resource argument.</target>
-        <note />
-      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Aspire.Cli/Resources/xlf/StopCommandStrings.de.xlf b/src/Aspire.Cli/Resources/xlf/StopCommandStrings.de.xlf
index 6d3e8ab7155..f11c98594e3 100644
--- a/src/Aspire.Cli/Resources/xlf/StopCommandStrings.de.xlf
+++ b/src/Aspire.Cli/Resources/xlf/StopCommandStrings.de.xlf
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
   <file datatype="xml" source-language="en" target-language="de" original="../StopCommandStrings.resx">
     <body>
@@ -13,7 +13,7 @@
         <note />
       </trans-unit>
       <trans-unit id="Description">
-        <source>Stop a running apphost or the specified resource.</source>
+        <source>Stop a running apphost.</source>
         <target state="translated">Beenden Sie einen aktiven Aspire-AppHost.</target>
         <note />
       </trans-unit>
@@ -52,11 +52,6 @@
         <target state="new">The {0} and {1} options cannot be used together.</target>
         <note />
       </trans-unit>
-      <trans-unit id="AllAndResourceMutuallyExclusive">
-        <source>The {0} option cannot be used with a resource argument.</source>
-        <target state="new">The {0} option cannot be used with a resource argument.</target>
-        <note />
-      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Aspire.Cli/Resources/xlf/StopCommandStrings.es.xlf b/src/Aspire.Cli/Resources/xlf/StopCommandStrings.es.xlf
index 08a7ce618be..ed2560c6a93 100644
--- a/src/Aspire.Cli/Resources/xlf/StopCommandStrings.es.xlf
+++ b/src/Aspire.Cli/Resources/xlf/StopCommandStrings.es.xlf
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
   <file datatype="xml" source-language="en" target-language="es" original="../StopCommandStrings.resx">
     <body>
@@ -13,7 +13,7 @@
         <note />
       </trans-unit>
       <trans-unit id="Description">
-        <source>Stop a running apphost or the specified resource.</source>
+        <source>Stop a running apphost.</source>
         <target state="translated">Detenga un apphost en ejecución de Aspire.</target>
         <note />
       </trans-unit>
@@ -52,11 +52,6 @@
         <target state="new">The {0} and {1} options cannot be used together.</target>
         <note />
       </trans-unit>
-      <trans-unit id="AllAndResourceMutuallyExclusive">
-        <source>The {0} option cannot be used with a resource argument.</source>
-        <target state="new">The {0} option cannot be used with a resource argument.</target>
-        <note />
-      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Aspire.Cli/Resources/xlf/StopCommandStrings.fr.xlf b/src/Aspire.Cli/Resources/xlf/StopCommandStrings.fr.xlf
index 7784090de21..ce390ab6a5c 100644
--- a/src/Aspire.Cli/Resources/xlf/StopCommandStrings.fr.xlf
+++ b/src/Aspire.Cli/Resources/xlf/StopCommandStrings.fr.xlf
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
   <file datatype="xml" source-language="en" target-language="fr" original="../StopCommandStrings.resx">
     <body>
@@ -13,7 +13,7 @@
         <note />
       </trans-unit>
       <trans-unit id="Description">
-        <source>Stop a running apphost or the specified resource.</source>
+        <source>Stop a running apphost.</source>
         <target state="translated">Arrêtez un AppHost Aspire en cours d’exécution.</target>
         <note />
       </trans-unit>
@@ -52,11 +52,6 @@
         <target state="new">The {0} and {1} options cannot be used together.</target>
         <note />
       </trans-unit>
-      <trans-unit id="AllAndResourceMutuallyExclusive">
-        <source>The {0} option cannot be used with a resource argument.</source>
-        <target state="new">The {0} option cannot be used with a resource argument.</target>
-        <note />
-      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Aspire.Cli/Resources/xlf/StopCommandStrings.it.xlf b/src/Aspire.Cli/Resources/xlf/StopCommandStrings.it.xlf
index 380e151a3be..115944c970f 100644
--- a/src/Aspire.Cli/Resources/xlf/StopCommandStrings.it.xlf
+++ b/src/Aspire.Cli/Resources/xlf/StopCommandStrings.it.xlf
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
   <file datatype="xml" source-language="en" target-language="it" original="../StopCommandStrings.resx">
     <body>
@@ -13,7 +13,7 @@
         <note />
       </trans-unit>
       <trans-unit id="Description">
-        <source>Stop a running apphost or the specified resource.</source>
+        <source>Stop a running apphost.</source>
         <target state="translated">Arrestare un apphost Aspire in esecuzione.</target>
         <note />
       </trans-unit>
@@ -52,11 +52,6 @@
         <target state="new">The {0} and {1} options cannot be used together.</target>
         <note />
       </trans-unit>
-      <trans-unit id="AllAndResourceMutuallyExclusive">
-        <source>The {0} option cannot be used with a resource argument.</source>
-        <target state="new">The {0} option cannot be used with a resource argument.</target>
-        <note />
-      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Aspire.Cli/Resources/xlf/StopCommandStrings.ja.xlf b/src/Aspire.Cli/Resources/xlf/StopCommandStrings.ja.xlf
index b243b954ba7..b6d1eb996a5 100644
--- a/src/Aspire.Cli/Resources/xlf/StopCommandStrings.ja.xlf
+++ b/src/Aspire.Cli/Resources/xlf/StopCommandStrings.ja.xlf
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
   <file datatype="xml" source-language="en" target-language="ja" original="../StopCommandStrings.resx">
     <body>
@@ -13,7 +13,7 @@
         <note />
       </trans-unit>
       <trans-unit id="Description">
-        <source>Stop a running apphost or the specified resource.</source>
+        <source>Stop a running apphost.</source>
         <target state="translated">実行中の Aspire apphost を停止します。</target>
         <note />
       </trans-unit>
@@ -52,11 +52,6 @@
         <target state="new">The {0} and {1} options cannot be used together.</target>
         <note />
       </trans-unit>
-      <trans-unit id="AllAndResourceMutuallyExclusive">
-        <source>The {0} option cannot be used with a resource argument.</source>
-        <target state="new">The {0} option cannot be used with a resource argument.</target>
-        <note />
-      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Aspire.Cli/Resources/xlf/StopCommandStrings.ko.xlf b/src/Aspire.Cli/Resources/xlf/StopCommandStrings.ko.xlf
index fe3fe6184b8..5ee8ba39293 100644
--- a/src/Aspire.Cli/Resources/xlf/StopCommandStrings.ko.xlf
+++ b/src/Aspire.Cli/Resources/xlf/StopCommandStrings.ko.xlf
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
   <file datatype="xml" source-language="en" target-language="ko" original="../StopCommandStrings.resx">
     <body>
@@ -13,7 +13,7 @@
         <note />
       </trans-unit>
       <trans-unit id="Description">
-        <source>Stop a running apphost or the specified resource.</source>
+        <source>Stop a running apphost.</source>
         <target state="translated">실행 중인 Aspire AppHost를 중지합니다.</target>
         <note />
       </trans-unit>
@@ -52,11 +52,6 @@
         <target state="new">The {0} and {1} options cannot be used together.</target>
         <note />
       </trans-unit>
-      <trans-unit id="AllAndResourceMutuallyExclusive">
-        <source>The {0} option cannot be used with a resource argument.</source>
-        <target state="new">The {0} option cannot be used with a resource argument.</target>
-        <note />
-      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Aspire.Cli/Resources/xlf/StopCommandStrings.pl.xlf b/src/Aspire.Cli/Resources/xlf/StopCommandStrings.pl.xlf
index bd1c07ed25c..d3528963b4b 100644
--- a/src/Aspire.Cli/Resources/xlf/StopCommandStrings.pl.xlf
+++ b/src/Aspire.Cli/Resources/xlf/StopCommandStrings.pl.xlf
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
   <file datatype="xml" source-language="en" target-language="pl" original="../StopCommandStrings.resx">
     <body>
@@ -13,7 +13,7 @@
         <note />
       </trans-unit>
       <trans-unit id="Description">
-        <source>Stop a running apphost or the specified resource.</source>
+        <source>Stop a running apphost.</source>
         <target state="translated">Zatrzymaj uruchomiony host aplikacji Wyszukaj.</target>
         <note />
       </trans-unit>
@@ -52,11 +52,6 @@
         <target state="new">The {0} and {1} options cannot be used together.</target>
         <note />
       </trans-unit>
-      <trans-unit id="AllAndResourceMutuallyExclusive">
-        <source>The {0} option cannot be used with a resource argument.</source>
-        <target state="new">The {0} option cannot be used with a resource argument.</target>
-        <note />
-      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Aspire.Cli/Resources/xlf/StopCommandStrings.pt-BR.xlf b/src/Aspire.Cli/Resources/xlf/StopCommandStrings.pt-BR.xlf
index f2727f8be72..1043d24ea40 100644
--- a/src/Aspire.Cli/Resources/xlf/StopCommandStrings.pt-BR.xlf
+++ b/src/Aspire.Cli/Resources/xlf/StopCommandStrings.pt-BR.xlf
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
   <file datatype="xml" source-language="en" target-language="pt-BR" original="../StopCommandStrings.resx">
     <body>
@@ -13,7 +13,7 @@
         <note />
       </trans-unit>
       <trans-unit id="Description">
-        <source>Stop a running apphost or the specified resource.</source>
+        <source>Stop a running apphost.</source>
         <target state="translated">Pare um AppHost Aspire em execução.</target>
         <note />
       </trans-unit>
@@ -52,11 +52,6 @@
         <target state="new">The {0} and {1} options cannot be used together.</target>
         <note />
       </trans-unit>
-      <trans-unit id="AllAndResourceMutuallyExclusive">
-        <source>The {0} option cannot be used with a resource argument.</source>
-        <target state="new">The {0} option cannot be used with a resource argument.</target>
-        <note />
-      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Aspire.Cli/Resources/xlf/StopCommandStrings.ru.xlf b/src/Aspire.Cli/Resources/xlf/StopCommandStrings.ru.xlf
index 566a65faff3..e7062c8526f 100644
--- a/src/Aspire.Cli/Resources/xlf/StopCommandStrings.ru.xlf
+++ b/src/Aspire.Cli/Resources/xlf/StopCommandStrings.ru.xlf
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
   <file datatype="xml" source-language="en" target-language="ru" original="../StopCommandStrings.resx">
     <body>
@@ -13,7 +13,7 @@
         <note />
       </trans-unit>
       <trans-unit id="Description">
-        <source>Stop a running apphost or the specified resource.</source>
+        <source>Stop a running apphost.</source>
         <target state="translated">Остановить запущенный хост приложений Aspire.</target>
         <note />
       </trans-unit>
@@ -52,11 +52,6 @@
         <target state="new">The {0} and {1} options cannot be used together.</target>
         <note />
       </trans-unit>
-      <trans-unit id="AllAndResourceMutuallyExclusive">
-        <source>The {0} option cannot be used with a resource argument.</source>
-        <target state="new">The {0} option cannot be used with a resource argument.</target>
-        <note />
-      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Aspire.Cli/Resources/xlf/StopCommandStrings.tr.xlf b/src/Aspire.Cli/Resources/xlf/StopCommandStrings.tr.xlf
index b9ff00ce107..e73b952181d 100644
--- a/src/Aspire.Cli/Resources/xlf/StopCommandStrings.tr.xlf
+++ b/src/Aspire.Cli/Resources/xlf/StopCommandStrings.tr.xlf
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
   <file datatype="xml" source-language="en" target-language="tr" original="../StopCommandStrings.resx">
     <body>
@@ -13,7 +13,7 @@
         <note />
       </trans-unit>
       <trans-unit id="Description">
-        <source>Stop a running apphost or the specified resource.</source>
+        <source>Stop a running apphost.</source>
         <target state="translated">Çalışan bir Aspire apphost'unu durdurun.</target>
         <note />
       </trans-unit>
@@ -52,11 +52,6 @@
         <target state="new">The {0} and {1} options cannot be used together.</target>
         <note />
       </trans-unit>
-      <trans-unit id="AllAndResourceMutuallyExclusive">
-        <source>The {0} option cannot be used with a resource argument.</source>
-        <target state="new">The {0} option cannot be used with a resource argument.</target>
-        <note />
-      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Aspire.Cli/Resources/xlf/StopCommandStrings.zh-Hans.xlf b/src/Aspire.Cli/Resources/xlf/StopCommandStrings.zh-Hans.xlf
index 0642c4d7c1b..ef09b74f363 100644
--- a/src/Aspire.Cli/Resources/xlf/StopCommandStrings.zh-Hans.xlf
+++ b/src/Aspire.Cli/Resources/xlf/StopCommandStrings.zh-Hans.xlf
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
   <file datatype="xml" source-language="en" target-language="zh-Hans" original="../StopCommandStrings.resx">
     <body>
@@ -13,7 +13,7 @@
         <note />
       </trans-unit>
       <trans-unit id="Description">
-        <source>Stop a running apphost or the specified resource.</source>
+        <source>Stop a running apphost.</source>
         <target state="translated">停止一个正在运行的 Aspire AppHost。</target>
         <note />
       </trans-unit>
@@ -52,11 +52,6 @@
         <target state="new">The {0} and {1} options cannot be used together.</target>
         <note />
       </trans-unit>
-      <trans-unit id="AllAndResourceMutuallyExclusive">
-        <source>The {0} option cannot be used with a resource argument.</source>
-        <target state="new">The {0} option cannot be used with a resource argument.</target>
-        <note />
-      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Aspire.Cli/Resources/xlf/StopCommandStrings.zh-Hant.xlf b/src/Aspire.Cli/Resources/xlf/StopCommandStrings.zh-Hant.xlf
index 282d8f5f69d..97ea62d05d9 100644
--- a/src/Aspire.Cli/Resources/xlf/StopCommandStrings.zh-Hant.xlf
+++ b/src/Aspire.Cli/Resources/xlf/StopCommandStrings.zh-Hant.xlf
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
   <file datatype="xml" source-language="en" target-language="zh-Hant" original="../StopCommandStrings.resx">
     <body>
@@ -13,7 +13,7 @@
         <note />
       </trans-unit>
       <trans-unit id="Description">
-        <source>Stop a running apphost or the specified resource.</source>
+        <source>Stop a running apphost.</source>
         <target state="translated">停止正在執行的 Aspire apphost。</target>
         <note />
       </trans-unit>
@@ -52,11 +52,6 @@
         <target state="new">The {0} and {1} options cannot be used together.</target>
         <note />
       </trans-unit>
-      <trans-unit id="AllAndResourceMutuallyExclusive">
-        <source>The {0} option cannot be used with a resource argument.</source>
-        <target state="new">The {0} option cannot be used with a resource argument.</target>
-        <note />
-      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file
diff --git a/tests/Aspire.Cli.Tests/Commands/ResourceCommandTests.cs b/tests/Aspire.Cli.Tests/Commands/ResourceCommandTests.cs
index afde5158d15..ec6ae33b66e 100644
--- a/tests/Aspire.Cli.Tests/Commands/ResourceCommandTests.cs
+++ b/tests/Aspire.Cli.Tests/Commands/ResourceCommandTests.cs
@@ -18,7 +18,7 @@ public async Task ResourceCommand_Help_Works()
         var provider = services.BuildServiceProvider();
 
         var command = provider.GetRequiredService<RootCommand>();
-        var result = command.Parse("command --help");
+        var result = command.Parse("resource --help");
 
         var exitCode = await result.InvokeAsync().DefaultTimeout();
 
@@ -33,7 +33,7 @@ public async Task ResourceCommand_RequiresResourceArgument()
         var provider = services.BuildServiceProvider();
 
         var command = provider.GetRequiredService<RootCommand>();
-        var result = command.Parse("command");
+        var result = command.Parse("resource");
 
         // Missing required argument should fail
         var exitCode = await result.InvokeAsync().DefaultTimeout();
@@ -48,7 +48,7 @@ public async Task ResourceCommand_RequiresCommandArgument()
         var provider = services.BuildServiceProvider();
 
         var command = provider.GetRequiredService<RootCommand>();
-        var result = command.Parse("command myresource");
+        var result = command.Parse("resource myresource");
 
         // Missing required command argument should fail
         var exitCode = await result.InvokeAsync().DefaultTimeout();
@@ -63,7 +63,7 @@ public async Task ResourceCommand_AcceptsBothArguments()
         var provider = services.BuildServiceProvider();
 
         var command = provider.GetRequiredService<RootCommand>();
-        var result = command.Parse("command myresource my-command --help");
+        var result = command.Parse("resource myresource my-command --help");
 
         var exitCode = await result.InvokeAsync().DefaultTimeout();
         Assert.Equal(ExitCodeConstants.Success, exitCode);
@@ -77,14 +77,39 @@ public async Task ResourceCommand_AcceptsProjectOption()
         var provider = services.BuildServiceProvider();
 
         var command = provider.GetRequiredService<RootCommand>();
-        var result = command.Parse("command myresource my-command --apphost /path/to/project.csproj --help");
+        var result = command.Parse("resource myresource my-command --apphost /path/to/project.csproj --help");
 
         var exitCode = await result.InvokeAsync().DefaultTimeout();
         Assert.Equal(ExitCodeConstants.Success, exitCode);
     }
 
     [Fact]
-    public async Task ResourceCommand_AcceptsKnownCommandNames()
+    public async Task ResourceCommand_AcceptsWellKnownCommandNames()
+    {
+        using var workspace = TemporaryWorkspace.Create(outputHelper);
+        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper);
+        var provider = services.BuildServiceProvider();
+
+        var command = provider.GetRequiredService<RootCommand>();
+
+        // Test with start
+        var startResult = command.Parse("resource myresource start --help");
+        var startExitCode = await startResult.InvokeAsync().DefaultTimeout();
+        Assert.Equal(ExitCodeConstants.Success, startExitCode);
+
+        // Test with stop
+        var stopResult = command.Parse("resource myresource stop --help");
+        var stopExitCode = await stopResult.InvokeAsync().DefaultTimeout();
+        Assert.Equal(ExitCodeConstants.Success, stopExitCode);
+
+        // Test with restart
+        var restartResult = command.Parse("resource myresource restart --help");
+        var restartExitCode = await restartResult.InvokeAsync().DefaultTimeout();
+        Assert.Equal(ExitCodeConstants.Success, restartExitCode);
+    }
+
+    [Fact]
+    public async Task ResourceCommand_AcceptsBackchannelCommandNames()
     {
         using var workspace = TemporaryWorkspace.Create(outputHelper);
         var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper);
@@ -93,18 +118,32 @@ public async Task ResourceCommand_AcceptsKnownCommandNames()
         var command = provider.GetRequiredService<RootCommand>();
 
         // Test with resource-start
-        var startResult = command.Parse("command myresource resource-start --help");
+        var startResult = command.Parse("resource myresource resource-start --help");
         var startExitCode = await startResult.InvokeAsync().DefaultTimeout();
         Assert.Equal(ExitCodeConstants.Success, startExitCode);
 
         // Test with resource-stop
-        var stopResult = command.Parse("command myresource resource-stop --help");
+        var stopResult = command.Parse("resource myresource resource-stop --help");
         var stopExitCode = await stopResult.InvokeAsync().DefaultTimeout();
         Assert.Equal(ExitCodeConstants.Success, stopExitCode);
 
         // Test with resource-restart
-        var restartResult = command.Parse("command myresource resource-restart --help");
+        var restartResult = command.Parse("resource myresource resource-restart --help");
         var restartExitCode = await restartResult.InvokeAsync().DefaultTimeout();
         Assert.Equal(ExitCodeConstants.Success, restartExitCode);
     }
+
+    [Fact]
+    public async Task ResourceCommand_AcceptsProjectOptionWithStart()
+    {
+        using var workspace = TemporaryWorkspace.Create(outputHelper);
+        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper);
+        var provider = services.BuildServiceProvider();
+
+        var command = provider.GetRequiredService<RootCommand>();
+        var result = command.Parse("resource myresource start --apphost /path/to/project.csproj --help");
+
+        var exitCode = await result.InvokeAsync().DefaultTimeout();
+        Assert.Equal(ExitCodeConstants.Success, exitCode);
+    }
 }
diff --git a/tests/Aspire.Cli.Tests/Commands/RestartCommandTests.cs b/tests/Aspire.Cli.Tests/Commands/RestartCommandTests.cs
deleted file mode 100644
index 952ac8ef23d..00000000000
--- a/tests/Aspire.Cli.Tests/Commands/RestartCommandTests.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using Aspire.Cli.Commands;
-using Aspire.Cli.Tests.Utils;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.AspNetCore.InternalTesting;
-
-namespace Aspire.Cli.Tests.Commands;
-
-public class RestartCommandTests(ITestOutputHelper outputHelper)
-{
-    [Fact]
-    public async Task RestartCommand_Help_Works()
-    {
-        using var workspace = TemporaryWorkspace.Create(outputHelper);
-        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper);
-        var provider = services.BuildServiceProvider();
-
-        var command = provider.GetRequiredService<RootCommand>();
-        var result = command.Parse("restart --help");
-
-        var exitCode = await result.InvokeAsync().DefaultTimeout();
-
-        Assert.Equal(ExitCodeConstants.Success, exitCode);
-    }
-
-    [Fact]
-    public async Task RestartCommand_RequiresResourceArgument()
-    {
-        using var workspace = TemporaryWorkspace.Create(outputHelper);
-        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper);
-        var provider = services.BuildServiceProvider();
-
-        var command = provider.GetRequiredService<RootCommand>();
-        var result = command.Parse("restart");
-
-        // Missing required argument should fail
-        var exitCode = await result.InvokeAsync().DefaultTimeout();
-        Assert.NotEqual(ExitCodeConstants.Success, exitCode);
-    }
-
-    [Fact]
-    public async Task RestartCommand_AcceptsResourceArgument()
-    {
-        using var workspace = TemporaryWorkspace.Create(outputHelper);
-        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper);
-        var provider = services.BuildServiceProvider();
-
-        var command = provider.GetRequiredService<RootCommand>();
-        var result = command.Parse("restart myresource --help");
-
-        var exitCode = await result.InvokeAsync().DefaultTimeout();
-        Assert.Equal(ExitCodeConstants.Success, exitCode);
-    }
-
-    [Fact]
-    public async Task RestartCommand_AcceptsProjectOption()
-    {
-        using var workspace = TemporaryWorkspace.Create(outputHelper);
-        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper);
-        var provider = services.BuildServiceProvider();
-
-        var command = provider.GetRequiredService<RootCommand>();
-        var result = command.Parse("restart myresource --apphost /path/to/project.csproj --help");
-
-        var exitCode = await result.InvokeAsync().DefaultTimeout();
-        Assert.Equal(ExitCodeConstants.Success, exitCode);
-    }
-}
diff --git a/tests/Aspire.Cli.Tests/Commands/RunCommandTests.cs b/tests/Aspire.Cli.Tests/Commands/RunCommandTests.cs
index f9c95c506be..56d1e6e6346 100644
--- a/tests/Aspire.Cli.Tests/Commands/RunCommandTests.cs
+++ b/tests/Aspire.Cli.Tests/Commands/RunCommandTests.cs
@@ -1479,6 +1479,21 @@ public async Task RunCommand_WithNoBuildAndWatchModeEnabled_ReturnsInvalidComman
         Assert.Equal(ExitCodeConstants.InvalidCommand, exitCode);
     }
 
+    [Fact]
+    public void RunCommand_ForwardsUnmatchedTokensToAppHost()
+    {
+        using var workspace = TemporaryWorkspace.Create(outputHelper);
+        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper);
+        var provider = services.BuildServiceProvider();
+
+        var command = provider.GetRequiredService<RootCommand>();
+        var result = command.Parse("run -- --custom-arg value");
+
+        Assert.Empty(result.Errors);
+        Assert.Contains("--custom-arg", result.UnmatchedTokens);
+        Assert.Contains("value", result.UnmatchedTokens);
+    }
+
     private sealed class TestFeatures : IFeatures
     {
         private readonly Dictionary<string, bool> _features = new();
diff --git a/tests/Aspire.Cli.Tests/Commands/StartCommandTests.cs b/tests/Aspire.Cli.Tests/Commands/StartCommandTests.cs
index e6a7146d81a..e1ed2ee9abe 100644
--- a/tests/Aspire.Cli.Tests/Commands/StartCommandTests.cs
+++ b/tests/Aspire.Cli.Tests/Commands/StartCommandTests.cs
@@ -25,49 +25,6 @@ public async Task StartCommand_Help_Works()
         Assert.Equal(ExitCodeConstants.Success, exitCode);
     }
 
-    [Fact]
-    public async Task StartCommand_RequiresResourceArgument()
-    {
-        using var workspace = TemporaryWorkspace.Create(outputHelper);
-        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper);
-        var provider = services.BuildServiceProvider();
-
-        var command = provider.GetRequiredService<RootCommand>();
-        var result = command.Parse("start");
-
-        // Missing required argument should fail
-        var exitCode = await result.InvokeAsync().DefaultTimeout();
-        Assert.NotEqual(ExitCodeConstants.Success, exitCode);
-    }
-
-    [Fact]
-    public async Task StartCommand_AcceptsResourceArgument()
-    {
-        using var workspace = TemporaryWorkspace.Create(outputHelper);
-        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper);
-        var provider = services.BuildServiceProvider();
-
-        var command = provider.GetRequiredService<RootCommand>();
-        var result = command.Parse("start myresource --help");
-
-        var exitCode = await result.InvokeAsync().DefaultTimeout();
-        Assert.Equal(ExitCodeConstants.Success, exitCode);
-    }
-
-    [Fact]
-    public async Task StartCommand_AcceptsProjectOption()
-    {
-        using var workspace = TemporaryWorkspace.Create(outputHelper);
-        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper);
-        var provider = services.BuildServiceProvider();
-
-        var command = provider.GetRequiredService<RootCommand>();
-        var result = command.Parse("start myresource --apphost /path/to/project.csproj --help");
-
-        var exitCode = await result.InvokeAsync().DefaultTimeout();
-        Assert.Equal(ExitCodeConstants.Success, exitCode);
-    }
-
     [Fact]
     public async Task StartCommand_AcceptsNoBuildOption()
     {
@@ -111,30 +68,17 @@ public async Task StartCommand_AcceptsIsolatedOption()
     }
 
     [Fact]
-    public async Task StartCommand_FormatOptionNotValidWithResource()
+    public void StartCommand_ForwardsUnmatchedTokensToAppHost()
     {
         using var workspace = TemporaryWorkspace.Create(outputHelper);
         var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper);
         var provider = services.BuildServiceProvider();
 
         var command = provider.GetRequiredService<RootCommand>();
-        var result = command.Parse("start myresource --format json");
+        var result = command.Parse("start -- --custom-arg value");
 
-        var exitCode = await result.InvokeAsync().DefaultTimeout();
-        Assert.Equal(ExitCodeConstants.InvalidCommand, exitCode);
-    }
-
-    [Fact]
-    public async Task StartCommand_IsolatedOptionNotValidWithResource()
-    {
-        using var workspace = TemporaryWorkspace.Create(outputHelper);
-        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper);
-        var provider = services.BuildServiceProvider();
-
-        var command = provider.GetRequiredService<RootCommand>();
-        var result = command.Parse("start myresource --isolated");
-
-        var exitCode = await result.InvokeAsync().DefaultTimeout();
-        Assert.Equal(ExitCodeConstants.InvalidCommand, exitCode);
+        Assert.Empty(result.Errors);
+        Assert.Contains("--custom-arg", result.UnmatchedTokens);
+        Assert.Contains("value", result.UnmatchedTokens);
     }
 }
diff --git a/tests/Aspire.Cli.Tests/Commands/StopCommandTests.cs b/tests/Aspire.Cli.Tests/Commands/StopCommandTests.cs
new file mode 100644
index 00000000000..79e15c4ac71
--- /dev/null
+++ b/tests/Aspire.Cli.Tests/Commands/StopCommandTests.cs
@@ -0,0 +1,41 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Aspire.Cli.Commands;
+using Aspire.Cli.Tests.Utils;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.AspNetCore.InternalTesting;
+
+namespace Aspire.Cli.Tests.Commands;
+
+public class StopCommandTests(ITestOutputHelper outputHelper)
+{
+    [Fact]
+    public async Task StopCommand_Help_Works()
+    {
+        using var workspace = TemporaryWorkspace.Create(outputHelper);
+        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper);
+        var provider = services.BuildServiceProvider();
+
+        var command = provider.GetRequiredService<RootCommand>();
+        var result = command.Parse("stop --help");
+
+        var exitCode = await result.InvokeAsync().DefaultTimeout();
+
+        Assert.Equal(ExitCodeConstants.Success, exitCode);
+    }
+
+    [Fact]
+    public async Task StopCommand_RejectsPositionalResourceArgument()
+    {
+        using var workspace = TemporaryWorkspace.Create(outputHelper);
+        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper);
+        var provider = services.BuildServiceProvider();
+
+        var command = provider.GetRequiredService<RootCommand>();
+        var result = command.Parse("stop myresource");
+
+        var exitCode = await result.InvokeAsync().DefaultTimeout();
+        Assert.NotEqual(ExitCodeConstants.Success, exitCode);
+    }
+}
diff --git a/tests/Aspire.Cli.Tests/Utils/CliTestHelper.cs b/tests/Aspire.Cli.Tests/Utils/CliTestHelper.cs
index 32ef1a8de78..2546f6bd1ba 100644
--- a/tests/Aspire.Cli.Tests/Utils/CliTestHelper.cs
+++ b/tests/Aspire.Cli.Tests/Utils/CliTestHelper.cs
@@ -169,7 +169,6 @@ public static IServiceCollection CreateServiceCollection(TemporaryWorkspace work
         services.AddTransient<RunCommand>();
         services.AddTransient<StopCommand>();
         services.AddTransient<StartCommand>();
-        services.AddTransient<RestartCommand>();
         services.AddTransient<ResourceCommand>();
         services.AddTransient<PsCommand>();
         services.AddTransient<DescribeCommand>();