Add operator and agent_name to deploy/launch metrics payloads

Call clientsignals.DetectOnce() directly in deploy and launch commands
to classify the operator as interactive/ci/agent, and capture the agent
name when present. Revert the context-plumbing approach in preparers.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: Sprite

internal/cmdutil/preparers/preparers.go

@@ -19,7 +19,6 @@ import (
 	"github.com/superfly/flyctl/internal/instrument"
 	"github.com/superfly/flyctl/internal/launchdarkly"
 	"github.com/superfly/flyctl/internal/logger"
-	"github.com/superfly/flyctl/internal/metrics"
 	"github.com/superfly/flyctl/internal/state"
 	"github.com/superfly/flyctl/internal/uiex"
 	mpgv1 "github.com/superfly/flyctl/internal/uiex/mpg/v1"
@@ -71,7 +70,6 @@ func InitClient(ctx context.Context) (context.Context, error) {
 	if clientSignalsEnabled {
 		s := clientsignals.DetectOnce()
 		signals = &s
-		ctx = metrics.WithClientAgent(ctx, s.Agent)
 	}
 
 	if flyutil.ClientFromContext(ctx) == nil {

internal/command/deploy/deploy.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/logrusorgru/aurora"
 	"github.com/spf13/cobra"
+	clientsignals "github.com/superfly/client-signals/go"
 	"github.com/superfly/fly-go/flaps"
 	"github.com/superfly/flyctl/internal/appconfig"
 	"github.com/superfly/flyctl/internal/build/imgsrc"
@@ -517,7 +518,7 @@ func deployToMachines(
 
 	startTime := time.Now()
 	var status metrics.DeployStatusPayload
-	status.ClientAgent = metrics.ClientAgentFromContext(ctx)
+	status.Operator, status.AgentName = metrics.OperatorFromSignals(clientsignals.DetectOnce())
 
 	metrics.Started(ctx, "deploy")
 	// TODO: remove this once there is nothing upstream using it

internal/command/launch/cmd.go

@@ -15,6 +15,7 @@ import (
 	"github.com/logrusorgru/aurora"
 	"github.com/samber/lo"
 	"github.com/spf13/cobra"
+	clientsignals "github.com/superfly/client-signals/go"
 	"github.com/superfly/flyctl/gql"
 	"github.com/superfly/flyctl/internal/appconfig"
 	"github.com/superfly/flyctl/internal/appsecrets"
@@ -303,7 +304,7 @@ func run(ctx context.Context) (err error) {
 
 	startTime := time.Now()
 	var status metrics.LaunchStatusPayload
-	status.ClientAgent = metrics.ClientAgentFromContext(ctx)
+	status.Operator, status.AgentName = metrics.OperatorFromSignals(clientsignals.DetectOnce())
 	metrics.Started(ctx, "launch")
 
 	var state *launchState = nil

internal/metrics/helpers.go

@@ -6,6 +6,7 @@ import (
 	"sync"
 	"time"
 
+	clientsignals "github.com/superfly/client-signals/go"
 	"github.com/superfly/flyctl/terminal"
 )
 
@@ -80,7 +81,8 @@ type LaunchStatusPayload struct {
 
 	ScannerFamily string `json:"scanner_family"`
 	FlyctlVersion string `json:"flyctlVersion"`
-	ClientAgent   string `json:"clientAgent,omitempty"`
+	Operator      string `json:"operator,omitempty"`
+	AgentName     string `json:"agentName,omitempty"`
 }
 
 func LaunchStatus(ctx context.Context, payload LaunchStatusPayload) {
@@ -114,7 +116,8 @@ type DeployStatusPayload struct {
 	Strategy      string `json:"strategy"`
 
 	FlyctlVersion string `json:"flyctlVersion"`
-	ClientAgent   string `json:"clientAgent,omitempty"`
+	Operator      string `json:"operator,omitempty"`
+	AgentName     string `json:"agentName,omitempty"`
 }
 
 func DeployStatus(ctx context.Context, payload DeployStatusPayload) {
@@ -161,15 +164,17 @@ func StartTiming(ctx context.Context, metricSlug string) func() {
 	}
 }
 
-type clientAgentKey struct{}
-
-func WithClientAgent(ctx context.Context, agent string) context.Context {
-	return context.WithValue(ctx, clientAgentKey{}, agent)
-}
-
-func ClientAgentFromContext(ctx context.Context) string {
-	val, _ := ctx.Value(clientAgentKey{}).(string)
-	return val
+// OperatorFromSignals returns an operator classification and, when the
+// operator is "agent", the agent name. Precedence: agent > ci > interactive.
+func OperatorFromSignals(s clientsignals.Signals) (operator, agentName string) {
+	switch {
+	case s.Agent != "":
+		return "agent", s.Agent
+	case s.CI:
+		return "ci", ""
+	default:
+		return "interactive", ""
+	}
 }
 
 type disableFlushMetricsKey struct{}