[release/13.6] Remove terminal commands feature flag

docs/specs/with-terminal.md

@@ -518,15 +518,14 @@ backchannel response has required `resourceTerminals` and `appHostTerminals`
 arrays, each empty when there are no terminals of that kind. Resource entries
 group their replicas; AppHost entries carry a terminal ID, title, and placement.
 The CLI's `--format json` output combines both into one array with an `owner`
-discriminator. Terminal commands are gated by `features.terminalCommandsEnabled`;
+discriminator. Terminal commands are available without a feature flag;
 their experimental backchannel contract can change between builds.
 
 ### Tape playback
 
 `aspire terminal tape play <resource> --tape-file <path>` uses Hex1b's
 `TapeParser` and `TapePlayer` to execute a VHS `.tape` script against an
-existing resource terminal. It requires the same `features.terminalCommandsEnabled` feature
-flag as `terminal attach` and `terminal ps`.
+existing resource terminal.
 
 ```sh
 aspire terminal tape play shell --tape-file ./probe.tape

extension/schemas/aspire-config.schema.json

@@ -221,22 +221,6 @@
           "description": "Enable or disable access to the staging channel for early access to preview features and packages",
           "default": false
         },
-        "terminalCommandsEnabled": {
-          "anyOf": [
-            {
-              "type": "boolean"
-            },
-            {
-              "type": "string",
-              "enum": [
-                "true",
-                "false"
-              ]
-            }
-          ],
-          "description": "(Experimental) Enable the 'aspire terminal' command group ('aspire terminal ps', 'aspire terminal attach'). Used in conjunction with the experimental WithTerminal() API (ASPIRETERMINAL001). Hidden by default while the API surface is in preview.",
-          "default": false
-        },
         "updateNotificationsEnabled": {
           "anyOf": [
             {

extension/schemas/aspire-global-settings.schema.json

@@ -173,22 +173,6 @@
           "description": "Enable or disable access to the staging channel for early access to preview features and packages",
           "default": false
         },
-        "terminalCommandsEnabled": {
-          "anyOf": [
-            {
-              "type": "boolean"
-            },
-            {
-              "type": "string",
-              "enum": [
-                "true",
-                "false"
-              ]
-            }
-          ],
-          "description": "(Experimental) Enable the 'aspire terminal' command group ('aspire terminal ps', 'aspire terminal attach'). Used in conjunction with the experimental WithTerminal() API (ASPIRETERMINAL001). Hidden by default while the API surface is in preview.",
-          "default": false
-        },
         "updateNotificationsEnabled": {
           "anyOf": [
             {

extension/schemas/aspire-settings.schema.json

@@ -173,22 +173,6 @@
           "description": "Enable or disable access to the staging channel for early access to preview features and packages",
           "default": false
         },
-        "terminalCommandsEnabled": {
-          "anyOf": [
-            {
-              "type": "boolean"
-            },
-            {
-              "type": "string",
-              "enum": [
-                "true",
-                "false"
-              ]
-            }
-          ],
-          "description": "(Experimental) Enable the 'aspire terminal' command group ('aspire terminal ps', 'aspire terminal attach'). Used in conjunction with the experimental WithTerminal() API (ASPIRETERMINAL001). Hidden by default while the API surface is in preview.",
-          "default": false
-        },
         "updateNotificationsEnabled": {
           "anyOf": [
             {

src/Aspire.Cli/Commands/RootCommand.cs

@@ -8,7 +8,6 @@
 
 using Aspire.Cli.Bundles;
 using Aspire.Cli.Commands.Sdk;
-using Aspire.Cli.Configuration;
 using Aspire.Cli.Interaction;
 using Aspire.Cli.Resources;
 using Aspire.Cli.Utils;
@@ -176,7 +175,6 @@ public RootCommand(
         ExtensionInternalCommand extensionInternalCommand,
         IBundleService bundleService,
         IInteractionService interactionService,
-        IFeatures features,
         IAnsiConsole ansiConsole,
         CliExecutionContext executionContext)
         : base(RootCommandStrings.Description)
@@ -228,12 +226,7 @@ public RootCommand(
         Subcommands.Add(describeCommand);
         Subcommands.Add(logsCommand);
         Subcommands.Add(integrationCommand);
-        // 'aspire terminal' is hidden behind a feature flag while WithTerminal() is experimental.
-        // Toggle with `aspire config set features.terminalCommandsEnabled true`.
-        if (features.IsFeatureEnabled(KnownFeatures.TerminalCommandsEnabled, defaultValue: false))
-        {
-            Subcommands.Add(terminalCommand);
-        }
+        Subcommands.Add(terminalCommand);
         Subcommands.Add(addCommand);
         Subcommands.Add(publishCommand);
         Subcommands.Add(configCommand);

src/Aspire.Cli/KnownFeatures.cs

@@ -35,7 +35,6 @@ internal static class KnownFeatures
     public static string ExperimentalPolyglotPython => "experimentalPolyglot:python";
     public static string NuGetSignatureVerificationEnabled => "nugetSignatureVerificationEnabled";
     public static string AspireSkillsRemoteFetchEnabled => "aspireSkillsRemoteFetchEnabled";
-    public static string TerminalCommandsEnabled => "terminalCommandsEnabled";
     public static string PolyglotIntegrationFilterEnabled => "polyglotIntegrationFilterEnabled";
 
     private static readonly Dictionary<string, FeatureMetadata> s_featureMetadata = new()
@@ -99,11 +98,6 @@ internal static class KnownFeatures
             // still honored if set directly in config.
             Hidden: true),
 
-        [TerminalCommandsEnabled] = new(
-            TerminalCommandsEnabled,
-            "(Experimental) Enable the 'aspire terminal' command group ('aspire terminal ps', 'aspire terminal attach', 'aspire terminal tape play'). Used in conjunction with the experimental WithTerminal() API (ASPIRETERMINAL001). Hidden by default while the API surface is in preview.",
-            DefaultValue: false),
-
         [PolyglotIntegrationFilterEnabled] = new(
             PolyglotIntegrationFilterEnabled,
             "(Experimental) Restrict 'aspire add', 'aspire integration list', and 'aspire integration search' in non-C# AppHosts to integrations carrying the 'polyglot' NuGet tag. Disabled by default because no remote feed resolves the tag usefully today: Azure DevOps Artifacts feeds ignore 'tags:' query scoping, and nuget.org returns no first-party integrations for it. The filter fails closed, so enabling it against a remote feed hides every integration. Enable it only against a local package source or hive, where the tag is read from the nuspec.",

tests/Aspire.Cli.EndToEnd.Tests/TerminalCommandTests.cs

@@ -29,7 +29,6 @@ public async Task TerminalAttachFrontend_ShowsViteHelpAndDetaches()
         await auto.PrepareDockerEnvironmentAsync(counter, workspace);
         await auto.InstallAspireCliAsync(strategy, counter);
 
-        await auto.RunCommandAsync("aspire config set features.terminalCommandsEnabled true -g", counter);
         await auto.AspireNewAsync("TerminalSupportApp", counter, template: AspireTemplate.ExpressReact);
 
         var appHostPath = Path.Combine(workspace.WorkspaceRoot.FullName, "TerminalSupportApp", "apphost.mts");

tests/Aspire.Cli.Tests/Commands/TerminalCommandTests.cs

@@ -18,7 +18,7 @@ public class TerminalCommandTests(ITestOutputHelper outputHelper)
     public async Task TerminalCommand_Help_Works()
     {
         using var workspace = TemporaryWorkspace.CreateForCli(outputHelper);
-        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper, o => o.EnabledFeatures = [KnownFeatures.TerminalCommandsEnabled]);
+        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper);
         using var provider = services.BuildServiceProvider();
 
         var command = provider.GetRequiredService<RootCommand>();
@@ -34,7 +34,7 @@ public async Task TerminalCommand_WhenNoSubcommand_PrintsHelpAndFails()
         // The 'terminal' parent command is non-runnable; it prints help when invoked
         // alone and returns InvalidCommand to mirror the DashboardCommand pattern.
         using var workspace = TemporaryWorkspace.CreateForCli(outputHelper);
-        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper, o => o.EnabledFeatures = [KnownFeatures.TerminalCommandsEnabled]);
+        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper);
         using var provider = services.BuildServiceProvider();
 
         var command = provider.GetRequiredService<RootCommand>();
@@ -48,7 +48,7 @@ public async Task TerminalCommand_WhenNoSubcommand_PrintsHelpAndFails()
     public async Task TerminalAttachCommand_WhenNoResourceArgument_FailsParsing()
     {
         using var workspace = TemporaryWorkspace.CreateForCli(outputHelper);
-        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper, o => o.EnabledFeatures = [KnownFeatures.TerminalCommandsEnabled]);
+        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper);
         using var provider = services.BuildServiceProvider();
 
         var command = provider.GetRequiredService<RootCommand>();
@@ -62,7 +62,7 @@ public async Task TerminalAttachCommand_WhenNoResourceArgument_FailsParsing()
     public async Task TerminalCommand_WhenNoAppHostRunning_ReturnsSuccess()
     {
         using var workspace = TemporaryWorkspace.CreateForCli(outputHelper);
-        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper, o => o.EnabledFeatures = [KnownFeatures.TerminalCommandsEnabled]);
+        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper);
         using var provider = services.BuildServiceProvider();
 
         var command = provider.GetRequiredService<RootCommand>();
@@ -295,7 +295,7 @@ public async Task TerminalCommand_NonInteractiveMultiReplicaWithoutFlag_ReturnsI
     public async Task TerminalPsCommand_WhenNoAppHostRunning_ReturnsSuccess()
     {
         using var workspace = TemporaryWorkspace.CreateForCli(outputHelper);
-        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper, o => o.EnabledFeatures = [KnownFeatures.TerminalCommandsEnabled]);
+        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper);
         using var provider = services.BuildServiceProvider();
 
         var command = provider.GetRequiredService<RootCommand>();

tests/Aspire.Cli.Tests/Commands/TerminalCommandViewerOptionTests.cs

@@ -19,7 +19,7 @@ public class TerminalCommandViewerOptionTests(ITestOutputHelper outputHelper)
     public void ViewerOption_Help_DescribesPrimarySecondaryBehaviour()
     {
         using var workspace = TemporaryWorkspace.CreateForCli(outputHelper);
-        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper, o => o.EnabledFeatures = [KnownFeatures.TerminalCommandsEnabled]);
+        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper);
         using var provider = services.BuildServiceProvider();
 
         var command = provider.GetRequiredService<RootCommand>();
@@ -47,7 +47,7 @@ public void ViewerOption_Help_DescribesPrimarySecondaryBehaviour()
     public void ViewerOption_DefaultIsFalse_WhenNotSpecified()
     {
         using var workspace = TemporaryWorkspace.CreateForCli(outputHelper);
-        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper, o => o.EnabledFeatures = [KnownFeatures.TerminalCommandsEnabled]);
+        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper);
         using var provider = services.BuildServiceProvider();
 
         var command = provider.GetRequiredService<RootCommand>();
@@ -62,7 +62,7 @@ public void ViewerOption_DefaultIsFalse_WhenNotSpecified()
     public void ViewerOption_ParsesToTrue_WhenSpecified()
     {
         using var workspace = TemporaryWorkspace.CreateForCli(outputHelper);
-        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper, o => o.EnabledFeatures = [KnownFeatures.TerminalCommandsEnabled]);
+        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper);
         using var provider = services.BuildServiceProvider();
 
         var command = provider.GetRequiredService<RootCommand>();

tests/Aspire.Cli.Tests/Commands/TerminalTapePlayCommandTests.cs

@@ -23,8 +23,7 @@ public class TerminalTapePlayCommandTests(ITestOutputHelper outputHelper)
     public async Task CommandHierarchy(string arguments, int expectedExitCode)
     {
         using var workspace = TemporaryWorkspace.CreateForCli(outputHelper);
-        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper,
-            options => options.EnabledFeatures = [KnownFeatures.TerminalCommandsEnabled]);
+        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper);
         using var provider = services.BuildServiceProvider();
 
         var result = provider.GetRequiredService<RootCommand>().Parse(arguments);
@@ -33,15 +32,15 @@ public async Task CommandHierarchy(string arguments, int expectedExitCode)
     }
 
     [Fact]
-    public void RequiresTerminalFeature()
+    public void AvailableWithoutFeatureFlag()
     {
         using var workspace = TemporaryWorkspace.CreateForCli(outputHelper);
         var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper);
         using var provider = services.BuildServiceProvider();
 
         var result = provider.GetRequiredService<RootCommand>().Parse("terminal tape play shell --tape-file probe.tape");
 
-        Assert.NotEmpty(result.Errors);
+        Assert.Empty(result.Errors);
     }
 
     [Theory]
@@ -96,8 +95,7 @@ public async Task NoRunningAppHostFails()
     {
         using var workspace = TemporaryWorkspace.CreateForCli(outputHelper);
         await File.WriteAllTextAsync(Path.Combine(workspace.WorkspaceRoot.FullName, "probe.tape"), "");
-        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper,
-            options => options.EnabledFeatures = [KnownFeatures.TerminalCommandsEnabled]);
+        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper);
         using var provider = services.BuildServiceProvider();
 
         var result = provider.GetRequiredService<RootCommand>().Parse("terminal tape play shell --tape-file probe.tape");

tests/Aspire.Cli.Tests/TestServices/TerminalCommandTestServices.cs

@@ -31,7 +31,6 @@ public static (ServiceProvider Provider, TestAppHostAuxiliaryBackchannel Backcha
 
         var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper, options =>
         {
-            options.EnabledFeatures = [KnownFeatures.TerminalCommandsEnabled];
             options.AuxiliaryBackchannelMonitorFactory = _ => monitor;
             configureOptions?.Invoke(options);
         });