feat: improve environment-aware autocomplete across commands

go.mod

@@ -51,6 +51,7 @@ require (
 	golang.org/x/crypto v0.48.0
 	golang.org/x/oauth2 v0.34.0
 	golang.org/x/sync v0.19.0
+	golang.org/x/term v0.40.0
 	google.golang.org/api v0.246.0
 	google.golang.org/grpc v1.78.0
 	gopkg.in/yaml.v3 v3.0.1
@@ -243,7 +244,6 @@ require (
 	golang.org/x/net v0.51.0 // indirect
 	golang.org/x/sys v0.41.0 // indirect
 	golang.org/x/telemetry v0.0.0-20260209163413-e7419c687ee4 // indirect
-	golang.org/x/term v0.40.0 // indirect
 	golang.org/x/text v0.34.0 // indirect
 	golang.org/x/time v0.14.0 // indirect
 	golang.org/x/tools v0.42.0 // indirect

internal/app/api.go

@@ -3,6 +3,7 @@ package app
 import (
 	"context"
 	"fmt"
+	"sort"
 
 	"github.com/nais/cli/internal/naisapi"
 	"github.com/nais/cli/internal/naisapi/gql"
@@ -109,3 +110,45 @@ func ApplicationEnvironments(ctx context.Context, team, appName string) ([]strin
 	}
 	return ret, nil
 }
+
+func TeamApplicationEnvironments(ctx context.Context, team string) ([]string, error) {
+	_ = `# @genqlient
+		query TeamApplicationEnvironments($team: Slug!) {
+		  team(slug: $team) {
+			  applications(first: 1000) {
+		      nodes {
+		        teamEnvironment {
+		          environment {
+		            name
+		          }
+		        }
+		      }
+		    }
+		  }
+		}
+		`
+
+	client, err := naisapi.GraphqlClient(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	resp, err := gql.TeamApplicationEnvironments(ctx, client, team)
+	if err != nil {
+		return nil, err
+	}
+
+	seen := make(map[string]struct{})
+	ret := make([]string, 0)
+	for _, node := range resp.Team.Applications.Nodes {
+		env := node.TeamEnvironment.Environment.Name
+		if _, ok := seen[env]; ok {
+			continue
+		}
+		seen[env] = struct{}{}
+		ret = append(ret, env)
+	}
+
+	sort.Strings(ret)
+	return ret, nil
+}

internal/app/command/flag/flag.go

@@ -3,10 +3,12 @@ package flag
 import (
 	"context"
 	"fmt"
+	"os"
 	"time"
 
 	activityutil "github.com/nais/cli/internal/activity"
 	"github.com/nais/cli/internal/app"
+	"github.com/nais/cli/internal/cliflags"
 	"github.com/nais/cli/internal/flags"
 	"github.com/nais/cli/internal/naisapi"
 	"github.com/nais/cli/internal/naisapi/gql"
@@ -20,11 +22,89 @@ type App struct {
 type Environments []string
 
 func (e *Environments) AutoComplete(ctx context.Context, args *naistrix.Arguments, str string, flags any) ([]string, string) {
-	envs, err := naisapi.GetAllEnvironments(ctx)
+	team := appTeamFromFlags(flags)
+	if cliTeam := cliflags.FirstFlagValue(os.Args, "-t", "--team"); cliTeam != "" {
+		team = cliTeam
+	}
+	if team == "" {
+		return autoCompleteEnvironments(ctx)
+	}
+
+	if appName := appNameForEnvironmentCompletion(args); appName != "" {
+		envs, err := app.ApplicationEnvironments(ctx, team, appName)
+		if err == nil && len(envs) > 0 {
+			return envs, "Available environments"
+		}
+	}
+
+	envs, err := app.TeamApplicationEnvironments(ctx, team)
 	if err != nil {
 		return nil, fmt.Sprintf("Failed to fetch environments for auto-completion: %v", err)
 	}
-	return envs, "Available environments"
+	if len(envs) > 0 {
+		return envs, "Available environments"
+	}
+
+	return nil, "No environments with applications found for this team."
+}
+
+func appTeamFromFlags(flags any) string {
+	switch f := flags.(type) {
+	case *Activity:
+		if f.App != nil && f.App.Team != "" {
+			return string(f.App.Team)
+		}
+		return string(f.Team)
+	case *Issues:
+		if f.App != nil && f.App.Team != "" {
+			return string(f.App.Team)
+		}
+		return string(f.Team)
+	case *List:
+		if f.App != nil && f.App.Team != "" {
+			return string(f.App.Team)
+		}
+		return string(f.Team)
+	case *Restart:
+		return string(f.Team)
+	case *App:
+		return string(f.Team)
+	default:
+		return ""
+	}
+}
+
+func appNameForEnvironmentCompletion(args *naistrix.Arguments) string {
+	if args.Len() > 0 {
+		if name := args.Get("name"); name != "" {
+			return name
+		}
+	}
+
+	// Some command/flag combinations (for example app restart with parent sticky flags)
+	// do not expose positional args through naistrix during completion.
+	if !isRestartCompletionFromCLIArgs() {
+		return ""
+	}
+
+	return appNameFromCLIArgs(os.Args)
+}
+
+func isRestartCompletionFromCLIArgs() bool {
+	return cliflags.HasSubCommandPathWithValueFlags(
+		os.Args,
+		"app",
+		[]string{"-t", "--team", "-e", "--environment", "--config"},
+		"restart",
+	)
+}
+
+func appNameFromCLIArgs(argv []string) string {
+	return cliflags.PositionalArgAfterSubcommand(
+		argv,
+		"restart",
+		[]string{"-t", "--team", "-e", "--environment", "--config"},
+	)
 }
 
 type instances []string
@@ -40,7 +120,7 @@ func (i *instances) AutoComplete(ctx context.Context, args *naistrix.Arguments,
 	}
 
 	if len(f.Team) == 0 {
-		return nil, "Please provide team to auto-complete instances. 'nais config team set <team>', or '--team <team>' flag."
+		return nil, "Please provide team to auto-complete instances. 'nais config set team <team>', or '--team <team>' flag."
 	}
 
 	instances, err := app.GetApplicationInstances(ctx, string(f.Team), args.Get("name"), string(f.Environment))
@@ -87,13 +167,17 @@ func (a *ActivityTypes) AutoComplete(context.Context, *naistrix.Arguments, strin
 type Env string
 
 func (e *Env) AutoComplete(ctx context.Context, args *naistrix.Arguments, str string, flags any) ([]string, string) {
-	if args.Len() == 0 {
-		return autoCompleteEnvironments(ctx)
-	}
-
 	f := flags.(*Log)
 	if len(f.Team) == 0 {
-		return nil, "Please provide team to auto-complete environments. 'nais config team set <team>', or '--team <team>' flag."
+		return nil, "Please provide team to auto-complete environments. 'nais config set team <team>', or '--team <team>' flag."
+	}
+
+	if args.Len() == 0 {
+		envs, err := app.TeamApplicationEnvironments(ctx, f.Team)
+		if err == nil && len(envs) > 0 {
+			return envs, "Available environments"
+		}
+		return autoCompleteEnvironments(ctx)
 	}
 
 	envs, err := app.ApplicationEnvironments(ctx, f.Team, args.Get("name"))

internal/app/command/issues.go

@@ -2,9 +2,11 @@ package command
 
 import (
 	"context"
+	"os"
 
 	"github.com/nais/cli/internal/app"
 	"github.com/nais/cli/internal/app/command/flag"
+	"github.com/nais/cli/internal/cliflags"
 	"github.com/nais/naistrix"
 	"github.com/nais/naistrix/output"
 )
@@ -42,7 +44,12 @@ func issues(parentFlags *flag.App) *naistrix.Command {
 				if len(flags.Team) == 0 {
 					return nil, "Please provide team to auto-complete application names. 'nais config set team <team>', or '--team <team>' flag."
 				}
-				apps, err := app.GetApplicationNames(ctx, flags.Team, flags.Environment)
+				environments := []string(flags.Environment)
+				if len(environments) == 0 {
+					environments = cliflags.UniqueFlagValues(os.Args, "-e", "--environment")
+				}
+
+				apps, err := app.GetApplicationNames(ctx, flags.Team, environments)
 				if err != nil {
 					return nil, "Unable to fetch application names."
 				}

internal/app/command/restart.go

@@ -2,9 +2,12 @@ package command
 
 import (
 	"context"
+	"fmt"
+	"os"
 
 	"github.com/nais/cli/internal/app"
 	"github.com/nais/cli/internal/app/command/flag"
+	"github.com/nais/cli/internal/cliflags"
 	"github.com/nais/naistrix"
 )
 
@@ -20,6 +23,27 @@ func restart(parentFlags *flag.App) *naistrix.Command {
 		Args: []naistrix.Argument{
 			{Name: "name"},
 		},
+		AutoCompleteFunc: func(ctx context.Context, args *naistrix.Arguments, _ string) ([]string, string) {
+			if args.Len() != 0 {
+				return nil, ""
+			}
+			if len(flags.Team) == 0 {
+				return nil, "Please provide team to auto-complete application names. 'nais config set team <team>', or '--team <team>' flag."
+			}
+			envs := []string(flags.Environment)
+			if len(envs) != 1 {
+				envs = cliflags.UniqueFlagValues(os.Args, "-e", "--environment")
+			}
+			if len(envs) != 1 {
+				return nil, "Please provide exactly one environment to auto-complete application names. '--environment <environment>' flag."
+			}
+
+			apps, err := app.GetApplicationNames(ctx, flags.Team, envs)
+			if err != nil {
+				return nil, fmt.Sprintf("Unable to fetch application names: %v", err)
+			}
+			return apps, "Select an application."
+		},
 		RunFunc: func(ctx context.Context, args *naistrix.Arguments, out *naistrix.OutputWriter) error {
 			ret, err := app.RestartApp(ctx, flags.Team, args.Get("name"), flags.Environment)
 			if err != nil {