From d11757863de3972222a05599516582ea4ac68e7e Mon Sep 17 00:00:00 2001
From: Adriano Sela Aviles <adriano@tailscale.com>
Date: Tue, 21 Jul 2026 11:23:45 -0700
Subject: [PATCH] cmd/tailscale/cli: remove wip-code gate for service list cmd

Updates #20166

Signed-off-by: Adriano Sela Aviles <adriano@tailscale.com>
---
 cmd/tailscale/cli/cli.go          |  2 +-
 cmd/tailscale/cli/service.go      | 47 +++++++++++++------------------
 cmd/tailscale/cli/service_test.go | 14 ---------
 3 files changed, 20 insertions(+), 43 deletions(-)

diff --git a/cmd/tailscale/cli/cli.go b/cmd/tailscale/cli/cli.go
index d4729f932..2f9243013 100644
--- a/cmd/tailscale/cli/cli.go
+++ b/cmd/tailscale/cli/cli.go
@@ -292,7 +292,7 @@ change in the future.
 			sshCmd,
 			nilOrCall(maybeFunnelCmd),
 			nilOrCall(maybeServeCmd),
-			serviceCmd(),
+			serviceCmd,
 			versionCmd,
 			nilOrCall(maybeWebCmd),
 			nilOrCall(fileCmd),
diff --git a/cmd/tailscale/cli/service.go b/cmd/tailscale/cli/service.go
index 012f56db9..35df8b6a0 100644
--- a/cmd/tailscale/cli/service.go
+++ b/cmd/tailscale/cli/service.go
@@ -14,7 +14,6 @@ import (
 	"text/tabwriter"
 
 	"github.com/peterbourgon/ff/v3/ffcli"
-	"tailscale.com/envknob"
 	"tailscale.com/ipn/ipnstate"
 	"tailscale.com/tailcfg"
 	"tailscale.com/types/ipproto"
@@ -51,40 +50,32 @@ func serviceListerFromContext(ctx context.Context) serviceLister {
 
 const serviceListUsage = "tailscale service list"
 
-func serviceCmd() *ffcli.Command {
-	// The service commands are still in development and gated behind the
-	// work-in-progress knob. When it's off, serviceCmd returns nil and is
-	// filtered out of the root command's subcommands by nonNilCmds.
-	if !envknob.UseWIPCode() {
-		return nil
-	}
-	return &ffcli.Command{
-		Name:       "service",
-		ShortHelp:  "Interact with Tailscale Services",
-		ShortUsage: "tailscale service",
-		LongHelp: strings.TrimSpace(`
+var serviceCmd = &ffcli.Command{
+	Name:       "service",
+	ShortHelp:  "Interact with Tailscale Services",
+	ShortUsage: "tailscale service",
+	LongHelp: strings.TrimSpace(`
 The 'tailscale service' command groups subcommands for Tailscale Services.
 
 A Tailscale Service is a virtual service with its own IP addresses. Which
 Services this node can reach is determined by the tailnet's ACLs. Use the 'list'
 subcommand to see the Services currently available to this node.
 `),
-		UsageFunc: usageFuncNoDefaultValues,
-		Exec:      func(context.Context, []string) error { return flag.ErrHelp },
-		Subcommands: []*ffcli.Command{
-			{
-				Name:       "list",
-				ShortUsage: serviceListUsage,
-				ShortHelp:  "List the Tailscale Services your node can access",
-				Exec:       runServiceList,
-				FlagSet: func() *flag.FlagSet {
-					fs := newFlagSet("list")
-					fs.BoolVar(&serviceListArgs.json, "json", false, "output in JSON format")
-					return fs
-				}(),
-			},
+	UsageFunc: usageFuncNoDefaultValues,
+	Exec:      func(context.Context, []string) error { return flag.ErrHelp },
+	Subcommands: []*ffcli.Command{
+		{
+			Name:       "list",
+			ShortUsage: serviceListUsage,
+			ShortHelp:  "List the Tailscale Services your node can access",
+			Exec:       runServiceList,
+			FlagSet: func() *flag.FlagSet {
+				fs := newFlagSet("list")
+				fs.BoolVar(&serviceListArgs.json, "json", false, "output in JSON format")
+				return fs
+			}(),
 		},
-	}
+	},
 }
 
 var serviceListArgs struct {
diff --git a/cmd/tailscale/cli/service_test.go b/cmd/tailscale/cli/service_test.go
index 03059ac80..f289ce97c 100644
--- a/cmd/tailscale/cli/service_test.go
+++ b/cmd/tailscale/cli/service_test.go
@@ -355,17 +355,3 @@ func TestServiceListerFromContextDefault(t *testing.T) {
 		t.Errorf("serviceListerFromContext default = %v, want &localClient", got)
 	}
 }
-
-// TestServiceCmdWIPGate verifies the service command is only registered when
-// work-in-progress code is enabled.
-func TestServiceCmdWIPGate(t *testing.T) {
-	t.Setenv("TAILSCALE_USE_WIP_CODE", "")
-	if cmd := serviceCmd(); cmd != nil {
-		t.Errorf("serviceCmd() = %v, want nil when WIP code is disabled", cmd)
-	}
-
-	t.Setenv("TAILSCALE_USE_WIP_CODE", "1")
-	if cmd := serviceCmd(); cmd == nil {
-		t.Error("serviceCmd() = nil, want non-nil when WIP code is enabled")
-	}
-}