fix: address Copilot review feedback (iteration 10)

- Format 'Show all subscriptions' with index prefix for consistent UX
- Add multi-tenant tests for set and remove actions

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: vhvb1989

cli/azd/cmd/config_sub_filter_test.go

@@ -189,3 +189,109 @@ func TestSubFilterRemoveAction_CancelledRemoval(t *testing.T) {
 	require.True(t, exists)
 	require.Equal(t, []string{"sub-1"}, ids)
 }
+
+func TestSubFilterSetAction_MultiTenant_SavesFilterForSelectedTenant(
+	t *testing.T,
+) {
+	mockConsole := mockinput.NewMockConsole()
+	ucm := newTestUserConfigManager(t)
+
+	mockAccount := &mockaccount.MockAccountManager{
+		Subscriptions: []account.Subscription{
+			{Id: "sub-1", Name: "Alpha", TenantId: "t1", UserAccessTenantId: "t1"},
+			{Id: "sub-2", Name: "Bravo", TenantId: "t2", UserAccessTenantId: "t2"},
+			{Id: "sub-3", Name: "Charlie", TenantId: "t2", UserAccessTenantId: "t2"},
+		},
+	}
+
+	action := &subFilterSetAction{
+		accountManager:    mockAccount,
+		userConfigManager: ucm,
+		console:           mockConsole,
+	}
+
+	// Select second tenant (index 1)
+	mockConsole.WhenSelect(func(opts input.ConsoleOptions) bool {
+		return strings.Contains(opts.Message, "tenant")
+	}).Respond(1)
+
+	// Pick the first subscription from tenant t2
+	mockConsole.WhenMultiSelect(func(opts input.ConsoleOptions) bool {
+		return strings.Contains(opts.Message, "subscription")
+	}).RespondFn(func(opts input.ConsoleOptions) (any, error) {
+		if len(opts.Options) > 0 {
+			return []string{opts.Options[0]}, nil
+		}
+		return []string{}, nil
+	})
+
+	result, err := action.Run(t.Context())
+	require.NoError(t, err)
+	require.NotNil(t, result)
+	require.Contains(t, result.Message.Header, "Saved subscription filter")
+
+	// Verify filter was saved under t2
+	cfg, err := ucm.Load()
+	require.NoError(t, err)
+	ids, exists := prompt.LoadSubscriptionFilter(cfg, "t2")
+	require.True(t, exists)
+	require.Len(t, ids, 1)
+
+	// Verify no filter saved under t1
+	_, exists = prompt.LoadSubscriptionFilter(cfg, "t1")
+	require.False(t, exists)
+}
+
+func TestSubFilterRemoveAction_MultiTenant_RemovesCorrectTenant(
+	t *testing.T,
+) {
+	mockConsole := mockinput.NewMockConsole()
+	ucm := newTestUserConfigManager(t)
+
+	// Pre-save filters for both tenants
+	cfg, err := ucm.Load()
+	require.NoError(t, err)
+	err = prompt.SaveSubscriptionFilter(cfg, "t1", []string{"sub-1"})
+	require.NoError(t, err)
+	err = prompt.SaveSubscriptionFilter(cfg, "t2", []string{"sub-2"})
+	require.NoError(t, err)
+	err = ucm.Save(cfg)
+	require.NoError(t, err)
+
+	mockAccount := &mockaccount.MockAccountManager{
+		Subscriptions: []account.Subscription{
+			{Id: "sub-1", Name: "Alpha", TenantId: "t1", UserAccessTenantId: "t1"},
+			{Id: "sub-2", Name: "Bravo", TenantId: "t2", UserAccessTenantId: "t2"},
+		},
+	}
+
+	action := &subFilterRemoveAction{
+		accountManager:    mockAccount,
+		userConfigManager: ucm,
+		console:           mockConsole,
+	}
+
+	// Select second tenant (index 1)
+	mockConsole.WhenSelect(func(opts input.ConsoleOptions) bool {
+		return strings.Contains(opts.Message, "tenant")
+	}).Respond(1)
+
+	// Confirm removal
+	mockConsole.WhenConfirm(func(opts input.ConsoleOptions) bool {
+		return strings.Contains(opts.Message, "Remove subscription filter")
+	}).Respond(true)
+
+	result, err := action.Run(t.Context())
+	require.NoError(t, err)
+	require.NotNil(t, result)
+	require.Contains(t, result.Message.Header, "Removed subscription filter")
+
+	// Verify t2 filter removed, t1 still exists
+	cfg, err = ucm.Load()
+	require.NoError(t, err)
+	_, exists := prompt.LoadSubscriptionFilter(cfg, "t2")
+	require.False(t, exists)
+	ids, exists := prompt.LoadSubscriptionFilter(cfg, "t1")
+	require.True(t, exists)
+	require.Equal(t, []string{"sub-1"}, ids)
+}

cli/azd/pkg/prompt/prompter.go

@@ -141,8 +141,10 @@ func (p *DefaultPrompter) PromptSubscription(ctx context.Context, msg string) (s
 
 	// Add "Show all subscriptions" option when filter is active
 	if filterApplied {
+		nextIdx := len(subscriptionOptions) + 1
 		subscriptionOptions = append(
-			subscriptionOptions, ShowAllSubscriptionsOption,
+			subscriptionOptions,
+			fmt.Sprintf("%2d. %s", nextIdx, ShowAllSubscriptionsOption),
 		)
 		subscriptions = append(
 			subscriptions, ShowAllSubscriptionsOption,

cli/azd/pkg/prompt/prompter_extra_test.go

@@ -272,7 +272,7 @@ func TestDefaultPrompter_PromptSubscription_FilterApplied(t *testing.T) {
 	require.Equal(t, "sub-alpha", subId)
 	// Should show only 1 sub + "Show all subscriptions"
 	require.Len(t, shownOptions, 2)
-	require.Equal(t, ShowAllSubscriptionsOption, shownOptions[len(shownOptions)-1])
+	require.Equal(t, " 2. "+ShowAllSubscriptionsOption, shownOptions[len(shownOptions)-1])
 }
 
 func TestDefaultPrompter_PromptSubscription_ShowAll(t *testing.T) {