From 9cf24318fab8b6c38e54c143242ae353093babeb Mon Sep 17 00:00:00 2001 From: "kernel-internal[bot]" <260533166+kernel-internal[bot]@users.noreply.github.com> Date: Mon, 17 Aug 2026 20:47:32 +0000 Subject: [PATCH 01/26] CLI: Update SDK to 0a28735 and add org entitlements command Bump github.com/kernel/kernel-go-sdk to v0.91.1-0.20260817203807-0a287359dcc5 (0a28735). Coverage gap found by enumerating all 140 methods in the SDK's api.md against the CLI command tree: the new Organization.Entitlements resource had no CLI surface. Everything else was already covered. New command: - `kernel org entitlements get` for client.Organization.Entitlements.Get (GET /org/entitlements). Renders Plan, Features, and Limits sections; supports --output json. Null constraint values mean unlimited in this API, and the SDK models them as non-pointer int64, so rendering keys off respjson field validity rather than the zero value. Tested against the real API: - kernel org entitlements get (table output, ENTERPRISE plan) - kernel org entitlements get --output json - kernel org entitlements get --output yaml (rejected as expected) - go build ./... and go test ./... pass, including 5 new unit tests covering populated constraints, null-as-unlimited, null plan fields, invalid --output, and API errors. Co-Authored-By: Claude Opus 5 --- README.md | 2 + cmd/org.go | 157 +++++++++++++++++++++++++++++++++++++++++++++++- cmd/org_test.go | 148 +++++++++++++++++++++++++++++++++++++++++++++ go.mod | 2 +- go.sum | 4 +- 5 files changed, 308 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 96eed04e..64611f30 100644 --- a/README.md +++ b/README.md @@ -729,6 +729,8 @@ Automated authentication for web services. The `run` command orchestrates the fu - `kernel org limits set` - Set the default per-project concurrency cap applied to projects without an explicit override - `--default-project-max-concurrent-sessions ` - Default maximum concurrent browsers for projects without an explicit override (`0` to remove the default) - `--output json`, `-o json` - Output raw JSON object +- `kernel org entitlements get` - Show the organization's effective feature access and constraints after applying its plan, active trial treatment, plan status, and organization-specific overrides; unlimited constraints are shown as `unlimited` + - `--output json`, `-o json` - Output raw JSON object ## Examples diff --git a/cmd/org.go b/cmd/org.go index ffd8c02b..790087bc 100644 --- a/cmd/org.go +++ b/cmd/org.go @@ -3,6 +3,7 @@ package cmd import ( "context" "fmt" + "time" "github.com/kernel/cli/pkg/util" "github.com/kernel/kernel-go-sdk" @@ -10,6 +11,7 @@ import ( "github.com/kernel/kernel-go-sdk/packages/param" "github.com/kernel/kernel-go-sdk/packages/respjson" "github.com/pterm/pterm" + "github.com/samber/lo" "github.com/spf13/cobra" ) @@ -19,14 +21,24 @@ type OrgLimitsService interface { Update(ctx context.Context, body kernel.OrganizationLimitUpdateParams, opts ...option.RequestOption) (res *kernel.OrgLimits, err error) } +// OrgEntitlementsService defines the subset of the Kernel SDK organization entitlements client that we use. +type OrgEntitlementsService interface { + Get(ctx context.Context, opts ...option.RequestOption) (res *kernel.OrgEntitlements, err error) +} + type OrgCmd struct { - limits OrgLimitsService + limits OrgLimitsService + entitlements OrgEntitlementsService } type OrgLimitsGetInput struct { Output string } +type OrgEntitlementsGetInput struct { + Output string +} + type OrgLimitsSetInput struct { DefaultProjectMaxConcurrentSessions Int64Flag Output string @@ -88,6 +100,118 @@ func (c OrgCmd) LimitsSet(ctx context.Context, in OrgLimitsSetInput) error { return nil } +func (c OrgCmd) EntitlementsGet(ctx context.Context, in OrgEntitlementsGetInput) error { + if err := validateJSONOutput(in.Output); err != nil { + return err + } + + entitlements, err := c.entitlements.Get(ctx) + if err != nil { + return util.CleanedUpSdkError{Err: err} + } + + if in.Output == "json" { + if entitlements == nil { + fmt.Println("null") + return nil + } + return util.PrintPrettyJSON(entitlements) + } + + renderOrgEntitlements(entitlements) + return nil +} + +func renderOrgEntitlements(ent *kernel.OrgEntitlements) { + if ent == nil { + pterm.Info.Println("No organization entitlements found") + return + } + + plan := ent.Plan + planRows := pterm.TableData{ + {"Field", "Value"}, + {"Plan", plan.ID}, + // Active trials resolve to a different effective plan than the + // contractual one, so show both. + {"Effective Plan", plan.EffectiveID}, + {"Trialing", lo.Ternary(plan.IsTrialing, "yes", "no")}, + // Billing status and trial end are both nullable. + {"Billing Status", formatOrgEntitlementString(plan.Status, plan.JSON.Status)}, + {"Trial Ends At", formatOrgEntitlementTime(plan.TrialEndsAt, plan.JSON.TrialEndsAt)}, + } + pterm.DefaultSection.Println("Plan") + PrintTableNoPad(planRows, true) + + f := ent.Features + featureRows := pterm.TableData{ + {"Feature", "Enabled", "Constraints"}, + {"Browser Extensions", formatOrgEntitlementEnabled(f.BrowserExtensions.Enabled), fmt.Sprintf("max stored per org: %s", formatProjectLimitValue(f.BrowserExtensions.MaxStoredPerOrg, f.BrowserExtensions.JSON.MaxStoredPerOrg))}, + {"Browser Pools", formatOrgEntitlementEnabled(f.BrowserPools.Enabled), ""}, + {"Browser Replays", formatOrgEntitlementEnabled(f.BrowserReplays.Enabled), fmt.Sprintf("retention: %s", formatOrgEntitlementDays(f.BrowserReplays.RetentionDays, f.BrowserReplays.JSON.RetentionDays))}, + {"Credential Providers", formatOrgEntitlementEnabled(f.CredentialProviders.Enabled), ""}, + {"Credentials", formatOrgEntitlementEnabled(f.Credentials.Enabled), ""}, + {"Custom Proxies", formatOrgEntitlementEnabled(f.CustomProxies.Enabled), ""}, + {"File I/O", formatOrgEntitlementEnabled(f.FileIo.Enabled), ""}, + {"GPU", formatOrgEntitlementEnabled(f.GPU.Enabled), ""}, + {"Managed Auth", formatOrgEntitlementEnabled(f.ManagedAuth.Enabled), formatManagedAuthConstraints(f.ManagedAuth)}, + {"Managed Proxies", formatOrgEntitlementEnabled(f.ManagedProxies.Enabled), ""}, + {"Profiles", formatOrgEntitlementEnabled(f.Profiles.Enabled), ""}, + {"Proxy Bypass Hosts", formatOrgEntitlementEnabled(f.ProxyBypassHosts.Enabled), ""}, + } + pterm.DefaultSection.Println("Features") + PrintTableNoPad(featureRows, true) + + l := ent.Limits + limitRows := pterm.TableData{ + {"Limit", "Value"}, + {"Max Concurrent Browsers", formatProjectLimitValue(l.MaxConcurrentBrowsers, l.JSON.MaxConcurrentBrowsers)}, + {"Max Concurrent Invocations", formatProjectLimitValue(l.MaxConcurrentInvocations, l.JSON.MaxConcurrentInvocations)}, + {"Default Max Concurrent Invocations Per App", formatProjectLimitValue(l.DefaultMaxConcurrentInvocationsPerApp, l.JSON.DefaultMaxConcurrentInvocationsPerApp)}, + } + pterm.DefaultSection.Println("Limits") + PrintTableNoPad(limitRows, true) +} + +func formatOrgEntitlementEnabled(enabled bool) string { + return lo.Ternary(enabled, "yes", "no") +} + +// formatManagedAuthConstraints summarizes the managed auth connection cap and the +// accepted health-check interval window in a single cell. +func formatManagedAuthConstraints(ma kernel.OrgEntitlementsFeaturesManagedAuth) string { + return fmt.Sprintf( + "max connections: %s, health check interval: %ds default (%ds-%ds)", + formatProjectLimitValue(ma.MaxConnections, ma.JSON.MaxConnections), + ma.HealthCheckIntervalDefaultSeconds, + ma.HealthCheckIntervalMinSeconds, + ma.HealthCheckIntervalMaxSeconds, + ) +} + +// formatOrgEntitlementDays renders a retention window, treating a null value as +// unlimited retention rather than zero days. +func formatOrgEntitlementDays(value int64, field respjson.Field) string { + if !field.Valid() { + return "unlimited" + } + return fmt.Sprintf("%d days", value) +} + +func formatOrgEntitlementString(value string, field respjson.Field) string { + if !field.Valid() || value == "" { + return "-" + } + return value +} + +func formatOrgEntitlementTime(value time.Time, field respjson.Field) string { + if !field.Valid() || value.IsZero() { + return "-" + } + return util.FormatLocal(value) +} + func renderOrgLimits(limits *kernel.OrgLimits) { if limits == nil { pterm.Info.Println("No organization limits found") @@ -144,6 +268,22 @@ var orgLimitsCmd = &cobra.Command{ }, } +var orgEntitlementsCmd = &cobra.Command{ + Use: "entitlements", + Short: "Read organization entitlements", + Run: func(cmd *cobra.Command, args []string) { + _ = cmd.Help() + }, +} + +var orgEntitlementsGetCmd = &cobra.Command{ + Use: "get", + Short: "Get organization entitlements", + Long: "Show the organization's effective feature access and constraints after applying its plan, active trial treatment, plan status, and organization-specific overrides. Unlimited constraints are shown as \"unlimited\".", + Args: cobra.NoArgs, + RunE: runOrgEntitlementsGet, +} + var orgLimitsGetCmd = &cobra.Command{ Use: "get", Short: "Get organization limits", @@ -162,7 +302,16 @@ var orgLimitsSetCmd = &cobra.Command{ func getOrgHandler(cmd *cobra.Command) OrgCmd { client := getKernelClient(cmd) - return OrgCmd{limits: &client.Organization.Limits} + return OrgCmd{ + limits: &client.Organization.Limits, + entitlements: &client.Organization.Entitlements, + } +} + +func runOrgEntitlementsGet(cmd *cobra.Command, args []string) error { + c := getOrgHandler(cmd) + output, _ := cmd.Flags().GetString("output") + return c.EntitlementsGet(cmd.Context(), OrgEntitlementsGetInput{Output: output}) } func runOrgLimitsGet(cmd *cobra.Command, args []string) error { @@ -189,7 +338,11 @@ func init() { orgLimitsSetCmd.Flags().Int64("default-project-max-concurrent-sessions", 0, "Default maximum concurrent browsers for projects without an explicit override (0 to remove the default)") addJSONOutputFlag(orgLimitsSetCmd) + addJSONOutputFlag(orgEntitlementsGetCmd) + orgLimitsCmd.AddCommand(orgLimitsGetCmd) orgLimitsCmd.AddCommand(orgLimitsSetCmd) + orgEntitlementsCmd.AddCommand(orgEntitlementsGetCmd) orgCmd.AddCommand(orgLimitsCmd) + orgCmd.AddCommand(orgEntitlementsCmd) } diff --git a/cmd/org_test.go b/cmd/org_test.go index 946800b0..ea2110db 100644 --- a/cmd/org_test.go +++ b/cmd/org_test.go @@ -4,6 +4,7 @@ import ( "context" "errors" "testing" + "time" "github.com/kernel/kernel-go-sdk" "github.com/kernel/kernel-go-sdk/option" @@ -177,3 +178,150 @@ func TestOrgLimitsSet_RejectsNegative(t *testing.T) { assert.Error(t, err) assert.Contains(t, err.Error(), "must be non-negative") } + +type FakeOrgEntitlementsService struct { + GetFunc func(ctx context.Context, opts ...option.RequestOption) (*kernel.OrgEntitlements, error) +} + +func (f *FakeOrgEntitlementsService) Get(ctx context.Context, opts ...option.RequestOption) (*kernel.OrgEntitlements, error) { + if f.GetFunc != nil { + return f.GetFunc(ctx, opts...) + } + return &kernel.OrgEntitlements{}, nil +} + +// populatedEntitlements builds an entitlements payload with every nullable field +// present, so renders exercise the non-"unlimited" branches. +func populatedEntitlements() *kernel.OrgEntitlements { + ent := &kernel.OrgEntitlements{} + + ent.Plan.ID = "START_UP" + ent.Plan.EffectiveID = "START_UP" + ent.Plan.IsTrialing = true + ent.Plan.Status = "ACTIVE" + ent.Plan.TrialEndsAt = time.Date(2030, 1, 2, 3, 4, 5, 0, time.UTC) + ent.Plan.JSON.Status = respjson.NewField(`"ACTIVE"`) + ent.Plan.JSON.TrialEndsAt = respjson.NewField(`"2030-01-02T03:04:05Z"`) + + ent.Features.BrowserExtensions.Enabled = true + ent.Features.BrowserExtensions.MaxStoredPerOrg = 25 + ent.Features.BrowserExtensions.JSON.MaxStoredPerOrg = respjson.NewField("25") + ent.Features.BrowserPools.Enabled = true + ent.Features.BrowserReplays.Enabled = true + ent.Features.BrowserReplays.RetentionDays = 7 + ent.Features.BrowserReplays.JSON.RetentionDays = respjson.NewField("7") + ent.Features.CredentialProviders.Enabled = true + ent.Features.Credentials.Enabled = true + ent.Features.CustomProxies.Enabled = false + ent.Features.FileIo.Enabled = true + ent.Features.GPU.Enabled = false + ent.Features.ManagedAuth.Enabled = true + ent.Features.ManagedAuth.MaxConnections = 10 + ent.Features.ManagedAuth.HealthCheckIntervalDefaultSeconds = 600 + ent.Features.ManagedAuth.HealthCheckIntervalMinSeconds = 300 + ent.Features.ManagedAuth.HealthCheckIntervalMaxSeconds = 86400 + ent.Features.ManagedAuth.JSON.MaxConnections = respjson.NewField("10") + ent.Features.ManagedProxies.Enabled = true + ent.Features.Profiles.Enabled = true + ent.Features.ProxyBypassHosts.Enabled = true + + ent.Limits.MaxConcurrentBrowsers = 50 + ent.Limits.MaxConcurrentInvocations = 20 + ent.Limits.DefaultMaxConcurrentInvocationsPerApp = 5 + ent.Limits.JSON.MaxConcurrentBrowsers = respjson.NewField("50") + ent.Limits.JSON.MaxConcurrentInvocations = respjson.NewField("20") + ent.Limits.JSON.DefaultMaxConcurrentInvocationsPerApp = respjson.NewField("5") + + return ent +} + +func TestOrgEntitlementsGet_RendersPlanFeaturesAndLimits(t *testing.T) { + buf := capturePtermOutput(t) + fake := &FakeOrgEntitlementsService{ + GetFunc: func(ctx context.Context, opts ...option.RequestOption) (*kernel.OrgEntitlements, error) { + return populatedEntitlements(), nil + }, + } + c := OrgCmd{entitlements: fake} + assert.NoError(t, c.EntitlementsGet(context.Background(), OrgEntitlementsGetInput{})) + + out := buf.String() + // Plan section + assert.Contains(t, out, "START_UP") + assert.Contains(t, out, "Effective Plan") + assert.Contains(t, out, "Trialing") + assert.Contains(t, out, "ACTIVE") + // Features section — every feature should get a row. + for _, feature := range []string{ + "Browser Extensions", "Browser Pools", "Browser Replays", "Credential Providers", + "Credentials", "Custom Proxies", "File I/O", "GPU", "Managed Auth", + "Managed Proxies", "Profiles", "Proxy Bypass Hosts", + } { + assert.Contains(t, out, feature) + } + assert.Contains(t, out, "max stored per org: 25") + assert.Contains(t, out, "retention: 7 days") + assert.Contains(t, out, "max connections: 10") + assert.Contains(t, out, "600s default (300s-86400s)") + // Limits section + assert.Contains(t, out, "Max Concurrent Browsers") + assert.Contains(t, out, "Max Concurrent Invocations") + assert.Contains(t, out, "Default Max Concurrent Invocations Per App") +} + +func TestOrgEntitlementsGet_NullConstraintsShownAsUnlimited(t *testing.T) { + buf := capturePtermOutput(t) + fake := &FakeOrgEntitlementsService{ + GetFunc: func(ctx context.Context, opts ...option.RequestOption) (*kernel.OrgEntitlements, error) { + ent := populatedEntitlements() + // Null (not omitted) constraints mean unlimited. + ent.Features.BrowserExtensions.JSON.MaxStoredPerOrg = respjson.NewField(respjson.Null) + ent.Features.ManagedAuth.JSON.MaxConnections = respjson.NewField(respjson.Null) + ent.Limits.JSON.MaxConcurrentBrowsers = respjson.NewField(respjson.Null) + return ent, nil + }, + } + c := OrgCmd{entitlements: fake} + assert.NoError(t, c.EntitlementsGet(context.Background(), OrgEntitlementsGetInput{})) + + out := buf.String() + assert.Contains(t, out, "max stored per org: unlimited") + assert.Contains(t, out, "max connections: unlimited") + assert.Contains(t, out, "unlimited") +} + +func TestOrgEntitlementsGet_NullPlanFieldsShownAsDash(t *testing.T) { + buf := capturePtermOutput(t) + fake := &FakeOrgEntitlementsService{ + GetFunc: func(ctx context.Context, opts ...option.RequestOption) (*kernel.OrgEntitlements, error) { + ent := populatedEntitlements() + ent.Plan.IsTrialing = false + ent.Plan.JSON.Status = respjson.NewField(respjson.Null) + ent.Plan.JSON.TrialEndsAt = respjson.NewField(respjson.Null) + return ent, nil + }, + } + c := OrgCmd{entitlements: fake} + assert.NoError(t, c.EntitlementsGet(context.Background(), OrgEntitlementsGetInput{})) + + out := buf.String() + assert.Contains(t, out, "Billing Status") + assert.Contains(t, out, "Trial Ends At") + assert.NotContains(t, out, "ACTIVE") +} + +func TestOrgEntitlementsGet_RejectsUnknownOutput(t *testing.T) { + c := OrgCmd{entitlements: &FakeOrgEntitlementsService{}} + assert.Error(t, c.EntitlementsGet(context.Background(), OrgEntitlementsGetInput{Output: "yaml"})) +} + +func TestOrgEntitlementsGet_SurfacesAPIError(t *testing.T) { + capturePtermOutput(t) + fake := &FakeOrgEntitlementsService{ + GetFunc: func(ctx context.Context, opts ...option.RequestOption) (*kernel.OrgEntitlements, error) { + return nil, errors.New("boom") + }, + } + c := OrgCmd{entitlements: fake} + assert.Error(t, c.EntitlementsGet(context.Background(), OrgEntitlementsGetInput{})) +} diff --git a/go.mod b/go.mod index ebe99635..85d0a029 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.1 github.com/golang-jwt/jwt/v5 v5.2.2 github.com/joho/godotenv v1.5.1 - github.com/kernel/kernel-go-sdk v0.91.0 + github.com/kernel/kernel-go-sdk v0.91.1-0.20260817203807-0a287359dcc5 github.com/klauspost/compress v1.18.5 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c github.com/pterm/pterm v0.12.80 diff --git a/go.sum b/go.sum index 7808eb39..b91fd6b3 100644 --- a/go.sum +++ b/go.sum @@ -64,8 +64,8 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= -github.com/kernel/kernel-go-sdk v0.91.0 h1:/bJKFJQ8ZwAyl+r8P1sUW8NQYEjDekYZJ5R8Sml5bus= -github.com/kernel/kernel-go-sdk v0.91.0/go.mod h1:EeZzSuHZVeHKxKCPUzxou2bovNGhXaz0RXrSqKNf1AQ= +github.com/kernel/kernel-go-sdk v0.91.1-0.20260817203807-0a287359dcc5 h1:Kaq0Dhh1VW36HzqOUOpvWnB1PF3XtPekC++RYdgePNQ= +github.com/kernel/kernel-go-sdk v0.91.1-0.20260817203807-0a287359dcc5/go.mod h1:EeZzSuHZVeHKxKCPUzxou2bovNGhXaz0RXrSqKNf1AQ= github.com/klauspost/compress v1.18.5 h1:/h1gH5Ce+VWNLSWqPzOVn6XBO+vJbCNGvjoaGBFW2IE= github.com/klauspost/compress v1.18.5/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= From dfdba4fccc49d1e67bce163b8122769024932fbc Mon Sep 17 00:00:00 2001 From: "kernel-internal[bot]" <260533166+kernel-internal[bot]@users.noreply.github.com> Date: Mon, 17 Aug 2026 21:07:08 +0000 Subject: [PATCH 02/26] CLI: Update Go SDK to v0.92.0 (a156820) Updates github.com/kernel/kernel-go-sdk from v0.91.1-0.20260817203807-0a287359dcc5 to v0.92.0. ## Coverage Analysis Diffing the two module sources shows the SDK API surface is byte-identical between these versions -- the only changes are release metadata (.release-please-manifest.json, CHANGELOG.md, README.md, internal/version.go). A full enumeration was still performed: - All 140 SDK methods in api.md have corresponding CLI commands. - The 4 x-cli-skip endpoints (/site-configs/lookup, /site-configs/resolve, /site-configs/analyses/{id}, /auth/connections/{id}/exchange) are absent from the SDK surface, so nothing to skip. - All params struct fields are covered by CLI flags except three, each intentional: - AuthConnectionLoginParams.BrowserTelemetry -- deprecated in favor of browser.telemetry, which the CLI already uses via ManagedAuthBrowserConfigParam. - AuditLogListParams.PageToken -- opaque cursor handled internally by ListAutoPaging; CLI exposes --limit instead. - BrowserCurlParams.TimeoutMs / ResponseEncoding -- `browsers curl` is implemented against browsers.HTTPClient rather than the SDK curl endpoint; --max-time covers the timeout and raw bytes are streamed, so response encoding is not applicable. No coverage gaps found; no new commands or flags added. ## Tested - go build ./... and go vet ./... clean - go test ./... all packages pass - Smoke tested rebuilt binary against the live API: `kernel browsers list` Triggered by: kernel/kernel-go-sdk@a1568205c576686eeafc634fff0ea72b75c28c0e Co-Authored-By: Claude Opus 5 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 85d0a029..502421b9 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.1 github.com/golang-jwt/jwt/v5 v5.2.2 github.com/joho/godotenv v1.5.1 - github.com/kernel/kernel-go-sdk v0.91.1-0.20260817203807-0a287359dcc5 + github.com/kernel/kernel-go-sdk v0.92.0 github.com/klauspost/compress v1.18.5 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c github.com/pterm/pterm v0.12.80 diff --git a/go.sum b/go.sum index b91fd6b3..04679b80 100644 --- a/go.sum +++ b/go.sum @@ -64,8 +64,8 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= -github.com/kernel/kernel-go-sdk v0.91.1-0.20260817203807-0a287359dcc5 h1:Kaq0Dhh1VW36HzqOUOpvWnB1PF3XtPekC++RYdgePNQ= -github.com/kernel/kernel-go-sdk v0.91.1-0.20260817203807-0a287359dcc5/go.mod h1:EeZzSuHZVeHKxKCPUzxou2bovNGhXaz0RXrSqKNf1AQ= +github.com/kernel/kernel-go-sdk v0.92.0 h1:3EeoPahTcGEo97BCbwT50gu8QJnawfL166z12hc8Ucg= +github.com/kernel/kernel-go-sdk v0.92.0/go.mod h1:EeZzSuHZVeHKxKCPUzxou2bovNGhXaz0RXrSqKNf1AQ= github.com/klauspost/compress v1.18.5 h1:/h1gH5Ce+VWNLSWqPzOVn6XBO+vJbCNGvjoaGBFW2IE= github.com/klauspost/compress v1.18.5/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= From 8a7b36334f3cc3f878df9b17d90da78d24e5b6d2 Mon Sep 17 00:00:00 2001 From: "kernel-internal[bot]" <260533166+kernel-internal[bot]@users.noreply.github.com> Date: Tue, 18 Aug 2026 21:13:13 +0000 Subject: [PATCH 03/26] CLI: Update Go SDK to 6e62bf5 and track managed-auth field reason Bumps kernel-go-sdk to 6e62bf5b91e5d315b90b6c9c7296e09e312fb338. That SDK release reshapes the canonical managed-auth input field: the boolean `replace_existing` is gone and a `reason` enum ("missing" | "rejected") takes its place, so `auth connections get` and the `auth connections follow` event stream now render `reason=` instead of the `replace-existing` marker. A rejected credential is still visible, now alongside the missing-value case it could not previously express. A full enumeration of api.md against the CLI's service interfaces and flags found no other coverage gaps: all 136 non-x-cli-skip SDK methods have commands, and every params field maps to an existing flag. Tested: auth connections list, auth connections get (table + json), browsers create -t 60, browsers get , browsers delete against the live API; go build ./... and go test ./cmd/... pass. Co-Authored-By: Claude Opus 5 --- cmd/auth_connections.go | 46 ++++++++++++++++++------------------ cmd/auth_connections_test.go | 5 +++- go.mod | 2 +- go.sum | 4 ++-- 4 files changed, 30 insertions(+), 27 deletions(-) diff --git a/cmd/auth_connections.go b/cmd/auth_connections.go index 79a34567..4237e9a3 100644 --- a/cmd/auth_connections.go +++ b/cmd/auth_connections.go @@ -414,13 +414,13 @@ func (c AuthConnectionCmd) Update(ctx context.Context, in AuthConnectionUpdateIn // models the one on `get` and the one on the `follow` event stream as two // identical but distinct types, so both are converted to this before rendering. type managedAuthInputField struct { - ID string - Label string - Type string - Ref string - Hint string - Required bool - ReplaceExisting bool + ID string + Label string + Type string + Ref string + Hint string + Reason string + Required bool } // managedAuthInputChoice is the choice counterpart of managedAuthInputField. @@ -448,8 +448,8 @@ func formatManagedAuthField(f managedAuthInputField) string { if f.Required { meta = append(meta, "required") } - if f.ReplaceExisting { - meta = append(meta, "replace-existing") + if f.Reason != "" { + meta = append(meta, "reason="+f.Reason) } if f.Hint != "" { meta = append(meta, fmt.Sprintf("hint=%q", f.Hint)) @@ -542,13 +542,13 @@ func (c AuthConnectionCmd) Get(ctx context.Context, in AuthConnectionGetInput) e fields := make([]string, 0, len(auth.Fields)) for _, f := range auth.Fields { fields = append(fields, formatManagedAuthField(managedAuthInputField{ - ID: f.ID, - Label: f.Label, - Type: f.Type, - Ref: f.Ref, - Hint: f.Hint, - Required: f.Required, - ReplaceExisting: f.ReplaceExisting, + ID: f.ID, + Label: f.Label, + Type: f.Type, + Ref: f.Ref, + Hint: f.Hint, + Reason: f.Reason, + Required: f.Required, })) } tableData = append(tableData, []string{"Fields", strings.Join(fields, "; ")}) @@ -1067,13 +1067,13 @@ func (c AuthConnectionCmd) Follow(ctx context.Context, in AuthConnectionFollowIn fields := make([]string, 0, len(state.Fields)) for _, f := range state.Fields { fields = append(fields, formatManagedAuthField(managedAuthInputField{ - ID: f.ID, - Label: f.Label, - Type: f.Type, - Ref: f.Ref, - Hint: f.Hint, - Required: f.Required, - ReplaceExisting: f.ReplaceExisting, + ID: f.ID, + Label: f.Label, + Type: f.Type, + Ref: f.Ref, + Hint: f.Hint, + Reason: f.Reason, + Required: f.Required, })) } pterm.Info.Printf(" Fields: %s\n", strings.Join(fields, ", ")) diff --git a/cmd/auth_connections_test.go b/cmd/auth_connections_test.go index b1c654a9..a403464e 100644 --- a/cmd/auth_connections_test.go +++ b/cmd/auth_connections_test.go @@ -154,6 +154,7 @@ func TestAuthConnectionsGet_PrintsCanonicalInputMetadata(t *testing.T) { Type: "code", Ref: "totp_code", Hint: "Enter the code sent to +1 ••• ••• 1234", + Reason: "rejected", Required: true, }, }, @@ -182,7 +183,9 @@ func TestAuthConnectionsGet_PrintsCanonicalInputMetadata(t *testing.T) { out := outBuf.String() assert.Contains(t, out, `otp (One-time code)`) - assert.Contains(t, out, `code, ref=totp_code, required`) + // The reason tells the user why the field is being asked for: "rejected" + // means a stored credential was refused, so a new value has to replace it. + assert.Contains(t, out, `code, ref=totp_code, required, reason=rejected`) assert.Contains(t, out, `hint="Enter the code sent to +1 ••• ••• 1234"`) assert.Contains(t, out, `mfa_sms (Text message)`) assert.Contains(t, out, `mfa_method, sms, to=+1 ••• ••• 1234`) diff --git a/go.mod b/go.mod index 502421b9..52d4a655 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.1 github.com/golang-jwt/jwt/v5 v5.2.2 github.com/joho/godotenv v1.5.1 - github.com/kernel/kernel-go-sdk v0.92.0 + github.com/kernel/kernel-go-sdk v0.92.1-0.20260818210401-6e62bf5b91e5 github.com/klauspost/compress v1.18.5 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c github.com/pterm/pterm v0.12.80 diff --git a/go.sum b/go.sum index 04679b80..ef49c798 100644 --- a/go.sum +++ b/go.sum @@ -64,8 +64,8 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= -github.com/kernel/kernel-go-sdk v0.92.0 h1:3EeoPahTcGEo97BCbwT50gu8QJnawfL166z12hc8Ucg= -github.com/kernel/kernel-go-sdk v0.92.0/go.mod h1:EeZzSuHZVeHKxKCPUzxou2bovNGhXaz0RXrSqKNf1AQ= +github.com/kernel/kernel-go-sdk v0.92.1-0.20260818210401-6e62bf5b91e5 h1:xnui88jn6CAp2Ys15AP7aagFGPveqrT/3LfdDsuIeY4= +github.com/kernel/kernel-go-sdk v0.92.1-0.20260818210401-6e62bf5b91e5/go.mod h1:EeZzSuHZVeHKxKCPUzxou2bovNGhXaz0RXrSqKNf1AQ= github.com/klauspost/compress v1.18.5 h1:/h1gH5Ce+VWNLSWqPzOVn6XBO+vJbCNGvjoaGBFW2IE= github.com/klauspost/compress v1.18.5/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= From ca46838accfb10bf06678d3de3185d3dbca51f3a Mon Sep 17 00:00:00 2001 From: "kernel-internal[bot]" <260533166+kernel-internal[bot]@users.noreply.github.com> Date: Wed, 19 Aug 2026 19:02:46 +0000 Subject: [PATCH 04/26] CLI: Update Go SDK to 796d424 and bind canonical submits to interactions Bumps kernel-go-sdk to 796d4245c87a39acbb0d408b05f0de830c500772. That SDK release adds `interaction_id` to managed auth state and to the submit request. The API requires it for canonical submissions (field_values / selected_choice_id) and rejects it when paired with a legacy submit mode, so before this change every canonical `auth connections submit` failed with "interaction_id is required for canonical submissions". `auth connections submit` gains --interaction-id. Left off, the CLI reads the connection's current interaction ID, since the ID changes on every actionable pause and the freshly read one is the only sane default; passing it pins the submission so the API can reject it as stale. Legacy submit modes never send one, and --interaction-id with a legacy mode is rejected locally with the same rule the API enforces. `auth connections get` and `follow` now show the interaction ID next to the canonical fields and choices it scopes. Also resolves the stale merge of main into this branch, which had left two competing org entitlements implementations in cmd/org.go (the branch built `org entitlements get`; main shipped `org entitlements` in #232) so the package no longer compiled. Main's reviewed version wins. A full enumeration of api.md against the CLI found no other gaps: all 136 non-x-cli-skip SDK methods have commands, and the only new params field in this release is SubmitFieldsRequest.interaction_id. Tested against the live API: created a managed auth connection, started a login flow, and confirmed `get` (table + JSON) and `follow` render the interaction ID at AWAITING_INPUT; canonical submit with and without --interaction-id now clears the API's interaction validation (it stops at this org's submit-v2 feature gate, while the same request sent without interaction_id still returns "interaction_id is required"); legacy `--field` submit still accepted; `--interaction-id` with `--field` rejected locally; org entitlements, browsers create/get/delete pass. go build ./..., go vet ./... and go test ./... pass. Co-Authored-By: Claude Opus 5 --- README.md | 3 +- cmd/auth_connections.go | 54 ++++++++++++- cmd/auth_connections_test.go | 127 +++++++++++++++++++++++++++--- cmd/org.go | 137 -------------------------------- cmd/org_test.go | 147 ----------------------------------- go.mod | 2 +- go.sum | 4 +- 7 files changed, 174 insertions(+), 300 deletions(-) diff --git a/README.md b/README.md index b45c27af..4f7655e4 100644 --- a/README.md +++ b/README.md @@ -619,6 +619,7 @@ Managed auth connections (`kernel auth connections`). The commands below are new - `kernel auth connections submit ` - New flags: - `--field-value ` - Canonical field-id=value pair from the connection's `fields` list (repeatable); preferred over the legacy `--field` - `--choice-id ` - Canonical choice ID from the connection's `choices` list + - `--interaction-id ` - Canonical interaction the submitted values answer. Only valid with `--field-value` or `--choice-id`; omit it and the CLI reads the connection's current interaction ID for you. Pass it to pin the submission, so the API rejects it if the flow has already moved on. `kernel auth connections get` and `follow` list those IDs alongside the metadata the API captured for them, so you can tell the options apart before submitting. Fields show their type, ref, and any hint (which names the masked destination a one-time code was sent to); choices show their type, semantic MFA method (`sms`, `totp`, `push`, …), and masked destination. @@ -731,8 +732,6 @@ Automated authentication for web services. The `run` command orchestrates the fu - `kernel org limits set` - Set the default per-project concurrency cap applied to projects without an explicit override - `--default-project-max-concurrent-sessions ` - Default maximum concurrent browsers for projects without an explicit override (`0` to remove the default) - `--output json`, `-o json` - Output raw JSON object -- `kernel org entitlements get` - Show the organization's effective feature access and constraints after applying its plan, active trial treatment, plan status, and organization-specific overrides; unlimited constraints are shown as `unlimited` - - `--output json`, `-o json` - Output raw JSON object ## Examples diff --git a/cmd/auth_connections.go b/cmd/auth_connections.go index 4237e9a3..c6aedcfa 100644 --- a/cmd/auth_connections.go +++ b/cmd/auth_connections.go @@ -130,7 +130,11 @@ type AuthConnectionSubmitInput struct { // canonical `field_values` keyed by the field IDs the API returned. CanonicalFieldValues map[string]string // SelectedChoiceID is the canonical choice ID from the API's `choices` list. - SelectedChoiceID string + SelectedChoiceID string + // InteractionID pins the submission to the canonical interaction the values + // were read from. Left empty, the CLI reads the connection's current + // interaction ID, since the API requires one for canonical submissions. + InteractionID string MfaOptionID string SignInOptionID string SSOButtonSelector string @@ -538,6 +542,11 @@ func (c AuthConnectionCmd) Get(ctx context.Context, in AuthConnectionGetInput) e // Canonical fields/choices supersede discovered_fields, mfa_options and // pending_sso_buttons. Show them first so the IDs needed by `submit // --field-value` and `submit --choice-id` are the first thing visible. + // The interaction ID scopes those submissions and only accompanies canonical + // input, so show it alongside them. + if auth.InteractionID != "" { + tableData = append(tableData, []string{"Interaction ID", auth.InteractionID}) + } if len(auth.Fields) > 0 { fields := make([]string, 0, len(auth.Fields)) for _, f := range auth.Fields { @@ -838,6 +847,28 @@ func (c AuthConnectionCmd) Submit(ctx context.Context, in AuthConnectionSubmitIn return fmt.Errorf("provide exactly one of: %s", submitModeFlags) } + // The API binds canonical submissions to the interaction the values were read + // from, and rejects an interaction ID sent with a legacy submit mode. + isCanonical := hasCanonicalFields || hasChoice + if in.InteractionID != "" && !isCanonical { + return fmt.Errorf("the --interaction-id flag is only valid with --field-value or --choice-id") + } + if isCanonical && in.InteractionID == "" { + // Resolve the current interaction rather than making the user copy it out + // of `get` or `follow` first. The ID changes on every actionable pause, so + // the freshly read one is the only one worth defaulting to; passing + // --interaction-id explicitly pins the submission to an older interaction + // and lets the API reject it as stale. + conn, err := c.svc.Get(ctx, in.ID) + if err != nil { + return util.CleanedUpSdkError{Err: fmt.Errorf("failed to fetch connection for interaction ID resolution: %w", err)} + } + if conn == nil || conn.InteractionID == "" { + return fmt.Errorf("connection %s has no canonical interaction awaiting input; run 'kernel auth connections get %s' to see what the flow is waiting on", in.ID, in.ID) + } + in.InteractionID = conn.InteractionID + } + // Resolve MFA option: the user may pass the label (e.g. "Get a text"), the // type (e.g. "sms"), or the display string ("Get a text (sms)"). The API // expects the type, so look up the connection's available options and map @@ -884,6 +915,9 @@ func (c AuthConnectionCmd) Submit(ctx context.Context, in AuthConnectionSubmitIn if hasChoice { params.SubmitFieldsRequest.SelectedChoiceID = kernel.Opt(in.SelectedChoiceID) } + if in.InteractionID != "" { + params.SubmitFieldsRequest.InteractionID = kernel.Opt(in.InteractionID) + } if hasMfaOption { params.SubmitFieldsRequest.MfaOptionID = kernel.Opt(in.MfaOptionID) } @@ -1063,6 +1097,9 @@ func (c AuthConnectionCmd) Follow(ctx context.Context, in AuthConnectionFollowIn state.Timestamp.Local().Format(time.RFC3339), state.FlowStatus, state.FlowStep) + if state.InteractionID != "" { + pterm.Info.Printf(" Interaction ID: %s\n", state.InteractionID) + } if len(state.Fields) > 0 { fields := make([]string, 0, len(state.Fields)) for _, f := range state.Fields { @@ -1181,8 +1218,18 @@ var authConnectionsSubmitCmd = &cobra.Command{ Short: "Submit field values to a login flow", Long: `Submit field values for the login form. Poll the managed auth to track progress. +Canonical submissions (--field-value, --choice-id) are bound to the interaction +they answer. The CLI reads the connection's current interaction ID for you; pass +--interaction-id to pin the submission to a specific interaction instead. + Examples: - # Submit field values + # Submit canonical field values from the connection's fields list + kernel auth connections submit --field-value field_email=me@example.com --field-value field_password=secret + + # Answer a specific interaction (rejected if the flow has moved on) + kernel auth connections submit --choice-id mfa_sms --interaction-id mai_abc123xyz + + # Submit legacy field values kernel auth connections submit --field username=myuser --field password=mypass # Select an MFA option @@ -1291,6 +1338,7 @@ func init() { addJSONOutputFlag(authConnectionsSubmitCmd) authConnectionsSubmitCmd.Flags().StringArray("field-value", []string{}, "Canonical field-id=value pair from the connection's `fields` list (repeatable)") authConnectionsSubmitCmd.Flags().String("choice-id", "", "Canonical choice ID from the connection's `choices` list") + authConnectionsSubmitCmd.Flags().String("interaction-id", "", "Canonical interaction ID the submitted values belong to; defaults to the connection's current interaction. Only valid with --field-value or --choice-id") authConnectionsSubmitCmd.Flags().StringArray("field", []string{}, "Legacy field name=value pair (repeatable); prefer --field-value") authConnectionsSubmitCmd.Flags().String("mfa-option-id", "", "MFA option ID if user selected an MFA method") authConnectionsSubmitCmd.Flags().String("sign-in-option-id", "", "Sign-in option ID if the flow returned non-MFA choices") @@ -1516,6 +1564,7 @@ func runAuthConnectionsSubmit(cmd *cobra.Command, args []string) error { fieldPairs, _ := cmd.Flags().GetStringArray("field") canonicalFieldPairs, _ := cmd.Flags().GetStringArray("field-value") choiceID, _ := cmd.Flags().GetString("choice-id") + interactionID, _ := cmd.Flags().GetString("interaction-id") mfaOptionID, _ := cmd.Flags().GetString("mfa-option-id") signInOptionID, _ := cmd.Flags().GetString("sign-in-option-id") ssoButtonSelector, _ := cmd.Flags().GetString("sso-button-selector") @@ -1543,6 +1592,7 @@ func runAuthConnectionsSubmit(cmd *cobra.Command, args []string) error { FieldValues: fieldValues, CanonicalFieldValues: canonicalFieldValues, SelectedChoiceID: choiceID, + InteractionID: interactionID, MfaOptionID: mfaOptionID, SignInOptionID: signInOptionID, SSOButtonSelector: ssoButtonSelector, diff --git a/cmd/auth_connections_test.go b/cmd/auth_connections_test.go index a403464e..4466e483 100644 --- a/cmd/auth_connections_test.go +++ b/cmd/auth_connections_test.go @@ -147,6 +147,9 @@ func TestAuthConnectionsGet_PrintsCanonicalInputMetadata(t *testing.T) { Status: kernel.ManagedAuthStatusNeedsAuth, FlowStatus: kernel.ManagedAuthFlowStatusInProgress, FlowStep: kernel.ManagedAuthFlowStepAwaitingInput, + // Canonical fields and choices always arrive with the interaction + // they belong to, which `submit` needs. + InteractionID: "mai_abc123xyz", Fields: []kernel.ManagedAuthField{ { ID: "otp", @@ -182,6 +185,7 @@ func TestAuthConnectionsGet_PrintsCanonicalInputMetadata(t *testing.T) { require.NoError(t, c.Get(context.Background(), AuthConnectionGetInput{ID: "e0x3vbw4z66kpwny3k5k46tj"})) out := outBuf.String() + assert.Contains(t, out, `mai_abc123xyz`) assert.Contains(t, out, `otp (One-time code)`) // The reason tells the user why the field is being asked for: "rejected" // means a stored credential was refused, so a new value has to replace it. @@ -823,16 +827,24 @@ func TestLogin_TelemetryOverride(t *testing.T) { assert.True(t, captured.Browser.Telemetry.Browser.Screenshot.Enabled.Value) } -func TestSubmit_CanonicalChoiceID(t *testing.T) { - capturePtermOutput(t) - var captured kernel.AuthConnectionSubmitParams - fake := &FakeAuthConnectionService{ +// canonicalSubmitFake serves the current interaction ID from `get` and captures +// what `submit` sends, which is what every canonical submission needs. +func canonicalSubmitFake(interactionID string, captured *kernel.AuthConnectionSubmitParams) *FakeAuthConnectionService { + return &FakeAuthConnectionService{ + GetFunc: func(ctx context.Context, id string, opts ...option.RequestOption) (*kernel.ManagedAuth, error) { + return &kernel.ManagedAuth{ID: id, InteractionID: interactionID}, nil + }, SubmitFunc: func(ctx context.Context, id string, body kernel.AuthConnectionSubmitParams, opts ...option.RequestOption) (*kernel.SubmitFieldsResponse, error) { - captured = body + *captured = body return &kernel.SubmitFieldsResponse{Accepted: true}, nil }, } - c := AuthConnectionCmd{svc: fake} +} + +func TestSubmit_CanonicalChoiceID(t *testing.T) { + capturePtermOutput(t) + var captured kernel.AuthConnectionSubmitParams + c := AuthConnectionCmd{svc: canonicalSubmitFake("mai_current", &captured)} require.NoError(t, c.Submit(context.Background(), AuthConnectionSubmitInput{ ID: "auth_1", SelectedChoiceID: "choice_sms", @@ -844,6 +856,53 @@ func TestSubmit_CanonicalChoiceID(t *testing.T) { } func TestSubmit_CanonicalFieldValues(t *testing.T) { + capturePtermOutput(t) + var captured kernel.AuthConnectionSubmitParams + c := AuthConnectionCmd{svc: canonicalSubmitFake("mai_current", &captured)} + require.NoError(t, c.Submit(context.Background(), AuthConnectionSubmitInput{ + ID: "auth_1", + CanonicalFieldValues: map[string]string{"field_email": "me@example.com"}, + })) + assert.Equal(t, map[string]string{"field_email": "me@example.com"}, captured.SubmitFieldsRequest.FieldValues) + assert.Nil(t, captured.SubmitFieldsRequest.Fields) +} + +func TestSubmit_CanonicalResolvesCurrentInteractionID(t *testing.T) { + capturePtermOutput(t) + var captured kernel.AuthConnectionSubmitParams + c := AuthConnectionCmd{svc: canonicalSubmitFake("mai_current", &captured)} + require.NoError(t, c.Submit(context.Background(), AuthConnectionSubmitInput{ + ID: "auth_1", + CanonicalFieldValues: map[string]string{"field_email": "me@example.com"}, + })) + require.True(t, captured.SubmitFieldsRequest.InteractionID.Valid()) + assert.Equal(t, "mai_current", captured.SubmitFieldsRequest.InteractionID.Value) +} + +func TestSubmit_ExplicitInteractionIDIsNotOverwritten(t *testing.T) { + capturePtermOutput(t) + var captured kernel.AuthConnectionSubmitParams + fake := canonicalSubmitFake("mai_current", &captured) + getCalls := 0 + inner := fake.GetFunc + fake.GetFunc = func(ctx context.Context, id string, opts ...option.RequestOption) (*kernel.ManagedAuth, error) { + getCalls++ + return inner(ctx, id, opts...) + } + c := AuthConnectionCmd{svc: fake} + require.NoError(t, c.Submit(context.Background(), AuthConnectionSubmitInput{ + ID: "auth_1", + SelectedChoiceID: "choice_sms", + // Pinning an older interaction is how a caller detects that the flow moved + // on, so the CLI must forward it untouched. + InteractionID: "mai_pinned", + })) + assert.Equal(t, 0, getCalls) + require.True(t, captured.SubmitFieldsRequest.InteractionID.Valid()) + assert.Equal(t, "mai_pinned", captured.SubmitFieldsRequest.InteractionID.Value) +} + +func TestSubmit_LegacyModeOmitsInteractionID(t *testing.T) { capturePtermOutput(t) var captured kernel.AuthConnectionSubmitParams fake := &FakeAuthConnectionService{ @@ -854,11 +913,61 @@ func TestSubmit_CanonicalFieldValues(t *testing.T) { } c := AuthConnectionCmd{svc: fake} require.NoError(t, c.Submit(context.Background(), AuthConnectionSubmitInput{ + ID: "auth_1", + FieldValues: map[string]string{"username": "me"}, + })) + // The API rejects an interaction ID paired with a legacy submit mode. + assert.False(t, captured.SubmitFieldsRequest.InteractionID.Valid()) +} + +func TestSubmit_InteractionIDRequiresCanonicalMode(t *testing.T) { + capturePtermOutput(t) + c := AuthConnectionCmd{svc: &FakeAuthConnectionService{}} + err := c.Submit(context.Background(), AuthConnectionSubmitInput{ + ID: "auth_1", + FieldValues: map[string]string{"username": "me"}, + InteractionID: "mai_current", + }) + require.Error(t, err) + assert.Contains(t, err.Error(), "the --interaction-id flag is only valid with --field-value or --choice-id") +} + +func TestSubmit_CanonicalWithoutPendingInteractionErrors(t *testing.T) { + capturePtermOutput(t) + submitted := false + fake := &FakeAuthConnectionService{ + GetFunc: func(ctx context.Context, id string, opts ...option.RequestOption) (*kernel.ManagedAuth, error) { + return &kernel.ManagedAuth{ID: id}, nil + }, + SubmitFunc: func(ctx context.Context, id string, body kernel.AuthConnectionSubmitParams, opts ...option.RequestOption) (*kernel.SubmitFieldsResponse, error) { + submitted = true + return &kernel.SubmitFieldsResponse{Accepted: true}, nil + }, + } + c := AuthConnectionCmd{svc: fake} + err := c.Submit(context.Background(), AuthConnectionSubmitInput{ + ID: "auth_1", + SelectedChoiceID: "choice_sms", + }) + require.Error(t, err) + assert.Contains(t, err.Error(), "no canonical interaction awaiting input") + assert.False(t, submitted) +} + +func TestSubmit_CanonicalGetErrorSurfaced(t *testing.T) { + capturePtermOutput(t) + fake := &FakeAuthConnectionService{ + GetFunc: func(ctx context.Context, id string, opts ...option.RequestOption) (*kernel.ManagedAuth, error) { + return nil, errors.New("boom") + }, + } + c := AuthConnectionCmd{svc: fake} + err := c.Submit(context.Background(), AuthConnectionSubmitInput{ ID: "auth_1", CanonicalFieldValues: map[string]string{"field_email": "me@example.com"}, - })) - assert.Equal(t, map[string]string{"field_email": "me@example.com"}, captured.SubmitFieldsRequest.FieldValues) - assert.Nil(t, captured.SubmitFieldsRequest.Fields) + }) + require.Error(t, err) + assert.Contains(t, err.Error(), "interaction ID resolution") } func TestSubmit_CanonicalAndLegacyAreMutuallyExclusive(t *testing.T) { diff --git a/cmd/org.go b/cmd/org.go index f6b58675..e8ba0d52 100644 --- a/cmd/org.go +++ b/cmd/org.go @@ -4,7 +4,6 @@ import ( "context" "encoding/json" "fmt" - "time" "github.com/kernel/cli/pkg/util" "github.com/kernel/kernel-go-sdk" @@ -12,7 +11,6 @@ import ( "github.com/kernel/kernel-go-sdk/packages/param" "github.com/kernel/kernel-go-sdk/packages/respjson" "github.com/pterm/pterm" - "github.com/samber/lo" "github.com/spf13/cobra" ) @@ -36,10 +34,6 @@ type OrgLimitsGetInput struct { Output string } -type OrgEntitlementsGetInput struct { - Output string -} - type OrgLimitsSetInput struct { DefaultProjectMaxConcurrentSessions Int64Flag Output string @@ -127,118 +121,6 @@ func (c OrgCmd) LimitsSet(ctx context.Context, in OrgLimitsSetInput) error { return nil } -func (c OrgCmd) EntitlementsGet(ctx context.Context, in OrgEntitlementsGetInput) error { - if err := validateJSONOutput(in.Output); err != nil { - return err - } - - entitlements, err := c.entitlements.Get(ctx) - if err != nil { - return util.CleanedUpSdkError{Err: err} - } - - if in.Output == "json" { - if entitlements == nil { - fmt.Println("null") - return nil - } - return util.PrintPrettyJSON(entitlements) - } - - renderOrgEntitlements(entitlements) - return nil -} - -func renderOrgEntitlements(ent *kernel.OrgEntitlements) { - if ent == nil { - pterm.Info.Println("No organization entitlements found") - return - } - - plan := ent.Plan - planRows := pterm.TableData{ - {"Field", "Value"}, - {"Plan", plan.ID}, - // Active trials resolve to a different effective plan than the - // contractual one, so show both. - {"Effective Plan", plan.EffectiveID}, - {"Trialing", lo.Ternary(plan.IsTrialing, "yes", "no")}, - // Billing status and trial end are both nullable. - {"Billing Status", formatOrgEntitlementString(plan.Status, plan.JSON.Status)}, - {"Trial Ends At", formatOrgEntitlementTime(plan.TrialEndsAt, plan.JSON.TrialEndsAt)}, - } - pterm.DefaultSection.Println("Plan") - PrintTableNoPad(planRows, true) - - f := ent.Features - featureRows := pterm.TableData{ - {"Feature", "Enabled", "Constraints"}, - {"Browser Extensions", formatOrgEntitlementEnabled(f.BrowserExtensions.Enabled), fmt.Sprintf("max stored per org: %s", formatProjectLimitValue(f.BrowserExtensions.MaxStoredPerOrg, f.BrowserExtensions.JSON.MaxStoredPerOrg))}, - {"Browser Pools", formatOrgEntitlementEnabled(f.BrowserPools.Enabled), ""}, - {"Browser Replays", formatOrgEntitlementEnabled(f.BrowserReplays.Enabled), fmt.Sprintf("retention: %s", formatOrgEntitlementDays(f.BrowserReplays.RetentionDays, f.BrowserReplays.JSON.RetentionDays))}, - {"Credential Providers", formatOrgEntitlementEnabled(f.CredentialProviders.Enabled), ""}, - {"Credentials", formatOrgEntitlementEnabled(f.Credentials.Enabled), ""}, - {"Custom Proxies", formatOrgEntitlementEnabled(f.CustomProxies.Enabled), ""}, - {"File I/O", formatOrgEntitlementEnabled(f.FileIo.Enabled), ""}, - {"GPU", formatOrgEntitlementEnabled(f.GPU.Enabled), ""}, - {"Managed Auth", formatOrgEntitlementEnabled(f.ManagedAuth.Enabled), formatManagedAuthConstraints(f.ManagedAuth)}, - {"Managed Proxies", formatOrgEntitlementEnabled(f.ManagedProxies.Enabled), ""}, - {"Profiles", formatOrgEntitlementEnabled(f.Profiles.Enabled), ""}, - {"Proxy Bypass Hosts", formatOrgEntitlementEnabled(f.ProxyBypassHosts.Enabled), ""}, - } - pterm.DefaultSection.Println("Features") - PrintTableNoPad(featureRows, true) - - l := ent.Limits - limitRows := pterm.TableData{ - {"Limit", "Value"}, - {"Max Concurrent Browsers", formatProjectLimitValue(l.MaxConcurrentBrowsers, l.JSON.MaxConcurrentBrowsers)}, - {"Max Concurrent Invocations", formatProjectLimitValue(l.MaxConcurrentInvocations, l.JSON.MaxConcurrentInvocations)}, - {"Default Max Concurrent Invocations Per App", formatProjectLimitValue(l.DefaultMaxConcurrentInvocationsPerApp, l.JSON.DefaultMaxConcurrentInvocationsPerApp)}, - } - pterm.DefaultSection.Println("Limits") - PrintTableNoPad(limitRows, true) -} - -func formatOrgEntitlementEnabled(enabled bool) string { - return lo.Ternary(enabled, "yes", "no") -} - -// formatManagedAuthConstraints summarizes the managed auth connection cap and the -// accepted health-check interval window in a single cell. -func formatManagedAuthConstraints(ma kernel.OrgEntitlementsFeaturesManagedAuth) string { - return fmt.Sprintf( - "max connections: %s, health check interval: %ds default (%ds-%ds)", - formatProjectLimitValue(ma.MaxConnections, ma.JSON.MaxConnections), - ma.HealthCheckIntervalDefaultSeconds, - ma.HealthCheckIntervalMinSeconds, - ma.HealthCheckIntervalMaxSeconds, - ) -} - -// formatOrgEntitlementDays renders a retention window, treating a null value as -// unlimited retention rather than zero days. -func formatOrgEntitlementDays(value int64, field respjson.Field) string { - if !field.Valid() { - return "unlimited" - } - return fmt.Sprintf("%d days", value) -} - -func formatOrgEntitlementString(value string, field respjson.Field) string { - if !field.Valid() || value == "" { - return "-" - } - return value -} - -func formatOrgEntitlementTime(value time.Time, field respjson.Field) string { - if !field.Valid() || value.IsZero() { - return "-" - } - return util.FormatLocal(value) -} - func renderOrgLimits(limits *kernel.OrgLimits) { if limits == nil { pterm.Info.Println("No organization limits found") @@ -370,22 +252,6 @@ var orgLimitsCmd = &cobra.Command{ }, } -var orgEntitlementsCmd = &cobra.Command{ - Use: "entitlements", - Short: "Read organization entitlements", - Run: func(cmd *cobra.Command, args []string) { - _ = cmd.Help() - }, -} - -var orgEntitlementsGetCmd = &cobra.Command{ - Use: "get", - Short: "Get organization entitlements", - Long: "Show the organization's effective feature access and constraints after applying its plan, active trial treatment, plan status, and organization-specific overrides. Unlimited constraints are shown as \"unlimited\".", - Args: cobra.NoArgs, - RunE: runOrgEntitlementsGet, -} - var orgLimitsGetCmd = &cobra.Command{ Use: "get", Short: "Get organization limits", @@ -449,11 +315,8 @@ func init() { addJSONOutputFlag(orgLimitsSetCmd) addJSONOutputFlag(orgEntitlementsCmd) - addJSONOutputFlag(orgEntitlementsGetCmd) - orgLimitsCmd.AddCommand(orgLimitsGetCmd) orgLimitsCmd.AddCommand(orgLimitsSetCmd) - orgEntitlementsCmd.AddCommand(orgEntitlementsGetCmd) orgCmd.AddCommand(orgLimitsCmd) orgCmd.AddCommand(orgEntitlementsCmd) } diff --git a/cmd/org_test.go b/cmd/org_test.go index 464d2a9a..e55713fd 100644 --- a/cmd/org_test.go +++ b/cmd/org_test.go @@ -413,150 +413,3 @@ func TestOrgLimitsSet_RejectsNegative(t *testing.T) { assert.Error(t, err) assert.Contains(t, err.Error(), "must be non-negative") } - -type FakeOrgEntitlementsService struct { - GetFunc func(ctx context.Context, opts ...option.RequestOption) (*kernel.OrgEntitlements, error) -} - -func (f *FakeOrgEntitlementsService) Get(ctx context.Context, opts ...option.RequestOption) (*kernel.OrgEntitlements, error) { - if f.GetFunc != nil { - return f.GetFunc(ctx, opts...) - } - return &kernel.OrgEntitlements{}, nil -} - -// populatedEntitlements builds an entitlements payload with every nullable field -// present, so renders exercise the non-"unlimited" branches. -func populatedEntitlements() *kernel.OrgEntitlements { - ent := &kernel.OrgEntitlements{} - - ent.Plan.ID = "START_UP" - ent.Plan.EffectiveID = "START_UP" - ent.Plan.IsTrialing = true - ent.Plan.Status = "ACTIVE" - ent.Plan.TrialEndsAt = time.Date(2030, 1, 2, 3, 4, 5, 0, time.UTC) - ent.Plan.JSON.Status = respjson.NewField(`"ACTIVE"`) - ent.Plan.JSON.TrialEndsAt = respjson.NewField(`"2030-01-02T03:04:05Z"`) - - ent.Features.BrowserExtensions.Enabled = true - ent.Features.BrowserExtensions.MaxStoredPerOrg = 25 - ent.Features.BrowserExtensions.JSON.MaxStoredPerOrg = respjson.NewField("25") - ent.Features.BrowserPools.Enabled = true - ent.Features.BrowserReplays.Enabled = true - ent.Features.BrowserReplays.RetentionDays = 7 - ent.Features.BrowserReplays.JSON.RetentionDays = respjson.NewField("7") - ent.Features.CredentialProviders.Enabled = true - ent.Features.Credentials.Enabled = true - ent.Features.CustomProxies.Enabled = false - ent.Features.FileIo.Enabled = true - ent.Features.GPU.Enabled = false - ent.Features.ManagedAuth.Enabled = true - ent.Features.ManagedAuth.MaxConnections = 10 - ent.Features.ManagedAuth.HealthCheckIntervalDefaultSeconds = 600 - ent.Features.ManagedAuth.HealthCheckIntervalMinSeconds = 300 - ent.Features.ManagedAuth.HealthCheckIntervalMaxSeconds = 86400 - ent.Features.ManagedAuth.JSON.MaxConnections = respjson.NewField("10") - ent.Features.ManagedProxies.Enabled = true - ent.Features.Profiles.Enabled = true - ent.Features.ProxyBypassHosts.Enabled = true - - ent.Limits.MaxConcurrentBrowsers = 50 - ent.Limits.MaxConcurrentInvocations = 20 - ent.Limits.DefaultMaxConcurrentInvocationsPerApp = 5 - ent.Limits.JSON.MaxConcurrentBrowsers = respjson.NewField("50") - ent.Limits.JSON.MaxConcurrentInvocations = respjson.NewField("20") - ent.Limits.JSON.DefaultMaxConcurrentInvocationsPerApp = respjson.NewField("5") - - return ent -} - -func TestOrgEntitlementsGet_RendersPlanFeaturesAndLimits(t *testing.T) { - buf := capturePtermOutput(t) - fake := &FakeOrgEntitlementsService{ - GetFunc: func(ctx context.Context, opts ...option.RequestOption) (*kernel.OrgEntitlements, error) { - return populatedEntitlements(), nil - }, - } - c := OrgCmd{entitlements: fake} - assert.NoError(t, c.EntitlementsGet(context.Background(), OrgEntitlementsGetInput{})) - - out := buf.String() - // Plan section - assert.Contains(t, out, "START_UP") - assert.Contains(t, out, "Effective Plan") - assert.Contains(t, out, "Trialing") - assert.Contains(t, out, "ACTIVE") - // Features section — every feature should get a row. - for _, feature := range []string{ - "Browser Extensions", "Browser Pools", "Browser Replays", "Credential Providers", - "Credentials", "Custom Proxies", "File I/O", "GPU", "Managed Auth", - "Managed Proxies", "Profiles", "Proxy Bypass Hosts", - } { - assert.Contains(t, out, feature) - } - assert.Contains(t, out, "max stored per org: 25") - assert.Contains(t, out, "retention: 7 days") - assert.Contains(t, out, "max connections: 10") - assert.Contains(t, out, "600s default (300s-86400s)") - // Limits section - assert.Contains(t, out, "Max Concurrent Browsers") - assert.Contains(t, out, "Max Concurrent Invocations") - assert.Contains(t, out, "Default Max Concurrent Invocations Per App") -} - -func TestOrgEntitlementsGet_NullConstraintsShownAsUnlimited(t *testing.T) { - buf := capturePtermOutput(t) - fake := &FakeOrgEntitlementsService{ - GetFunc: func(ctx context.Context, opts ...option.RequestOption) (*kernel.OrgEntitlements, error) { - ent := populatedEntitlements() - // Null (not omitted) constraints mean unlimited. - ent.Features.BrowserExtensions.JSON.MaxStoredPerOrg = respjson.NewField(respjson.Null) - ent.Features.ManagedAuth.JSON.MaxConnections = respjson.NewField(respjson.Null) - ent.Limits.JSON.MaxConcurrentBrowsers = respjson.NewField(respjson.Null) - return ent, nil - }, - } - c := OrgCmd{entitlements: fake} - assert.NoError(t, c.EntitlementsGet(context.Background(), OrgEntitlementsGetInput{})) - - out := buf.String() - assert.Contains(t, out, "max stored per org: unlimited") - assert.Contains(t, out, "max connections: unlimited") - assert.Contains(t, out, "unlimited") -} - -func TestOrgEntitlementsGet_NullPlanFieldsShownAsDash(t *testing.T) { - buf := capturePtermOutput(t) - fake := &FakeOrgEntitlementsService{ - GetFunc: func(ctx context.Context, opts ...option.RequestOption) (*kernel.OrgEntitlements, error) { - ent := populatedEntitlements() - ent.Plan.IsTrialing = false - ent.Plan.JSON.Status = respjson.NewField(respjson.Null) - ent.Plan.JSON.TrialEndsAt = respjson.NewField(respjson.Null) - return ent, nil - }, - } - c := OrgCmd{entitlements: fake} - assert.NoError(t, c.EntitlementsGet(context.Background(), OrgEntitlementsGetInput{})) - - out := buf.String() - assert.Contains(t, out, "Billing Status") - assert.Contains(t, out, "Trial Ends At") - assert.NotContains(t, out, "ACTIVE") -} - -func TestOrgEntitlementsGet_RejectsUnknownOutput(t *testing.T) { - c := OrgCmd{entitlements: &FakeOrgEntitlementsService{}} - assert.Error(t, c.EntitlementsGet(context.Background(), OrgEntitlementsGetInput{Output: "yaml"})) -} - -func TestOrgEntitlementsGet_SurfacesAPIError(t *testing.T) { - capturePtermOutput(t) - fake := &FakeOrgEntitlementsService{ - GetFunc: func(ctx context.Context, opts ...option.RequestOption) (*kernel.OrgEntitlements, error) { - return nil, errors.New("boom") - }, - } - c := OrgCmd{entitlements: fake} - assert.Error(t, c.EntitlementsGet(context.Background(), OrgEntitlementsGetInput{})) -} diff --git a/go.mod b/go.mod index 502421b9..900e422a 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.1 github.com/golang-jwt/jwt/v5 v5.2.2 github.com/joho/godotenv v1.5.1 - github.com/kernel/kernel-go-sdk v0.92.0 + github.com/kernel/kernel-go-sdk v0.92.1-0.20260819184853-796d4245c87a github.com/klauspost/compress v1.18.5 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c github.com/pterm/pterm v0.12.80 diff --git a/go.sum b/go.sum index 04679b80..4ec0e491 100644 --- a/go.sum +++ b/go.sum @@ -64,8 +64,8 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= -github.com/kernel/kernel-go-sdk v0.92.0 h1:3EeoPahTcGEo97BCbwT50gu8QJnawfL166z12hc8Ucg= -github.com/kernel/kernel-go-sdk v0.92.0/go.mod h1:EeZzSuHZVeHKxKCPUzxou2bovNGhXaz0RXrSqKNf1AQ= +github.com/kernel/kernel-go-sdk v0.92.1-0.20260819184853-796d4245c87a h1:VJcz+I1d/VTEHkKM4O7+Wf+ejSbXQtytUtDXnZ0+b+4= +github.com/kernel/kernel-go-sdk v0.92.1-0.20260819184853-796d4245c87a/go.mod h1:EeZzSuHZVeHKxKCPUzxou2bovNGhXaz0RXrSqKNf1AQ= github.com/klauspost/compress v1.18.5 h1:/h1gH5Ce+VWNLSWqPzOVn6XBO+vJbCNGvjoaGBFW2IE= github.com/klauspost/compress v1.18.5/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= From 31d2462fcbd0d9f53d417493761424714b81da23 Mon Sep 17 00:00:00 2001 From: "kernel-internal[bot]" <260533166+kernel-internal[bot]@users.noreply.github.com> Date: Wed, 19 Aug 2026 20:39:11 +0000 Subject: [PATCH 05/26] CLI: Update Go SDK to 467fea7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps kernel-go-sdk to v0.92.1-0.20260819203102-467fea72ee93, which adds the proxy_error browser telemetry event (BrowserProxyErrorEvent) to the telemetry event union. No CLI coverage gaps: a full enumeration of all 137 SDK methods in api.md found a corresponding CLI command for each, and the new event type needs no code change because the telemetry commands render category/type generically and accept --types values without a fixed allowlist. Tested: go build ./..., go vet ./..., go test ./... (all pass); browsers create --telemetry all, browsers curl, browsers telemetry events (table, --output json, --categories network --all, --types proxy_error), browsers telemetry stream --categories network --types proxy_error, browsers delete — all against the live API. Co-Authored-By: Claude Opus 5 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 900e422a..59cb47a0 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.1 github.com/golang-jwt/jwt/v5 v5.2.2 github.com/joho/godotenv v1.5.1 - github.com/kernel/kernel-go-sdk v0.92.1-0.20260819184853-796d4245c87a + github.com/kernel/kernel-go-sdk v0.92.1-0.20260819203102-467fea72ee93 github.com/klauspost/compress v1.18.5 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c github.com/pterm/pterm v0.12.80 diff --git a/go.sum b/go.sum index 4ec0e491..662bb5e0 100644 --- a/go.sum +++ b/go.sum @@ -64,8 +64,8 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= -github.com/kernel/kernel-go-sdk v0.92.1-0.20260819184853-796d4245c87a h1:VJcz+I1d/VTEHkKM4O7+Wf+ejSbXQtytUtDXnZ0+b+4= -github.com/kernel/kernel-go-sdk v0.92.1-0.20260819184853-796d4245c87a/go.mod h1:EeZzSuHZVeHKxKCPUzxou2bovNGhXaz0RXrSqKNf1AQ= +github.com/kernel/kernel-go-sdk v0.92.1-0.20260819203102-467fea72ee93 h1:p+OWj+8b1iK+Bx/5gSSTP9itGLbN5w2hY/CVT0eBdRM= +github.com/kernel/kernel-go-sdk v0.92.1-0.20260819203102-467fea72ee93/go.mod h1:EeZzSuHZVeHKxKCPUzxou2bovNGhXaz0RXrSqKNf1AQ= github.com/klauspost/compress v1.18.5 h1:/h1gH5Ce+VWNLSWqPzOVn6XBO+vJbCNGvjoaGBFW2IE= github.com/klauspost/compress v1.18.5/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= From 16880f448f52ba874488156b50db24745f4685b3 Mon Sep 17 00:00:00 2001 From: "kernel-internal[bot]" <260533166+kernel-internal[bot]@users.noreply.github.com> Date: Thu, 20 Aug 2026 00:06:00 +0000 Subject: [PATCH 06/26] CLI: Update Go SDK to v0.93.0 (0802326) Bumps github.com/kernel/kernel-go-sdk to 08023260493e4584c4d87638849ab4491b34ec49 (v0.93.0). The 0.93.0 release only changed version/changelog metadata relative to the SDK revision the CLI was already pinned to (467fea7); api.md and all generated Go sources are byte-identical, so there are no new methods, params, or fields to expose. Coverage analysis: full enumeration of all 140 SDK methods in api.md against the CLI command tree found no gaps. Every method has a command, and every param struct field is reachable via a flag, a positional arg, or a derived value. Tested: go build ./..., go vet ./..., go test ./... (all pass), plus live API smoke tests for browsers list/create/get/delete, browsers telemetry events, auth connections list, profiles list, telemetry destinations list. Co-Authored-By: Claude Opus 5 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 59cb47a0..0e346401 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.1 github.com/golang-jwt/jwt/v5 v5.2.2 github.com/joho/godotenv v1.5.1 - github.com/kernel/kernel-go-sdk v0.92.1-0.20260819203102-467fea72ee93 + github.com/kernel/kernel-go-sdk v0.93.0 github.com/klauspost/compress v1.18.5 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c github.com/pterm/pterm v0.12.80 diff --git a/go.sum b/go.sum index 662bb5e0..78374443 100644 --- a/go.sum +++ b/go.sum @@ -64,8 +64,8 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= -github.com/kernel/kernel-go-sdk v0.92.1-0.20260819203102-467fea72ee93 h1:p+OWj+8b1iK+Bx/5gSSTP9itGLbN5w2hY/CVT0eBdRM= -github.com/kernel/kernel-go-sdk v0.92.1-0.20260819203102-467fea72ee93/go.mod h1:EeZzSuHZVeHKxKCPUzxou2bovNGhXaz0RXrSqKNf1AQ= +github.com/kernel/kernel-go-sdk v0.93.0 h1:mPsZKoQlLsgsC0TehWJ/Q5XqWwKu33bKfnuqnfNHtjs= +github.com/kernel/kernel-go-sdk v0.93.0/go.mod h1:EeZzSuHZVeHKxKCPUzxou2bovNGhXaz0RXrSqKNf1AQ= github.com/klauspost/compress v1.18.5 h1:/h1gH5Ce+VWNLSWqPzOVn6XBO+vJbCNGvjoaGBFW2IE= github.com/klauspost/compress v1.18.5/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= From f9b126f68e11d78fd112775a398e6ac03cce2c35 Mon Sep 17 00:00:00 2001 From: "kernel-internal[bot]" <260533166+kernel-internal[bot]@users.noreply.github.com> Date: Fri, 21 Aug 2026 15:30:19 +0000 Subject: [PATCH 07/26] CLI: Update Go SDK to 9a36566 and cover the telemetry control/platform split Updates kernel-go-sdk to 9a36566d8999ca346a9eeccede0cbf88d651b93f, which mirrors the control/platform telemetry split into the public API. BrowserTelemetryCategories gains a `platform` category and `control` becomes its own config type carrying `cdp.excluded_methods`, so the previous `p.Control = on()` no longer compiled. New coverage: - `--telemetry=platform` is now a settable category on browsers create/update, browser-pools create/update/acquire, and auth connections create/update/login, and is reported by the telemetry summaries and details tables. - `--telemetry-cdp-exclude` (new flag, same eight commands) sets BrowserTelemetryCdpControlConfigParam.ExcludedMethods. Values are the 38 CDP methods the proxy reports, matched case-insensitively and canonicalized; `--telemetry-cdp-exclude=none` sends an empty list to report every method again. Combining it with `--telemetry=off` is rejected, and on auth connection update/login it requires `--telemetry` in the same command, since a connection stores its browser config as sent and exclusions alone would drop its category selection. - Excluded methods are surfaced in the create/update telemetry summary, the browser-pool details table, and the auth connection details table. A full enumeration of the 140 methods in api.md against the CLI command tree found no missing commands. The x-cli-skip endpoints (site-configs, auth connection exchange) remain excluded. Tested against the live API: browsers create/update/delete with --telemetry=control,platform --telemetry-cdp-exclude (set, replace, and =none clear); browser-pools create/get/update/acquire/delete; auth connections create/get/update/delete; browsers telemetry events --categories platform; and the unknown-method, --telemetry=off, and missing---telemetry error paths. Co-Authored-By: Claude Opus 5 --- cmd/auth_connections.go | 60 +++++++----- cmd/browser_pools.go | 87 ++++++++++------- cmd/browser_pools_test.go | 6 +- cmd/browsers.go | 126 +++++++++++++----------- cmd/browsers_telemetry.go | 173 ++++++++++++++++++++++++++++----- cmd/browsers_telemetry_test.go | 130 ++++++++++++++++++++----- go.mod | 2 +- go.sum | 4 +- 8 files changed, 417 insertions(+), 171 deletions(-) diff --git a/cmd/auth_connections.go b/cmd/auth_connections.go index c6aedcfa..d7fc1f9a 100644 --- a/cmd/auth_connections.go +++ b/cmd/auth_connections.go @@ -57,6 +57,7 @@ type AuthConnectionCreateInput struct { NoAutoReauth bool RecordSession BoolFlag Telemetry string + TelemetryCdpExclude string TelemetryExport string Output string } @@ -92,6 +93,7 @@ type AuthConnectionUpdateInput struct { AutoReauth BoolFlag RecordSession BoolFlag Telemetry string + TelemetryCdpExclude string TelemetryExport string Output string } @@ -111,15 +113,16 @@ type AuthConnectionDeleteInput struct { } type AuthConnectionLoginInput struct { - ID string - ProxyID string - ProxyName string - ProxyMode string - Stealth BoolFlag - RecordSession BoolFlag - Telemetry string - TelemetryExport string - Output string + ID string + ProxyID string + ProxyName string + ProxyMode string + Stealth BoolFlag + RecordSession BoolFlag + Telemetry string + TelemetryCdpExclude string + TelemetryExport string + Output string } type AuthConnectionSubmitInput struct { @@ -237,8 +240,8 @@ func (c AuthConnectionCmd) Create(ctx context.Context, in AuthConnectionCreateIn params.ManagedAuthCreateRequest.RecordSession = kernel.Opt(in.RecordSession.Value) } - if in.Telemetry != "" || in.TelemetryExport != "" { - t, err := buildManagedAuthTelemetryParam(in.Telemetry, in.TelemetryExport, true) + if in.Telemetry != "" || in.TelemetryCdpExclude != "" || in.TelemetryExport != "" { + t, err := buildManagedAuthTelemetryParam(in.Telemetry, in.TelemetryCdpExclude, in.TelemetryExport, true) if err != nil { return err } @@ -383,8 +386,8 @@ func (c AuthConnectionCmd) Update(ctx context.Context, in AuthConnectionUpdateIn hasChanges = true } - if in.Telemetry != "" || in.TelemetryExport != "" { - t, err := buildManagedAuthTelemetryParam(in.Telemetry, in.TelemetryExport, false) + if in.Telemetry != "" || in.TelemetryCdpExclude != "" || in.TelemetryExport != "" { + t, err := buildManagedAuthTelemetryParam(in.Telemetry, in.TelemetryCdpExclude, in.TelemetryExport, false) if err != nil { return err } @@ -781,8 +784,8 @@ func (c AuthConnectionCmd) Login(ctx context.Context, in AuthConnectionLoginInpu params.RecordSession = kernel.Opt(in.RecordSession.Value) } - if in.Telemetry != "" || in.TelemetryExport != "" { - t, err := buildManagedAuthTelemetryParam(in.Telemetry, in.TelemetryExport, false) + if in.Telemetry != "" || in.TelemetryCdpExclude != "" || in.TelemetryExport != "" { + t, err := buildManagedAuthTelemetryParam(in.Telemetry, in.TelemetryCdpExclude, in.TelemetryExport, false) if err != nil { return err } @@ -1279,6 +1282,7 @@ func init() { authConnectionsCreateCmd.Flags().Bool("record-session", false, "Record browser sessions for this connection by default (useful for debugging)") authConnectionsCreateCmd.Flags().String("telemetry", "", "Configure telemetry for this connection's browser sessions (opt-in): --telemetry=all (default set), --telemetry=off (disable), or --telemetry=console,network (capture exactly those categories)") authConnectionsCreateCmd.Flags().String("telemetry-export-otlp", "", "Export this connection's captured telemetry over OTLP to one of the org's configured destinations, by ID or name; --telemetry-export-otlp=off disables export. Implies --telemetry=all when --telemetry is not set, since export requires capture") + authConnectionsCreateCmd.Flags().String("telemetry-cdp-exclude", "", "Leave the named CDP methods out of control telemetry's cdp_command events, comma-separated (e.g. Input.dispatchMouseEvent,Page.captureScreenshot); --telemetry-cdp-exclude=none clears the list. Excluded commands are still relayed to the browser, they just produce no event") _ = authConnectionsCreateCmd.MarkFlagRequired("domain") _ = authConnectionsCreateCmd.MarkFlagRequired("profile-name") authConnectionsCreateCmd.MarkFlagsMutuallyExclusive("credential-name", "credential-provider") @@ -1308,6 +1312,7 @@ func init() { authConnectionsUpdateCmd.Flags().Bool("record-session", false, "Set whether browser sessions are recorded by default; use --record-session=false to disable") authConnectionsUpdateCmd.Flags().String("telemetry", "", "Update telemetry for future browser sessions: --telemetry=all (reset to default set), --telemetry=off (disable), or --telemetry=console,network (merge those categories into the current selection)") authConnectionsUpdateCmd.Flags().String("telemetry-export-otlp", "", "Update where future sessions export captured telemetry over OTLP, by destination ID or name; --telemetry-export-otlp=off disables export. Naming a destination requires passing --telemetry in the same command, since export and capture are validated together") + authConnectionsUpdateCmd.Flags().String("telemetry-cdp-exclude", "", "Leave the named CDP methods out of control telemetry's cdp_command events, comma-separated (e.g. Input.dispatchMouseEvent,Page.captureScreenshot); --telemetry-cdp-exclude=none clears the list. Excluded commands are still relayed to the browser, they just produce no event") authConnectionsUpdateCmd.MarkFlagsMutuallyExclusive("credential-name", "credential-provider") authConnectionsUpdateCmd.MarkFlagsMutuallyExclusive("save-credentials", "no-save-credentials") authConnectionsUpdateCmd.MarkFlagsMutuallyExclusive("health-checks", "no-health-checks") @@ -1333,6 +1338,7 @@ func init() { authConnectionsLoginCmd.Flags().Bool("record-session", false, "Override whether this login's browser session is recorded; use --record-session=false to disable") authConnectionsLoginCmd.Flags().String("telemetry", "", "Telemetry override for this login only, merged onto the connection's config: --telemetry=all, --telemetry=off, or --telemetry=console,network") authConnectionsLoginCmd.Flags().String("telemetry-export-otlp", "", "Export override for this login only: an OTLP destination ID or name; --telemetry-export-otlp=off disables export for this login. Naming a destination requires passing --telemetry in the same command, since export and capture are validated together") + authConnectionsLoginCmd.Flags().String("telemetry-cdp-exclude", "", "Leave the named CDP methods out of control telemetry's cdp_command events, comma-separated (e.g. Input.dispatchMouseEvent,Page.captureScreenshot); --telemetry-cdp-exclude=none clears the list. Excluded commands are still relayed to the browser, they just produce no event") // Submit flags addJSONOutputFlag(authConnectionsSubmitCmd) @@ -1387,6 +1393,7 @@ func runAuthConnectionsCreate(cmd *cobra.Command, args []string) error { noHealthChecks, _ := cmd.Flags().GetBool("no-health-checks") noAutoReauth, _ := cmd.Flags().GetBool("no-auto-reauth") telemetry, _ := cmd.Flags().GetString("telemetry") + telemetryCdpExclude, _ := cmd.Flags().GetString("telemetry-cdp-exclude") telemetryExport, _ := cmd.Flags().GetString("telemetry-export-otlp") svc := client.Auth.Connections @@ -1410,6 +1417,7 @@ func runAuthConnectionsCreate(cmd *cobra.Command, args []string) error { NoAutoReauth: noAutoReauth, RecordSession: readBoolFlag(cmd.Flags(), "record-session"), Telemetry: telemetry, + TelemetryCdpExclude: telemetryCdpExclude, TelemetryExport: telemetryExport, Output: output, }) @@ -1443,6 +1451,7 @@ func runAuthConnectionsUpdate(cmd *cobra.Command, args []string) error { noSaveCredentials, _ := cmd.Flags().GetBool("no-save-credentials") healthCheckInterval, _ := cmd.Flags().GetInt("health-check-interval") telemetry, _ := cmd.Flags().GetString("telemetry") + telemetryCdpExclude, _ := cmd.Flags().GetString("telemetry-cdp-exclude") telemetryExport, _ := cmd.Flags().GetString("telemetry-export-otlp") saveCredentialsFlag := BoolFlag{} @@ -1496,6 +1505,7 @@ func runAuthConnectionsUpdate(cmd *cobra.Command, args []string) error { AutoReauth: togglePair("auto-reauth", "no-auto-reauth"), RecordSession: readBoolFlag(cmd.Flags(), "record-session"), Telemetry: telemetry, + TelemetryCdpExclude: telemetryCdpExclude, TelemetryExport: telemetryExport, Output: output, }) @@ -1541,20 +1551,22 @@ func runAuthConnectionsLogin(cmd *cobra.Command, args []string) error { proxyName, _ := cmd.Flags().GetString("proxy-name") proxyMode, _ := cmd.Flags().GetString("proxy-mode") telemetry, _ := cmd.Flags().GetString("telemetry") + telemetryCdpExclude, _ := cmd.Flags().GetString("telemetry-cdp-exclude") telemetryExport, _ := cmd.Flags().GetString("telemetry-export-otlp") svc := client.Auth.Connections c := AuthConnectionCmd{svc: &svc} return c.Login(cmd.Context(), AuthConnectionLoginInput{ - ID: args[0], - ProxyID: proxyID, - ProxyName: proxyName, - ProxyMode: proxyMode, - Stealth: readBoolFlag(cmd.Flags(), "stealth"), - RecordSession: readBoolFlag(cmd.Flags(), "record-session"), - Telemetry: telemetry, - TelemetryExport: telemetryExport, - Output: output, + ID: args[0], + ProxyID: proxyID, + ProxyName: proxyName, + ProxyMode: proxyMode, + Stealth: readBoolFlag(cmd.Flags(), "stealth"), + RecordSession: readBoolFlag(cmd.Flags(), "record-session"), + Telemetry: telemetry, + TelemetryCdpExclude: telemetryCdpExclude, + TelemetryExport: telemetryExport, + Output: output, }) } diff --git a/cmd/browser_pools.go b/cmd/browser_pools.go index c6f7051b..276018d7 100644 --- a/cmd/browser_pools.go +++ b/cmd/browser_pools.go @@ -108,21 +108,24 @@ func (c BrowserPoolsCmd) List(ctx context.Context, in BrowserPoolsListInput) err return nil } -// buildPoolNewTelemetryParam converts a --telemetry flag value to the pool create param. -func buildPoolNewTelemetryParam(s string) (kernel.BrowserPoolNewParamsTelemetry, error) { - enabled, browser, err := resolveTelemetryFlag(s) +// buildPoolNewTelemetryParam converts --telemetry and --telemetry-cdp-exclude flag +// values to the pool create param. +func buildPoolNewTelemetryParam(s, cdpExclude string) (kernel.BrowserPoolNewParamsTelemetry, error) { + enabled, browser, err := resolveTelemetryFlag(s, cdpExclude) return kernel.BrowserPoolNewParamsTelemetry{Enabled: enabled, Browser: browser}, err } -// buildPoolUpdateTelemetryParam converts a --telemetry flag value to the pool update param. -func buildPoolUpdateTelemetryParam(s string) (kernel.BrowserPoolUpdateParamsTelemetry, error) { - enabled, browser, err := resolveTelemetryFlag(s) +// buildPoolUpdateTelemetryParam converts --telemetry and --telemetry-cdp-exclude flag +// values to the pool update param. +func buildPoolUpdateTelemetryParam(s, cdpExclude string) (kernel.BrowserPoolUpdateParamsTelemetry, error) { + enabled, browser, err := resolveTelemetryFlag(s, cdpExclude) return kernel.BrowserPoolUpdateParamsTelemetry{Enabled: enabled, Browser: browser}, err } -// buildPoolAcquireTelemetryParam converts a --telemetry flag value to the acquire override param. -func buildPoolAcquireTelemetryParam(s string) (kernel.BrowserPoolAcquireParamsTelemetry, error) { - enabled, browser, err := resolveTelemetryFlag(s) +// buildPoolAcquireTelemetryParam converts --telemetry and --telemetry-cdp-exclude flag +// values to the acquire override param. +func buildPoolAcquireTelemetryParam(s, cdpExclude string) (kernel.BrowserPoolAcquireParamsTelemetry, error) { + enabled, browser, err := resolveTelemetryFlag(s, cdpExclude) return kernel.BrowserPoolAcquireParamsTelemetry{Enabled: enabled, Browser: browser}, err } @@ -132,7 +135,11 @@ func formatPoolTelemetry(cfg kernel.BrowserTelemetryConfig) string { if len(on) == 0 { return "disabled" } - return strings.Join(on, ", ") + base := strings.Join(on, ", ") + if ex := formatCdpExcludedMethods(cfg.Browser.Control.Cdp.ExcludedMethods); ex != "" { + return base + " (excluding CDP methods: " + ex + ")" + } + return base } type BrowserPoolsCreateInput struct { @@ -155,6 +162,7 @@ type BrowserPoolsCreateInput struct { ChromePolicy string ChromePolicyFile string Telemetry string + TelemetryCdpExclude string Output string } @@ -247,8 +255,8 @@ func (c BrowserPoolsCmd) Create(ctx context.Context, in BrowserPoolsCreateInput) params.ChromePolicy = chromePolicy } - if in.Telemetry != "" { - t, err := buildPoolNewTelemetryParam(in.Telemetry) + if in.Telemetry != "" || in.TelemetryCdpExclude != "" { + t, err := buildPoolNewTelemetryParam(in.Telemetry, in.TelemetryCdpExclude) if err != nil { return err } @@ -269,7 +277,7 @@ func (c BrowserPoolsCmd) Create(ctx context.Context, in BrowserPoolsCreateInput) } else { pterm.Success.Printf("Created browser pool %s\n", pool.ID) } - if in.Telemetry != "" { + if in.Telemetry != "" || in.TelemetryCdpExclude != "" { printTelemetrySummary(pool.BrowserPoolConfig.Telemetry) } return nil @@ -350,6 +358,7 @@ type BrowserPoolsUpdateInput struct { ChromePolicyFile string ClearChromePolicy bool Telemetry string + TelemetryCdpExclude string DiscardAllIdle BoolFlag Output string } @@ -488,8 +497,8 @@ func (c BrowserPoolsCmd) Update(ctx context.Context, in BrowserPoolsUpdateInput) params.SetExtraFields(extraFields) } - if in.Telemetry != "" { - t, err := buildPoolUpdateTelemetryParam(in.Telemetry) + if in.Telemetry != "" || in.TelemetryCdpExclude != "" { + t, err := buildPoolUpdateTelemetryParam(in.Telemetry, in.TelemetryCdpExclude) if err != nil { return err } @@ -510,7 +519,7 @@ func (c BrowserPoolsCmd) Update(ctx context.Context, in BrowserPoolsUpdateInput) } else { pterm.Success.Printf("Updated browser pool %s\n", pool.ID) } - if in.Telemetry != "" { + if in.Telemetry != "" || in.TelemetryCdpExclude != "" { printTelemetrySummary(pool.BrowserPoolConfig.Telemetry) } return nil @@ -535,13 +544,14 @@ func (c BrowserPoolsCmd) Delete(ctx context.Context, in BrowserPoolsDeleteInput) } type BrowserPoolsAcquireInput struct { - IDOrName string - TimeoutSeconds int64 - Name string - StartURL string - Tags map[string]string - Telemetry string - Output string + IDOrName string + TimeoutSeconds int64 + Name string + StartURL string + Tags map[string]string + Telemetry string + TelemetryCdpExclude string + Output string } // buildAcquireParams builds the SDK params for acquiring a browser from a pool. @@ -549,7 +559,7 @@ type BrowserPoolsAcquireInput struct { // path so the per-lease name/tags/start-url/telemetry forwarding cannot silently // diverge between them. The telemetry override merges onto the pool's config for // this lease. -func buildAcquireParams(name string, tags map[string]string, timeoutSeconds int64, telemetry, startURL string) (kernel.BrowserPoolAcquireParams, error) { +func buildAcquireParams(name string, tags map[string]string, timeoutSeconds int64, telemetry, telemetryCdpExclude, startURL string) (kernel.BrowserPoolAcquireParams, error) { params := kernel.BrowserPoolAcquireParams{} if timeoutSeconds > 0 { params.AcquireTimeoutSeconds = kernel.Int(timeoutSeconds) @@ -563,8 +573,8 @@ func buildAcquireParams(name string, tags map[string]string, timeoutSeconds int6 if len(tags) > 0 { params.Tags = kernel.Tags(tags) } - if telemetry != "" { - t, err := buildPoolAcquireTelemetryParam(telemetry) + if telemetry != "" || telemetryCdpExclude != "" { + t, err := buildPoolAcquireTelemetryParam(telemetry, telemetryCdpExclude) if err != nil { return kernel.BrowserPoolAcquireParams{}, err } @@ -578,7 +588,7 @@ func (c BrowserPoolsCmd) Acquire(ctx context.Context, in BrowserPoolsAcquireInpu return err } - params, err := buildAcquireParams(in.Name, in.Tags, in.TimeoutSeconds, in.Telemetry, in.StartURL) + params, err := buildAcquireParams(in.Name, in.Tags, in.TimeoutSeconds, in.Telemetry, in.TelemetryCdpExclude, in.StartURL) if err != nil { return err } @@ -749,6 +759,7 @@ func init() { browserPoolsCreateCmd.Flags().String("chrome-policy", "", "Custom Chrome enterprise policy as a JSON object") browserPoolsCreateCmd.Flags().String("chrome-policy-file", "", "Read Chrome enterprise policy (JSON object) from a file (use '-' for stdin)") browserPoolsCreateCmd.Flags().String("telemetry", "", "Configure telemetry for browsers warmed into the pool (opt-in): --telemetry=all (default set), --telemetry=off (disable), or --telemetry=console,network (capture exactly those categories)") + browserPoolsCreateCmd.Flags().String("telemetry-cdp-exclude", "", "Leave the named CDP methods out of control telemetry's cdp_command events, comma-separated (e.g. Input.dispatchMouseEvent,Page.captureScreenshot); --telemetry-cdp-exclude=none clears the list. Excluded commands are still relayed to the browser, they just produce no event") browserPoolsCreateCmd.MarkFlagsMutuallyExclusive("chrome-policy", "chrome-policy-file") addJSONOutputFlag(browserPoolsGetCmd) @@ -779,6 +790,7 @@ func init() { browserPoolsUpdateCmd.MarkFlagsMutuallyExclusive("chrome-policy", "chrome-policy-file") browserPoolsUpdateCmd.MarkFlagsMutuallyExclusive("private-host", "clear-private-hosts") browserPoolsUpdateCmd.Flags().String("telemetry", "", "Update pool telemetry: --telemetry=all (reset to default set), --telemetry=off (disable), or --telemetry=console,network (merge those categories into the current selection). Applies only to browsers warmed after the update.") + browserPoolsUpdateCmd.Flags().String("telemetry-cdp-exclude", "", "Leave the named CDP methods out of control telemetry's cdp_command events, comma-separated (e.g. Input.dispatchMouseEvent,Page.captureScreenshot); --telemetry-cdp-exclude=none clears the list. Excluded commands are still relayed to the browser, they just produce no event") browserPoolsUpdateCmd.Flags().Bool("discard-all-idle", false, "Discard all idle browsers") addJSONOutputFlag(browserPoolsUpdateCmd) @@ -789,6 +801,7 @@ func init() { browserPoolsAcquireCmd.Flags().String("start-url", "", "URL to navigate the acquired browser to, overriding the pool's start URL for this acquire only (best-effort)") browserPoolsAcquireCmd.Flags().StringArray("tag", nil, "Set a tag KEY=VALUE on the acquired session (repeatable; applies to this lease)") browserPoolsAcquireCmd.Flags().String("telemetry", "", "Telemetry override for this lease only, merged onto the pool's config: --telemetry=all, --telemetry=off, or --telemetry=console,network") + browserPoolsAcquireCmd.Flags().String("telemetry-cdp-exclude", "", "Leave the named CDP methods out of control telemetry's cdp_command events, comma-separated (e.g. Input.dispatchMouseEvent,Page.captureScreenshot); --telemetry-cdp-exclude=none clears the list. Excluded commands are still relayed to the browser, they just produce no event") addJSONOutputFlag(browserPoolsAcquireCmd) browserPoolsReleaseCmd.Flags().String("session-id", "", "Browser session ID to release") @@ -845,6 +858,7 @@ func runBrowserPoolsCreate(cmd *cobra.Command, args []string) error { chromePolicy, _ := cmd.Flags().GetString("chrome-policy") chromePolicyFile, _ := cmd.Flags().GetString("chrome-policy-file") telemetry, _ := cmd.Flags().GetString("telemetry") + telemetryCdpExclude, _ := cmd.Flags().GetString("telemetry-cdp-exclude") output, _ := cmd.Flags().GetString("output") in := BrowserPoolsCreateInput{ @@ -867,6 +881,7 @@ func runBrowserPoolsCreate(cmd *cobra.Command, args []string) error { ChromePolicy: chromePolicy, ChromePolicyFile: chromePolicyFile, Telemetry: telemetry, + TelemetryCdpExclude: telemetryCdpExclude, Output: output, } @@ -908,6 +923,7 @@ func runBrowserPoolsUpdate(cmd *cobra.Command, args []string) error { chromePolicyFile, _ := cmd.Flags().GetString("chrome-policy-file") clearChromePolicy, _ := cmd.Flags().GetBool("clear-chrome-policy") telemetry, _ := cmd.Flags().GetString("telemetry") + telemetryCdpExclude, _ := cmd.Flags().GetString("telemetry-cdp-exclude") discardIdle, _ := cmd.Flags().GetBool("discard-all-idle") output, _ := cmd.Flags().GetString("output") @@ -937,6 +953,7 @@ func runBrowserPoolsUpdate(cmd *cobra.Command, args []string) error { ChromePolicyFile: chromePolicyFile, ClearChromePolicy: clearChromePolicy, Telemetry: telemetry, + TelemetryCdpExclude: telemetryCdpExclude, DiscardAllIdle: BoolFlag{Set: cmd.Flags().Changed("discard-all-idle"), Value: discardIdle}, Output: output, } @@ -959,16 +976,18 @@ func runBrowserPoolsAcquire(cmd *cobra.Command, args []string) error { startURL, _ := cmd.Flags().GetString("start-url") tags, _ := tagsFromFlag(cmd, "tag") telemetry, _ := cmd.Flags().GetString("telemetry") + telemetryCdpExclude, _ := cmd.Flags().GetString("telemetry-cdp-exclude") output, _ := cmd.Flags().GetString("output") c := BrowserPoolsCmd{client: &client.BrowserPools} return c.Acquire(cmd.Context(), BrowserPoolsAcquireInput{ - IDOrName: args[0], - TimeoutSeconds: timeout, - Name: name, - StartURL: startURL, - Tags: tags, - Telemetry: telemetry, - Output: output, + IDOrName: args[0], + TimeoutSeconds: timeout, + Name: name, + StartURL: startURL, + Tags: tags, + Telemetry: telemetry, + TelemetryCdpExclude: telemetryCdpExclude, + Output: output, }) } diff --git a/cmd/browser_pools_test.go b/cmd/browser_pools_test.go index e0a143ff..387f3f18 100644 --- a/cmd/browser_pools_test.go +++ b/cmd/browser_pools_test.go @@ -239,7 +239,7 @@ func TestBrowserPoolsCreate_PrivateHostNormalization(t *testing.T) { // forwarding used by both `browser-pools acquire` and the `browsers create // --pool-id` lease path. func TestBuildAcquireParams(t *testing.T) { - p, err := buildAcquireParams("lease", map[string]string{"env": "prod"}, 30, "console,network", "https://example.com") + p, err := buildAcquireParams("lease", map[string]string{"env": "prod"}, 30, "console,network", "", "https://example.com") assert.NoError(t, err) assert.True(t, p.Name.Valid()) assert.Equal(t, "lease", p.Name.Value) @@ -252,7 +252,7 @@ func TestBuildAcquireParams(t *testing.T) { assert.True(t, p.Telemetry.Browser.Network.Enabled.Value) // Unset inputs produce an empty params struct (nothing forwarded). - empty, err := buildAcquireParams("", nil, 0, "", "") + empty, err := buildAcquireParams("", nil, 0, "", "", "") assert.NoError(t, err) assert.False(t, empty.Name.Valid()) assert.Len(t, empty.Tags, 0) @@ -260,7 +260,7 @@ func TestBuildAcquireParams(t *testing.T) { assert.False(t, empty.StartURL.Valid()) // An invalid category surfaces an error rather than a partial param. - _, err = buildAcquireParams("", nil, 0, "bogus", "") + _, err = buildAcquireParams("", nil, 0, "bogus", "", "") assert.Error(t, err) } diff --git a/cmd/browsers.go b/cmd/browsers.go index 326f88d1..5e4c82b7 100644 --- a/cmd/browsers.go +++ b/cmd/browsers.go @@ -360,31 +360,32 @@ func formatTags(tags kernel.Tags) string { // Inputs for each command type BrowsersCreateInput struct { - TimeoutSeconds int - Stealth BoolFlag - Headless BoolFlag - GPU BoolFlag - Memory string - InvocationID string - Kiosk BoolFlag - ProfileID string - ProfileName string - ProfileSaveChanges BoolFlag - ProxyID string - ProxyName string - ProxyMode string - Region string - PrivateHosts []string - StartURL string - Extensions []string - Viewport string - Telemetry string - TelemetryExport string - ChromePolicy string - ChromePolicyFile string - Name string - Tags map[string]string - Output string + TimeoutSeconds int + Stealth BoolFlag + Headless BoolFlag + GPU BoolFlag + Memory string + InvocationID string + Kiosk BoolFlag + ProfileID string + ProfileName string + ProfileSaveChanges BoolFlag + ProxyID string + ProxyName string + ProxyMode string + Region string + PrivateHosts []string + StartURL string + Extensions []string + Viewport string + Telemetry string + TelemetryCdpExclude string + TelemetryExport string + ChromePolicy string + ChromePolicyFile string + Name string + Tags map[string]string + Output string } type BrowsersDeleteInput struct { @@ -415,6 +416,7 @@ type BrowsersUpdateInput struct { Viewport string Force bool Telemetry string + TelemetryCdpExclude string Name string SetName bool ClearName bool @@ -669,8 +671,8 @@ func (b BrowsersCmd) Create(ctx context.Context, in BrowsersCreateInput) error { } } - if in.Telemetry != "" || in.TelemetryExport != "" { - t, err := buildNewTelemetryParam(in.Telemetry, in.TelemetryExport) + if in.Telemetry != "" || in.TelemetryCdpExclude != "" || in.TelemetryExport != "" { + t, err := buildNewTelemetryParam(in.Telemetry, in.TelemetryCdpExclude, in.TelemetryExport) if err != nil { return err } @@ -705,7 +707,7 @@ func (b BrowsersCmd) Create(ctx context.Context, in BrowsersCreateInput) error { } printBrowserSessionResult(browser.SessionID, browser.CdpWsURL, browser.BrowserLiveViewURL, browser.Profile, browser.ProfileSaveChanges, browser.StartURL, browser.Name, browser.Tags) - if in.Telemetry != "" || in.TelemetryExport != "" { + if in.Telemetry != "" || in.TelemetryCdpExclude != "" || in.TelemetryExport != "" { printTelemetrySummary(browser.Telemetry) } return nil @@ -941,8 +943,8 @@ func (b BrowsersCmd) Update(ctx context.Context, in BrowsersUpdateInput) error { } // Validate that at least one update option is provided - if !hasProxyChange && !hasProfileChange && !hasViewportChange && in.Telemetry == "" && !hasNameChange && !hasTagsChange { - return fmt.Errorf("must specify at least one of: --proxy-id, --proxy-name, --proxy-mode, --clear-proxy, --disable-default-proxy, --profile-id, --profile-name, --viewport, --telemetry, --name, --clear-name, --tag, or --clear-tags") + if !hasProxyChange && !hasProfileChange && !hasViewportChange && in.Telemetry == "" && in.TelemetryCdpExclude == "" && !hasNameChange && !hasTagsChange { + return fmt.Errorf("must specify at least one of: --proxy-id, --proxy-name, --proxy-mode, --clear-proxy, --disable-default-proxy, --profile-id, --profile-name, --viewport, --telemetry, --telemetry-cdp-exclude, --name, --clear-name, --tag, or --clear-tags") } params := kernel.BrowserUpdateParams{} @@ -985,8 +987,8 @@ func (b BrowsersCmd) Update(ctx context.Context, in BrowsersUpdateInput) error { } // Handle telemetry changes - if in.Telemetry != "" { - t, err := buildUpdateTelemetryParam(in.Telemetry) + if in.Telemetry != "" || in.TelemetryCdpExclude != "" { + t, err := buildUpdateTelemetryParam(in.Telemetry, in.TelemetryCdpExclude) if err != nil { return err } @@ -1036,7 +1038,7 @@ func (b BrowsersCmd) Update(ctx context.Context, in BrowsersUpdateInput) error { if hasProfileChange { pterm.Info.Printf("Profile save changes: %t\n", browser.ProfileSaveChanges) } - if in.Telemetry != "" { + if in.Telemetry != "" || in.TelemetryCdpExclude != "" { printTelemetrySummary(browser.Telemetry) } return nil @@ -2682,6 +2684,7 @@ func init() { browsersUpdateCmd.Flags().String("viewport", "", "Browser viewport size (e.g., 1920x1080@25). Supported: 2560x1440@10, 1920x1080@25, 1920x1200@25, 1440x900@25, 1024x768@60, 1200x800@60, 1280x800@60") browsersUpdateCmd.Flags().Bool("force", false, "Force viewport resize even when a live view or recording/replay is active") browsersUpdateCmd.Flags().String("telemetry", "", "Update telemetry: --telemetry=all (reset to default set), --telemetry=off (disable), or --telemetry=console,network (merge those categories into the current selection)") + browsersUpdateCmd.Flags().String("telemetry-cdp-exclude", "", "Leave the named CDP methods out of control telemetry's cdp_command events, comma-separated (e.g. Input.dispatchMouseEvent,Page.captureScreenshot); --telemetry-cdp-exclude=none clears the list. Excluded commands are still relayed to the browser, they just produce no event") browsersUpdateCmd.Flags().String("name", "", "Set a new unique name for the browser session (mutually exclusive with --clear-name)") browsersUpdateCmd.Flags().Bool("clear-name", false, "Clear the browser session name") browsersUpdateCmd.Flags().StringArray("tag", nil, "Set a tag KEY=VALUE (repeatable; up to 50 pairs). Replaces the entire tag set; mutually exclusive with --clear-tags") @@ -2963,6 +2966,7 @@ func init() { browsersCreateCmd.Flags().String("pool-id", "", "Browser pool ID to acquire from (mutually exclusive with --pool-name)") browsersCreateCmd.Flags().String("pool-name", "", "Browser pool name to acquire from (mutually exclusive with --pool-id)") browsersCreateCmd.Flags().String("telemetry", "", "Configure telemetry (opt-in): --telemetry=all (default set), --telemetry=off (disable), or --telemetry=console,network (capture exactly those categories)") + browsersCreateCmd.Flags().String("telemetry-cdp-exclude", "", "Leave the named CDP methods out of control telemetry's cdp_command events, comma-separated (e.g. Input.dispatchMouseEvent,Page.captureScreenshot); --telemetry-cdp-exclude=none clears the list. Excluded commands are still relayed to the browser, they just produce no event") browsersCreateCmd.Flags().String("telemetry-export-otlp", "", "Export captured telemetry over OTLP to one of the org's configured destinations, by ID or name; --telemetry-export-otlp=off disables export. Implies --telemetry=all when --telemetry is not set, since export requires capture") browsersCreateCmd.Flags().String("name", "", "Optional unique name for the browser session (used to find it later; can be changed with 'browsers update --name')") browsersCreateCmd.Flags().StringArray("tag", nil, "Set a tag KEY=VALUE on the session (repeatable; up to 50 pairs)") @@ -3094,6 +3098,7 @@ func runBrowsersCreate(cmd *cobra.Command, args []string) error { poolID, _ := cmd.Flags().GetString("pool-id") poolName, _ := cmd.Flags().GetString("pool-name") telemetry, _ := cmd.Flags().GetString("telemetry") + telemetryCdpExclude, _ := cmd.Flags().GetString("telemetry-cdp-exclude") telemetryExport, _ := cmd.Flags().GetString("telemetry-export-otlp") name, _ := cmd.Flags().GetString("name") tags, _ := tagsFromFlag(cmd, "tag") @@ -3160,7 +3165,7 @@ func runBrowsersCreate(cmd *cobra.Command, args []string) error { if cmd.Flags().Changed("timeout") && timeout > 0 { acquireTimeout = int64(timeout) } - acquireParams, err := buildAcquireParams(name, tags, acquireTimeout, telemetry, startURL) + acquireParams, err := buildAcquireParams(name, tags, acquireTimeout, telemetry, telemetryCdpExclude, startURL) if err != nil { return err } @@ -3202,31 +3207,32 @@ func runBrowsersCreate(cmd *cobra.Command, args []string) error { } in := BrowsersCreateInput{ - TimeoutSeconds: timeout, - Stealth: BoolFlag{Set: cmd.Flags().Changed("stealth"), Value: stealthVal}, - Headless: BoolFlag{Set: cmd.Flags().Changed("headless"), Value: headlessVal}, - GPU: BoolFlag{Set: cmd.Flags().Changed("gpu"), Value: gpuVal}, - Memory: memory, - InvocationID: invocationID, - Kiosk: BoolFlag{Set: cmd.Flags().Changed("kiosk"), Value: kioskVal}, - ProfileID: profileID, - ProfileName: profileName, - ProfileSaveChanges: BoolFlag{Set: cmd.Flags().Changed("save-changes"), Value: saveChanges}, - ProxyID: proxyID, - ProxyName: proxyName, - ProxyMode: proxyMode, - Region: region, - PrivateHosts: privateHosts, - StartURL: startURL, - Extensions: extensions, - Viewport: viewport, - Telemetry: telemetry, - TelemetryExport: telemetryExport, - ChromePolicy: chromePolicy, - ChromePolicyFile: chromePolicyFile, - Name: name, - Tags: tags, - Output: output, + TimeoutSeconds: timeout, + Stealth: BoolFlag{Set: cmd.Flags().Changed("stealth"), Value: stealthVal}, + Headless: BoolFlag{Set: cmd.Flags().Changed("headless"), Value: headlessVal}, + GPU: BoolFlag{Set: cmd.Flags().Changed("gpu"), Value: gpuVal}, + Memory: memory, + InvocationID: invocationID, + Kiosk: BoolFlag{Set: cmd.Flags().Changed("kiosk"), Value: kioskVal}, + ProfileID: profileID, + ProfileName: profileName, + ProfileSaveChanges: BoolFlag{Set: cmd.Flags().Changed("save-changes"), Value: saveChanges}, + ProxyID: proxyID, + ProxyName: proxyName, + ProxyMode: proxyMode, + Region: region, + PrivateHosts: privateHosts, + StartURL: startURL, + Extensions: extensions, + Viewport: viewport, + Telemetry: telemetry, + TelemetryCdpExclude: telemetryCdpExclude, + TelemetryExport: telemetryExport, + ChromePolicy: chromePolicy, + ChromePolicyFile: chromePolicyFile, + Name: name, + Tags: tags, + Output: output, } svc := client.Browsers @@ -3288,6 +3294,7 @@ func runBrowsersUpdate(cmd *cobra.Command, args []string) error { viewport, _ := cmd.Flags().GetString("viewport") force, _ := cmd.Flags().GetBool("force") telemetry, _ := cmd.Flags().GetString("telemetry") + telemetryCdpExclude, _ := cmd.Flags().GetString("telemetry-cdp-exclude") name, _ := cmd.Flags().GetString("name") clearName, _ := cmd.Flags().GetBool("clear-name") tags, tagsProvided := tagsFromFlag(cmd, "tag") @@ -3308,6 +3315,7 @@ func runBrowsersUpdate(cmd *cobra.Command, args []string) error { Viewport: viewport, Force: force, Telemetry: telemetry, + TelemetryCdpExclude: telemetryCdpExclude, Name: name, SetName: cmd.Flags().Changed("name"), ClearName: clearName, diff --git a/cmd/browsers_telemetry.go b/cmd/browsers_telemetry.go index 9a37ef36..03699772 100644 --- a/cmd/browsers_telemetry.go +++ b/cmd/browsers_telemetry.go @@ -76,7 +76,9 @@ func parseTelemetryCategories(s string) (kernel.BrowserTelemetryCategoriesConfig case "interaction": p.Interaction = on() case "control": - p.Control = on() + p.Control = kernel.BrowserTelemetryControlConfigParam{Enabled: kernel.Opt(true)} + case "platform": + p.Platform = on() case "connection": p.Connection = on() case "system": @@ -92,20 +94,112 @@ func parseTelemetryCategories(s string) (kernel.BrowserTelemetryCategoriesConfig return p, nil } -// resolveTelemetryFlag interprets a --telemetry flag value shared by every browser -// and browser-pool command: "all" enables the default set, "off" disables capture, -// and a comma-separated list opts into exactly those categories. It returns the -// resolved (enabled, browser) pair so each endpoint can assemble its own param type. -func resolveTelemetryFlag(s string) (param.Opt[bool], kernel.BrowserTelemetryCategoriesConfigParam, error) { +// cdpCommandMethods are the browser-control commands the CDP proxy reports as +// cdp_command events, and so the values --telemetry-cdp-exclude accepts. +var cdpCommandMethods = []string{ + "Input.dispatchMouseEvent", + "Input.dispatchKeyEvent", + "Input.insertText", + "Input.imeSetComposition", + "Input.dispatchTouchEvent", + "Input.dispatchDragEvent", + "Input.cancelDragging", + "Input.emulateTouchFromMouseEvent", + "Input.synthesizePinchGesture", + "Input.synthesizeScrollGesture", + "Input.synthesizeTapGesture", + "DOM.setFileInputFiles", + "DOM.focus", + "DOM.scrollIntoViewIfNeeded", + "Page.bringToFront", + "Page.captureScreenshot", + "Page.captureSnapshot", + "Page.handleJavaScriptDialog", + "Page.navigate", + "Page.navigateToHistoryEntry", + "Page.reload", + "Page.printToPDF", + "Page.startScreencast", + "Page.stopScreencast", + "Page.stopLoading", + "Page.close", + "Page.setWebLifecycleState", + "Target.activateTarget", + "Target.closeTarget", + "Target.createTarget", + "Target.createBrowserContext", + "Target.disposeBrowserContext", + "Target.openDevTools", + "Browser.cancelDownload", + "Browser.close", + "Browser.setWindowBounds", + "Browser.setContentsSize", + "Autofill.trigger", +} + +// telemetryCdpExcludeNone is the --telemetry-cdp-exclude value that clears the +// exclusion list rather than naming methods to drop. +const telemetryCdpExcludeNone = "none" + +// parseTelemetryCdpExcludedMethods parses a --telemetry-cdp-exclude value into the +// exclusion list carried by the control category. "none" resolves to an empty list, +// which tells the API to report every supported method again. Method names are +// matched case-insensitively and returned in their canonical CDP spelling. +func parseTelemetryCdpExcludedMethods(s string) ([]kernel.BrowserCdpCommandMethod, error) { + methods := []kernel.BrowserCdpCommandMethod{} + if strings.TrimSpace(s) == telemetryCdpExcludeNone { + return methods, nil + } + for _, part := range strings.Split(s, ",") { + name := strings.TrimSpace(part) + if name == "" { + continue + } + i := slices.IndexFunc(cdpCommandMethods, func(m string) bool { return strings.EqualFold(m, name) }) + if i < 0 { + return nil, fmt.Errorf("unknown CDP method %q: must be one of %s, or %q to clear the exclusion list", name, strings.Join(cdpCommandMethods, ", "), telemetryCdpExcludeNone) + } + methods = append(methods, kernel.BrowserCdpCommandMethod(cdpCommandMethods[i])) + } + return methods, nil +} + +// resolveTelemetryFlag interprets the --telemetry and --telemetry-cdp-exclude flag +// values shared by every browser and browser-pool command: "all" enables the default +// set, "off" disables capture, and a comma-separated list opts into exactly those +// categories. Excluded CDP methods are merged into the control category independently +// of the selection, so they survive a later update that only names categories. It +// returns the resolved (enabled, browser) pair so each endpoint can assemble its own +// param type. +func resolveTelemetryFlag(s, cdpExclude string) (param.Opt[bool], kernel.BrowserTelemetryCategoriesConfigParam, error) { + var enabled param.Opt[bool] + var p kernel.BrowserTelemetryCategoriesConfigParam switch s { case "all": - return kernel.Opt(true), kernel.BrowserTelemetryCategoriesConfigParam{}, nil + enabled = kernel.Opt(true) case "off": - return kernel.Opt(false), kernel.BrowserTelemetryCategoriesConfigParam{}, nil + enabled = kernel.Opt(false) default: - p, err := parseTelemetryCategories(s) - return param.Opt[bool]{}, p, err + var err error + if p, err = parseTelemetryCategories(s); err != nil { + return enabled, p, err + } + } + if cdpExclude == "" { + return enabled, p, nil } + // Exclusion is a control-telemetry setting, so it has no meaning in a request + // that turns capture off. Error messages never lead with a flag token — the + // error style title-cases the first word. + if s == "off" { + return enabled, p, fmt.Errorf("cannot combine --telemetry=off with --telemetry-cdp-exclude: excluding CDP methods only applies while control telemetry is captured") + } + methods, err := parseTelemetryCdpExcludedMethods(cdpExclude) + if err != nil { + return enabled, p, err + } + p.Control.Cdp.ExcludedMethods = methods + return enabled, p, nil } // telemetryExportOff is the --telemetry-export-otlp value that turns export off @@ -167,10 +261,10 @@ func validateTelemetryExportCombo(telemetry, id, name string, canImply bool) err return nil } -// buildNewTelemetryParam converts --telemetry and --telemetry-export-otlp flag -// values to the create API param. -func buildNewTelemetryParam(s, export string) (kernel.BrowserNewParamsTelemetry, error) { - enabled, browser, err := resolveTelemetryFlag(s) +// buildNewTelemetryParam converts --telemetry, --telemetry-cdp-exclude and +// --telemetry-export-otlp flag values to the create API param. +func buildNewTelemetryParam(s, cdpExclude, export string) (kernel.BrowserNewParamsTelemetry, error) { + enabled, browser, err := resolveTelemetryFlag(s, cdpExclude) p := kernel.BrowserNewParamsTelemetry{Enabled: enabled, Browser: browser} if err != nil || export == "" { return p, err @@ -207,26 +301,37 @@ func optIfSet(s string) param.Opt[string] { return kernel.Opt(s) } -// buildUpdateTelemetryParam converts a --telemetry flag value to the update API param. -func buildUpdateTelemetryParam(s string) (kernel.BrowserUpdateParamsTelemetry, error) { - enabled, browser, err := resolveTelemetryFlag(s) +// buildUpdateTelemetryParam converts --telemetry and --telemetry-cdp-exclude flag +// values to the update API param. +func buildUpdateTelemetryParam(s, cdpExclude string) (kernel.BrowserUpdateParamsTelemetry, error) { + enabled, browser, err := resolveTelemetryFlag(s, cdpExclude) return kernel.BrowserUpdateParamsTelemetry{Enabled: enabled, Browser: browser}, err } -// buildManagedAuthTelemetryParam converts --telemetry and --telemetry-export-otlp -// flag values to the browser telemetry config carried by an auth connection's -// browser settings, shared by create, update, and login. +// buildManagedAuthTelemetryParam converts --telemetry, --telemetry-cdp-exclude and +// --telemetry-export-otlp flag values to the browser telemetry config carried by an +// auth connection's browser settings, shared by create, update, and login. // // canImply is true only on create, where there is no stored selection to clobber // and capture can safely be turned on for the user so a destination works on its // own. On update and login it is false: enabling capture there would replace the // connection's current category selection rather than merge onto it. -func buildManagedAuthTelemetryParam(s, export string, canImply bool) (kernel.ManagedAuthBrowserConfigTelemetryParam, error) { - enabled, browser, err := resolveTelemetryFlag(s) +func buildManagedAuthTelemetryParam(s, cdpExclude, export string, canImply bool) (kernel.ManagedAuthBrowserConfigTelemetryParam, error) { + enabled, browser, err := resolveTelemetryFlag(s, cdpExclude) p := kernel.ManagedAuthBrowserConfigTelemetryParam{Enabled: enabled, Browser: browser} - if err != nil || export == "" { + if err != nil { return p, err } + // A connection stores the browser config as sent rather than resolving it, so a + // request carrying only CDP exclusions would drop the connection's category + // selection. On update and login the user has to restate what to capture; on + // create there is nothing to lose. + if cdpExclude != "" && s == "" && !canImply { + return p, fmt.Errorf("setting --telemetry-cdp-exclude also requires --telemetry in the same command: the connection stores its browser config as sent, so exclusions on their own would drop its category selection") + } + if export == "" { + return p, nil + } exEnabled, id, name, err := resolveTelemetryExportFlag(export) if err != nil { return p, err @@ -264,6 +369,9 @@ func formatManagedAuthTelemetry(cfg kernel.ManagedAuthBrowserConfigTelemetry) st } return "disabled" }() + if ex := formatCdpExcludedMethods(cfg.Browser.Control.Cdp.ExcludedMethods); ex != "" { + base += " (excluding CDP methods: " + ex + ")" + } if dest := managedAuthExportDestination(cfg.Export); dest != "" { return base + " (exporting to " + dest + ")" } @@ -287,7 +395,7 @@ func managedAuthExportDestination(ex kernel.ManagedAuthBrowserConfigTelemetryExp // flows automatically whenever a CDP category is captured. var settableCategories = []string{ "console", "network", "page", "interaction", - "control", "connection", "system", "screenshot", "captcha", + "control", "connection", "system", "screenshot", "platform", "captcha", } // streamFilterCategories are the categories accepted by `telemetry stream --categories`. @@ -310,6 +418,7 @@ func telemetryEnabledCategories(cfg kernel.BrowserTelemetryConfig) []string { {"connection", b.Connection.Enabled}, {"system", b.System.Enabled}, {"screenshot", b.Screenshot.Enabled}, + {"platform", b.Platform.Enabled}, {"captcha", b.Captcha.Enabled}, } on := make([]string, 0, len(ordered)) @@ -330,6 +439,9 @@ func printTelemetrySummary(cfg kernel.BrowserTelemetryConfig) { return } pterm.Info.Printf("Telemetry capturing: %s\n", strings.Join(on, ", ")) + if ex := formatCdpExcludedMethods(cfg.Browser.Control.Cdp.ExcludedMethods); ex != "" { + pterm.Info.Printf("Telemetry excluding CDP methods: %s\n", ex) + } if cfg.Export.Otlp.Enabled { // The response reports the resolved destination by ID even when the request // selected it by name. @@ -341,6 +453,19 @@ func printTelemetrySummary(cfg kernel.BrowserTelemetryConfig) { } } +// formatCdpExcludedMethods renders the CDP methods left out of control +// telemetry's cdp_command stream, or "" when every supported method is reported. +func formatCdpExcludedMethods(methods []kernel.BrowserCdpCommandMethod) string { + if len(methods) == 0 { + return "" + } + names := make([]string, 0, len(methods)) + for _, m := range methods { + names = append(names, string(m)) + } + return strings.Join(names, ", ") +} + // shouldEmit applies client-side category/type filters to a telemetry event. func shouldEmit(category, eventType string, categories, types []string) bool { if len(categories) > 0 && !slices.Contains(categories, category) { diff --git a/cmd/browsers_telemetry_test.go b/cmd/browsers_telemetry_test.go index fe3b88e1..d9458bff 100644 --- a/cmd/browsers_telemetry_test.go +++ b/cmd/browsers_telemetry_test.go @@ -299,14 +299,17 @@ func TestShouldEmit(t *testing.T) { } func TestParseTelemetryCategories_OptInList(t *testing.T) { - p, err := parseTelemetryCategories("network,control,captcha") + p, err := parseTelemetryCategories("network,control,captcha,platform") assert.NoError(t, err) // Listed categories are enabled. - for _, c := range []kernel.BrowserTelemetryCategoryConfigParam{p.Network, p.Control, p.Captcha} { + for _, c := range []kernel.BrowserTelemetryCategoryConfigParam{p.Network, p.Captcha, p.Platform} { assert.True(t, c.Enabled.Valid()) assert.True(t, c.Enabled.Value) } + // Control carries its own config type, so it is checked separately. + assert.True(t, p.Control.Enabled.Valid()) + assert.True(t, p.Control.Enabled.Value) // Unlisted categories are omitted (opt-in: the instance treats them as off). assert.False(t, p.Console.Enabled.Valid()) assert.False(t, p.Page.Enabled.Valid()) @@ -336,21 +339,21 @@ func TestParseTelemetryCategories_WhitespaceTolerance(t *testing.T) { // listed categories enabled (Enabled unset). func TestBuildTelemetryParam_WireEncoding(t *testing.T) { t.Run("all", func(t *testing.T) { - p, err := buildNewTelemetryParam("all", "") + p, err := buildNewTelemetryParam("all", "", "") assert.NoError(t, err) assert.True(t, p.Enabled.Valid()) assert.True(t, p.Enabled.Value) assert.False(t, p.Browser.Network.Enabled.Valid()) }) t.Run("off", func(t *testing.T) { - p, err := buildNewTelemetryParam("off", "") + p, err := buildNewTelemetryParam("off", "", "") assert.NoError(t, err) assert.True(t, p.Enabled.Valid()) assert.False(t, p.Enabled.Value) assert.False(t, p.Browser.Network.Enabled.Valid()) }) t.Run("opt-in list sets only Browser", func(t *testing.T) { - p, err := buildNewTelemetryParam("network,control", "") + p, err := buildNewTelemetryParam("network,control", "", "") assert.NoError(t, err) assert.False(t, p.Enabled.Valid(), "Enabled must be unset for an opt-in selection") assert.True(t, p.Browser.Network.Enabled.Valid()) @@ -366,7 +369,7 @@ func TestBuildTelemetryParam_WireEncoding(t *testing.T) { // enabled=false combined with one. func TestBuildTelemetryParam_ExportWireEncoding(t *testing.T) { t.Run("destination by CUID sets id", func(t *testing.T) { - p, err := buildNewTelemetryParam("", "abcdefghijklmnopqrstuvwx") + p, err := buildNewTelemetryParam("", "", "abcdefghijklmnopqrstuvwx") assert.NoError(t, err) otlp := p.Export.Otlp assert.True(t, otlp.Destination.ID.Valid()) @@ -375,7 +378,7 @@ func TestBuildTelemetryParam_ExportWireEncoding(t *testing.T) { assert.False(t, otlp.Enabled.Valid(), "a destination implies enabled server-side") }) t.Run("destination by name sets name", func(t *testing.T) { - p, err := buildNewTelemetryParam("", "my-collector") + p, err := buildNewTelemetryParam("", "", "my-collector") assert.NoError(t, err) otlp := p.Export.Otlp assert.True(t, otlp.Destination.Name.Valid()) @@ -383,20 +386,20 @@ func TestBuildTelemetryParam_ExportWireEncoding(t *testing.T) { assert.False(t, otlp.Destination.ID.Valid(), "id must be unset when name is sent") }) t.Run("destination implies capture on create", func(t *testing.T) { - p, err := buildNewTelemetryParam("", "my-collector") + p, err := buildNewTelemetryParam("", "", "my-collector") assert.NoError(t, err) assert.True(t, p.Enabled.Valid(), "export requires capture, so create implies it") assert.True(t, p.Enabled.Value) }) t.Run("explicit --telemetry selection is preserved", func(t *testing.T) { - p, err := buildNewTelemetryParam("network,control", "my-collector") + p, err := buildNewTelemetryParam("network,control", "", "my-collector") assert.NoError(t, err) assert.False(t, p.Enabled.Valid(), "an opt-in selection must not be overridden") assert.True(t, p.Browser.Network.Enabled.Value) assert.Equal(t, "my-collector", p.Export.Otlp.Destination.Name.Value) }) t.Run("off disables export without a destination", func(t *testing.T) { - p, err := buildNewTelemetryParam("all", "off") + p, err := buildNewTelemetryParam("all", "", "off") assert.NoError(t, err) otlp := p.Export.Otlp assert.True(t, otlp.Enabled.Valid()) @@ -405,7 +408,7 @@ func TestBuildTelemetryParam_ExportWireEncoding(t *testing.T) { assert.False(t, otlp.Destination.Name.Valid()) }) t.Run("off does not imply capture", func(t *testing.T) { - p, err := buildNewTelemetryParam("", "off") + p, err := buildNewTelemetryParam("", "", "off") assert.NoError(t, err) assert.False(t, p.Enabled.Valid(), "disabling export must not turn capture on") }) @@ -414,44 +417,44 @@ func TestBuildTelemetryParam_ExportWireEncoding(t *testing.T) { // same request. Update and login refuse to supply one: doing so would replace // the connection's current category selection. t.Run("update requires an explicit --telemetry alongside a destination", func(t *testing.T) { - _, err := buildManagedAuthTelemetryParam("", "my-collector", false) + _, err := buildManagedAuthTelemetryParam("", "", "my-collector", false) assert.Error(t, err) assert.Contains(t, err.Error(), "also requires --telemetry") }) t.Run("login requires an explicit --telemetry alongside a destination", func(t *testing.T) { - _, err := buildManagedAuthTelemetryParam("", "my-collector", false) + _, err := buildManagedAuthTelemetryParam("", "", "my-collector", false) assert.Error(t, err) assert.Contains(t, err.Error(), "also requires --telemetry") }) t.Run("update never implies capture when --telemetry is given", func(t *testing.T) { - p, err := buildManagedAuthTelemetryParam("console", "my-collector", false) + p, err := buildManagedAuthTelemetryParam("console", "", "my-collector", false) assert.NoError(t, err) assert.False(t, p.Enabled.Valid(), "an opt-in selection must not be widened to the default set") assert.True(t, p.Browser.Console.Enabled.Value) assert.Equal(t, "my-collector", p.Export.Otlp.Destination.Name.Value) }) t.Run("login never implies capture when --telemetry is given", func(t *testing.T) { - p, err := buildManagedAuthTelemetryParam("console", "my-collector", false) + p, err := buildManagedAuthTelemetryParam("console", "", "my-collector", false) assert.NoError(t, err) assert.False(t, p.Enabled.Valid()) assert.Equal(t, "my-collector", p.Export.Otlp.Destination.Name.Value) }) t.Run("update and login allow export=off without --telemetry", func(t *testing.T) { - u, err := buildManagedAuthTelemetryParam("", "off", false) + u, err := buildManagedAuthTelemetryParam("", "", "off", false) assert.NoError(t, err) assert.False(t, u.Export.Otlp.Enabled.Value) - l, err := buildManagedAuthTelemetryParam("", "off", false) + l, err := buildManagedAuthTelemetryParam("", "", "off", false) assert.NoError(t, err) assert.False(t, l.Export.Otlp.Enabled.Value) }) t.Run("auth connection create implies capture", func(t *testing.T) { - p, err := buildManagedAuthTelemetryParam("", "my-collector", true) + p, err := buildManagedAuthTelemetryParam("", "", "my-collector", true) assert.NoError(t, err) assert.True(t, p.Enabled.Valid()) assert.True(t, p.Enabled.Value) }) t.Run("invalid category still errors with export set", func(t *testing.T) { - _, err := buildNewTelemetryParam("bogus", "my-collector") + _, err := buildNewTelemetryParam("bogus", "", "my-collector") assert.Error(t, err) }) t.Run("telemetry=off with a destination is rejected", func(t *testing.T) { @@ -459,9 +462,9 @@ func TestBuildTelemetryParam_ExportWireEncoding(t *testing.T) { name string fn func() error }{ - {"create", func() error { _, e := buildNewTelemetryParam("off", "my-collector"); return e }}, - {"auth create", func() error { _, e := buildManagedAuthTelemetryParam("off", "my-collector", true); return e }}, - {"auth update/login", func() error { _, e := buildManagedAuthTelemetryParam("off", "my-collector", false); return e }}, + {"create", func() error { _, e := buildNewTelemetryParam("off", "", "my-collector"); return e }}, + {"auth create", func() error { _, e := buildManagedAuthTelemetryParam("off", "", "my-collector", true); return e }}, + {"auth update/login", func() error { _, e := buildManagedAuthTelemetryParam("off", "", "my-collector", false); return e }}, } { err := tc.fn() assert.Error(t, err, tc.name) @@ -469,13 +472,13 @@ func TestBuildTelemetryParam_ExportWireEncoding(t *testing.T) { } }) t.Run("telemetry=off with export=off is allowed", func(t *testing.T) { - p, err := buildNewTelemetryParam("off", "off") + p, err := buildNewTelemetryParam("off", "", "off") assert.NoError(t, err) assert.False(t, p.Enabled.Value) assert.False(t, p.Export.Otlp.Enabled.Value) }) t.Run("empty export value errors", func(t *testing.T) { - _, err := buildNewTelemetryParam("all", " ") + _, err := buildNewTelemetryParam("all", "", " ") assert.Error(t, err) }) } @@ -718,3 +721,82 @@ func TestTelemetryEvents_FullScanIgnoresOffsetUsesSince(t *testing.T) { assert.Equal(t, "5m", gotQuery.Since.Value, "--all walks the window from --since") _ = buf } + +func TestParseTelemetryCategories_Platform(t *testing.T) { + p, err := parseTelemetryCategories("platform") + + assert.NoError(t, err) + assert.True(t, p.Platform.Enabled.Valid()) + assert.True(t, p.Platform.Enabled.Value) + // platform is opt-in only, so it must be offered by the flag's error message too. + _, err = parseTelemetryCategories("bogus") + assert.ErrorContains(t, err, "platform") +} + +func TestTelemetryEnabledCategories_Platform(t *testing.T) { + cfg := kernel.BrowserTelemetryConfig{Browser: kernel.BrowserTelemetryCategoriesConfig{}} + cfg.Browser.Platform.Enabled = true + + assert.Equal(t, []string{"platform"}, telemetryEnabledCategories(cfg)) +} + +func TestParseTelemetryCdpExcludedMethods(t *testing.T) { + t.Run("canonicalizes and trims", func(t *testing.T) { + got, err := parseTelemetryCdpExcludedMethods(" input.dispatchmouseevent , Page.captureScreenshot ") + assert.NoError(t, err) + assert.Equal(t, []kernel.BrowserCdpCommandMethod{ + kernel.BrowserCdpCommandMethodInputDispatchMouseEvent, + kernel.BrowserCdpCommandMethodPageCaptureScreenshot, + }, got) + }) + t.Run("none clears the list", func(t *testing.T) { + got, err := parseTelemetryCdpExcludedMethods("none") + assert.NoError(t, err) + assert.NotNil(t, got, "an empty list must still be sent, so the API reports every method again") + assert.Empty(t, got) + }) + t.Run("rejects unknown methods", func(t *testing.T) { + _, err := parseTelemetryCdpExcludedMethods("Page.doesNotExist") + assert.ErrorContains(t, err, "unknown CDP method") + }) +} + +func TestBuildTelemetryParam_CdpExclude(t *testing.T) { + t.Run("merges into control without enabling it", func(t *testing.T) { + p, err := buildNewTelemetryParam("", "Input.dispatchMouseEvent", "") + assert.NoError(t, err) + assert.False(t, p.Enabled.Valid()) + assert.False(t, p.Browser.Control.Enabled.Valid(), "exclusions must not silently flip the control category") + assert.Equal(t, []kernel.BrowserCdpCommandMethod{ + kernel.BrowserCdpCommandMethodInputDispatchMouseEvent, + }, p.Browser.Control.Cdp.ExcludedMethods) + }) + t.Run("combines with a category selection", func(t *testing.T) { + p, err := buildUpdateTelemetryParam("control,network", "Page.captureScreenshot") + assert.NoError(t, err) + assert.True(t, p.Browser.Control.Enabled.Value) + assert.Equal(t, []kernel.BrowserCdpCommandMethod{ + kernel.BrowserCdpCommandMethodPageCaptureScreenshot, + }, p.Browser.Control.Cdp.ExcludedMethods) + }) + t.Run("rejects combining with telemetry off", func(t *testing.T) { + _, err := buildNewTelemetryParam("off", "Page.captureScreenshot", "") + assert.ErrorContains(t, err, "cannot combine --telemetry=off with --telemetry-cdp-exclude") + }) +} + +func TestBuildManagedAuthTelemetryParam_CdpExcludeNeedsCategories(t *testing.T) { + // The connection stores the config verbatim, so exclusions on their own would + // replace its category selection — allowed on create, rejected on update/login. + _, err := buildManagedAuthTelemetryParam("", "Page.navigate", "", false) + assert.ErrorContains(t, err, "also requires --telemetry in the same command") + + p, err := buildManagedAuthTelemetryParam("", "Page.navigate", "", true) + assert.NoError(t, err) + assert.Equal(t, []kernel.BrowserCdpCommandMethod{ + kernel.BrowserCdpCommandMethodPageNavigate, + }, p.Browser.Control.Cdp.ExcludedMethods) + + _, err = buildManagedAuthTelemetryParam("control", "Page.navigate", "", false) + assert.NoError(t, err) +} diff --git a/go.mod b/go.mod index 0e346401..cbedb97c 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.1 github.com/golang-jwt/jwt/v5 v5.2.2 github.com/joho/godotenv v1.5.1 - github.com/kernel/kernel-go-sdk v0.93.0 + github.com/kernel/kernel-go-sdk v0.93.1-0.20260821151320-9a36566d8999 github.com/klauspost/compress v1.18.5 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c github.com/pterm/pterm v0.12.80 diff --git a/go.sum b/go.sum index 78374443..7b5172cd 100644 --- a/go.sum +++ b/go.sum @@ -64,8 +64,8 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= -github.com/kernel/kernel-go-sdk v0.93.0 h1:mPsZKoQlLsgsC0TehWJ/Q5XqWwKu33bKfnuqnfNHtjs= -github.com/kernel/kernel-go-sdk v0.93.0/go.mod h1:EeZzSuHZVeHKxKCPUzxou2bovNGhXaz0RXrSqKNf1AQ= +github.com/kernel/kernel-go-sdk v0.93.1-0.20260821151320-9a36566d8999 h1:+BIiUH4JK5tCi3P57exQgbyGEXCrFNY3OpMuuI931Xo= +github.com/kernel/kernel-go-sdk v0.93.1-0.20260821151320-9a36566d8999/go.mod h1:EeZzSuHZVeHKxKCPUzxou2bovNGhXaz0RXrSqKNf1AQ= github.com/klauspost/compress v1.18.5 h1:/h1gH5Ce+VWNLSWqPzOVn6XBO+vJbCNGvjoaGBFW2IE= github.com/klauspost/compress v1.18.5/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= From 063d7f5e4e0f7ca1986aee458495956a39fb3d2c Mon Sep 17 00:00:00 2001 From: "kernel-internal[bot]" <260533166+kernel-internal[bot]@users.noreply.github.com> Date: Fri, 21 Aug 2026 17:44:24 +0000 Subject: [PATCH 08/26] CLI: Update Go SDK to c042837 and drop the telemetry control/platform split MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Updates kernel-go-sdk to c0428370612f0ae242d9c4cbbf87e6a6436ff9d9. The previous update (f9b126f) targeted SDK commit 9a36566d8999, which is not reachable from the SDK's main branch — that telemetry control/platform split never landed. Against c042837 the CLI no longer compiled: BrowserTelemetryControlConfigParam, BrowserCdpCommandMethod, the `platform` category, and `control.cdp` do not exist. This reverts f9b126f's code changes, so the CLI is back to the nine categories the SDK actually ships (captcha, connection, console, control, interaction, network, page, screenshot, system) and the `--telemetry-cdp-exclude` flag is gone. The only API-surface change between the CLI's previous SDK and c042837 is browser_routing.go adding "computer" and "playwright" to the direct-to-VM routing allowlist — an internal default with no CLI-visible effect. Coverage analysis: a full enumeration of the 140 methods in api.md against the CLI command tree found no missing commands, and a field-by-field pass over every Params struct found no missing flags. The x-cli-skip endpoints (site-configs, auth connection exchange) remain excluded. Tested against the production API: - browsers create --telemetry=console,network / update --telemetry=page / telemetry events / get / delete - browser-pools create --telemetry=console / get / update --telemetry=network / delete - browsers create --telemetry-cdp-exclude now correctly rejects the removed flag - read-only sweep: auth context, auth connections list, browsers list, browser-pools list, app list, proxies list, profiles list, extensions list, org entitlements, telemetry destinations list, credentials list, projects list - go build ./..., go vet ./..., go test ./... all pass Triggered by: kernel/kernel-go-sdk@c0428370612f0ae242d9c4cbbf87e6a6436ff9d9 Co-Authored-By: Claude Opus 5 --- cmd/auth_connections.go | 60 +++++------- cmd/browser_pools.go | 87 +++++++---------- cmd/browser_pools_test.go | 6 +- cmd/browsers.go | 126 +++++++++++------------- cmd/browsers_telemetry.go | 173 +++++---------------------------- cmd/browsers_telemetry_test.go | 130 +++++-------------------- go.mod | 2 +- go.sum | 4 +- 8 files changed, 171 insertions(+), 417 deletions(-) diff --git a/cmd/auth_connections.go b/cmd/auth_connections.go index d7fc1f9a..c6aedcfa 100644 --- a/cmd/auth_connections.go +++ b/cmd/auth_connections.go @@ -57,7 +57,6 @@ type AuthConnectionCreateInput struct { NoAutoReauth bool RecordSession BoolFlag Telemetry string - TelemetryCdpExclude string TelemetryExport string Output string } @@ -93,7 +92,6 @@ type AuthConnectionUpdateInput struct { AutoReauth BoolFlag RecordSession BoolFlag Telemetry string - TelemetryCdpExclude string TelemetryExport string Output string } @@ -113,16 +111,15 @@ type AuthConnectionDeleteInput struct { } type AuthConnectionLoginInput struct { - ID string - ProxyID string - ProxyName string - ProxyMode string - Stealth BoolFlag - RecordSession BoolFlag - Telemetry string - TelemetryCdpExclude string - TelemetryExport string - Output string + ID string + ProxyID string + ProxyName string + ProxyMode string + Stealth BoolFlag + RecordSession BoolFlag + Telemetry string + TelemetryExport string + Output string } type AuthConnectionSubmitInput struct { @@ -240,8 +237,8 @@ func (c AuthConnectionCmd) Create(ctx context.Context, in AuthConnectionCreateIn params.ManagedAuthCreateRequest.RecordSession = kernel.Opt(in.RecordSession.Value) } - if in.Telemetry != "" || in.TelemetryCdpExclude != "" || in.TelemetryExport != "" { - t, err := buildManagedAuthTelemetryParam(in.Telemetry, in.TelemetryCdpExclude, in.TelemetryExport, true) + if in.Telemetry != "" || in.TelemetryExport != "" { + t, err := buildManagedAuthTelemetryParam(in.Telemetry, in.TelemetryExport, true) if err != nil { return err } @@ -386,8 +383,8 @@ func (c AuthConnectionCmd) Update(ctx context.Context, in AuthConnectionUpdateIn hasChanges = true } - if in.Telemetry != "" || in.TelemetryCdpExclude != "" || in.TelemetryExport != "" { - t, err := buildManagedAuthTelemetryParam(in.Telemetry, in.TelemetryCdpExclude, in.TelemetryExport, false) + if in.Telemetry != "" || in.TelemetryExport != "" { + t, err := buildManagedAuthTelemetryParam(in.Telemetry, in.TelemetryExport, false) if err != nil { return err } @@ -784,8 +781,8 @@ func (c AuthConnectionCmd) Login(ctx context.Context, in AuthConnectionLoginInpu params.RecordSession = kernel.Opt(in.RecordSession.Value) } - if in.Telemetry != "" || in.TelemetryCdpExclude != "" || in.TelemetryExport != "" { - t, err := buildManagedAuthTelemetryParam(in.Telemetry, in.TelemetryCdpExclude, in.TelemetryExport, false) + if in.Telemetry != "" || in.TelemetryExport != "" { + t, err := buildManagedAuthTelemetryParam(in.Telemetry, in.TelemetryExport, false) if err != nil { return err } @@ -1282,7 +1279,6 @@ func init() { authConnectionsCreateCmd.Flags().Bool("record-session", false, "Record browser sessions for this connection by default (useful for debugging)") authConnectionsCreateCmd.Flags().String("telemetry", "", "Configure telemetry for this connection's browser sessions (opt-in): --telemetry=all (default set), --telemetry=off (disable), or --telemetry=console,network (capture exactly those categories)") authConnectionsCreateCmd.Flags().String("telemetry-export-otlp", "", "Export this connection's captured telemetry over OTLP to one of the org's configured destinations, by ID or name; --telemetry-export-otlp=off disables export. Implies --telemetry=all when --telemetry is not set, since export requires capture") - authConnectionsCreateCmd.Flags().String("telemetry-cdp-exclude", "", "Leave the named CDP methods out of control telemetry's cdp_command events, comma-separated (e.g. Input.dispatchMouseEvent,Page.captureScreenshot); --telemetry-cdp-exclude=none clears the list. Excluded commands are still relayed to the browser, they just produce no event") _ = authConnectionsCreateCmd.MarkFlagRequired("domain") _ = authConnectionsCreateCmd.MarkFlagRequired("profile-name") authConnectionsCreateCmd.MarkFlagsMutuallyExclusive("credential-name", "credential-provider") @@ -1312,7 +1308,6 @@ func init() { authConnectionsUpdateCmd.Flags().Bool("record-session", false, "Set whether browser sessions are recorded by default; use --record-session=false to disable") authConnectionsUpdateCmd.Flags().String("telemetry", "", "Update telemetry for future browser sessions: --telemetry=all (reset to default set), --telemetry=off (disable), or --telemetry=console,network (merge those categories into the current selection)") authConnectionsUpdateCmd.Flags().String("telemetry-export-otlp", "", "Update where future sessions export captured telemetry over OTLP, by destination ID or name; --telemetry-export-otlp=off disables export. Naming a destination requires passing --telemetry in the same command, since export and capture are validated together") - authConnectionsUpdateCmd.Flags().String("telemetry-cdp-exclude", "", "Leave the named CDP methods out of control telemetry's cdp_command events, comma-separated (e.g. Input.dispatchMouseEvent,Page.captureScreenshot); --telemetry-cdp-exclude=none clears the list. Excluded commands are still relayed to the browser, they just produce no event") authConnectionsUpdateCmd.MarkFlagsMutuallyExclusive("credential-name", "credential-provider") authConnectionsUpdateCmd.MarkFlagsMutuallyExclusive("save-credentials", "no-save-credentials") authConnectionsUpdateCmd.MarkFlagsMutuallyExclusive("health-checks", "no-health-checks") @@ -1338,7 +1333,6 @@ func init() { authConnectionsLoginCmd.Flags().Bool("record-session", false, "Override whether this login's browser session is recorded; use --record-session=false to disable") authConnectionsLoginCmd.Flags().String("telemetry", "", "Telemetry override for this login only, merged onto the connection's config: --telemetry=all, --telemetry=off, or --telemetry=console,network") authConnectionsLoginCmd.Flags().String("telemetry-export-otlp", "", "Export override for this login only: an OTLP destination ID or name; --telemetry-export-otlp=off disables export for this login. Naming a destination requires passing --telemetry in the same command, since export and capture are validated together") - authConnectionsLoginCmd.Flags().String("telemetry-cdp-exclude", "", "Leave the named CDP methods out of control telemetry's cdp_command events, comma-separated (e.g. Input.dispatchMouseEvent,Page.captureScreenshot); --telemetry-cdp-exclude=none clears the list. Excluded commands are still relayed to the browser, they just produce no event") // Submit flags addJSONOutputFlag(authConnectionsSubmitCmd) @@ -1393,7 +1387,6 @@ func runAuthConnectionsCreate(cmd *cobra.Command, args []string) error { noHealthChecks, _ := cmd.Flags().GetBool("no-health-checks") noAutoReauth, _ := cmd.Flags().GetBool("no-auto-reauth") telemetry, _ := cmd.Flags().GetString("telemetry") - telemetryCdpExclude, _ := cmd.Flags().GetString("telemetry-cdp-exclude") telemetryExport, _ := cmd.Flags().GetString("telemetry-export-otlp") svc := client.Auth.Connections @@ -1417,7 +1410,6 @@ func runAuthConnectionsCreate(cmd *cobra.Command, args []string) error { NoAutoReauth: noAutoReauth, RecordSession: readBoolFlag(cmd.Flags(), "record-session"), Telemetry: telemetry, - TelemetryCdpExclude: telemetryCdpExclude, TelemetryExport: telemetryExport, Output: output, }) @@ -1451,7 +1443,6 @@ func runAuthConnectionsUpdate(cmd *cobra.Command, args []string) error { noSaveCredentials, _ := cmd.Flags().GetBool("no-save-credentials") healthCheckInterval, _ := cmd.Flags().GetInt("health-check-interval") telemetry, _ := cmd.Flags().GetString("telemetry") - telemetryCdpExclude, _ := cmd.Flags().GetString("telemetry-cdp-exclude") telemetryExport, _ := cmd.Flags().GetString("telemetry-export-otlp") saveCredentialsFlag := BoolFlag{} @@ -1505,7 +1496,6 @@ func runAuthConnectionsUpdate(cmd *cobra.Command, args []string) error { AutoReauth: togglePair("auto-reauth", "no-auto-reauth"), RecordSession: readBoolFlag(cmd.Flags(), "record-session"), Telemetry: telemetry, - TelemetryCdpExclude: telemetryCdpExclude, TelemetryExport: telemetryExport, Output: output, }) @@ -1551,22 +1541,20 @@ func runAuthConnectionsLogin(cmd *cobra.Command, args []string) error { proxyName, _ := cmd.Flags().GetString("proxy-name") proxyMode, _ := cmd.Flags().GetString("proxy-mode") telemetry, _ := cmd.Flags().GetString("telemetry") - telemetryCdpExclude, _ := cmd.Flags().GetString("telemetry-cdp-exclude") telemetryExport, _ := cmd.Flags().GetString("telemetry-export-otlp") svc := client.Auth.Connections c := AuthConnectionCmd{svc: &svc} return c.Login(cmd.Context(), AuthConnectionLoginInput{ - ID: args[0], - ProxyID: proxyID, - ProxyName: proxyName, - ProxyMode: proxyMode, - Stealth: readBoolFlag(cmd.Flags(), "stealth"), - RecordSession: readBoolFlag(cmd.Flags(), "record-session"), - Telemetry: telemetry, - TelemetryCdpExclude: telemetryCdpExclude, - TelemetryExport: telemetryExport, - Output: output, + ID: args[0], + ProxyID: proxyID, + ProxyName: proxyName, + ProxyMode: proxyMode, + Stealth: readBoolFlag(cmd.Flags(), "stealth"), + RecordSession: readBoolFlag(cmd.Flags(), "record-session"), + Telemetry: telemetry, + TelemetryExport: telemetryExport, + Output: output, }) } diff --git a/cmd/browser_pools.go b/cmd/browser_pools.go index 276018d7..c6f7051b 100644 --- a/cmd/browser_pools.go +++ b/cmd/browser_pools.go @@ -108,24 +108,21 @@ func (c BrowserPoolsCmd) List(ctx context.Context, in BrowserPoolsListInput) err return nil } -// buildPoolNewTelemetryParam converts --telemetry and --telemetry-cdp-exclude flag -// values to the pool create param. -func buildPoolNewTelemetryParam(s, cdpExclude string) (kernel.BrowserPoolNewParamsTelemetry, error) { - enabled, browser, err := resolveTelemetryFlag(s, cdpExclude) +// buildPoolNewTelemetryParam converts a --telemetry flag value to the pool create param. +func buildPoolNewTelemetryParam(s string) (kernel.BrowserPoolNewParamsTelemetry, error) { + enabled, browser, err := resolveTelemetryFlag(s) return kernel.BrowserPoolNewParamsTelemetry{Enabled: enabled, Browser: browser}, err } -// buildPoolUpdateTelemetryParam converts --telemetry and --telemetry-cdp-exclude flag -// values to the pool update param. -func buildPoolUpdateTelemetryParam(s, cdpExclude string) (kernel.BrowserPoolUpdateParamsTelemetry, error) { - enabled, browser, err := resolveTelemetryFlag(s, cdpExclude) +// buildPoolUpdateTelemetryParam converts a --telemetry flag value to the pool update param. +func buildPoolUpdateTelemetryParam(s string) (kernel.BrowserPoolUpdateParamsTelemetry, error) { + enabled, browser, err := resolveTelemetryFlag(s) return kernel.BrowserPoolUpdateParamsTelemetry{Enabled: enabled, Browser: browser}, err } -// buildPoolAcquireTelemetryParam converts --telemetry and --telemetry-cdp-exclude flag -// values to the acquire override param. -func buildPoolAcquireTelemetryParam(s, cdpExclude string) (kernel.BrowserPoolAcquireParamsTelemetry, error) { - enabled, browser, err := resolveTelemetryFlag(s, cdpExclude) +// buildPoolAcquireTelemetryParam converts a --telemetry flag value to the acquire override param. +func buildPoolAcquireTelemetryParam(s string) (kernel.BrowserPoolAcquireParamsTelemetry, error) { + enabled, browser, err := resolveTelemetryFlag(s) return kernel.BrowserPoolAcquireParamsTelemetry{Enabled: enabled, Browser: browser}, err } @@ -135,11 +132,7 @@ func formatPoolTelemetry(cfg kernel.BrowserTelemetryConfig) string { if len(on) == 0 { return "disabled" } - base := strings.Join(on, ", ") - if ex := formatCdpExcludedMethods(cfg.Browser.Control.Cdp.ExcludedMethods); ex != "" { - return base + " (excluding CDP methods: " + ex + ")" - } - return base + return strings.Join(on, ", ") } type BrowserPoolsCreateInput struct { @@ -162,7 +155,6 @@ type BrowserPoolsCreateInput struct { ChromePolicy string ChromePolicyFile string Telemetry string - TelemetryCdpExclude string Output string } @@ -255,8 +247,8 @@ func (c BrowserPoolsCmd) Create(ctx context.Context, in BrowserPoolsCreateInput) params.ChromePolicy = chromePolicy } - if in.Telemetry != "" || in.TelemetryCdpExclude != "" { - t, err := buildPoolNewTelemetryParam(in.Telemetry, in.TelemetryCdpExclude) + if in.Telemetry != "" { + t, err := buildPoolNewTelemetryParam(in.Telemetry) if err != nil { return err } @@ -277,7 +269,7 @@ func (c BrowserPoolsCmd) Create(ctx context.Context, in BrowserPoolsCreateInput) } else { pterm.Success.Printf("Created browser pool %s\n", pool.ID) } - if in.Telemetry != "" || in.TelemetryCdpExclude != "" { + if in.Telemetry != "" { printTelemetrySummary(pool.BrowserPoolConfig.Telemetry) } return nil @@ -358,7 +350,6 @@ type BrowserPoolsUpdateInput struct { ChromePolicyFile string ClearChromePolicy bool Telemetry string - TelemetryCdpExclude string DiscardAllIdle BoolFlag Output string } @@ -497,8 +488,8 @@ func (c BrowserPoolsCmd) Update(ctx context.Context, in BrowserPoolsUpdateInput) params.SetExtraFields(extraFields) } - if in.Telemetry != "" || in.TelemetryCdpExclude != "" { - t, err := buildPoolUpdateTelemetryParam(in.Telemetry, in.TelemetryCdpExclude) + if in.Telemetry != "" { + t, err := buildPoolUpdateTelemetryParam(in.Telemetry) if err != nil { return err } @@ -519,7 +510,7 @@ func (c BrowserPoolsCmd) Update(ctx context.Context, in BrowserPoolsUpdateInput) } else { pterm.Success.Printf("Updated browser pool %s\n", pool.ID) } - if in.Telemetry != "" || in.TelemetryCdpExclude != "" { + if in.Telemetry != "" { printTelemetrySummary(pool.BrowserPoolConfig.Telemetry) } return nil @@ -544,14 +535,13 @@ func (c BrowserPoolsCmd) Delete(ctx context.Context, in BrowserPoolsDeleteInput) } type BrowserPoolsAcquireInput struct { - IDOrName string - TimeoutSeconds int64 - Name string - StartURL string - Tags map[string]string - Telemetry string - TelemetryCdpExclude string - Output string + IDOrName string + TimeoutSeconds int64 + Name string + StartURL string + Tags map[string]string + Telemetry string + Output string } // buildAcquireParams builds the SDK params for acquiring a browser from a pool. @@ -559,7 +549,7 @@ type BrowserPoolsAcquireInput struct { // path so the per-lease name/tags/start-url/telemetry forwarding cannot silently // diverge between them. The telemetry override merges onto the pool's config for // this lease. -func buildAcquireParams(name string, tags map[string]string, timeoutSeconds int64, telemetry, telemetryCdpExclude, startURL string) (kernel.BrowserPoolAcquireParams, error) { +func buildAcquireParams(name string, tags map[string]string, timeoutSeconds int64, telemetry, startURL string) (kernel.BrowserPoolAcquireParams, error) { params := kernel.BrowserPoolAcquireParams{} if timeoutSeconds > 0 { params.AcquireTimeoutSeconds = kernel.Int(timeoutSeconds) @@ -573,8 +563,8 @@ func buildAcquireParams(name string, tags map[string]string, timeoutSeconds int6 if len(tags) > 0 { params.Tags = kernel.Tags(tags) } - if telemetry != "" || telemetryCdpExclude != "" { - t, err := buildPoolAcquireTelemetryParam(telemetry, telemetryCdpExclude) + if telemetry != "" { + t, err := buildPoolAcquireTelemetryParam(telemetry) if err != nil { return kernel.BrowserPoolAcquireParams{}, err } @@ -588,7 +578,7 @@ func (c BrowserPoolsCmd) Acquire(ctx context.Context, in BrowserPoolsAcquireInpu return err } - params, err := buildAcquireParams(in.Name, in.Tags, in.TimeoutSeconds, in.Telemetry, in.TelemetryCdpExclude, in.StartURL) + params, err := buildAcquireParams(in.Name, in.Tags, in.TimeoutSeconds, in.Telemetry, in.StartURL) if err != nil { return err } @@ -759,7 +749,6 @@ func init() { browserPoolsCreateCmd.Flags().String("chrome-policy", "", "Custom Chrome enterprise policy as a JSON object") browserPoolsCreateCmd.Flags().String("chrome-policy-file", "", "Read Chrome enterprise policy (JSON object) from a file (use '-' for stdin)") browserPoolsCreateCmd.Flags().String("telemetry", "", "Configure telemetry for browsers warmed into the pool (opt-in): --telemetry=all (default set), --telemetry=off (disable), or --telemetry=console,network (capture exactly those categories)") - browserPoolsCreateCmd.Flags().String("telemetry-cdp-exclude", "", "Leave the named CDP methods out of control telemetry's cdp_command events, comma-separated (e.g. Input.dispatchMouseEvent,Page.captureScreenshot); --telemetry-cdp-exclude=none clears the list. Excluded commands are still relayed to the browser, they just produce no event") browserPoolsCreateCmd.MarkFlagsMutuallyExclusive("chrome-policy", "chrome-policy-file") addJSONOutputFlag(browserPoolsGetCmd) @@ -790,7 +779,6 @@ func init() { browserPoolsUpdateCmd.MarkFlagsMutuallyExclusive("chrome-policy", "chrome-policy-file") browserPoolsUpdateCmd.MarkFlagsMutuallyExclusive("private-host", "clear-private-hosts") browserPoolsUpdateCmd.Flags().String("telemetry", "", "Update pool telemetry: --telemetry=all (reset to default set), --telemetry=off (disable), or --telemetry=console,network (merge those categories into the current selection). Applies only to browsers warmed after the update.") - browserPoolsUpdateCmd.Flags().String("telemetry-cdp-exclude", "", "Leave the named CDP methods out of control telemetry's cdp_command events, comma-separated (e.g. Input.dispatchMouseEvent,Page.captureScreenshot); --telemetry-cdp-exclude=none clears the list. Excluded commands are still relayed to the browser, they just produce no event") browserPoolsUpdateCmd.Flags().Bool("discard-all-idle", false, "Discard all idle browsers") addJSONOutputFlag(browserPoolsUpdateCmd) @@ -801,7 +789,6 @@ func init() { browserPoolsAcquireCmd.Flags().String("start-url", "", "URL to navigate the acquired browser to, overriding the pool's start URL for this acquire only (best-effort)") browserPoolsAcquireCmd.Flags().StringArray("tag", nil, "Set a tag KEY=VALUE on the acquired session (repeatable; applies to this lease)") browserPoolsAcquireCmd.Flags().String("telemetry", "", "Telemetry override for this lease only, merged onto the pool's config: --telemetry=all, --telemetry=off, or --telemetry=console,network") - browserPoolsAcquireCmd.Flags().String("telemetry-cdp-exclude", "", "Leave the named CDP methods out of control telemetry's cdp_command events, comma-separated (e.g. Input.dispatchMouseEvent,Page.captureScreenshot); --telemetry-cdp-exclude=none clears the list. Excluded commands are still relayed to the browser, they just produce no event") addJSONOutputFlag(browserPoolsAcquireCmd) browserPoolsReleaseCmd.Flags().String("session-id", "", "Browser session ID to release") @@ -858,7 +845,6 @@ func runBrowserPoolsCreate(cmd *cobra.Command, args []string) error { chromePolicy, _ := cmd.Flags().GetString("chrome-policy") chromePolicyFile, _ := cmd.Flags().GetString("chrome-policy-file") telemetry, _ := cmd.Flags().GetString("telemetry") - telemetryCdpExclude, _ := cmd.Flags().GetString("telemetry-cdp-exclude") output, _ := cmd.Flags().GetString("output") in := BrowserPoolsCreateInput{ @@ -881,7 +867,6 @@ func runBrowserPoolsCreate(cmd *cobra.Command, args []string) error { ChromePolicy: chromePolicy, ChromePolicyFile: chromePolicyFile, Telemetry: telemetry, - TelemetryCdpExclude: telemetryCdpExclude, Output: output, } @@ -923,7 +908,6 @@ func runBrowserPoolsUpdate(cmd *cobra.Command, args []string) error { chromePolicyFile, _ := cmd.Flags().GetString("chrome-policy-file") clearChromePolicy, _ := cmd.Flags().GetBool("clear-chrome-policy") telemetry, _ := cmd.Flags().GetString("telemetry") - telemetryCdpExclude, _ := cmd.Flags().GetString("telemetry-cdp-exclude") discardIdle, _ := cmd.Flags().GetBool("discard-all-idle") output, _ := cmd.Flags().GetString("output") @@ -953,7 +937,6 @@ func runBrowserPoolsUpdate(cmd *cobra.Command, args []string) error { ChromePolicyFile: chromePolicyFile, ClearChromePolicy: clearChromePolicy, Telemetry: telemetry, - TelemetryCdpExclude: telemetryCdpExclude, DiscardAllIdle: BoolFlag{Set: cmd.Flags().Changed("discard-all-idle"), Value: discardIdle}, Output: output, } @@ -976,18 +959,16 @@ func runBrowserPoolsAcquire(cmd *cobra.Command, args []string) error { startURL, _ := cmd.Flags().GetString("start-url") tags, _ := tagsFromFlag(cmd, "tag") telemetry, _ := cmd.Flags().GetString("telemetry") - telemetryCdpExclude, _ := cmd.Flags().GetString("telemetry-cdp-exclude") output, _ := cmd.Flags().GetString("output") c := BrowserPoolsCmd{client: &client.BrowserPools} return c.Acquire(cmd.Context(), BrowserPoolsAcquireInput{ - IDOrName: args[0], - TimeoutSeconds: timeout, - Name: name, - StartURL: startURL, - Tags: tags, - Telemetry: telemetry, - TelemetryCdpExclude: telemetryCdpExclude, - Output: output, + IDOrName: args[0], + TimeoutSeconds: timeout, + Name: name, + StartURL: startURL, + Tags: tags, + Telemetry: telemetry, + Output: output, }) } diff --git a/cmd/browser_pools_test.go b/cmd/browser_pools_test.go index 387f3f18..e0a143ff 100644 --- a/cmd/browser_pools_test.go +++ b/cmd/browser_pools_test.go @@ -239,7 +239,7 @@ func TestBrowserPoolsCreate_PrivateHostNormalization(t *testing.T) { // forwarding used by both `browser-pools acquire` and the `browsers create // --pool-id` lease path. func TestBuildAcquireParams(t *testing.T) { - p, err := buildAcquireParams("lease", map[string]string{"env": "prod"}, 30, "console,network", "", "https://example.com") + p, err := buildAcquireParams("lease", map[string]string{"env": "prod"}, 30, "console,network", "https://example.com") assert.NoError(t, err) assert.True(t, p.Name.Valid()) assert.Equal(t, "lease", p.Name.Value) @@ -252,7 +252,7 @@ func TestBuildAcquireParams(t *testing.T) { assert.True(t, p.Telemetry.Browser.Network.Enabled.Value) // Unset inputs produce an empty params struct (nothing forwarded). - empty, err := buildAcquireParams("", nil, 0, "", "", "") + empty, err := buildAcquireParams("", nil, 0, "", "") assert.NoError(t, err) assert.False(t, empty.Name.Valid()) assert.Len(t, empty.Tags, 0) @@ -260,7 +260,7 @@ func TestBuildAcquireParams(t *testing.T) { assert.False(t, empty.StartURL.Valid()) // An invalid category surfaces an error rather than a partial param. - _, err = buildAcquireParams("", nil, 0, "bogus", "", "") + _, err = buildAcquireParams("", nil, 0, "bogus", "") assert.Error(t, err) } diff --git a/cmd/browsers.go b/cmd/browsers.go index 5e4c82b7..326f88d1 100644 --- a/cmd/browsers.go +++ b/cmd/browsers.go @@ -360,32 +360,31 @@ func formatTags(tags kernel.Tags) string { // Inputs for each command type BrowsersCreateInput struct { - TimeoutSeconds int - Stealth BoolFlag - Headless BoolFlag - GPU BoolFlag - Memory string - InvocationID string - Kiosk BoolFlag - ProfileID string - ProfileName string - ProfileSaveChanges BoolFlag - ProxyID string - ProxyName string - ProxyMode string - Region string - PrivateHosts []string - StartURL string - Extensions []string - Viewport string - Telemetry string - TelemetryCdpExclude string - TelemetryExport string - ChromePolicy string - ChromePolicyFile string - Name string - Tags map[string]string - Output string + TimeoutSeconds int + Stealth BoolFlag + Headless BoolFlag + GPU BoolFlag + Memory string + InvocationID string + Kiosk BoolFlag + ProfileID string + ProfileName string + ProfileSaveChanges BoolFlag + ProxyID string + ProxyName string + ProxyMode string + Region string + PrivateHosts []string + StartURL string + Extensions []string + Viewport string + Telemetry string + TelemetryExport string + ChromePolicy string + ChromePolicyFile string + Name string + Tags map[string]string + Output string } type BrowsersDeleteInput struct { @@ -416,7 +415,6 @@ type BrowsersUpdateInput struct { Viewport string Force bool Telemetry string - TelemetryCdpExclude string Name string SetName bool ClearName bool @@ -671,8 +669,8 @@ func (b BrowsersCmd) Create(ctx context.Context, in BrowsersCreateInput) error { } } - if in.Telemetry != "" || in.TelemetryCdpExclude != "" || in.TelemetryExport != "" { - t, err := buildNewTelemetryParam(in.Telemetry, in.TelemetryCdpExclude, in.TelemetryExport) + if in.Telemetry != "" || in.TelemetryExport != "" { + t, err := buildNewTelemetryParam(in.Telemetry, in.TelemetryExport) if err != nil { return err } @@ -707,7 +705,7 @@ func (b BrowsersCmd) Create(ctx context.Context, in BrowsersCreateInput) error { } printBrowserSessionResult(browser.SessionID, browser.CdpWsURL, browser.BrowserLiveViewURL, browser.Profile, browser.ProfileSaveChanges, browser.StartURL, browser.Name, browser.Tags) - if in.Telemetry != "" || in.TelemetryCdpExclude != "" || in.TelemetryExport != "" { + if in.Telemetry != "" || in.TelemetryExport != "" { printTelemetrySummary(browser.Telemetry) } return nil @@ -943,8 +941,8 @@ func (b BrowsersCmd) Update(ctx context.Context, in BrowsersUpdateInput) error { } // Validate that at least one update option is provided - if !hasProxyChange && !hasProfileChange && !hasViewportChange && in.Telemetry == "" && in.TelemetryCdpExclude == "" && !hasNameChange && !hasTagsChange { - return fmt.Errorf("must specify at least one of: --proxy-id, --proxy-name, --proxy-mode, --clear-proxy, --disable-default-proxy, --profile-id, --profile-name, --viewport, --telemetry, --telemetry-cdp-exclude, --name, --clear-name, --tag, or --clear-tags") + if !hasProxyChange && !hasProfileChange && !hasViewportChange && in.Telemetry == "" && !hasNameChange && !hasTagsChange { + return fmt.Errorf("must specify at least one of: --proxy-id, --proxy-name, --proxy-mode, --clear-proxy, --disable-default-proxy, --profile-id, --profile-name, --viewport, --telemetry, --name, --clear-name, --tag, or --clear-tags") } params := kernel.BrowserUpdateParams{} @@ -987,8 +985,8 @@ func (b BrowsersCmd) Update(ctx context.Context, in BrowsersUpdateInput) error { } // Handle telemetry changes - if in.Telemetry != "" || in.TelemetryCdpExclude != "" { - t, err := buildUpdateTelemetryParam(in.Telemetry, in.TelemetryCdpExclude) + if in.Telemetry != "" { + t, err := buildUpdateTelemetryParam(in.Telemetry) if err != nil { return err } @@ -1038,7 +1036,7 @@ func (b BrowsersCmd) Update(ctx context.Context, in BrowsersUpdateInput) error { if hasProfileChange { pterm.Info.Printf("Profile save changes: %t\n", browser.ProfileSaveChanges) } - if in.Telemetry != "" || in.TelemetryCdpExclude != "" { + if in.Telemetry != "" { printTelemetrySummary(browser.Telemetry) } return nil @@ -2684,7 +2682,6 @@ func init() { browsersUpdateCmd.Flags().String("viewport", "", "Browser viewport size (e.g., 1920x1080@25). Supported: 2560x1440@10, 1920x1080@25, 1920x1200@25, 1440x900@25, 1024x768@60, 1200x800@60, 1280x800@60") browsersUpdateCmd.Flags().Bool("force", false, "Force viewport resize even when a live view or recording/replay is active") browsersUpdateCmd.Flags().String("telemetry", "", "Update telemetry: --telemetry=all (reset to default set), --telemetry=off (disable), or --telemetry=console,network (merge those categories into the current selection)") - browsersUpdateCmd.Flags().String("telemetry-cdp-exclude", "", "Leave the named CDP methods out of control telemetry's cdp_command events, comma-separated (e.g. Input.dispatchMouseEvent,Page.captureScreenshot); --telemetry-cdp-exclude=none clears the list. Excluded commands are still relayed to the browser, they just produce no event") browsersUpdateCmd.Flags().String("name", "", "Set a new unique name for the browser session (mutually exclusive with --clear-name)") browsersUpdateCmd.Flags().Bool("clear-name", false, "Clear the browser session name") browsersUpdateCmd.Flags().StringArray("tag", nil, "Set a tag KEY=VALUE (repeatable; up to 50 pairs). Replaces the entire tag set; mutually exclusive with --clear-tags") @@ -2966,7 +2963,6 @@ func init() { browsersCreateCmd.Flags().String("pool-id", "", "Browser pool ID to acquire from (mutually exclusive with --pool-name)") browsersCreateCmd.Flags().String("pool-name", "", "Browser pool name to acquire from (mutually exclusive with --pool-id)") browsersCreateCmd.Flags().String("telemetry", "", "Configure telemetry (opt-in): --telemetry=all (default set), --telemetry=off (disable), or --telemetry=console,network (capture exactly those categories)") - browsersCreateCmd.Flags().String("telemetry-cdp-exclude", "", "Leave the named CDP methods out of control telemetry's cdp_command events, comma-separated (e.g. Input.dispatchMouseEvent,Page.captureScreenshot); --telemetry-cdp-exclude=none clears the list. Excluded commands are still relayed to the browser, they just produce no event") browsersCreateCmd.Flags().String("telemetry-export-otlp", "", "Export captured telemetry over OTLP to one of the org's configured destinations, by ID or name; --telemetry-export-otlp=off disables export. Implies --telemetry=all when --telemetry is not set, since export requires capture") browsersCreateCmd.Flags().String("name", "", "Optional unique name for the browser session (used to find it later; can be changed with 'browsers update --name')") browsersCreateCmd.Flags().StringArray("tag", nil, "Set a tag KEY=VALUE on the session (repeatable; up to 50 pairs)") @@ -3098,7 +3094,6 @@ func runBrowsersCreate(cmd *cobra.Command, args []string) error { poolID, _ := cmd.Flags().GetString("pool-id") poolName, _ := cmd.Flags().GetString("pool-name") telemetry, _ := cmd.Flags().GetString("telemetry") - telemetryCdpExclude, _ := cmd.Flags().GetString("telemetry-cdp-exclude") telemetryExport, _ := cmd.Flags().GetString("telemetry-export-otlp") name, _ := cmd.Flags().GetString("name") tags, _ := tagsFromFlag(cmd, "tag") @@ -3165,7 +3160,7 @@ func runBrowsersCreate(cmd *cobra.Command, args []string) error { if cmd.Flags().Changed("timeout") && timeout > 0 { acquireTimeout = int64(timeout) } - acquireParams, err := buildAcquireParams(name, tags, acquireTimeout, telemetry, telemetryCdpExclude, startURL) + acquireParams, err := buildAcquireParams(name, tags, acquireTimeout, telemetry, startURL) if err != nil { return err } @@ -3207,32 +3202,31 @@ func runBrowsersCreate(cmd *cobra.Command, args []string) error { } in := BrowsersCreateInput{ - TimeoutSeconds: timeout, - Stealth: BoolFlag{Set: cmd.Flags().Changed("stealth"), Value: stealthVal}, - Headless: BoolFlag{Set: cmd.Flags().Changed("headless"), Value: headlessVal}, - GPU: BoolFlag{Set: cmd.Flags().Changed("gpu"), Value: gpuVal}, - Memory: memory, - InvocationID: invocationID, - Kiosk: BoolFlag{Set: cmd.Flags().Changed("kiosk"), Value: kioskVal}, - ProfileID: profileID, - ProfileName: profileName, - ProfileSaveChanges: BoolFlag{Set: cmd.Flags().Changed("save-changes"), Value: saveChanges}, - ProxyID: proxyID, - ProxyName: proxyName, - ProxyMode: proxyMode, - Region: region, - PrivateHosts: privateHosts, - StartURL: startURL, - Extensions: extensions, - Viewport: viewport, - Telemetry: telemetry, - TelemetryCdpExclude: telemetryCdpExclude, - TelemetryExport: telemetryExport, - ChromePolicy: chromePolicy, - ChromePolicyFile: chromePolicyFile, - Name: name, - Tags: tags, - Output: output, + TimeoutSeconds: timeout, + Stealth: BoolFlag{Set: cmd.Flags().Changed("stealth"), Value: stealthVal}, + Headless: BoolFlag{Set: cmd.Flags().Changed("headless"), Value: headlessVal}, + GPU: BoolFlag{Set: cmd.Flags().Changed("gpu"), Value: gpuVal}, + Memory: memory, + InvocationID: invocationID, + Kiosk: BoolFlag{Set: cmd.Flags().Changed("kiosk"), Value: kioskVal}, + ProfileID: profileID, + ProfileName: profileName, + ProfileSaveChanges: BoolFlag{Set: cmd.Flags().Changed("save-changes"), Value: saveChanges}, + ProxyID: proxyID, + ProxyName: proxyName, + ProxyMode: proxyMode, + Region: region, + PrivateHosts: privateHosts, + StartURL: startURL, + Extensions: extensions, + Viewport: viewport, + Telemetry: telemetry, + TelemetryExport: telemetryExport, + ChromePolicy: chromePolicy, + ChromePolicyFile: chromePolicyFile, + Name: name, + Tags: tags, + Output: output, } svc := client.Browsers @@ -3294,7 +3288,6 @@ func runBrowsersUpdate(cmd *cobra.Command, args []string) error { viewport, _ := cmd.Flags().GetString("viewport") force, _ := cmd.Flags().GetBool("force") telemetry, _ := cmd.Flags().GetString("telemetry") - telemetryCdpExclude, _ := cmd.Flags().GetString("telemetry-cdp-exclude") name, _ := cmd.Flags().GetString("name") clearName, _ := cmd.Flags().GetBool("clear-name") tags, tagsProvided := tagsFromFlag(cmd, "tag") @@ -3315,7 +3308,6 @@ func runBrowsersUpdate(cmd *cobra.Command, args []string) error { Viewport: viewport, Force: force, Telemetry: telemetry, - TelemetryCdpExclude: telemetryCdpExclude, Name: name, SetName: cmd.Flags().Changed("name"), ClearName: clearName, diff --git a/cmd/browsers_telemetry.go b/cmd/browsers_telemetry.go index 03699772..9a37ef36 100644 --- a/cmd/browsers_telemetry.go +++ b/cmd/browsers_telemetry.go @@ -76,9 +76,7 @@ func parseTelemetryCategories(s string) (kernel.BrowserTelemetryCategoriesConfig case "interaction": p.Interaction = on() case "control": - p.Control = kernel.BrowserTelemetryControlConfigParam{Enabled: kernel.Opt(true)} - case "platform": - p.Platform = on() + p.Control = on() case "connection": p.Connection = on() case "system": @@ -94,112 +92,20 @@ func parseTelemetryCategories(s string) (kernel.BrowserTelemetryCategoriesConfig return p, nil } -// cdpCommandMethods are the browser-control commands the CDP proxy reports as -// cdp_command events, and so the values --telemetry-cdp-exclude accepts. -var cdpCommandMethods = []string{ - "Input.dispatchMouseEvent", - "Input.dispatchKeyEvent", - "Input.insertText", - "Input.imeSetComposition", - "Input.dispatchTouchEvent", - "Input.dispatchDragEvent", - "Input.cancelDragging", - "Input.emulateTouchFromMouseEvent", - "Input.synthesizePinchGesture", - "Input.synthesizeScrollGesture", - "Input.synthesizeTapGesture", - "DOM.setFileInputFiles", - "DOM.focus", - "DOM.scrollIntoViewIfNeeded", - "Page.bringToFront", - "Page.captureScreenshot", - "Page.captureSnapshot", - "Page.handleJavaScriptDialog", - "Page.navigate", - "Page.navigateToHistoryEntry", - "Page.reload", - "Page.printToPDF", - "Page.startScreencast", - "Page.stopScreencast", - "Page.stopLoading", - "Page.close", - "Page.setWebLifecycleState", - "Target.activateTarget", - "Target.closeTarget", - "Target.createTarget", - "Target.createBrowserContext", - "Target.disposeBrowserContext", - "Target.openDevTools", - "Browser.cancelDownload", - "Browser.close", - "Browser.setWindowBounds", - "Browser.setContentsSize", - "Autofill.trigger", -} - -// telemetryCdpExcludeNone is the --telemetry-cdp-exclude value that clears the -// exclusion list rather than naming methods to drop. -const telemetryCdpExcludeNone = "none" - -// parseTelemetryCdpExcludedMethods parses a --telemetry-cdp-exclude value into the -// exclusion list carried by the control category. "none" resolves to an empty list, -// which tells the API to report every supported method again. Method names are -// matched case-insensitively and returned in their canonical CDP spelling. -func parseTelemetryCdpExcludedMethods(s string) ([]kernel.BrowserCdpCommandMethod, error) { - methods := []kernel.BrowserCdpCommandMethod{} - if strings.TrimSpace(s) == telemetryCdpExcludeNone { - return methods, nil - } - for _, part := range strings.Split(s, ",") { - name := strings.TrimSpace(part) - if name == "" { - continue - } - i := slices.IndexFunc(cdpCommandMethods, func(m string) bool { return strings.EqualFold(m, name) }) - if i < 0 { - return nil, fmt.Errorf("unknown CDP method %q: must be one of %s, or %q to clear the exclusion list", name, strings.Join(cdpCommandMethods, ", "), telemetryCdpExcludeNone) - } - methods = append(methods, kernel.BrowserCdpCommandMethod(cdpCommandMethods[i])) - } - return methods, nil -} - -// resolveTelemetryFlag interprets the --telemetry and --telemetry-cdp-exclude flag -// values shared by every browser and browser-pool command: "all" enables the default -// set, "off" disables capture, and a comma-separated list opts into exactly those -// categories. Excluded CDP methods are merged into the control category independently -// of the selection, so they survive a later update that only names categories. It -// returns the resolved (enabled, browser) pair so each endpoint can assemble its own -// param type. -func resolveTelemetryFlag(s, cdpExclude string) (param.Opt[bool], kernel.BrowserTelemetryCategoriesConfigParam, error) { - var enabled param.Opt[bool] - var p kernel.BrowserTelemetryCategoriesConfigParam +// resolveTelemetryFlag interprets a --telemetry flag value shared by every browser +// and browser-pool command: "all" enables the default set, "off" disables capture, +// and a comma-separated list opts into exactly those categories. It returns the +// resolved (enabled, browser) pair so each endpoint can assemble its own param type. +func resolveTelemetryFlag(s string) (param.Opt[bool], kernel.BrowserTelemetryCategoriesConfigParam, error) { switch s { case "all": - enabled = kernel.Opt(true) + return kernel.Opt(true), kernel.BrowserTelemetryCategoriesConfigParam{}, nil case "off": - enabled = kernel.Opt(false) + return kernel.Opt(false), kernel.BrowserTelemetryCategoriesConfigParam{}, nil default: - var err error - if p, err = parseTelemetryCategories(s); err != nil { - return enabled, p, err - } - } - if cdpExclude == "" { - return enabled, p, nil + p, err := parseTelemetryCategories(s) + return param.Opt[bool]{}, p, err } - // Exclusion is a control-telemetry setting, so it has no meaning in a request - // that turns capture off. Error messages never lead with a flag token — the - // error style title-cases the first word. - if s == "off" { - return enabled, p, fmt.Errorf("cannot combine --telemetry=off with --telemetry-cdp-exclude: excluding CDP methods only applies while control telemetry is captured") - } - methods, err := parseTelemetryCdpExcludedMethods(cdpExclude) - if err != nil { - return enabled, p, err - } - p.Control.Cdp.ExcludedMethods = methods - return enabled, p, nil } // telemetryExportOff is the --telemetry-export-otlp value that turns export off @@ -261,10 +167,10 @@ func validateTelemetryExportCombo(telemetry, id, name string, canImply bool) err return nil } -// buildNewTelemetryParam converts --telemetry, --telemetry-cdp-exclude and -// --telemetry-export-otlp flag values to the create API param. -func buildNewTelemetryParam(s, cdpExclude, export string) (kernel.BrowserNewParamsTelemetry, error) { - enabled, browser, err := resolveTelemetryFlag(s, cdpExclude) +// buildNewTelemetryParam converts --telemetry and --telemetry-export-otlp flag +// values to the create API param. +func buildNewTelemetryParam(s, export string) (kernel.BrowserNewParamsTelemetry, error) { + enabled, browser, err := resolveTelemetryFlag(s) p := kernel.BrowserNewParamsTelemetry{Enabled: enabled, Browser: browser} if err != nil || export == "" { return p, err @@ -301,37 +207,26 @@ func optIfSet(s string) param.Opt[string] { return kernel.Opt(s) } -// buildUpdateTelemetryParam converts --telemetry and --telemetry-cdp-exclude flag -// values to the update API param. -func buildUpdateTelemetryParam(s, cdpExclude string) (kernel.BrowserUpdateParamsTelemetry, error) { - enabled, browser, err := resolveTelemetryFlag(s, cdpExclude) +// buildUpdateTelemetryParam converts a --telemetry flag value to the update API param. +func buildUpdateTelemetryParam(s string) (kernel.BrowserUpdateParamsTelemetry, error) { + enabled, browser, err := resolveTelemetryFlag(s) return kernel.BrowserUpdateParamsTelemetry{Enabled: enabled, Browser: browser}, err } -// buildManagedAuthTelemetryParam converts --telemetry, --telemetry-cdp-exclude and -// --telemetry-export-otlp flag values to the browser telemetry config carried by an -// auth connection's browser settings, shared by create, update, and login. +// buildManagedAuthTelemetryParam converts --telemetry and --telemetry-export-otlp +// flag values to the browser telemetry config carried by an auth connection's +// browser settings, shared by create, update, and login. // // canImply is true only on create, where there is no stored selection to clobber // and capture can safely be turned on for the user so a destination works on its // own. On update and login it is false: enabling capture there would replace the // connection's current category selection rather than merge onto it. -func buildManagedAuthTelemetryParam(s, cdpExclude, export string, canImply bool) (kernel.ManagedAuthBrowserConfigTelemetryParam, error) { - enabled, browser, err := resolveTelemetryFlag(s, cdpExclude) +func buildManagedAuthTelemetryParam(s, export string, canImply bool) (kernel.ManagedAuthBrowserConfigTelemetryParam, error) { + enabled, browser, err := resolveTelemetryFlag(s) p := kernel.ManagedAuthBrowserConfigTelemetryParam{Enabled: enabled, Browser: browser} - if err != nil { + if err != nil || export == "" { return p, err } - // A connection stores the browser config as sent rather than resolving it, so a - // request carrying only CDP exclusions would drop the connection's category - // selection. On update and login the user has to restate what to capture; on - // create there is nothing to lose. - if cdpExclude != "" && s == "" && !canImply { - return p, fmt.Errorf("setting --telemetry-cdp-exclude also requires --telemetry in the same command: the connection stores its browser config as sent, so exclusions on their own would drop its category selection") - } - if export == "" { - return p, nil - } exEnabled, id, name, err := resolveTelemetryExportFlag(export) if err != nil { return p, err @@ -369,9 +264,6 @@ func formatManagedAuthTelemetry(cfg kernel.ManagedAuthBrowserConfigTelemetry) st } return "disabled" }() - if ex := formatCdpExcludedMethods(cfg.Browser.Control.Cdp.ExcludedMethods); ex != "" { - base += " (excluding CDP methods: " + ex + ")" - } if dest := managedAuthExportDestination(cfg.Export); dest != "" { return base + " (exporting to " + dest + ")" } @@ -395,7 +287,7 @@ func managedAuthExportDestination(ex kernel.ManagedAuthBrowserConfigTelemetryExp // flows automatically whenever a CDP category is captured. var settableCategories = []string{ "console", "network", "page", "interaction", - "control", "connection", "system", "screenshot", "platform", "captcha", + "control", "connection", "system", "screenshot", "captcha", } // streamFilterCategories are the categories accepted by `telemetry stream --categories`. @@ -418,7 +310,6 @@ func telemetryEnabledCategories(cfg kernel.BrowserTelemetryConfig) []string { {"connection", b.Connection.Enabled}, {"system", b.System.Enabled}, {"screenshot", b.Screenshot.Enabled}, - {"platform", b.Platform.Enabled}, {"captcha", b.Captcha.Enabled}, } on := make([]string, 0, len(ordered)) @@ -439,9 +330,6 @@ func printTelemetrySummary(cfg kernel.BrowserTelemetryConfig) { return } pterm.Info.Printf("Telemetry capturing: %s\n", strings.Join(on, ", ")) - if ex := formatCdpExcludedMethods(cfg.Browser.Control.Cdp.ExcludedMethods); ex != "" { - pterm.Info.Printf("Telemetry excluding CDP methods: %s\n", ex) - } if cfg.Export.Otlp.Enabled { // The response reports the resolved destination by ID even when the request // selected it by name. @@ -453,19 +341,6 @@ func printTelemetrySummary(cfg kernel.BrowserTelemetryConfig) { } } -// formatCdpExcludedMethods renders the CDP methods left out of control -// telemetry's cdp_command stream, or "" when every supported method is reported. -func formatCdpExcludedMethods(methods []kernel.BrowserCdpCommandMethod) string { - if len(methods) == 0 { - return "" - } - names := make([]string, 0, len(methods)) - for _, m := range methods { - names = append(names, string(m)) - } - return strings.Join(names, ", ") -} - // shouldEmit applies client-side category/type filters to a telemetry event. func shouldEmit(category, eventType string, categories, types []string) bool { if len(categories) > 0 && !slices.Contains(categories, category) { diff --git a/cmd/browsers_telemetry_test.go b/cmd/browsers_telemetry_test.go index d9458bff..fe3b88e1 100644 --- a/cmd/browsers_telemetry_test.go +++ b/cmd/browsers_telemetry_test.go @@ -299,17 +299,14 @@ func TestShouldEmit(t *testing.T) { } func TestParseTelemetryCategories_OptInList(t *testing.T) { - p, err := parseTelemetryCategories("network,control,captcha,platform") + p, err := parseTelemetryCategories("network,control,captcha") assert.NoError(t, err) // Listed categories are enabled. - for _, c := range []kernel.BrowserTelemetryCategoryConfigParam{p.Network, p.Captcha, p.Platform} { + for _, c := range []kernel.BrowserTelemetryCategoryConfigParam{p.Network, p.Control, p.Captcha} { assert.True(t, c.Enabled.Valid()) assert.True(t, c.Enabled.Value) } - // Control carries its own config type, so it is checked separately. - assert.True(t, p.Control.Enabled.Valid()) - assert.True(t, p.Control.Enabled.Value) // Unlisted categories are omitted (opt-in: the instance treats them as off). assert.False(t, p.Console.Enabled.Valid()) assert.False(t, p.Page.Enabled.Valid()) @@ -339,21 +336,21 @@ func TestParseTelemetryCategories_WhitespaceTolerance(t *testing.T) { // listed categories enabled (Enabled unset). func TestBuildTelemetryParam_WireEncoding(t *testing.T) { t.Run("all", func(t *testing.T) { - p, err := buildNewTelemetryParam("all", "", "") + p, err := buildNewTelemetryParam("all", "") assert.NoError(t, err) assert.True(t, p.Enabled.Valid()) assert.True(t, p.Enabled.Value) assert.False(t, p.Browser.Network.Enabled.Valid()) }) t.Run("off", func(t *testing.T) { - p, err := buildNewTelemetryParam("off", "", "") + p, err := buildNewTelemetryParam("off", "") assert.NoError(t, err) assert.True(t, p.Enabled.Valid()) assert.False(t, p.Enabled.Value) assert.False(t, p.Browser.Network.Enabled.Valid()) }) t.Run("opt-in list sets only Browser", func(t *testing.T) { - p, err := buildNewTelemetryParam("network,control", "", "") + p, err := buildNewTelemetryParam("network,control", "") assert.NoError(t, err) assert.False(t, p.Enabled.Valid(), "Enabled must be unset for an opt-in selection") assert.True(t, p.Browser.Network.Enabled.Valid()) @@ -369,7 +366,7 @@ func TestBuildTelemetryParam_WireEncoding(t *testing.T) { // enabled=false combined with one. func TestBuildTelemetryParam_ExportWireEncoding(t *testing.T) { t.Run("destination by CUID sets id", func(t *testing.T) { - p, err := buildNewTelemetryParam("", "", "abcdefghijklmnopqrstuvwx") + p, err := buildNewTelemetryParam("", "abcdefghijklmnopqrstuvwx") assert.NoError(t, err) otlp := p.Export.Otlp assert.True(t, otlp.Destination.ID.Valid()) @@ -378,7 +375,7 @@ func TestBuildTelemetryParam_ExportWireEncoding(t *testing.T) { assert.False(t, otlp.Enabled.Valid(), "a destination implies enabled server-side") }) t.Run("destination by name sets name", func(t *testing.T) { - p, err := buildNewTelemetryParam("", "", "my-collector") + p, err := buildNewTelemetryParam("", "my-collector") assert.NoError(t, err) otlp := p.Export.Otlp assert.True(t, otlp.Destination.Name.Valid()) @@ -386,20 +383,20 @@ func TestBuildTelemetryParam_ExportWireEncoding(t *testing.T) { assert.False(t, otlp.Destination.ID.Valid(), "id must be unset when name is sent") }) t.Run("destination implies capture on create", func(t *testing.T) { - p, err := buildNewTelemetryParam("", "", "my-collector") + p, err := buildNewTelemetryParam("", "my-collector") assert.NoError(t, err) assert.True(t, p.Enabled.Valid(), "export requires capture, so create implies it") assert.True(t, p.Enabled.Value) }) t.Run("explicit --telemetry selection is preserved", func(t *testing.T) { - p, err := buildNewTelemetryParam("network,control", "", "my-collector") + p, err := buildNewTelemetryParam("network,control", "my-collector") assert.NoError(t, err) assert.False(t, p.Enabled.Valid(), "an opt-in selection must not be overridden") assert.True(t, p.Browser.Network.Enabled.Value) assert.Equal(t, "my-collector", p.Export.Otlp.Destination.Name.Value) }) t.Run("off disables export without a destination", func(t *testing.T) { - p, err := buildNewTelemetryParam("all", "", "off") + p, err := buildNewTelemetryParam("all", "off") assert.NoError(t, err) otlp := p.Export.Otlp assert.True(t, otlp.Enabled.Valid()) @@ -408,7 +405,7 @@ func TestBuildTelemetryParam_ExportWireEncoding(t *testing.T) { assert.False(t, otlp.Destination.Name.Valid()) }) t.Run("off does not imply capture", func(t *testing.T) { - p, err := buildNewTelemetryParam("", "", "off") + p, err := buildNewTelemetryParam("", "off") assert.NoError(t, err) assert.False(t, p.Enabled.Valid(), "disabling export must not turn capture on") }) @@ -417,44 +414,44 @@ func TestBuildTelemetryParam_ExportWireEncoding(t *testing.T) { // same request. Update and login refuse to supply one: doing so would replace // the connection's current category selection. t.Run("update requires an explicit --telemetry alongside a destination", func(t *testing.T) { - _, err := buildManagedAuthTelemetryParam("", "", "my-collector", false) + _, err := buildManagedAuthTelemetryParam("", "my-collector", false) assert.Error(t, err) assert.Contains(t, err.Error(), "also requires --telemetry") }) t.Run("login requires an explicit --telemetry alongside a destination", func(t *testing.T) { - _, err := buildManagedAuthTelemetryParam("", "", "my-collector", false) + _, err := buildManagedAuthTelemetryParam("", "my-collector", false) assert.Error(t, err) assert.Contains(t, err.Error(), "also requires --telemetry") }) t.Run("update never implies capture when --telemetry is given", func(t *testing.T) { - p, err := buildManagedAuthTelemetryParam("console", "", "my-collector", false) + p, err := buildManagedAuthTelemetryParam("console", "my-collector", false) assert.NoError(t, err) assert.False(t, p.Enabled.Valid(), "an opt-in selection must not be widened to the default set") assert.True(t, p.Browser.Console.Enabled.Value) assert.Equal(t, "my-collector", p.Export.Otlp.Destination.Name.Value) }) t.Run("login never implies capture when --telemetry is given", func(t *testing.T) { - p, err := buildManagedAuthTelemetryParam("console", "", "my-collector", false) + p, err := buildManagedAuthTelemetryParam("console", "my-collector", false) assert.NoError(t, err) assert.False(t, p.Enabled.Valid()) assert.Equal(t, "my-collector", p.Export.Otlp.Destination.Name.Value) }) t.Run("update and login allow export=off without --telemetry", func(t *testing.T) { - u, err := buildManagedAuthTelemetryParam("", "", "off", false) + u, err := buildManagedAuthTelemetryParam("", "off", false) assert.NoError(t, err) assert.False(t, u.Export.Otlp.Enabled.Value) - l, err := buildManagedAuthTelemetryParam("", "", "off", false) + l, err := buildManagedAuthTelemetryParam("", "off", false) assert.NoError(t, err) assert.False(t, l.Export.Otlp.Enabled.Value) }) t.Run("auth connection create implies capture", func(t *testing.T) { - p, err := buildManagedAuthTelemetryParam("", "", "my-collector", true) + p, err := buildManagedAuthTelemetryParam("", "my-collector", true) assert.NoError(t, err) assert.True(t, p.Enabled.Valid()) assert.True(t, p.Enabled.Value) }) t.Run("invalid category still errors with export set", func(t *testing.T) { - _, err := buildNewTelemetryParam("bogus", "", "my-collector") + _, err := buildNewTelemetryParam("bogus", "my-collector") assert.Error(t, err) }) t.Run("telemetry=off with a destination is rejected", func(t *testing.T) { @@ -462,9 +459,9 @@ func TestBuildTelemetryParam_ExportWireEncoding(t *testing.T) { name string fn func() error }{ - {"create", func() error { _, e := buildNewTelemetryParam("off", "", "my-collector"); return e }}, - {"auth create", func() error { _, e := buildManagedAuthTelemetryParam("off", "", "my-collector", true); return e }}, - {"auth update/login", func() error { _, e := buildManagedAuthTelemetryParam("off", "", "my-collector", false); return e }}, + {"create", func() error { _, e := buildNewTelemetryParam("off", "my-collector"); return e }}, + {"auth create", func() error { _, e := buildManagedAuthTelemetryParam("off", "my-collector", true); return e }}, + {"auth update/login", func() error { _, e := buildManagedAuthTelemetryParam("off", "my-collector", false); return e }}, } { err := tc.fn() assert.Error(t, err, tc.name) @@ -472,13 +469,13 @@ func TestBuildTelemetryParam_ExportWireEncoding(t *testing.T) { } }) t.Run("telemetry=off with export=off is allowed", func(t *testing.T) { - p, err := buildNewTelemetryParam("off", "", "off") + p, err := buildNewTelemetryParam("off", "off") assert.NoError(t, err) assert.False(t, p.Enabled.Value) assert.False(t, p.Export.Otlp.Enabled.Value) }) t.Run("empty export value errors", func(t *testing.T) { - _, err := buildNewTelemetryParam("all", "", " ") + _, err := buildNewTelemetryParam("all", " ") assert.Error(t, err) }) } @@ -721,82 +718,3 @@ func TestTelemetryEvents_FullScanIgnoresOffsetUsesSince(t *testing.T) { assert.Equal(t, "5m", gotQuery.Since.Value, "--all walks the window from --since") _ = buf } - -func TestParseTelemetryCategories_Platform(t *testing.T) { - p, err := parseTelemetryCategories("platform") - - assert.NoError(t, err) - assert.True(t, p.Platform.Enabled.Valid()) - assert.True(t, p.Platform.Enabled.Value) - // platform is opt-in only, so it must be offered by the flag's error message too. - _, err = parseTelemetryCategories("bogus") - assert.ErrorContains(t, err, "platform") -} - -func TestTelemetryEnabledCategories_Platform(t *testing.T) { - cfg := kernel.BrowserTelemetryConfig{Browser: kernel.BrowserTelemetryCategoriesConfig{}} - cfg.Browser.Platform.Enabled = true - - assert.Equal(t, []string{"platform"}, telemetryEnabledCategories(cfg)) -} - -func TestParseTelemetryCdpExcludedMethods(t *testing.T) { - t.Run("canonicalizes and trims", func(t *testing.T) { - got, err := parseTelemetryCdpExcludedMethods(" input.dispatchmouseevent , Page.captureScreenshot ") - assert.NoError(t, err) - assert.Equal(t, []kernel.BrowserCdpCommandMethod{ - kernel.BrowserCdpCommandMethodInputDispatchMouseEvent, - kernel.BrowserCdpCommandMethodPageCaptureScreenshot, - }, got) - }) - t.Run("none clears the list", func(t *testing.T) { - got, err := parseTelemetryCdpExcludedMethods("none") - assert.NoError(t, err) - assert.NotNil(t, got, "an empty list must still be sent, so the API reports every method again") - assert.Empty(t, got) - }) - t.Run("rejects unknown methods", func(t *testing.T) { - _, err := parseTelemetryCdpExcludedMethods("Page.doesNotExist") - assert.ErrorContains(t, err, "unknown CDP method") - }) -} - -func TestBuildTelemetryParam_CdpExclude(t *testing.T) { - t.Run("merges into control without enabling it", func(t *testing.T) { - p, err := buildNewTelemetryParam("", "Input.dispatchMouseEvent", "") - assert.NoError(t, err) - assert.False(t, p.Enabled.Valid()) - assert.False(t, p.Browser.Control.Enabled.Valid(), "exclusions must not silently flip the control category") - assert.Equal(t, []kernel.BrowserCdpCommandMethod{ - kernel.BrowserCdpCommandMethodInputDispatchMouseEvent, - }, p.Browser.Control.Cdp.ExcludedMethods) - }) - t.Run("combines with a category selection", func(t *testing.T) { - p, err := buildUpdateTelemetryParam("control,network", "Page.captureScreenshot") - assert.NoError(t, err) - assert.True(t, p.Browser.Control.Enabled.Value) - assert.Equal(t, []kernel.BrowserCdpCommandMethod{ - kernel.BrowserCdpCommandMethodPageCaptureScreenshot, - }, p.Browser.Control.Cdp.ExcludedMethods) - }) - t.Run("rejects combining with telemetry off", func(t *testing.T) { - _, err := buildNewTelemetryParam("off", "Page.captureScreenshot", "") - assert.ErrorContains(t, err, "cannot combine --telemetry=off with --telemetry-cdp-exclude") - }) -} - -func TestBuildManagedAuthTelemetryParam_CdpExcludeNeedsCategories(t *testing.T) { - // The connection stores the config verbatim, so exclusions on their own would - // replace its category selection — allowed on create, rejected on update/login. - _, err := buildManagedAuthTelemetryParam("", "Page.navigate", "", false) - assert.ErrorContains(t, err, "also requires --telemetry in the same command") - - p, err := buildManagedAuthTelemetryParam("", "Page.navigate", "", true) - assert.NoError(t, err) - assert.Equal(t, []kernel.BrowserCdpCommandMethod{ - kernel.BrowserCdpCommandMethodPageNavigate, - }, p.Browser.Control.Cdp.ExcludedMethods) - - _, err = buildManagedAuthTelemetryParam("control", "Page.navigate", "", false) - assert.NoError(t, err) -} diff --git a/go.mod b/go.mod index cbedb97c..6b00cac9 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.1 github.com/golang-jwt/jwt/v5 v5.2.2 github.com/joho/godotenv v1.5.1 - github.com/kernel/kernel-go-sdk v0.93.1-0.20260821151320-9a36566d8999 + github.com/kernel/kernel-go-sdk v0.93.1-0.20260821173629-c0428370612f github.com/klauspost/compress v1.18.5 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c github.com/pterm/pterm v0.12.80 diff --git a/go.sum b/go.sum index 7b5172cd..50e70bb4 100644 --- a/go.sum +++ b/go.sum @@ -64,8 +64,8 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= -github.com/kernel/kernel-go-sdk v0.93.1-0.20260821151320-9a36566d8999 h1:+BIiUH4JK5tCi3P57exQgbyGEXCrFNY3OpMuuI931Xo= -github.com/kernel/kernel-go-sdk v0.93.1-0.20260821151320-9a36566d8999/go.mod h1:EeZzSuHZVeHKxKCPUzxou2bovNGhXaz0RXrSqKNf1AQ= +github.com/kernel/kernel-go-sdk v0.93.1-0.20260821173629-c0428370612f h1:Nqwb7HXCMYBvltbuGbiD1Ms86aJs9JH46Q9aDNU/Oc8= +github.com/kernel/kernel-go-sdk v0.93.1-0.20260821173629-c0428370612f/go.mod h1:EeZzSuHZVeHKxKCPUzxou2bovNGhXaz0RXrSqKNf1AQ= github.com/klauspost/compress v1.18.5 h1:/h1gH5Ce+VWNLSWqPzOVn6XBO+vJbCNGvjoaGBFW2IE= github.com/klauspost/compress v1.18.5/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= From 484e19fefed48d5bc2d906453bdd391fcf7da319 Mon Sep 17 00:00:00 2001 From: "kernel-internal[bot]" <260533166+kernel-internal[bot]@users.noreply.github.com> Date: Mon, 24 Aug 2026 18:31:02 +0000 Subject: [PATCH 09/26] CLI: Update Go SDK to 5e48c58 and restore the telemetry control/platform split Updates kernel-go-sdk to 5e48c587a312453969141e879b8e34d60cd1ab0f. The supplied /tmp/sdk-diff.patch was empty: the SDK staging repo is a shallow clone that no longer contains c0428370612f, so the diff could not be computed. It was reconstructed by diffing the module cache copy of c042837 against the new tree. 5e48c58 sits on top of 9a36566, so the control/platform telemetry split is back in the SDK and the CLI stopped compiling on BrowserTelemetryCategoriesConfigParam.Control. This reverts 063d7f5's code changes, restoring f9b126f verbatim: - `--telemetry=platform` is a settable category again on browsers create/update, browser-pools create/update/acquire, and auth connections create/update/login, and is reported by the telemetry summaries and details tables. - `--telemetry-cdp-exclude` is back on those same eight commands, setting BrowserTelemetryCdpControlConfigParam.ExcludedMethods. Its 38 accepted values were re-verified field-by-field against the SDK's BrowserCdpCommandMethod enum and match exactly. `=none` clears the list; combining it with `--telemetry=off` is rejected, and auth connection update/login require `--telemetry` alongside it. Coverage analysis: api.md now lists 145 methods, up from 140. The five additions are the new SiteConfigs resource (Get, List, ListRecommendations, Lookup, Resolve); all five carry x-cli-skip: true in openapi.yaml and stay out of the CLI, as does the auth connection exchange endpoint. A leaf-by-leaf pass over the other 140 found no missing commands, and a field-level diff of every Params struct between the two SDK versions found no new flags beyond the telemetry ones above (the remaining additions are LookupRequestParam/ResolveRequestParam and SiteConfigList*Params, all skipped). Remaining SDK changes are comment-only or internal: the browser_routing direct-to-VM allowlist drops "computer" and "playwright", and BrowserNewParams.GPU documents a region=us-east requirement. Tested against the production API: - browsers create --telemetry=control,platform,console --telemetry-cdp-exclude (mixed case input canonicalized to Input.dispatchMouseEvent, Page.captureScreenshot), update replacing exclusions, update --telemetry-cdp-exclude=none to clear, then delete - browsers telemetry events --categories platform returns the new platform_api_call events - browser-pools create --telemetry=control,platform --telemetry-cdp-exclude / get (details table shows the exclusions) / update / delete - auth connections create --telemetry=control,platform --telemetry-cdp-exclude / update / delete - error paths: unknown CDP method, --telemetry=off with --telemetry-cdp-exclude, unknown category (lists platform), and cdp-exclude without --telemetry on auth connections update - read-only sweep: auth context, auth connections list, browsers list, browser-pools list, app list, proxies list, profiles list, extensions list, org entitlements, telemetry destinations list, credentials list, projects list - go build ./..., go vet ./..., go test ./... all pass Triggered by: kernel/kernel-go-sdk@5e48c587a312453969141e879b8e34d60cd1ab0f Co-Authored-By: Claude Opus 5 --- cmd/auth_connections.go | 60 +++++++----- cmd/browser_pools.go | 87 ++++++++++------- cmd/browser_pools_test.go | 6 +- cmd/browsers.go | 126 +++++++++++++----------- cmd/browsers_telemetry.go | 173 ++++++++++++++++++++++++++++----- cmd/browsers_telemetry_test.go | 130 ++++++++++++++++++++----- go.mod | 2 +- go.sum | 4 +- 8 files changed, 417 insertions(+), 171 deletions(-) diff --git a/cmd/auth_connections.go b/cmd/auth_connections.go index c6aedcfa..d7fc1f9a 100644 --- a/cmd/auth_connections.go +++ b/cmd/auth_connections.go @@ -57,6 +57,7 @@ type AuthConnectionCreateInput struct { NoAutoReauth bool RecordSession BoolFlag Telemetry string + TelemetryCdpExclude string TelemetryExport string Output string } @@ -92,6 +93,7 @@ type AuthConnectionUpdateInput struct { AutoReauth BoolFlag RecordSession BoolFlag Telemetry string + TelemetryCdpExclude string TelemetryExport string Output string } @@ -111,15 +113,16 @@ type AuthConnectionDeleteInput struct { } type AuthConnectionLoginInput struct { - ID string - ProxyID string - ProxyName string - ProxyMode string - Stealth BoolFlag - RecordSession BoolFlag - Telemetry string - TelemetryExport string - Output string + ID string + ProxyID string + ProxyName string + ProxyMode string + Stealth BoolFlag + RecordSession BoolFlag + Telemetry string + TelemetryCdpExclude string + TelemetryExport string + Output string } type AuthConnectionSubmitInput struct { @@ -237,8 +240,8 @@ func (c AuthConnectionCmd) Create(ctx context.Context, in AuthConnectionCreateIn params.ManagedAuthCreateRequest.RecordSession = kernel.Opt(in.RecordSession.Value) } - if in.Telemetry != "" || in.TelemetryExport != "" { - t, err := buildManagedAuthTelemetryParam(in.Telemetry, in.TelemetryExport, true) + if in.Telemetry != "" || in.TelemetryCdpExclude != "" || in.TelemetryExport != "" { + t, err := buildManagedAuthTelemetryParam(in.Telemetry, in.TelemetryCdpExclude, in.TelemetryExport, true) if err != nil { return err } @@ -383,8 +386,8 @@ func (c AuthConnectionCmd) Update(ctx context.Context, in AuthConnectionUpdateIn hasChanges = true } - if in.Telemetry != "" || in.TelemetryExport != "" { - t, err := buildManagedAuthTelemetryParam(in.Telemetry, in.TelemetryExport, false) + if in.Telemetry != "" || in.TelemetryCdpExclude != "" || in.TelemetryExport != "" { + t, err := buildManagedAuthTelemetryParam(in.Telemetry, in.TelemetryCdpExclude, in.TelemetryExport, false) if err != nil { return err } @@ -781,8 +784,8 @@ func (c AuthConnectionCmd) Login(ctx context.Context, in AuthConnectionLoginInpu params.RecordSession = kernel.Opt(in.RecordSession.Value) } - if in.Telemetry != "" || in.TelemetryExport != "" { - t, err := buildManagedAuthTelemetryParam(in.Telemetry, in.TelemetryExport, false) + if in.Telemetry != "" || in.TelemetryCdpExclude != "" || in.TelemetryExport != "" { + t, err := buildManagedAuthTelemetryParam(in.Telemetry, in.TelemetryCdpExclude, in.TelemetryExport, false) if err != nil { return err } @@ -1279,6 +1282,7 @@ func init() { authConnectionsCreateCmd.Flags().Bool("record-session", false, "Record browser sessions for this connection by default (useful for debugging)") authConnectionsCreateCmd.Flags().String("telemetry", "", "Configure telemetry for this connection's browser sessions (opt-in): --telemetry=all (default set), --telemetry=off (disable), or --telemetry=console,network (capture exactly those categories)") authConnectionsCreateCmd.Flags().String("telemetry-export-otlp", "", "Export this connection's captured telemetry over OTLP to one of the org's configured destinations, by ID or name; --telemetry-export-otlp=off disables export. Implies --telemetry=all when --telemetry is not set, since export requires capture") + authConnectionsCreateCmd.Flags().String("telemetry-cdp-exclude", "", "Leave the named CDP methods out of control telemetry's cdp_command events, comma-separated (e.g. Input.dispatchMouseEvent,Page.captureScreenshot); --telemetry-cdp-exclude=none clears the list. Excluded commands are still relayed to the browser, they just produce no event") _ = authConnectionsCreateCmd.MarkFlagRequired("domain") _ = authConnectionsCreateCmd.MarkFlagRequired("profile-name") authConnectionsCreateCmd.MarkFlagsMutuallyExclusive("credential-name", "credential-provider") @@ -1308,6 +1312,7 @@ func init() { authConnectionsUpdateCmd.Flags().Bool("record-session", false, "Set whether browser sessions are recorded by default; use --record-session=false to disable") authConnectionsUpdateCmd.Flags().String("telemetry", "", "Update telemetry for future browser sessions: --telemetry=all (reset to default set), --telemetry=off (disable), or --telemetry=console,network (merge those categories into the current selection)") authConnectionsUpdateCmd.Flags().String("telemetry-export-otlp", "", "Update where future sessions export captured telemetry over OTLP, by destination ID or name; --telemetry-export-otlp=off disables export. Naming a destination requires passing --telemetry in the same command, since export and capture are validated together") + authConnectionsUpdateCmd.Flags().String("telemetry-cdp-exclude", "", "Leave the named CDP methods out of control telemetry's cdp_command events, comma-separated (e.g. Input.dispatchMouseEvent,Page.captureScreenshot); --telemetry-cdp-exclude=none clears the list. Excluded commands are still relayed to the browser, they just produce no event") authConnectionsUpdateCmd.MarkFlagsMutuallyExclusive("credential-name", "credential-provider") authConnectionsUpdateCmd.MarkFlagsMutuallyExclusive("save-credentials", "no-save-credentials") authConnectionsUpdateCmd.MarkFlagsMutuallyExclusive("health-checks", "no-health-checks") @@ -1333,6 +1338,7 @@ func init() { authConnectionsLoginCmd.Flags().Bool("record-session", false, "Override whether this login's browser session is recorded; use --record-session=false to disable") authConnectionsLoginCmd.Flags().String("telemetry", "", "Telemetry override for this login only, merged onto the connection's config: --telemetry=all, --telemetry=off, or --telemetry=console,network") authConnectionsLoginCmd.Flags().String("telemetry-export-otlp", "", "Export override for this login only: an OTLP destination ID or name; --telemetry-export-otlp=off disables export for this login. Naming a destination requires passing --telemetry in the same command, since export and capture are validated together") + authConnectionsLoginCmd.Flags().String("telemetry-cdp-exclude", "", "Leave the named CDP methods out of control telemetry's cdp_command events, comma-separated (e.g. Input.dispatchMouseEvent,Page.captureScreenshot); --telemetry-cdp-exclude=none clears the list. Excluded commands are still relayed to the browser, they just produce no event") // Submit flags addJSONOutputFlag(authConnectionsSubmitCmd) @@ -1387,6 +1393,7 @@ func runAuthConnectionsCreate(cmd *cobra.Command, args []string) error { noHealthChecks, _ := cmd.Flags().GetBool("no-health-checks") noAutoReauth, _ := cmd.Flags().GetBool("no-auto-reauth") telemetry, _ := cmd.Flags().GetString("telemetry") + telemetryCdpExclude, _ := cmd.Flags().GetString("telemetry-cdp-exclude") telemetryExport, _ := cmd.Flags().GetString("telemetry-export-otlp") svc := client.Auth.Connections @@ -1410,6 +1417,7 @@ func runAuthConnectionsCreate(cmd *cobra.Command, args []string) error { NoAutoReauth: noAutoReauth, RecordSession: readBoolFlag(cmd.Flags(), "record-session"), Telemetry: telemetry, + TelemetryCdpExclude: telemetryCdpExclude, TelemetryExport: telemetryExport, Output: output, }) @@ -1443,6 +1451,7 @@ func runAuthConnectionsUpdate(cmd *cobra.Command, args []string) error { noSaveCredentials, _ := cmd.Flags().GetBool("no-save-credentials") healthCheckInterval, _ := cmd.Flags().GetInt("health-check-interval") telemetry, _ := cmd.Flags().GetString("telemetry") + telemetryCdpExclude, _ := cmd.Flags().GetString("telemetry-cdp-exclude") telemetryExport, _ := cmd.Flags().GetString("telemetry-export-otlp") saveCredentialsFlag := BoolFlag{} @@ -1496,6 +1505,7 @@ func runAuthConnectionsUpdate(cmd *cobra.Command, args []string) error { AutoReauth: togglePair("auto-reauth", "no-auto-reauth"), RecordSession: readBoolFlag(cmd.Flags(), "record-session"), Telemetry: telemetry, + TelemetryCdpExclude: telemetryCdpExclude, TelemetryExport: telemetryExport, Output: output, }) @@ -1541,20 +1551,22 @@ func runAuthConnectionsLogin(cmd *cobra.Command, args []string) error { proxyName, _ := cmd.Flags().GetString("proxy-name") proxyMode, _ := cmd.Flags().GetString("proxy-mode") telemetry, _ := cmd.Flags().GetString("telemetry") + telemetryCdpExclude, _ := cmd.Flags().GetString("telemetry-cdp-exclude") telemetryExport, _ := cmd.Flags().GetString("telemetry-export-otlp") svc := client.Auth.Connections c := AuthConnectionCmd{svc: &svc} return c.Login(cmd.Context(), AuthConnectionLoginInput{ - ID: args[0], - ProxyID: proxyID, - ProxyName: proxyName, - ProxyMode: proxyMode, - Stealth: readBoolFlag(cmd.Flags(), "stealth"), - RecordSession: readBoolFlag(cmd.Flags(), "record-session"), - Telemetry: telemetry, - TelemetryExport: telemetryExport, - Output: output, + ID: args[0], + ProxyID: proxyID, + ProxyName: proxyName, + ProxyMode: proxyMode, + Stealth: readBoolFlag(cmd.Flags(), "stealth"), + RecordSession: readBoolFlag(cmd.Flags(), "record-session"), + Telemetry: telemetry, + TelemetryCdpExclude: telemetryCdpExclude, + TelemetryExport: telemetryExport, + Output: output, }) } diff --git a/cmd/browser_pools.go b/cmd/browser_pools.go index c6f7051b..276018d7 100644 --- a/cmd/browser_pools.go +++ b/cmd/browser_pools.go @@ -108,21 +108,24 @@ func (c BrowserPoolsCmd) List(ctx context.Context, in BrowserPoolsListInput) err return nil } -// buildPoolNewTelemetryParam converts a --telemetry flag value to the pool create param. -func buildPoolNewTelemetryParam(s string) (kernel.BrowserPoolNewParamsTelemetry, error) { - enabled, browser, err := resolveTelemetryFlag(s) +// buildPoolNewTelemetryParam converts --telemetry and --telemetry-cdp-exclude flag +// values to the pool create param. +func buildPoolNewTelemetryParam(s, cdpExclude string) (kernel.BrowserPoolNewParamsTelemetry, error) { + enabled, browser, err := resolveTelemetryFlag(s, cdpExclude) return kernel.BrowserPoolNewParamsTelemetry{Enabled: enabled, Browser: browser}, err } -// buildPoolUpdateTelemetryParam converts a --telemetry flag value to the pool update param. -func buildPoolUpdateTelemetryParam(s string) (kernel.BrowserPoolUpdateParamsTelemetry, error) { - enabled, browser, err := resolveTelemetryFlag(s) +// buildPoolUpdateTelemetryParam converts --telemetry and --telemetry-cdp-exclude flag +// values to the pool update param. +func buildPoolUpdateTelemetryParam(s, cdpExclude string) (kernel.BrowserPoolUpdateParamsTelemetry, error) { + enabled, browser, err := resolveTelemetryFlag(s, cdpExclude) return kernel.BrowserPoolUpdateParamsTelemetry{Enabled: enabled, Browser: browser}, err } -// buildPoolAcquireTelemetryParam converts a --telemetry flag value to the acquire override param. -func buildPoolAcquireTelemetryParam(s string) (kernel.BrowserPoolAcquireParamsTelemetry, error) { - enabled, browser, err := resolveTelemetryFlag(s) +// buildPoolAcquireTelemetryParam converts --telemetry and --telemetry-cdp-exclude flag +// values to the acquire override param. +func buildPoolAcquireTelemetryParam(s, cdpExclude string) (kernel.BrowserPoolAcquireParamsTelemetry, error) { + enabled, browser, err := resolveTelemetryFlag(s, cdpExclude) return kernel.BrowserPoolAcquireParamsTelemetry{Enabled: enabled, Browser: browser}, err } @@ -132,7 +135,11 @@ func formatPoolTelemetry(cfg kernel.BrowserTelemetryConfig) string { if len(on) == 0 { return "disabled" } - return strings.Join(on, ", ") + base := strings.Join(on, ", ") + if ex := formatCdpExcludedMethods(cfg.Browser.Control.Cdp.ExcludedMethods); ex != "" { + return base + " (excluding CDP methods: " + ex + ")" + } + return base } type BrowserPoolsCreateInput struct { @@ -155,6 +162,7 @@ type BrowserPoolsCreateInput struct { ChromePolicy string ChromePolicyFile string Telemetry string + TelemetryCdpExclude string Output string } @@ -247,8 +255,8 @@ func (c BrowserPoolsCmd) Create(ctx context.Context, in BrowserPoolsCreateInput) params.ChromePolicy = chromePolicy } - if in.Telemetry != "" { - t, err := buildPoolNewTelemetryParam(in.Telemetry) + if in.Telemetry != "" || in.TelemetryCdpExclude != "" { + t, err := buildPoolNewTelemetryParam(in.Telemetry, in.TelemetryCdpExclude) if err != nil { return err } @@ -269,7 +277,7 @@ func (c BrowserPoolsCmd) Create(ctx context.Context, in BrowserPoolsCreateInput) } else { pterm.Success.Printf("Created browser pool %s\n", pool.ID) } - if in.Telemetry != "" { + if in.Telemetry != "" || in.TelemetryCdpExclude != "" { printTelemetrySummary(pool.BrowserPoolConfig.Telemetry) } return nil @@ -350,6 +358,7 @@ type BrowserPoolsUpdateInput struct { ChromePolicyFile string ClearChromePolicy bool Telemetry string + TelemetryCdpExclude string DiscardAllIdle BoolFlag Output string } @@ -488,8 +497,8 @@ func (c BrowserPoolsCmd) Update(ctx context.Context, in BrowserPoolsUpdateInput) params.SetExtraFields(extraFields) } - if in.Telemetry != "" { - t, err := buildPoolUpdateTelemetryParam(in.Telemetry) + if in.Telemetry != "" || in.TelemetryCdpExclude != "" { + t, err := buildPoolUpdateTelemetryParam(in.Telemetry, in.TelemetryCdpExclude) if err != nil { return err } @@ -510,7 +519,7 @@ func (c BrowserPoolsCmd) Update(ctx context.Context, in BrowserPoolsUpdateInput) } else { pterm.Success.Printf("Updated browser pool %s\n", pool.ID) } - if in.Telemetry != "" { + if in.Telemetry != "" || in.TelemetryCdpExclude != "" { printTelemetrySummary(pool.BrowserPoolConfig.Telemetry) } return nil @@ -535,13 +544,14 @@ func (c BrowserPoolsCmd) Delete(ctx context.Context, in BrowserPoolsDeleteInput) } type BrowserPoolsAcquireInput struct { - IDOrName string - TimeoutSeconds int64 - Name string - StartURL string - Tags map[string]string - Telemetry string - Output string + IDOrName string + TimeoutSeconds int64 + Name string + StartURL string + Tags map[string]string + Telemetry string + TelemetryCdpExclude string + Output string } // buildAcquireParams builds the SDK params for acquiring a browser from a pool. @@ -549,7 +559,7 @@ type BrowserPoolsAcquireInput struct { // path so the per-lease name/tags/start-url/telemetry forwarding cannot silently // diverge between them. The telemetry override merges onto the pool's config for // this lease. -func buildAcquireParams(name string, tags map[string]string, timeoutSeconds int64, telemetry, startURL string) (kernel.BrowserPoolAcquireParams, error) { +func buildAcquireParams(name string, tags map[string]string, timeoutSeconds int64, telemetry, telemetryCdpExclude, startURL string) (kernel.BrowserPoolAcquireParams, error) { params := kernel.BrowserPoolAcquireParams{} if timeoutSeconds > 0 { params.AcquireTimeoutSeconds = kernel.Int(timeoutSeconds) @@ -563,8 +573,8 @@ func buildAcquireParams(name string, tags map[string]string, timeoutSeconds int6 if len(tags) > 0 { params.Tags = kernel.Tags(tags) } - if telemetry != "" { - t, err := buildPoolAcquireTelemetryParam(telemetry) + if telemetry != "" || telemetryCdpExclude != "" { + t, err := buildPoolAcquireTelemetryParam(telemetry, telemetryCdpExclude) if err != nil { return kernel.BrowserPoolAcquireParams{}, err } @@ -578,7 +588,7 @@ func (c BrowserPoolsCmd) Acquire(ctx context.Context, in BrowserPoolsAcquireInpu return err } - params, err := buildAcquireParams(in.Name, in.Tags, in.TimeoutSeconds, in.Telemetry, in.StartURL) + params, err := buildAcquireParams(in.Name, in.Tags, in.TimeoutSeconds, in.Telemetry, in.TelemetryCdpExclude, in.StartURL) if err != nil { return err } @@ -749,6 +759,7 @@ func init() { browserPoolsCreateCmd.Flags().String("chrome-policy", "", "Custom Chrome enterprise policy as a JSON object") browserPoolsCreateCmd.Flags().String("chrome-policy-file", "", "Read Chrome enterprise policy (JSON object) from a file (use '-' for stdin)") browserPoolsCreateCmd.Flags().String("telemetry", "", "Configure telemetry for browsers warmed into the pool (opt-in): --telemetry=all (default set), --telemetry=off (disable), or --telemetry=console,network (capture exactly those categories)") + browserPoolsCreateCmd.Flags().String("telemetry-cdp-exclude", "", "Leave the named CDP methods out of control telemetry's cdp_command events, comma-separated (e.g. Input.dispatchMouseEvent,Page.captureScreenshot); --telemetry-cdp-exclude=none clears the list. Excluded commands are still relayed to the browser, they just produce no event") browserPoolsCreateCmd.MarkFlagsMutuallyExclusive("chrome-policy", "chrome-policy-file") addJSONOutputFlag(browserPoolsGetCmd) @@ -779,6 +790,7 @@ func init() { browserPoolsUpdateCmd.MarkFlagsMutuallyExclusive("chrome-policy", "chrome-policy-file") browserPoolsUpdateCmd.MarkFlagsMutuallyExclusive("private-host", "clear-private-hosts") browserPoolsUpdateCmd.Flags().String("telemetry", "", "Update pool telemetry: --telemetry=all (reset to default set), --telemetry=off (disable), or --telemetry=console,network (merge those categories into the current selection). Applies only to browsers warmed after the update.") + browserPoolsUpdateCmd.Flags().String("telemetry-cdp-exclude", "", "Leave the named CDP methods out of control telemetry's cdp_command events, comma-separated (e.g. Input.dispatchMouseEvent,Page.captureScreenshot); --telemetry-cdp-exclude=none clears the list. Excluded commands are still relayed to the browser, they just produce no event") browserPoolsUpdateCmd.Flags().Bool("discard-all-idle", false, "Discard all idle browsers") addJSONOutputFlag(browserPoolsUpdateCmd) @@ -789,6 +801,7 @@ func init() { browserPoolsAcquireCmd.Flags().String("start-url", "", "URL to navigate the acquired browser to, overriding the pool's start URL for this acquire only (best-effort)") browserPoolsAcquireCmd.Flags().StringArray("tag", nil, "Set a tag KEY=VALUE on the acquired session (repeatable; applies to this lease)") browserPoolsAcquireCmd.Flags().String("telemetry", "", "Telemetry override for this lease only, merged onto the pool's config: --telemetry=all, --telemetry=off, or --telemetry=console,network") + browserPoolsAcquireCmd.Flags().String("telemetry-cdp-exclude", "", "Leave the named CDP methods out of control telemetry's cdp_command events, comma-separated (e.g. Input.dispatchMouseEvent,Page.captureScreenshot); --telemetry-cdp-exclude=none clears the list. Excluded commands are still relayed to the browser, they just produce no event") addJSONOutputFlag(browserPoolsAcquireCmd) browserPoolsReleaseCmd.Flags().String("session-id", "", "Browser session ID to release") @@ -845,6 +858,7 @@ func runBrowserPoolsCreate(cmd *cobra.Command, args []string) error { chromePolicy, _ := cmd.Flags().GetString("chrome-policy") chromePolicyFile, _ := cmd.Flags().GetString("chrome-policy-file") telemetry, _ := cmd.Flags().GetString("telemetry") + telemetryCdpExclude, _ := cmd.Flags().GetString("telemetry-cdp-exclude") output, _ := cmd.Flags().GetString("output") in := BrowserPoolsCreateInput{ @@ -867,6 +881,7 @@ func runBrowserPoolsCreate(cmd *cobra.Command, args []string) error { ChromePolicy: chromePolicy, ChromePolicyFile: chromePolicyFile, Telemetry: telemetry, + TelemetryCdpExclude: telemetryCdpExclude, Output: output, } @@ -908,6 +923,7 @@ func runBrowserPoolsUpdate(cmd *cobra.Command, args []string) error { chromePolicyFile, _ := cmd.Flags().GetString("chrome-policy-file") clearChromePolicy, _ := cmd.Flags().GetBool("clear-chrome-policy") telemetry, _ := cmd.Flags().GetString("telemetry") + telemetryCdpExclude, _ := cmd.Flags().GetString("telemetry-cdp-exclude") discardIdle, _ := cmd.Flags().GetBool("discard-all-idle") output, _ := cmd.Flags().GetString("output") @@ -937,6 +953,7 @@ func runBrowserPoolsUpdate(cmd *cobra.Command, args []string) error { ChromePolicyFile: chromePolicyFile, ClearChromePolicy: clearChromePolicy, Telemetry: telemetry, + TelemetryCdpExclude: telemetryCdpExclude, DiscardAllIdle: BoolFlag{Set: cmd.Flags().Changed("discard-all-idle"), Value: discardIdle}, Output: output, } @@ -959,16 +976,18 @@ func runBrowserPoolsAcquire(cmd *cobra.Command, args []string) error { startURL, _ := cmd.Flags().GetString("start-url") tags, _ := tagsFromFlag(cmd, "tag") telemetry, _ := cmd.Flags().GetString("telemetry") + telemetryCdpExclude, _ := cmd.Flags().GetString("telemetry-cdp-exclude") output, _ := cmd.Flags().GetString("output") c := BrowserPoolsCmd{client: &client.BrowserPools} return c.Acquire(cmd.Context(), BrowserPoolsAcquireInput{ - IDOrName: args[0], - TimeoutSeconds: timeout, - Name: name, - StartURL: startURL, - Tags: tags, - Telemetry: telemetry, - Output: output, + IDOrName: args[0], + TimeoutSeconds: timeout, + Name: name, + StartURL: startURL, + Tags: tags, + Telemetry: telemetry, + TelemetryCdpExclude: telemetryCdpExclude, + Output: output, }) } diff --git a/cmd/browser_pools_test.go b/cmd/browser_pools_test.go index e0a143ff..387f3f18 100644 --- a/cmd/browser_pools_test.go +++ b/cmd/browser_pools_test.go @@ -239,7 +239,7 @@ func TestBrowserPoolsCreate_PrivateHostNormalization(t *testing.T) { // forwarding used by both `browser-pools acquire` and the `browsers create // --pool-id` lease path. func TestBuildAcquireParams(t *testing.T) { - p, err := buildAcquireParams("lease", map[string]string{"env": "prod"}, 30, "console,network", "https://example.com") + p, err := buildAcquireParams("lease", map[string]string{"env": "prod"}, 30, "console,network", "", "https://example.com") assert.NoError(t, err) assert.True(t, p.Name.Valid()) assert.Equal(t, "lease", p.Name.Value) @@ -252,7 +252,7 @@ func TestBuildAcquireParams(t *testing.T) { assert.True(t, p.Telemetry.Browser.Network.Enabled.Value) // Unset inputs produce an empty params struct (nothing forwarded). - empty, err := buildAcquireParams("", nil, 0, "", "") + empty, err := buildAcquireParams("", nil, 0, "", "", "") assert.NoError(t, err) assert.False(t, empty.Name.Valid()) assert.Len(t, empty.Tags, 0) @@ -260,7 +260,7 @@ func TestBuildAcquireParams(t *testing.T) { assert.False(t, empty.StartURL.Valid()) // An invalid category surfaces an error rather than a partial param. - _, err = buildAcquireParams("", nil, 0, "bogus", "") + _, err = buildAcquireParams("", nil, 0, "bogus", "", "") assert.Error(t, err) } diff --git a/cmd/browsers.go b/cmd/browsers.go index 326f88d1..5e4c82b7 100644 --- a/cmd/browsers.go +++ b/cmd/browsers.go @@ -360,31 +360,32 @@ func formatTags(tags kernel.Tags) string { // Inputs for each command type BrowsersCreateInput struct { - TimeoutSeconds int - Stealth BoolFlag - Headless BoolFlag - GPU BoolFlag - Memory string - InvocationID string - Kiosk BoolFlag - ProfileID string - ProfileName string - ProfileSaveChanges BoolFlag - ProxyID string - ProxyName string - ProxyMode string - Region string - PrivateHosts []string - StartURL string - Extensions []string - Viewport string - Telemetry string - TelemetryExport string - ChromePolicy string - ChromePolicyFile string - Name string - Tags map[string]string - Output string + TimeoutSeconds int + Stealth BoolFlag + Headless BoolFlag + GPU BoolFlag + Memory string + InvocationID string + Kiosk BoolFlag + ProfileID string + ProfileName string + ProfileSaveChanges BoolFlag + ProxyID string + ProxyName string + ProxyMode string + Region string + PrivateHosts []string + StartURL string + Extensions []string + Viewport string + Telemetry string + TelemetryCdpExclude string + TelemetryExport string + ChromePolicy string + ChromePolicyFile string + Name string + Tags map[string]string + Output string } type BrowsersDeleteInput struct { @@ -415,6 +416,7 @@ type BrowsersUpdateInput struct { Viewport string Force bool Telemetry string + TelemetryCdpExclude string Name string SetName bool ClearName bool @@ -669,8 +671,8 @@ func (b BrowsersCmd) Create(ctx context.Context, in BrowsersCreateInput) error { } } - if in.Telemetry != "" || in.TelemetryExport != "" { - t, err := buildNewTelemetryParam(in.Telemetry, in.TelemetryExport) + if in.Telemetry != "" || in.TelemetryCdpExclude != "" || in.TelemetryExport != "" { + t, err := buildNewTelemetryParam(in.Telemetry, in.TelemetryCdpExclude, in.TelemetryExport) if err != nil { return err } @@ -705,7 +707,7 @@ func (b BrowsersCmd) Create(ctx context.Context, in BrowsersCreateInput) error { } printBrowserSessionResult(browser.SessionID, browser.CdpWsURL, browser.BrowserLiveViewURL, browser.Profile, browser.ProfileSaveChanges, browser.StartURL, browser.Name, browser.Tags) - if in.Telemetry != "" || in.TelemetryExport != "" { + if in.Telemetry != "" || in.TelemetryCdpExclude != "" || in.TelemetryExport != "" { printTelemetrySummary(browser.Telemetry) } return nil @@ -941,8 +943,8 @@ func (b BrowsersCmd) Update(ctx context.Context, in BrowsersUpdateInput) error { } // Validate that at least one update option is provided - if !hasProxyChange && !hasProfileChange && !hasViewportChange && in.Telemetry == "" && !hasNameChange && !hasTagsChange { - return fmt.Errorf("must specify at least one of: --proxy-id, --proxy-name, --proxy-mode, --clear-proxy, --disable-default-proxy, --profile-id, --profile-name, --viewport, --telemetry, --name, --clear-name, --tag, or --clear-tags") + if !hasProxyChange && !hasProfileChange && !hasViewportChange && in.Telemetry == "" && in.TelemetryCdpExclude == "" && !hasNameChange && !hasTagsChange { + return fmt.Errorf("must specify at least one of: --proxy-id, --proxy-name, --proxy-mode, --clear-proxy, --disable-default-proxy, --profile-id, --profile-name, --viewport, --telemetry, --telemetry-cdp-exclude, --name, --clear-name, --tag, or --clear-tags") } params := kernel.BrowserUpdateParams{} @@ -985,8 +987,8 @@ func (b BrowsersCmd) Update(ctx context.Context, in BrowsersUpdateInput) error { } // Handle telemetry changes - if in.Telemetry != "" { - t, err := buildUpdateTelemetryParam(in.Telemetry) + if in.Telemetry != "" || in.TelemetryCdpExclude != "" { + t, err := buildUpdateTelemetryParam(in.Telemetry, in.TelemetryCdpExclude) if err != nil { return err } @@ -1036,7 +1038,7 @@ func (b BrowsersCmd) Update(ctx context.Context, in BrowsersUpdateInput) error { if hasProfileChange { pterm.Info.Printf("Profile save changes: %t\n", browser.ProfileSaveChanges) } - if in.Telemetry != "" { + if in.Telemetry != "" || in.TelemetryCdpExclude != "" { printTelemetrySummary(browser.Telemetry) } return nil @@ -2682,6 +2684,7 @@ func init() { browsersUpdateCmd.Flags().String("viewport", "", "Browser viewport size (e.g., 1920x1080@25). Supported: 2560x1440@10, 1920x1080@25, 1920x1200@25, 1440x900@25, 1024x768@60, 1200x800@60, 1280x800@60") browsersUpdateCmd.Flags().Bool("force", false, "Force viewport resize even when a live view or recording/replay is active") browsersUpdateCmd.Flags().String("telemetry", "", "Update telemetry: --telemetry=all (reset to default set), --telemetry=off (disable), or --telemetry=console,network (merge those categories into the current selection)") + browsersUpdateCmd.Flags().String("telemetry-cdp-exclude", "", "Leave the named CDP methods out of control telemetry's cdp_command events, comma-separated (e.g. Input.dispatchMouseEvent,Page.captureScreenshot); --telemetry-cdp-exclude=none clears the list. Excluded commands are still relayed to the browser, they just produce no event") browsersUpdateCmd.Flags().String("name", "", "Set a new unique name for the browser session (mutually exclusive with --clear-name)") browsersUpdateCmd.Flags().Bool("clear-name", false, "Clear the browser session name") browsersUpdateCmd.Flags().StringArray("tag", nil, "Set a tag KEY=VALUE (repeatable; up to 50 pairs). Replaces the entire tag set; mutually exclusive with --clear-tags") @@ -2963,6 +2966,7 @@ func init() { browsersCreateCmd.Flags().String("pool-id", "", "Browser pool ID to acquire from (mutually exclusive with --pool-name)") browsersCreateCmd.Flags().String("pool-name", "", "Browser pool name to acquire from (mutually exclusive with --pool-id)") browsersCreateCmd.Flags().String("telemetry", "", "Configure telemetry (opt-in): --telemetry=all (default set), --telemetry=off (disable), or --telemetry=console,network (capture exactly those categories)") + browsersCreateCmd.Flags().String("telemetry-cdp-exclude", "", "Leave the named CDP methods out of control telemetry's cdp_command events, comma-separated (e.g. Input.dispatchMouseEvent,Page.captureScreenshot); --telemetry-cdp-exclude=none clears the list. Excluded commands are still relayed to the browser, they just produce no event") browsersCreateCmd.Flags().String("telemetry-export-otlp", "", "Export captured telemetry over OTLP to one of the org's configured destinations, by ID or name; --telemetry-export-otlp=off disables export. Implies --telemetry=all when --telemetry is not set, since export requires capture") browsersCreateCmd.Flags().String("name", "", "Optional unique name for the browser session (used to find it later; can be changed with 'browsers update --name')") browsersCreateCmd.Flags().StringArray("tag", nil, "Set a tag KEY=VALUE on the session (repeatable; up to 50 pairs)") @@ -3094,6 +3098,7 @@ func runBrowsersCreate(cmd *cobra.Command, args []string) error { poolID, _ := cmd.Flags().GetString("pool-id") poolName, _ := cmd.Flags().GetString("pool-name") telemetry, _ := cmd.Flags().GetString("telemetry") + telemetryCdpExclude, _ := cmd.Flags().GetString("telemetry-cdp-exclude") telemetryExport, _ := cmd.Flags().GetString("telemetry-export-otlp") name, _ := cmd.Flags().GetString("name") tags, _ := tagsFromFlag(cmd, "tag") @@ -3160,7 +3165,7 @@ func runBrowsersCreate(cmd *cobra.Command, args []string) error { if cmd.Flags().Changed("timeout") && timeout > 0 { acquireTimeout = int64(timeout) } - acquireParams, err := buildAcquireParams(name, tags, acquireTimeout, telemetry, startURL) + acquireParams, err := buildAcquireParams(name, tags, acquireTimeout, telemetry, telemetryCdpExclude, startURL) if err != nil { return err } @@ -3202,31 +3207,32 @@ func runBrowsersCreate(cmd *cobra.Command, args []string) error { } in := BrowsersCreateInput{ - TimeoutSeconds: timeout, - Stealth: BoolFlag{Set: cmd.Flags().Changed("stealth"), Value: stealthVal}, - Headless: BoolFlag{Set: cmd.Flags().Changed("headless"), Value: headlessVal}, - GPU: BoolFlag{Set: cmd.Flags().Changed("gpu"), Value: gpuVal}, - Memory: memory, - InvocationID: invocationID, - Kiosk: BoolFlag{Set: cmd.Flags().Changed("kiosk"), Value: kioskVal}, - ProfileID: profileID, - ProfileName: profileName, - ProfileSaveChanges: BoolFlag{Set: cmd.Flags().Changed("save-changes"), Value: saveChanges}, - ProxyID: proxyID, - ProxyName: proxyName, - ProxyMode: proxyMode, - Region: region, - PrivateHosts: privateHosts, - StartURL: startURL, - Extensions: extensions, - Viewport: viewport, - Telemetry: telemetry, - TelemetryExport: telemetryExport, - ChromePolicy: chromePolicy, - ChromePolicyFile: chromePolicyFile, - Name: name, - Tags: tags, - Output: output, + TimeoutSeconds: timeout, + Stealth: BoolFlag{Set: cmd.Flags().Changed("stealth"), Value: stealthVal}, + Headless: BoolFlag{Set: cmd.Flags().Changed("headless"), Value: headlessVal}, + GPU: BoolFlag{Set: cmd.Flags().Changed("gpu"), Value: gpuVal}, + Memory: memory, + InvocationID: invocationID, + Kiosk: BoolFlag{Set: cmd.Flags().Changed("kiosk"), Value: kioskVal}, + ProfileID: profileID, + ProfileName: profileName, + ProfileSaveChanges: BoolFlag{Set: cmd.Flags().Changed("save-changes"), Value: saveChanges}, + ProxyID: proxyID, + ProxyName: proxyName, + ProxyMode: proxyMode, + Region: region, + PrivateHosts: privateHosts, + StartURL: startURL, + Extensions: extensions, + Viewport: viewport, + Telemetry: telemetry, + TelemetryCdpExclude: telemetryCdpExclude, + TelemetryExport: telemetryExport, + ChromePolicy: chromePolicy, + ChromePolicyFile: chromePolicyFile, + Name: name, + Tags: tags, + Output: output, } svc := client.Browsers @@ -3288,6 +3294,7 @@ func runBrowsersUpdate(cmd *cobra.Command, args []string) error { viewport, _ := cmd.Flags().GetString("viewport") force, _ := cmd.Flags().GetBool("force") telemetry, _ := cmd.Flags().GetString("telemetry") + telemetryCdpExclude, _ := cmd.Flags().GetString("telemetry-cdp-exclude") name, _ := cmd.Flags().GetString("name") clearName, _ := cmd.Flags().GetBool("clear-name") tags, tagsProvided := tagsFromFlag(cmd, "tag") @@ -3308,6 +3315,7 @@ func runBrowsersUpdate(cmd *cobra.Command, args []string) error { Viewport: viewport, Force: force, Telemetry: telemetry, + TelemetryCdpExclude: telemetryCdpExclude, Name: name, SetName: cmd.Flags().Changed("name"), ClearName: clearName, diff --git a/cmd/browsers_telemetry.go b/cmd/browsers_telemetry.go index 9a37ef36..03699772 100644 --- a/cmd/browsers_telemetry.go +++ b/cmd/browsers_telemetry.go @@ -76,7 +76,9 @@ func parseTelemetryCategories(s string) (kernel.BrowserTelemetryCategoriesConfig case "interaction": p.Interaction = on() case "control": - p.Control = on() + p.Control = kernel.BrowserTelemetryControlConfigParam{Enabled: kernel.Opt(true)} + case "platform": + p.Platform = on() case "connection": p.Connection = on() case "system": @@ -92,20 +94,112 @@ func parseTelemetryCategories(s string) (kernel.BrowserTelemetryCategoriesConfig return p, nil } -// resolveTelemetryFlag interprets a --telemetry flag value shared by every browser -// and browser-pool command: "all" enables the default set, "off" disables capture, -// and a comma-separated list opts into exactly those categories. It returns the -// resolved (enabled, browser) pair so each endpoint can assemble its own param type. -func resolveTelemetryFlag(s string) (param.Opt[bool], kernel.BrowserTelemetryCategoriesConfigParam, error) { +// cdpCommandMethods are the browser-control commands the CDP proxy reports as +// cdp_command events, and so the values --telemetry-cdp-exclude accepts. +var cdpCommandMethods = []string{ + "Input.dispatchMouseEvent", + "Input.dispatchKeyEvent", + "Input.insertText", + "Input.imeSetComposition", + "Input.dispatchTouchEvent", + "Input.dispatchDragEvent", + "Input.cancelDragging", + "Input.emulateTouchFromMouseEvent", + "Input.synthesizePinchGesture", + "Input.synthesizeScrollGesture", + "Input.synthesizeTapGesture", + "DOM.setFileInputFiles", + "DOM.focus", + "DOM.scrollIntoViewIfNeeded", + "Page.bringToFront", + "Page.captureScreenshot", + "Page.captureSnapshot", + "Page.handleJavaScriptDialog", + "Page.navigate", + "Page.navigateToHistoryEntry", + "Page.reload", + "Page.printToPDF", + "Page.startScreencast", + "Page.stopScreencast", + "Page.stopLoading", + "Page.close", + "Page.setWebLifecycleState", + "Target.activateTarget", + "Target.closeTarget", + "Target.createTarget", + "Target.createBrowserContext", + "Target.disposeBrowserContext", + "Target.openDevTools", + "Browser.cancelDownload", + "Browser.close", + "Browser.setWindowBounds", + "Browser.setContentsSize", + "Autofill.trigger", +} + +// telemetryCdpExcludeNone is the --telemetry-cdp-exclude value that clears the +// exclusion list rather than naming methods to drop. +const telemetryCdpExcludeNone = "none" + +// parseTelemetryCdpExcludedMethods parses a --telemetry-cdp-exclude value into the +// exclusion list carried by the control category. "none" resolves to an empty list, +// which tells the API to report every supported method again. Method names are +// matched case-insensitively and returned in their canonical CDP spelling. +func parseTelemetryCdpExcludedMethods(s string) ([]kernel.BrowserCdpCommandMethod, error) { + methods := []kernel.BrowserCdpCommandMethod{} + if strings.TrimSpace(s) == telemetryCdpExcludeNone { + return methods, nil + } + for _, part := range strings.Split(s, ",") { + name := strings.TrimSpace(part) + if name == "" { + continue + } + i := slices.IndexFunc(cdpCommandMethods, func(m string) bool { return strings.EqualFold(m, name) }) + if i < 0 { + return nil, fmt.Errorf("unknown CDP method %q: must be one of %s, or %q to clear the exclusion list", name, strings.Join(cdpCommandMethods, ", "), telemetryCdpExcludeNone) + } + methods = append(methods, kernel.BrowserCdpCommandMethod(cdpCommandMethods[i])) + } + return methods, nil +} + +// resolveTelemetryFlag interprets the --telemetry and --telemetry-cdp-exclude flag +// values shared by every browser and browser-pool command: "all" enables the default +// set, "off" disables capture, and a comma-separated list opts into exactly those +// categories. Excluded CDP methods are merged into the control category independently +// of the selection, so they survive a later update that only names categories. It +// returns the resolved (enabled, browser) pair so each endpoint can assemble its own +// param type. +func resolveTelemetryFlag(s, cdpExclude string) (param.Opt[bool], kernel.BrowserTelemetryCategoriesConfigParam, error) { + var enabled param.Opt[bool] + var p kernel.BrowserTelemetryCategoriesConfigParam switch s { case "all": - return kernel.Opt(true), kernel.BrowserTelemetryCategoriesConfigParam{}, nil + enabled = kernel.Opt(true) case "off": - return kernel.Opt(false), kernel.BrowserTelemetryCategoriesConfigParam{}, nil + enabled = kernel.Opt(false) default: - p, err := parseTelemetryCategories(s) - return param.Opt[bool]{}, p, err + var err error + if p, err = parseTelemetryCategories(s); err != nil { + return enabled, p, err + } + } + if cdpExclude == "" { + return enabled, p, nil } + // Exclusion is a control-telemetry setting, so it has no meaning in a request + // that turns capture off. Error messages never lead with a flag token — the + // error style title-cases the first word. + if s == "off" { + return enabled, p, fmt.Errorf("cannot combine --telemetry=off with --telemetry-cdp-exclude: excluding CDP methods only applies while control telemetry is captured") + } + methods, err := parseTelemetryCdpExcludedMethods(cdpExclude) + if err != nil { + return enabled, p, err + } + p.Control.Cdp.ExcludedMethods = methods + return enabled, p, nil } // telemetryExportOff is the --telemetry-export-otlp value that turns export off @@ -167,10 +261,10 @@ func validateTelemetryExportCombo(telemetry, id, name string, canImply bool) err return nil } -// buildNewTelemetryParam converts --telemetry and --telemetry-export-otlp flag -// values to the create API param. -func buildNewTelemetryParam(s, export string) (kernel.BrowserNewParamsTelemetry, error) { - enabled, browser, err := resolveTelemetryFlag(s) +// buildNewTelemetryParam converts --telemetry, --telemetry-cdp-exclude and +// --telemetry-export-otlp flag values to the create API param. +func buildNewTelemetryParam(s, cdpExclude, export string) (kernel.BrowserNewParamsTelemetry, error) { + enabled, browser, err := resolveTelemetryFlag(s, cdpExclude) p := kernel.BrowserNewParamsTelemetry{Enabled: enabled, Browser: browser} if err != nil || export == "" { return p, err @@ -207,26 +301,37 @@ func optIfSet(s string) param.Opt[string] { return kernel.Opt(s) } -// buildUpdateTelemetryParam converts a --telemetry flag value to the update API param. -func buildUpdateTelemetryParam(s string) (kernel.BrowserUpdateParamsTelemetry, error) { - enabled, browser, err := resolveTelemetryFlag(s) +// buildUpdateTelemetryParam converts --telemetry and --telemetry-cdp-exclude flag +// values to the update API param. +func buildUpdateTelemetryParam(s, cdpExclude string) (kernel.BrowserUpdateParamsTelemetry, error) { + enabled, browser, err := resolveTelemetryFlag(s, cdpExclude) return kernel.BrowserUpdateParamsTelemetry{Enabled: enabled, Browser: browser}, err } -// buildManagedAuthTelemetryParam converts --telemetry and --telemetry-export-otlp -// flag values to the browser telemetry config carried by an auth connection's -// browser settings, shared by create, update, and login. +// buildManagedAuthTelemetryParam converts --telemetry, --telemetry-cdp-exclude and +// --telemetry-export-otlp flag values to the browser telemetry config carried by an +// auth connection's browser settings, shared by create, update, and login. // // canImply is true only on create, where there is no stored selection to clobber // and capture can safely be turned on for the user so a destination works on its // own. On update and login it is false: enabling capture there would replace the // connection's current category selection rather than merge onto it. -func buildManagedAuthTelemetryParam(s, export string, canImply bool) (kernel.ManagedAuthBrowserConfigTelemetryParam, error) { - enabled, browser, err := resolveTelemetryFlag(s) +func buildManagedAuthTelemetryParam(s, cdpExclude, export string, canImply bool) (kernel.ManagedAuthBrowserConfigTelemetryParam, error) { + enabled, browser, err := resolveTelemetryFlag(s, cdpExclude) p := kernel.ManagedAuthBrowserConfigTelemetryParam{Enabled: enabled, Browser: browser} - if err != nil || export == "" { + if err != nil { return p, err } + // A connection stores the browser config as sent rather than resolving it, so a + // request carrying only CDP exclusions would drop the connection's category + // selection. On update and login the user has to restate what to capture; on + // create there is nothing to lose. + if cdpExclude != "" && s == "" && !canImply { + return p, fmt.Errorf("setting --telemetry-cdp-exclude also requires --telemetry in the same command: the connection stores its browser config as sent, so exclusions on their own would drop its category selection") + } + if export == "" { + return p, nil + } exEnabled, id, name, err := resolveTelemetryExportFlag(export) if err != nil { return p, err @@ -264,6 +369,9 @@ func formatManagedAuthTelemetry(cfg kernel.ManagedAuthBrowserConfigTelemetry) st } return "disabled" }() + if ex := formatCdpExcludedMethods(cfg.Browser.Control.Cdp.ExcludedMethods); ex != "" { + base += " (excluding CDP methods: " + ex + ")" + } if dest := managedAuthExportDestination(cfg.Export); dest != "" { return base + " (exporting to " + dest + ")" } @@ -287,7 +395,7 @@ func managedAuthExportDestination(ex kernel.ManagedAuthBrowserConfigTelemetryExp // flows automatically whenever a CDP category is captured. var settableCategories = []string{ "console", "network", "page", "interaction", - "control", "connection", "system", "screenshot", "captcha", + "control", "connection", "system", "screenshot", "platform", "captcha", } // streamFilterCategories are the categories accepted by `telemetry stream --categories`. @@ -310,6 +418,7 @@ func telemetryEnabledCategories(cfg kernel.BrowserTelemetryConfig) []string { {"connection", b.Connection.Enabled}, {"system", b.System.Enabled}, {"screenshot", b.Screenshot.Enabled}, + {"platform", b.Platform.Enabled}, {"captcha", b.Captcha.Enabled}, } on := make([]string, 0, len(ordered)) @@ -330,6 +439,9 @@ func printTelemetrySummary(cfg kernel.BrowserTelemetryConfig) { return } pterm.Info.Printf("Telemetry capturing: %s\n", strings.Join(on, ", ")) + if ex := formatCdpExcludedMethods(cfg.Browser.Control.Cdp.ExcludedMethods); ex != "" { + pterm.Info.Printf("Telemetry excluding CDP methods: %s\n", ex) + } if cfg.Export.Otlp.Enabled { // The response reports the resolved destination by ID even when the request // selected it by name. @@ -341,6 +453,19 @@ func printTelemetrySummary(cfg kernel.BrowserTelemetryConfig) { } } +// formatCdpExcludedMethods renders the CDP methods left out of control +// telemetry's cdp_command stream, or "" when every supported method is reported. +func formatCdpExcludedMethods(methods []kernel.BrowserCdpCommandMethod) string { + if len(methods) == 0 { + return "" + } + names := make([]string, 0, len(methods)) + for _, m := range methods { + names = append(names, string(m)) + } + return strings.Join(names, ", ") +} + // shouldEmit applies client-side category/type filters to a telemetry event. func shouldEmit(category, eventType string, categories, types []string) bool { if len(categories) > 0 && !slices.Contains(categories, category) { diff --git a/cmd/browsers_telemetry_test.go b/cmd/browsers_telemetry_test.go index fe3b88e1..d9458bff 100644 --- a/cmd/browsers_telemetry_test.go +++ b/cmd/browsers_telemetry_test.go @@ -299,14 +299,17 @@ func TestShouldEmit(t *testing.T) { } func TestParseTelemetryCategories_OptInList(t *testing.T) { - p, err := parseTelemetryCategories("network,control,captcha") + p, err := parseTelemetryCategories("network,control,captcha,platform") assert.NoError(t, err) // Listed categories are enabled. - for _, c := range []kernel.BrowserTelemetryCategoryConfigParam{p.Network, p.Control, p.Captcha} { + for _, c := range []kernel.BrowserTelemetryCategoryConfigParam{p.Network, p.Captcha, p.Platform} { assert.True(t, c.Enabled.Valid()) assert.True(t, c.Enabled.Value) } + // Control carries its own config type, so it is checked separately. + assert.True(t, p.Control.Enabled.Valid()) + assert.True(t, p.Control.Enabled.Value) // Unlisted categories are omitted (opt-in: the instance treats them as off). assert.False(t, p.Console.Enabled.Valid()) assert.False(t, p.Page.Enabled.Valid()) @@ -336,21 +339,21 @@ func TestParseTelemetryCategories_WhitespaceTolerance(t *testing.T) { // listed categories enabled (Enabled unset). func TestBuildTelemetryParam_WireEncoding(t *testing.T) { t.Run("all", func(t *testing.T) { - p, err := buildNewTelemetryParam("all", "") + p, err := buildNewTelemetryParam("all", "", "") assert.NoError(t, err) assert.True(t, p.Enabled.Valid()) assert.True(t, p.Enabled.Value) assert.False(t, p.Browser.Network.Enabled.Valid()) }) t.Run("off", func(t *testing.T) { - p, err := buildNewTelemetryParam("off", "") + p, err := buildNewTelemetryParam("off", "", "") assert.NoError(t, err) assert.True(t, p.Enabled.Valid()) assert.False(t, p.Enabled.Value) assert.False(t, p.Browser.Network.Enabled.Valid()) }) t.Run("opt-in list sets only Browser", func(t *testing.T) { - p, err := buildNewTelemetryParam("network,control", "") + p, err := buildNewTelemetryParam("network,control", "", "") assert.NoError(t, err) assert.False(t, p.Enabled.Valid(), "Enabled must be unset for an opt-in selection") assert.True(t, p.Browser.Network.Enabled.Valid()) @@ -366,7 +369,7 @@ func TestBuildTelemetryParam_WireEncoding(t *testing.T) { // enabled=false combined with one. func TestBuildTelemetryParam_ExportWireEncoding(t *testing.T) { t.Run("destination by CUID sets id", func(t *testing.T) { - p, err := buildNewTelemetryParam("", "abcdefghijklmnopqrstuvwx") + p, err := buildNewTelemetryParam("", "", "abcdefghijklmnopqrstuvwx") assert.NoError(t, err) otlp := p.Export.Otlp assert.True(t, otlp.Destination.ID.Valid()) @@ -375,7 +378,7 @@ func TestBuildTelemetryParam_ExportWireEncoding(t *testing.T) { assert.False(t, otlp.Enabled.Valid(), "a destination implies enabled server-side") }) t.Run("destination by name sets name", func(t *testing.T) { - p, err := buildNewTelemetryParam("", "my-collector") + p, err := buildNewTelemetryParam("", "", "my-collector") assert.NoError(t, err) otlp := p.Export.Otlp assert.True(t, otlp.Destination.Name.Valid()) @@ -383,20 +386,20 @@ func TestBuildTelemetryParam_ExportWireEncoding(t *testing.T) { assert.False(t, otlp.Destination.ID.Valid(), "id must be unset when name is sent") }) t.Run("destination implies capture on create", func(t *testing.T) { - p, err := buildNewTelemetryParam("", "my-collector") + p, err := buildNewTelemetryParam("", "", "my-collector") assert.NoError(t, err) assert.True(t, p.Enabled.Valid(), "export requires capture, so create implies it") assert.True(t, p.Enabled.Value) }) t.Run("explicit --telemetry selection is preserved", func(t *testing.T) { - p, err := buildNewTelemetryParam("network,control", "my-collector") + p, err := buildNewTelemetryParam("network,control", "", "my-collector") assert.NoError(t, err) assert.False(t, p.Enabled.Valid(), "an opt-in selection must not be overridden") assert.True(t, p.Browser.Network.Enabled.Value) assert.Equal(t, "my-collector", p.Export.Otlp.Destination.Name.Value) }) t.Run("off disables export without a destination", func(t *testing.T) { - p, err := buildNewTelemetryParam("all", "off") + p, err := buildNewTelemetryParam("all", "", "off") assert.NoError(t, err) otlp := p.Export.Otlp assert.True(t, otlp.Enabled.Valid()) @@ -405,7 +408,7 @@ func TestBuildTelemetryParam_ExportWireEncoding(t *testing.T) { assert.False(t, otlp.Destination.Name.Valid()) }) t.Run("off does not imply capture", func(t *testing.T) { - p, err := buildNewTelemetryParam("", "off") + p, err := buildNewTelemetryParam("", "", "off") assert.NoError(t, err) assert.False(t, p.Enabled.Valid(), "disabling export must not turn capture on") }) @@ -414,44 +417,44 @@ func TestBuildTelemetryParam_ExportWireEncoding(t *testing.T) { // same request. Update and login refuse to supply one: doing so would replace // the connection's current category selection. t.Run("update requires an explicit --telemetry alongside a destination", func(t *testing.T) { - _, err := buildManagedAuthTelemetryParam("", "my-collector", false) + _, err := buildManagedAuthTelemetryParam("", "", "my-collector", false) assert.Error(t, err) assert.Contains(t, err.Error(), "also requires --telemetry") }) t.Run("login requires an explicit --telemetry alongside a destination", func(t *testing.T) { - _, err := buildManagedAuthTelemetryParam("", "my-collector", false) + _, err := buildManagedAuthTelemetryParam("", "", "my-collector", false) assert.Error(t, err) assert.Contains(t, err.Error(), "also requires --telemetry") }) t.Run("update never implies capture when --telemetry is given", func(t *testing.T) { - p, err := buildManagedAuthTelemetryParam("console", "my-collector", false) + p, err := buildManagedAuthTelemetryParam("console", "", "my-collector", false) assert.NoError(t, err) assert.False(t, p.Enabled.Valid(), "an opt-in selection must not be widened to the default set") assert.True(t, p.Browser.Console.Enabled.Value) assert.Equal(t, "my-collector", p.Export.Otlp.Destination.Name.Value) }) t.Run("login never implies capture when --telemetry is given", func(t *testing.T) { - p, err := buildManagedAuthTelemetryParam("console", "my-collector", false) + p, err := buildManagedAuthTelemetryParam("console", "", "my-collector", false) assert.NoError(t, err) assert.False(t, p.Enabled.Valid()) assert.Equal(t, "my-collector", p.Export.Otlp.Destination.Name.Value) }) t.Run("update and login allow export=off without --telemetry", func(t *testing.T) { - u, err := buildManagedAuthTelemetryParam("", "off", false) + u, err := buildManagedAuthTelemetryParam("", "", "off", false) assert.NoError(t, err) assert.False(t, u.Export.Otlp.Enabled.Value) - l, err := buildManagedAuthTelemetryParam("", "off", false) + l, err := buildManagedAuthTelemetryParam("", "", "off", false) assert.NoError(t, err) assert.False(t, l.Export.Otlp.Enabled.Value) }) t.Run("auth connection create implies capture", func(t *testing.T) { - p, err := buildManagedAuthTelemetryParam("", "my-collector", true) + p, err := buildManagedAuthTelemetryParam("", "", "my-collector", true) assert.NoError(t, err) assert.True(t, p.Enabled.Valid()) assert.True(t, p.Enabled.Value) }) t.Run("invalid category still errors with export set", func(t *testing.T) { - _, err := buildNewTelemetryParam("bogus", "my-collector") + _, err := buildNewTelemetryParam("bogus", "", "my-collector") assert.Error(t, err) }) t.Run("telemetry=off with a destination is rejected", func(t *testing.T) { @@ -459,9 +462,9 @@ func TestBuildTelemetryParam_ExportWireEncoding(t *testing.T) { name string fn func() error }{ - {"create", func() error { _, e := buildNewTelemetryParam("off", "my-collector"); return e }}, - {"auth create", func() error { _, e := buildManagedAuthTelemetryParam("off", "my-collector", true); return e }}, - {"auth update/login", func() error { _, e := buildManagedAuthTelemetryParam("off", "my-collector", false); return e }}, + {"create", func() error { _, e := buildNewTelemetryParam("off", "", "my-collector"); return e }}, + {"auth create", func() error { _, e := buildManagedAuthTelemetryParam("off", "", "my-collector", true); return e }}, + {"auth update/login", func() error { _, e := buildManagedAuthTelemetryParam("off", "", "my-collector", false); return e }}, } { err := tc.fn() assert.Error(t, err, tc.name) @@ -469,13 +472,13 @@ func TestBuildTelemetryParam_ExportWireEncoding(t *testing.T) { } }) t.Run("telemetry=off with export=off is allowed", func(t *testing.T) { - p, err := buildNewTelemetryParam("off", "off") + p, err := buildNewTelemetryParam("off", "", "off") assert.NoError(t, err) assert.False(t, p.Enabled.Value) assert.False(t, p.Export.Otlp.Enabled.Value) }) t.Run("empty export value errors", func(t *testing.T) { - _, err := buildNewTelemetryParam("all", " ") + _, err := buildNewTelemetryParam("all", "", " ") assert.Error(t, err) }) } @@ -718,3 +721,82 @@ func TestTelemetryEvents_FullScanIgnoresOffsetUsesSince(t *testing.T) { assert.Equal(t, "5m", gotQuery.Since.Value, "--all walks the window from --since") _ = buf } + +func TestParseTelemetryCategories_Platform(t *testing.T) { + p, err := parseTelemetryCategories("platform") + + assert.NoError(t, err) + assert.True(t, p.Platform.Enabled.Valid()) + assert.True(t, p.Platform.Enabled.Value) + // platform is opt-in only, so it must be offered by the flag's error message too. + _, err = parseTelemetryCategories("bogus") + assert.ErrorContains(t, err, "platform") +} + +func TestTelemetryEnabledCategories_Platform(t *testing.T) { + cfg := kernel.BrowserTelemetryConfig{Browser: kernel.BrowserTelemetryCategoriesConfig{}} + cfg.Browser.Platform.Enabled = true + + assert.Equal(t, []string{"platform"}, telemetryEnabledCategories(cfg)) +} + +func TestParseTelemetryCdpExcludedMethods(t *testing.T) { + t.Run("canonicalizes and trims", func(t *testing.T) { + got, err := parseTelemetryCdpExcludedMethods(" input.dispatchmouseevent , Page.captureScreenshot ") + assert.NoError(t, err) + assert.Equal(t, []kernel.BrowserCdpCommandMethod{ + kernel.BrowserCdpCommandMethodInputDispatchMouseEvent, + kernel.BrowserCdpCommandMethodPageCaptureScreenshot, + }, got) + }) + t.Run("none clears the list", func(t *testing.T) { + got, err := parseTelemetryCdpExcludedMethods("none") + assert.NoError(t, err) + assert.NotNil(t, got, "an empty list must still be sent, so the API reports every method again") + assert.Empty(t, got) + }) + t.Run("rejects unknown methods", func(t *testing.T) { + _, err := parseTelemetryCdpExcludedMethods("Page.doesNotExist") + assert.ErrorContains(t, err, "unknown CDP method") + }) +} + +func TestBuildTelemetryParam_CdpExclude(t *testing.T) { + t.Run("merges into control without enabling it", func(t *testing.T) { + p, err := buildNewTelemetryParam("", "Input.dispatchMouseEvent", "") + assert.NoError(t, err) + assert.False(t, p.Enabled.Valid()) + assert.False(t, p.Browser.Control.Enabled.Valid(), "exclusions must not silently flip the control category") + assert.Equal(t, []kernel.BrowserCdpCommandMethod{ + kernel.BrowserCdpCommandMethodInputDispatchMouseEvent, + }, p.Browser.Control.Cdp.ExcludedMethods) + }) + t.Run("combines with a category selection", func(t *testing.T) { + p, err := buildUpdateTelemetryParam("control,network", "Page.captureScreenshot") + assert.NoError(t, err) + assert.True(t, p.Browser.Control.Enabled.Value) + assert.Equal(t, []kernel.BrowserCdpCommandMethod{ + kernel.BrowserCdpCommandMethodPageCaptureScreenshot, + }, p.Browser.Control.Cdp.ExcludedMethods) + }) + t.Run("rejects combining with telemetry off", func(t *testing.T) { + _, err := buildNewTelemetryParam("off", "Page.captureScreenshot", "") + assert.ErrorContains(t, err, "cannot combine --telemetry=off with --telemetry-cdp-exclude") + }) +} + +func TestBuildManagedAuthTelemetryParam_CdpExcludeNeedsCategories(t *testing.T) { + // The connection stores the config verbatim, so exclusions on their own would + // replace its category selection — allowed on create, rejected on update/login. + _, err := buildManagedAuthTelemetryParam("", "Page.navigate", "", false) + assert.ErrorContains(t, err, "also requires --telemetry in the same command") + + p, err := buildManagedAuthTelemetryParam("", "Page.navigate", "", true) + assert.NoError(t, err) + assert.Equal(t, []kernel.BrowserCdpCommandMethod{ + kernel.BrowserCdpCommandMethodPageNavigate, + }, p.Browser.Control.Cdp.ExcludedMethods) + + _, err = buildManagedAuthTelemetryParam("control", "Page.navigate", "", false) + assert.NoError(t, err) +} diff --git a/go.mod b/go.mod index 6b00cac9..a7c24c52 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.1 github.com/golang-jwt/jwt/v5 v5.2.2 github.com/joho/godotenv v1.5.1 - github.com/kernel/kernel-go-sdk v0.93.1-0.20260821173629-c0428370612f + github.com/kernel/kernel-go-sdk v0.93.1-0.20260824182203-5e48c587a312 github.com/klauspost/compress v1.18.5 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c github.com/pterm/pterm v0.12.80 diff --git a/go.sum b/go.sum index 50e70bb4..6074144b 100644 --- a/go.sum +++ b/go.sum @@ -64,8 +64,8 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= -github.com/kernel/kernel-go-sdk v0.93.1-0.20260821173629-c0428370612f h1:Nqwb7HXCMYBvltbuGbiD1Ms86aJs9JH46Q9aDNU/Oc8= -github.com/kernel/kernel-go-sdk v0.93.1-0.20260821173629-c0428370612f/go.mod h1:EeZzSuHZVeHKxKCPUzxou2bovNGhXaz0RXrSqKNf1AQ= +github.com/kernel/kernel-go-sdk v0.93.1-0.20260824182203-5e48c587a312 h1:AuicZBMEwgADoR6EvMe8n6Mq4SE0O7OTxhE+dTAEsCs= +github.com/kernel/kernel-go-sdk v0.93.1-0.20260824182203-5e48c587a312/go.mod h1:EeZzSuHZVeHKxKCPUzxou2bovNGhXaz0RXrSqKNf1AQ= github.com/klauspost/compress v1.18.5 h1:/h1gH5Ce+VWNLSWqPzOVn6XBO+vJbCNGvjoaGBFW2IE= github.com/klauspost/compress v1.18.5/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= From 8b5a06bdc9e755564b6f4b33e0e77dd651502809 Mon Sep 17 00:00:00 2001 From: "kernel-internal[bot]" <260533166+kernel-internal[bot]@users.noreply.github.com> Date: Mon, 24 Aug 2026 20:13:17 +0000 Subject: [PATCH 10/26] CLI: Update Go SDK to 26309b6 and drop the telemetry control/platform split MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Updates kernel-go-sdk to 26309b6ff244c7c729ed11101ada01757df34212. The supplied /tmp/sdk-diff.patch was empty, so the diff was recomputed by unshallowing the SDK clone. The result explains the churn: the CLI's previous pin, 5e48c587a312, is not on the SDK's main branch — it lives on origin/stlc/promotion-conflict, forked from 0802326. 26309b6 is on main, so moving to it removes the SiteConfigs resource and the control/platform telemetry split again, and the CLI stopped compiling on BrowserTelemetryControlConfigParam, BrowserCdpCommandMethod, the `platform` category, and `control.cdp`. This is the same situation 063d7f5 handled, so it reverts 484e19f's code changes, leaving cmd/ byte-identical to the 063d7f5 state (modulo the unrelated MCP install work merged from main since): - `--telemetry` is back to the nine categories the SDK actually ships (captcha, connection, console, control, interaction, network, page, screenshot, system); `platform` is rejected again. - `--telemetry-cdp-exclude` is gone from all eight commands (browsers create/update, browser-pools create/update/acquire, auth connections create/update/login). 26309b6 is c042837 plus lib/browserrouting/route_cache.go and its tests (stale-JWT eviction), so the public API surface is identical to c042837 and nothing new needs CLI coverage. Coverage analysis: api.md lists 140 methods, down from 145 — the five removals are the SiteConfigs resource, which carried x-cli-skip: true in openapi.yaml and was never in the CLI. All 140 remaining methods were checked one by one against CLI call sites and every one is reachable; the nine that looked unmatched at first (Deployments/Invocations/Auth.Connections.Follow, Browsers.Logs.Stream, Browsers.Telemetry.Stream, Browsers.Process.StdoutStream, Invocations.DeleteBrowsers/ListBrowsers, Browsers.Curl) all resolve to *Streaming variants or, for curl, a deliberate raw-HTTP-through-the-browser implementation. A field-level pass over all 100 Params structs reachable from api.md flagged only three candidates, all non-gaps: AuditLogListParams.PageToken is handled by ListAutoPaging, AuthConnectionLoginParams.BrowserTelemetry is the deprecated alias for the browser.telemetry the CLI already sets, and BrowserCurlParams.TimeoutMs / ResponseEncoding are unused because `browsers curl` streams raw bytes and maps the timeout onto --max-time. Tested against the production API: - browsers create --telemetry=console,network,control / get / update --telemetry=page / telemetry events / delete - browser-pools create --telemetry=console,control / get (details table shows the categories) / update --telemetry=network / delete - auth connections create --telemetry=console,control / update --telemetry=network / get / delete - removed surfaces now rejected: --telemetry=platform lists only the nine valid categories, and --telemetry-cdp-exclude is an unknown flag on both browsers create and auth connections update - read-only sweep: auth context, browsers list, browser-pools list, auth connections list, app list, proxies list, profiles list, extensions list, org entitlements, org limits get, telemetry destinations list, credentials list, projects list, api-keys list, credential-providers list, audit-logs search - go build ./..., go vet ./..., go test ./... all pass Triggered by: kernel/kernel-go-sdk@26309b6ff244c7c729ed11101ada01757df34212 Co-Authored-By: Claude Opus 5 --- cmd/auth_connections.go | 60 +++++------- cmd/browser_pools.go | 87 +++++++---------- cmd/browser_pools_test.go | 6 +- cmd/browsers.go | 126 +++++++++++------------- cmd/browsers_telemetry.go | 173 +++++---------------------------- cmd/browsers_telemetry_test.go | 130 +++++-------------------- go.mod | 2 +- go.sum | 4 +- 8 files changed, 171 insertions(+), 417 deletions(-) diff --git a/cmd/auth_connections.go b/cmd/auth_connections.go index d7fc1f9a..c6aedcfa 100644 --- a/cmd/auth_connections.go +++ b/cmd/auth_connections.go @@ -57,7 +57,6 @@ type AuthConnectionCreateInput struct { NoAutoReauth bool RecordSession BoolFlag Telemetry string - TelemetryCdpExclude string TelemetryExport string Output string } @@ -93,7 +92,6 @@ type AuthConnectionUpdateInput struct { AutoReauth BoolFlag RecordSession BoolFlag Telemetry string - TelemetryCdpExclude string TelemetryExport string Output string } @@ -113,16 +111,15 @@ type AuthConnectionDeleteInput struct { } type AuthConnectionLoginInput struct { - ID string - ProxyID string - ProxyName string - ProxyMode string - Stealth BoolFlag - RecordSession BoolFlag - Telemetry string - TelemetryCdpExclude string - TelemetryExport string - Output string + ID string + ProxyID string + ProxyName string + ProxyMode string + Stealth BoolFlag + RecordSession BoolFlag + Telemetry string + TelemetryExport string + Output string } type AuthConnectionSubmitInput struct { @@ -240,8 +237,8 @@ func (c AuthConnectionCmd) Create(ctx context.Context, in AuthConnectionCreateIn params.ManagedAuthCreateRequest.RecordSession = kernel.Opt(in.RecordSession.Value) } - if in.Telemetry != "" || in.TelemetryCdpExclude != "" || in.TelemetryExport != "" { - t, err := buildManagedAuthTelemetryParam(in.Telemetry, in.TelemetryCdpExclude, in.TelemetryExport, true) + if in.Telemetry != "" || in.TelemetryExport != "" { + t, err := buildManagedAuthTelemetryParam(in.Telemetry, in.TelemetryExport, true) if err != nil { return err } @@ -386,8 +383,8 @@ func (c AuthConnectionCmd) Update(ctx context.Context, in AuthConnectionUpdateIn hasChanges = true } - if in.Telemetry != "" || in.TelemetryCdpExclude != "" || in.TelemetryExport != "" { - t, err := buildManagedAuthTelemetryParam(in.Telemetry, in.TelemetryCdpExclude, in.TelemetryExport, false) + if in.Telemetry != "" || in.TelemetryExport != "" { + t, err := buildManagedAuthTelemetryParam(in.Telemetry, in.TelemetryExport, false) if err != nil { return err } @@ -784,8 +781,8 @@ func (c AuthConnectionCmd) Login(ctx context.Context, in AuthConnectionLoginInpu params.RecordSession = kernel.Opt(in.RecordSession.Value) } - if in.Telemetry != "" || in.TelemetryCdpExclude != "" || in.TelemetryExport != "" { - t, err := buildManagedAuthTelemetryParam(in.Telemetry, in.TelemetryCdpExclude, in.TelemetryExport, false) + if in.Telemetry != "" || in.TelemetryExport != "" { + t, err := buildManagedAuthTelemetryParam(in.Telemetry, in.TelemetryExport, false) if err != nil { return err } @@ -1282,7 +1279,6 @@ func init() { authConnectionsCreateCmd.Flags().Bool("record-session", false, "Record browser sessions for this connection by default (useful for debugging)") authConnectionsCreateCmd.Flags().String("telemetry", "", "Configure telemetry for this connection's browser sessions (opt-in): --telemetry=all (default set), --telemetry=off (disable), or --telemetry=console,network (capture exactly those categories)") authConnectionsCreateCmd.Flags().String("telemetry-export-otlp", "", "Export this connection's captured telemetry over OTLP to one of the org's configured destinations, by ID or name; --telemetry-export-otlp=off disables export. Implies --telemetry=all when --telemetry is not set, since export requires capture") - authConnectionsCreateCmd.Flags().String("telemetry-cdp-exclude", "", "Leave the named CDP methods out of control telemetry's cdp_command events, comma-separated (e.g. Input.dispatchMouseEvent,Page.captureScreenshot); --telemetry-cdp-exclude=none clears the list. Excluded commands are still relayed to the browser, they just produce no event") _ = authConnectionsCreateCmd.MarkFlagRequired("domain") _ = authConnectionsCreateCmd.MarkFlagRequired("profile-name") authConnectionsCreateCmd.MarkFlagsMutuallyExclusive("credential-name", "credential-provider") @@ -1312,7 +1308,6 @@ func init() { authConnectionsUpdateCmd.Flags().Bool("record-session", false, "Set whether browser sessions are recorded by default; use --record-session=false to disable") authConnectionsUpdateCmd.Flags().String("telemetry", "", "Update telemetry for future browser sessions: --telemetry=all (reset to default set), --telemetry=off (disable), or --telemetry=console,network (merge those categories into the current selection)") authConnectionsUpdateCmd.Flags().String("telemetry-export-otlp", "", "Update where future sessions export captured telemetry over OTLP, by destination ID or name; --telemetry-export-otlp=off disables export. Naming a destination requires passing --telemetry in the same command, since export and capture are validated together") - authConnectionsUpdateCmd.Flags().String("telemetry-cdp-exclude", "", "Leave the named CDP methods out of control telemetry's cdp_command events, comma-separated (e.g. Input.dispatchMouseEvent,Page.captureScreenshot); --telemetry-cdp-exclude=none clears the list. Excluded commands are still relayed to the browser, they just produce no event") authConnectionsUpdateCmd.MarkFlagsMutuallyExclusive("credential-name", "credential-provider") authConnectionsUpdateCmd.MarkFlagsMutuallyExclusive("save-credentials", "no-save-credentials") authConnectionsUpdateCmd.MarkFlagsMutuallyExclusive("health-checks", "no-health-checks") @@ -1338,7 +1333,6 @@ func init() { authConnectionsLoginCmd.Flags().Bool("record-session", false, "Override whether this login's browser session is recorded; use --record-session=false to disable") authConnectionsLoginCmd.Flags().String("telemetry", "", "Telemetry override for this login only, merged onto the connection's config: --telemetry=all, --telemetry=off, or --telemetry=console,network") authConnectionsLoginCmd.Flags().String("telemetry-export-otlp", "", "Export override for this login only: an OTLP destination ID or name; --telemetry-export-otlp=off disables export for this login. Naming a destination requires passing --telemetry in the same command, since export and capture are validated together") - authConnectionsLoginCmd.Flags().String("telemetry-cdp-exclude", "", "Leave the named CDP methods out of control telemetry's cdp_command events, comma-separated (e.g. Input.dispatchMouseEvent,Page.captureScreenshot); --telemetry-cdp-exclude=none clears the list. Excluded commands are still relayed to the browser, they just produce no event") // Submit flags addJSONOutputFlag(authConnectionsSubmitCmd) @@ -1393,7 +1387,6 @@ func runAuthConnectionsCreate(cmd *cobra.Command, args []string) error { noHealthChecks, _ := cmd.Flags().GetBool("no-health-checks") noAutoReauth, _ := cmd.Flags().GetBool("no-auto-reauth") telemetry, _ := cmd.Flags().GetString("telemetry") - telemetryCdpExclude, _ := cmd.Flags().GetString("telemetry-cdp-exclude") telemetryExport, _ := cmd.Flags().GetString("telemetry-export-otlp") svc := client.Auth.Connections @@ -1417,7 +1410,6 @@ func runAuthConnectionsCreate(cmd *cobra.Command, args []string) error { NoAutoReauth: noAutoReauth, RecordSession: readBoolFlag(cmd.Flags(), "record-session"), Telemetry: telemetry, - TelemetryCdpExclude: telemetryCdpExclude, TelemetryExport: telemetryExport, Output: output, }) @@ -1451,7 +1443,6 @@ func runAuthConnectionsUpdate(cmd *cobra.Command, args []string) error { noSaveCredentials, _ := cmd.Flags().GetBool("no-save-credentials") healthCheckInterval, _ := cmd.Flags().GetInt("health-check-interval") telemetry, _ := cmd.Flags().GetString("telemetry") - telemetryCdpExclude, _ := cmd.Flags().GetString("telemetry-cdp-exclude") telemetryExport, _ := cmd.Flags().GetString("telemetry-export-otlp") saveCredentialsFlag := BoolFlag{} @@ -1505,7 +1496,6 @@ func runAuthConnectionsUpdate(cmd *cobra.Command, args []string) error { AutoReauth: togglePair("auto-reauth", "no-auto-reauth"), RecordSession: readBoolFlag(cmd.Flags(), "record-session"), Telemetry: telemetry, - TelemetryCdpExclude: telemetryCdpExclude, TelemetryExport: telemetryExport, Output: output, }) @@ -1551,22 +1541,20 @@ func runAuthConnectionsLogin(cmd *cobra.Command, args []string) error { proxyName, _ := cmd.Flags().GetString("proxy-name") proxyMode, _ := cmd.Flags().GetString("proxy-mode") telemetry, _ := cmd.Flags().GetString("telemetry") - telemetryCdpExclude, _ := cmd.Flags().GetString("telemetry-cdp-exclude") telemetryExport, _ := cmd.Flags().GetString("telemetry-export-otlp") svc := client.Auth.Connections c := AuthConnectionCmd{svc: &svc} return c.Login(cmd.Context(), AuthConnectionLoginInput{ - ID: args[0], - ProxyID: proxyID, - ProxyName: proxyName, - ProxyMode: proxyMode, - Stealth: readBoolFlag(cmd.Flags(), "stealth"), - RecordSession: readBoolFlag(cmd.Flags(), "record-session"), - Telemetry: telemetry, - TelemetryCdpExclude: telemetryCdpExclude, - TelemetryExport: telemetryExport, - Output: output, + ID: args[0], + ProxyID: proxyID, + ProxyName: proxyName, + ProxyMode: proxyMode, + Stealth: readBoolFlag(cmd.Flags(), "stealth"), + RecordSession: readBoolFlag(cmd.Flags(), "record-session"), + Telemetry: telemetry, + TelemetryExport: telemetryExport, + Output: output, }) } diff --git a/cmd/browser_pools.go b/cmd/browser_pools.go index 276018d7..c6f7051b 100644 --- a/cmd/browser_pools.go +++ b/cmd/browser_pools.go @@ -108,24 +108,21 @@ func (c BrowserPoolsCmd) List(ctx context.Context, in BrowserPoolsListInput) err return nil } -// buildPoolNewTelemetryParam converts --telemetry and --telemetry-cdp-exclude flag -// values to the pool create param. -func buildPoolNewTelemetryParam(s, cdpExclude string) (kernel.BrowserPoolNewParamsTelemetry, error) { - enabled, browser, err := resolveTelemetryFlag(s, cdpExclude) +// buildPoolNewTelemetryParam converts a --telemetry flag value to the pool create param. +func buildPoolNewTelemetryParam(s string) (kernel.BrowserPoolNewParamsTelemetry, error) { + enabled, browser, err := resolveTelemetryFlag(s) return kernel.BrowserPoolNewParamsTelemetry{Enabled: enabled, Browser: browser}, err } -// buildPoolUpdateTelemetryParam converts --telemetry and --telemetry-cdp-exclude flag -// values to the pool update param. -func buildPoolUpdateTelemetryParam(s, cdpExclude string) (kernel.BrowserPoolUpdateParamsTelemetry, error) { - enabled, browser, err := resolveTelemetryFlag(s, cdpExclude) +// buildPoolUpdateTelemetryParam converts a --telemetry flag value to the pool update param. +func buildPoolUpdateTelemetryParam(s string) (kernel.BrowserPoolUpdateParamsTelemetry, error) { + enabled, browser, err := resolveTelemetryFlag(s) return kernel.BrowserPoolUpdateParamsTelemetry{Enabled: enabled, Browser: browser}, err } -// buildPoolAcquireTelemetryParam converts --telemetry and --telemetry-cdp-exclude flag -// values to the acquire override param. -func buildPoolAcquireTelemetryParam(s, cdpExclude string) (kernel.BrowserPoolAcquireParamsTelemetry, error) { - enabled, browser, err := resolveTelemetryFlag(s, cdpExclude) +// buildPoolAcquireTelemetryParam converts a --telemetry flag value to the acquire override param. +func buildPoolAcquireTelemetryParam(s string) (kernel.BrowserPoolAcquireParamsTelemetry, error) { + enabled, browser, err := resolveTelemetryFlag(s) return kernel.BrowserPoolAcquireParamsTelemetry{Enabled: enabled, Browser: browser}, err } @@ -135,11 +132,7 @@ func formatPoolTelemetry(cfg kernel.BrowserTelemetryConfig) string { if len(on) == 0 { return "disabled" } - base := strings.Join(on, ", ") - if ex := formatCdpExcludedMethods(cfg.Browser.Control.Cdp.ExcludedMethods); ex != "" { - return base + " (excluding CDP methods: " + ex + ")" - } - return base + return strings.Join(on, ", ") } type BrowserPoolsCreateInput struct { @@ -162,7 +155,6 @@ type BrowserPoolsCreateInput struct { ChromePolicy string ChromePolicyFile string Telemetry string - TelemetryCdpExclude string Output string } @@ -255,8 +247,8 @@ func (c BrowserPoolsCmd) Create(ctx context.Context, in BrowserPoolsCreateInput) params.ChromePolicy = chromePolicy } - if in.Telemetry != "" || in.TelemetryCdpExclude != "" { - t, err := buildPoolNewTelemetryParam(in.Telemetry, in.TelemetryCdpExclude) + if in.Telemetry != "" { + t, err := buildPoolNewTelemetryParam(in.Telemetry) if err != nil { return err } @@ -277,7 +269,7 @@ func (c BrowserPoolsCmd) Create(ctx context.Context, in BrowserPoolsCreateInput) } else { pterm.Success.Printf("Created browser pool %s\n", pool.ID) } - if in.Telemetry != "" || in.TelemetryCdpExclude != "" { + if in.Telemetry != "" { printTelemetrySummary(pool.BrowserPoolConfig.Telemetry) } return nil @@ -358,7 +350,6 @@ type BrowserPoolsUpdateInput struct { ChromePolicyFile string ClearChromePolicy bool Telemetry string - TelemetryCdpExclude string DiscardAllIdle BoolFlag Output string } @@ -497,8 +488,8 @@ func (c BrowserPoolsCmd) Update(ctx context.Context, in BrowserPoolsUpdateInput) params.SetExtraFields(extraFields) } - if in.Telemetry != "" || in.TelemetryCdpExclude != "" { - t, err := buildPoolUpdateTelemetryParam(in.Telemetry, in.TelemetryCdpExclude) + if in.Telemetry != "" { + t, err := buildPoolUpdateTelemetryParam(in.Telemetry) if err != nil { return err } @@ -519,7 +510,7 @@ func (c BrowserPoolsCmd) Update(ctx context.Context, in BrowserPoolsUpdateInput) } else { pterm.Success.Printf("Updated browser pool %s\n", pool.ID) } - if in.Telemetry != "" || in.TelemetryCdpExclude != "" { + if in.Telemetry != "" { printTelemetrySummary(pool.BrowserPoolConfig.Telemetry) } return nil @@ -544,14 +535,13 @@ func (c BrowserPoolsCmd) Delete(ctx context.Context, in BrowserPoolsDeleteInput) } type BrowserPoolsAcquireInput struct { - IDOrName string - TimeoutSeconds int64 - Name string - StartURL string - Tags map[string]string - Telemetry string - TelemetryCdpExclude string - Output string + IDOrName string + TimeoutSeconds int64 + Name string + StartURL string + Tags map[string]string + Telemetry string + Output string } // buildAcquireParams builds the SDK params for acquiring a browser from a pool. @@ -559,7 +549,7 @@ type BrowserPoolsAcquireInput struct { // path so the per-lease name/tags/start-url/telemetry forwarding cannot silently // diverge between them. The telemetry override merges onto the pool's config for // this lease. -func buildAcquireParams(name string, tags map[string]string, timeoutSeconds int64, telemetry, telemetryCdpExclude, startURL string) (kernel.BrowserPoolAcquireParams, error) { +func buildAcquireParams(name string, tags map[string]string, timeoutSeconds int64, telemetry, startURL string) (kernel.BrowserPoolAcquireParams, error) { params := kernel.BrowserPoolAcquireParams{} if timeoutSeconds > 0 { params.AcquireTimeoutSeconds = kernel.Int(timeoutSeconds) @@ -573,8 +563,8 @@ func buildAcquireParams(name string, tags map[string]string, timeoutSeconds int6 if len(tags) > 0 { params.Tags = kernel.Tags(tags) } - if telemetry != "" || telemetryCdpExclude != "" { - t, err := buildPoolAcquireTelemetryParam(telemetry, telemetryCdpExclude) + if telemetry != "" { + t, err := buildPoolAcquireTelemetryParam(telemetry) if err != nil { return kernel.BrowserPoolAcquireParams{}, err } @@ -588,7 +578,7 @@ func (c BrowserPoolsCmd) Acquire(ctx context.Context, in BrowserPoolsAcquireInpu return err } - params, err := buildAcquireParams(in.Name, in.Tags, in.TimeoutSeconds, in.Telemetry, in.TelemetryCdpExclude, in.StartURL) + params, err := buildAcquireParams(in.Name, in.Tags, in.TimeoutSeconds, in.Telemetry, in.StartURL) if err != nil { return err } @@ -759,7 +749,6 @@ func init() { browserPoolsCreateCmd.Flags().String("chrome-policy", "", "Custom Chrome enterprise policy as a JSON object") browserPoolsCreateCmd.Flags().String("chrome-policy-file", "", "Read Chrome enterprise policy (JSON object) from a file (use '-' for stdin)") browserPoolsCreateCmd.Flags().String("telemetry", "", "Configure telemetry for browsers warmed into the pool (opt-in): --telemetry=all (default set), --telemetry=off (disable), or --telemetry=console,network (capture exactly those categories)") - browserPoolsCreateCmd.Flags().String("telemetry-cdp-exclude", "", "Leave the named CDP methods out of control telemetry's cdp_command events, comma-separated (e.g. Input.dispatchMouseEvent,Page.captureScreenshot); --telemetry-cdp-exclude=none clears the list. Excluded commands are still relayed to the browser, they just produce no event") browserPoolsCreateCmd.MarkFlagsMutuallyExclusive("chrome-policy", "chrome-policy-file") addJSONOutputFlag(browserPoolsGetCmd) @@ -790,7 +779,6 @@ func init() { browserPoolsUpdateCmd.MarkFlagsMutuallyExclusive("chrome-policy", "chrome-policy-file") browserPoolsUpdateCmd.MarkFlagsMutuallyExclusive("private-host", "clear-private-hosts") browserPoolsUpdateCmd.Flags().String("telemetry", "", "Update pool telemetry: --telemetry=all (reset to default set), --telemetry=off (disable), or --telemetry=console,network (merge those categories into the current selection). Applies only to browsers warmed after the update.") - browserPoolsUpdateCmd.Flags().String("telemetry-cdp-exclude", "", "Leave the named CDP methods out of control telemetry's cdp_command events, comma-separated (e.g. Input.dispatchMouseEvent,Page.captureScreenshot); --telemetry-cdp-exclude=none clears the list. Excluded commands are still relayed to the browser, they just produce no event") browserPoolsUpdateCmd.Flags().Bool("discard-all-idle", false, "Discard all idle browsers") addJSONOutputFlag(browserPoolsUpdateCmd) @@ -801,7 +789,6 @@ func init() { browserPoolsAcquireCmd.Flags().String("start-url", "", "URL to navigate the acquired browser to, overriding the pool's start URL for this acquire only (best-effort)") browserPoolsAcquireCmd.Flags().StringArray("tag", nil, "Set a tag KEY=VALUE on the acquired session (repeatable; applies to this lease)") browserPoolsAcquireCmd.Flags().String("telemetry", "", "Telemetry override for this lease only, merged onto the pool's config: --telemetry=all, --telemetry=off, or --telemetry=console,network") - browserPoolsAcquireCmd.Flags().String("telemetry-cdp-exclude", "", "Leave the named CDP methods out of control telemetry's cdp_command events, comma-separated (e.g. Input.dispatchMouseEvent,Page.captureScreenshot); --telemetry-cdp-exclude=none clears the list. Excluded commands are still relayed to the browser, they just produce no event") addJSONOutputFlag(browserPoolsAcquireCmd) browserPoolsReleaseCmd.Flags().String("session-id", "", "Browser session ID to release") @@ -858,7 +845,6 @@ func runBrowserPoolsCreate(cmd *cobra.Command, args []string) error { chromePolicy, _ := cmd.Flags().GetString("chrome-policy") chromePolicyFile, _ := cmd.Flags().GetString("chrome-policy-file") telemetry, _ := cmd.Flags().GetString("telemetry") - telemetryCdpExclude, _ := cmd.Flags().GetString("telemetry-cdp-exclude") output, _ := cmd.Flags().GetString("output") in := BrowserPoolsCreateInput{ @@ -881,7 +867,6 @@ func runBrowserPoolsCreate(cmd *cobra.Command, args []string) error { ChromePolicy: chromePolicy, ChromePolicyFile: chromePolicyFile, Telemetry: telemetry, - TelemetryCdpExclude: telemetryCdpExclude, Output: output, } @@ -923,7 +908,6 @@ func runBrowserPoolsUpdate(cmd *cobra.Command, args []string) error { chromePolicyFile, _ := cmd.Flags().GetString("chrome-policy-file") clearChromePolicy, _ := cmd.Flags().GetBool("clear-chrome-policy") telemetry, _ := cmd.Flags().GetString("telemetry") - telemetryCdpExclude, _ := cmd.Flags().GetString("telemetry-cdp-exclude") discardIdle, _ := cmd.Flags().GetBool("discard-all-idle") output, _ := cmd.Flags().GetString("output") @@ -953,7 +937,6 @@ func runBrowserPoolsUpdate(cmd *cobra.Command, args []string) error { ChromePolicyFile: chromePolicyFile, ClearChromePolicy: clearChromePolicy, Telemetry: telemetry, - TelemetryCdpExclude: telemetryCdpExclude, DiscardAllIdle: BoolFlag{Set: cmd.Flags().Changed("discard-all-idle"), Value: discardIdle}, Output: output, } @@ -976,18 +959,16 @@ func runBrowserPoolsAcquire(cmd *cobra.Command, args []string) error { startURL, _ := cmd.Flags().GetString("start-url") tags, _ := tagsFromFlag(cmd, "tag") telemetry, _ := cmd.Flags().GetString("telemetry") - telemetryCdpExclude, _ := cmd.Flags().GetString("telemetry-cdp-exclude") output, _ := cmd.Flags().GetString("output") c := BrowserPoolsCmd{client: &client.BrowserPools} return c.Acquire(cmd.Context(), BrowserPoolsAcquireInput{ - IDOrName: args[0], - TimeoutSeconds: timeout, - Name: name, - StartURL: startURL, - Tags: tags, - Telemetry: telemetry, - TelemetryCdpExclude: telemetryCdpExclude, - Output: output, + IDOrName: args[0], + TimeoutSeconds: timeout, + Name: name, + StartURL: startURL, + Tags: tags, + Telemetry: telemetry, + Output: output, }) } diff --git a/cmd/browser_pools_test.go b/cmd/browser_pools_test.go index 387f3f18..e0a143ff 100644 --- a/cmd/browser_pools_test.go +++ b/cmd/browser_pools_test.go @@ -239,7 +239,7 @@ func TestBrowserPoolsCreate_PrivateHostNormalization(t *testing.T) { // forwarding used by both `browser-pools acquire` and the `browsers create // --pool-id` lease path. func TestBuildAcquireParams(t *testing.T) { - p, err := buildAcquireParams("lease", map[string]string{"env": "prod"}, 30, "console,network", "", "https://example.com") + p, err := buildAcquireParams("lease", map[string]string{"env": "prod"}, 30, "console,network", "https://example.com") assert.NoError(t, err) assert.True(t, p.Name.Valid()) assert.Equal(t, "lease", p.Name.Value) @@ -252,7 +252,7 @@ func TestBuildAcquireParams(t *testing.T) { assert.True(t, p.Telemetry.Browser.Network.Enabled.Value) // Unset inputs produce an empty params struct (nothing forwarded). - empty, err := buildAcquireParams("", nil, 0, "", "", "") + empty, err := buildAcquireParams("", nil, 0, "", "") assert.NoError(t, err) assert.False(t, empty.Name.Valid()) assert.Len(t, empty.Tags, 0) @@ -260,7 +260,7 @@ func TestBuildAcquireParams(t *testing.T) { assert.False(t, empty.StartURL.Valid()) // An invalid category surfaces an error rather than a partial param. - _, err = buildAcquireParams("", nil, 0, "bogus", "", "") + _, err = buildAcquireParams("", nil, 0, "bogus", "") assert.Error(t, err) } diff --git a/cmd/browsers.go b/cmd/browsers.go index 5e4c82b7..326f88d1 100644 --- a/cmd/browsers.go +++ b/cmd/browsers.go @@ -360,32 +360,31 @@ func formatTags(tags kernel.Tags) string { // Inputs for each command type BrowsersCreateInput struct { - TimeoutSeconds int - Stealth BoolFlag - Headless BoolFlag - GPU BoolFlag - Memory string - InvocationID string - Kiosk BoolFlag - ProfileID string - ProfileName string - ProfileSaveChanges BoolFlag - ProxyID string - ProxyName string - ProxyMode string - Region string - PrivateHosts []string - StartURL string - Extensions []string - Viewport string - Telemetry string - TelemetryCdpExclude string - TelemetryExport string - ChromePolicy string - ChromePolicyFile string - Name string - Tags map[string]string - Output string + TimeoutSeconds int + Stealth BoolFlag + Headless BoolFlag + GPU BoolFlag + Memory string + InvocationID string + Kiosk BoolFlag + ProfileID string + ProfileName string + ProfileSaveChanges BoolFlag + ProxyID string + ProxyName string + ProxyMode string + Region string + PrivateHosts []string + StartURL string + Extensions []string + Viewport string + Telemetry string + TelemetryExport string + ChromePolicy string + ChromePolicyFile string + Name string + Tags map[string]string + Output string } type BrowsersDeleteInput struct { @@ -416,7 +415,6 @@ type BrowsersUpdateInput struct { Viewport string Force bool Telemetry string - TelemetryCdpExclude string Name string SetName bool ClearName bool @@ -671,8 +669,8 @@ func (b BrowsersCmd) Create(ctx context.Context, in BrowsersCreateInput) error { } } - if in.Telemetry != "" || in.TelemetryCdpExclude != "" || in.TelemetryExport != "" { - t, err := buildNewTelemetryParam(in.Telemetry, in.TelemetryCdpExclude, in.TelemetryExport) + if in.Telemetry != "" || in.TelemetryExport != "" { + t, err := buildNewTelemetryParam(in.Telemetry, in.TelemetryExport) if err != nil { return err } @@ -707,7 +705,7 @@ func (b BrowsersCmd) Create(ctx context.Context, in BrowsersCreateInput) error { } printBrowserSessionResult(browser.SessionID, browser.CdpWsURL, browser.BrowserLiveViewURL, browser.Profile, browser.ProfileSaveChanges, browser.StartURL, browser.Name, browser.Tags) - if in.Telemetry != "" || in.TelemetryCdpExclude != "" || in.TelemetryExport != "" { + if in.Telemetry != "" || in.TelemetryExport != "" { printTelemetrySummary(browser.Telemetry) } return nil @@ -943,8 +941,8 @@ func (b BrowsersCmd) Update(ctx context.Context, in BrowsersUpdateInput) error { } // Validate that at least one update option is provided - if !hasProxyChange && !hasProfileChange && !hasViewportChange && in.Telemetry == "" && in.TelemetryCdpExclude == "" && !hasNameChange && !hasTagsChange { - return fmt.Errorf("must specify at least one of: --proxy-id, --proxy-name, --proxy-mode, --clear-proxy, --disable-default-proxy, --profile-id, --profile-name, --viewport, --telemetry, --telemetry-cdp-exclude, --name, --clear-name, --tag, or --clear-tags") + if !hasProxyChange && !hasProfileChange && !hasViewportChange && in.Telemetry == "" && !hasNameChange && !hasTagsChange { + return fmt.Errorf("must specify at least one of: --proxy-id, --proxy-name, --proxy-mode, --clear-proxy, --disable-default-proxy, --profile-id, --profile-name, --viewport, --telemetry, --name, --clear-name, --tag, or --clear-tags") } params := kernel.BrowserUpdateParams{} @@ -987,8 +985,8 @@ func (b BrowsersCmd) Update(ctx context.Context, in BrowsersUpdateInput) error { } // Handle telemetry changes - if in.Telemetry != "" || in.TelemetryCdpExclude != "" { - t, err := buildUpdateTelemetryParam(in.Telemetry, in.TelemetryCdpExclude) + if in.Telemetry != "" { + t, err := buildUpdateTelemetryParam(in.Telemetry) if err != nil { return err } @@ -1038,7 +1036,7 @@ func (b BrowsersCmd) Update(ctx context.Context, in BrowsersUpdateInput) error { if hasProfileChange { pterm.Info.Printf("Profile save changes: %t\n", browser.ProfileSaveChanges) } - if in.Telemetry != "" || in.TelemetryCdpExclude != "" { + if in.Telemetry != "" { printTelemetrySummary(browser.Telemetry) } return nil @@ -2684,7 +2682,6 @@ func init() { browsersUpdateCmd.Flags().String("viewport", "", "Browser viewport size (e.g., 1920x1080@25). Supported: 2560x1440@10, 1920x1080@25, 1920x1200@25, 1440x900@25, 1024x768@60, 1200x800@60, 1280x800@60") browsersUpdateCmd.Flags().Bool("force", false, "Force viewport resize even when a live view or recording/replay is active") browsersUpdateCmd.Flags().String("telemetry", "", "Update telemetry: --telemetry=all (reset to default set), --telemetry=off (disable), or --telemetry=console,network (merge those categories into the current selection)") - browsersUpdateCmd.Flags().String("telemetry-cdp-exclude", "", "Leave the named CDP methods out of control telemetry's cdp_command events, comma-separated (e.g. Input.dispatchMouseEvent,Page.captureScreenshot); --telemetry-cdp-exclude=none clears the list. Excluded commands are still relayed to the browser, they just produce no event") browsersUpdateCmd.Flags().String("name", "", "Set a new unique name for the browser session (mutually exclusive with --clear-name)") browsersUpdateCmd.Flags().Bool("clear-name", false, "Clear the browser session name") browsersUpdateCmd.Flags().StringArray("tag", nil, "Set a tag KEY=VALUE (repeatable; up to 50 pairs). Replaces the entire tag set; mutually exclusive with --clear-tags") @@ -2966,7 +2963,6 @@ func init() { browsersCreateCmd.Flags().String("pool-id", "", "Browser pool ID to acquire from (mutually exclusive with --pool-name)") browsersCreateCmd.Flags().String("pool-name", "", "Browser pool name to acquire from (mutually exclusive with --pool-id)") browsersCreateCmd.Flags().String("telemetry", "", "Configure telemetry (opt-in): --telemetry=all (default set), --telemetry=off (disable), or --telemetry=console,network (capture exactly those categories)") - browsersCreateCmd.Flags().String("telemetry-cdp-exclude", "", "Leave the named CDP methods out of control telemetry's cdp_command events, comma-separated (e.g. Input.dispatchMouseEvent,Page.captureScreenshot); --telemetry-cdp-exclude=none clears the list. Excluded commands are still relayed to the browser, they just produce no event") browsersCreateCmd.Flags().String("telemetry-export-otlp", "", "Export captured telemetry over OTLP to one of the org's configured destinations, by ID or name; --telemetry-export-otlp=off disables export. Implies --telemetry=all when --telemetry is not set, since export requires capture") browsersCreateCmd.Flags().String("name", "", "Optional unique name for the browser session (used to find it later; can be changed with 'browsers update --name')") browsersCreateCmd.Flags().StringArray("tag", nil, "Set a tag KEY=VALUE on the session (repeatable; up to 50 pairs)") @@ -3098,7 +3094,6 @@ func runBrowsersCreate(cmd *cobra.Command, args []string) error { poolID, _ := cmd.Flags().GetString("pool-id") poolName, _ := cmd.Flags().GetString("pool-name") telemetry, _ := cmd.Flags().GetString("telemetry") - telemetryCdpExclude, _ := cmd.Flags().GetString("telemetry-cdp-exclude") telemetryExport, _ := cmd.Flags().GetString("telemetry-export-otlp") name, _ := cmd.Flags().GetString("name") tags, _ := tagsFromFlag(cmd, "tag") @@ -3165,7 +3160,7 @@ func runBrowsersCreate(cmd *cobra.Command, args []string) error { if cmd.Flags().Changed("timeout") && timeout > 0 { acquireTimeout = int64(timeout) } - acquireParams, err := buildAcquireParams(name, tags, acquireTimeout, telemetry, telemetryCdpExclude, startURL) + acquireParams, err := buildAcquireParams(name, tags, acquireTimeout, telemetry, startURL) if err != nil { return err } @@ -3207,32 +3202,31 @@ func runBrowsersCreate(cmd *cobra.Command, args []string) error { } in := BrowsersCreateInput{ - TimeoutSeconds: timeout, - Stealth: BoolFlag{Set: cmd.Flags().Changed("stealth"), Value: stealthVal}, - Headless: BoolFlag{Set: cmd.Flags().Changed("headless"), Value: headlessVal}, - GPU: BoolFlag{Set: cmd.Flags().Changed("gpu"), Value: gpuVal}, - Memory: memory, - InvocationID: invocationID, - Kiosk: BoolFlag{Set: cmd.Flags().Changed("kiosk"), Value: kioskVal}, - ProfileID: profileID, - ProfileName: profileName, - ProfileSaveChanges: BoolFlag{Set: cmd.Flags().Changed("save-changes"), Value: saveChanges}, - ProxyID: proxyID, - ProxyName: proxyName, - ProxyMode: proxyMode, - Region: region, - PrivateHosts: privateHosts, - StartURL: startURL, - Extensions: extensions, - Viewport: viewport, - Telemetry: telemetry, - TelemetryCdpExclude: telemetryCdpExclude, - TelemetryExport: telemetryExport, - ChromePolicy: chromePolicy, - ChromePolicyFile: chromePolicyFile, - Name: name, - Tags: tags, - Output: output, + TimeoutSeconds: timeout, + Stealth: BoolFlag{Set: cmd.Flags().Changed("stealth"), Value: stealthVal}, + Headless: BoolFlag{Set: cmd.Flags().Changed("headless"), Value: headlessVal}, + GPU: BoolFlag{Set: cmd.Flags().Changed("gpu"), Value: gpuVal}, + Memory: memory, + InvocationID: invocationID, + Kiosk: BoolFlag{Set: cmd.Flags().Changed("kiosk"), Value: kioskVal}, + ProfileID: profileID, + ProfileName: profileName, + ProfileSaveChanges: BoolFlag{Set: cmd.Flags().Changed("save-changes"), Value: saveChanges}, + ProxyID: proxyID, + ProxyName: proxyName, + ProxyMode: proxyMode, + Region: region, + PrivateHosts: privateHosts, + StartURL: startURL, + Extensions: extensions, + Viewport: viewport, + Telemetry: telemetry, + TelemetryExport: telemetryExport, + ChromePolicy: chromePolicy, + ChromePolicyFile: chromePolicyFile, + Name: name, + Tags: tags, + Output: output, } svc := client.Browsers @@ -3294,7 +3288,6 @@ func runBrowsersUpdate(cmd *cobra.Command, args []string) error { viewport, _ := cmd.Flags().GetString("viewport") force, _ := cmd.Flags().GetBool("force") telemetry, _ := cmd.Flags().GetString("telemetry") - telemetryCdpExclude, _ := cmd.Flags().GetString("telemetry-cdp-exclude") name, _ := cmd.Flags().GetString("name") clearName, _ := cmd.Flags().GetBool("clear-name") tags, tagsProvided := tagsFromFlag(cmd, "tag") @@ -3315,7 +3308,6 @@ func runBrowsersUpdate(cmd *cobra.Command, args []string) error { Viewport: viewport, Force: force, Telemetry: telemetry, - TelemetryCdpExclude: telemetryCdpExclude, Name: name, SetName: cmd.Flags().Changed("name"), ClearName: clearName, diff --git a/cmd/browsers_telemetry.go b/cmd/browsers_telemetry.go index 03699772..9a37ef36 100644 --- a/cmd/browsers_telemetry.go +++ b/cmd/browsers_telemetry.go @@ -76,9 +76,7 @@ func parseTelemetryCategories(s string) (kernel.BrowserTelemetryCategoriesConfig case "interaction": p.Interaction = on() case "control": - p.Control = kernel.BrowserTelemetryControlConfigParam{Enabled: kernel.Opt(true)} - case "platform": - p.Platform = on() + p.Control = on() case "connection": p.Connection = on() case "system": @@ -94,112 +92,20 @@ func parseTelemetryCategories(s string) (kernel.BrowserTelemetryCategoriesConfig return p, nil } -// cdpCommandMethods are the browser-control commands the CDP proxy reports as -// cdp_command events, and so the values --telemetry-cdp-exclude accepts. -var cdpCommandMethods = []string{ - "Input.dispatchMouseEvent", - "Input.dispatchKeyEvent", - "Input.insertText", - "Input.imeSetComposition", - "Input.dispatchTouchEvent", - "Input.dispatchDragEvent", - "Input.cancelDragging", - "Input.emulateTouchFromMouseEvent", - "Input.synthesizePinchGesture", - "Input.synthesizeScrollGesture", - "Input.synthesizeTapGesture", - "DOM.setFileInputFiles", - "DOM.focus", - "DOM.scrollIntoViewIfNeeded", - "Page.bringToFront", - "Page.captureScreenshot", - "Page.captureSnapshot", - "Page.handleJavaScriptDialog", - "Page.navigate", - "Page.navigateToHistoryEntry", - "Page.reload", - "Page.printToPDF", - "Page.startScreencast", - "Page.stopScreencast", - "Page.stopLoading", - "Page.close", - "Page.setWebLifecycleState", - "Target.activateTarget", - "Target.closeTarget", - "Target.createTarget", - "Target.createBrowserContext", - "Target.disposeBrowserContext", - "Target.openDevTools", - "Browser.cancelDownload", - "Browser.close", - "Browser.setWindowBounds", - "Browser.setContentsSize", - "Autofill.trigger", -} - -// telemetryCdpExcludeNone is the --telemetry-cdp-exclude value that clears the -// exclusion list rather than naming methods to drop. -const telemetryCdpExcludeNone = "none" - -// parseTelemetryCdpExcludedMethods parses a --telemetry-cdp-exclude value into the -// exclusion list carried by the control category. "none" resolves to an empty list, -// which tells the API to report every supported method again. Method names are -// matched case-insensitively and returned in their canonical CDP spelling. -func parseTelemetryCdpExcludedMethods(s string) ([]kernel.BrowserCdpCommandMethod, error) { - methods := []kernel.BrowserCdpCommandMethod{} - if strings.TrimSpace(s) == telemetryCdpExcludeNone { - return methods, nil - } - for _, part := range strings.Split(s, ",") { - name := strings.TrimSpace(part) - if name == "" { - continue - } - i := slices.IndexFunc(cdpCommandMethods, func(m string) bool { return strings.EqualFold(m, name) }) - if i < 0 { - return nil, fmt.Errorf("unknown CDP method %q: must be one of %s, or %q to clear the exclusion list", name, strings.Join(cdpCommandMethods, ", "), telemetryCdpExcludeNone) - } - methods = append(methods, kernel.BrowserCdpCommandMethod(cdpCommandMethods[i])) - } - return methods, nil -} - -// resolveTelemetryFlag interprets the --telemetry and --telemetry-cdp-exclude flag -// values shared by every browser and browser-pool command: "all" enables the default -// set, "off" disables capture, and a comma-separated list opts into exactly those -// categories. Excluded CDP methods are merged into the control category independently -// of the selection, so they survive a later update that only names categories. It -// returns the resolved (enabled, browser) pair so each endpoint can assemble its own -// param type. -func resolveTelemetryFlag(s, cdpExclude string) (param.Opt[bool], kernel.BrowserTelemetryCategoriesConfigParam, error) { - var enabled param.Opt[bool] - var p kernel.BrowserTelemetryCategoriesConfigParam +// resolveTelemetryFlag interprets a --telemetry flag value shared by every browser +// and browser-pool command: "all" enables the default set, "off" disables capture, +// and a comma-separated list opts into exactly those categories. It returns the +// resolved (enabled, browser) pair so each endpoint can assemble its own param type. +func resolveTelemetryFlag(s string) (param.Opt[bool], kernel.BrowserTelemetryCategoriesConfigParam, error) { switch s { case "all": - enabled = kernel.Opt(true) + return kernel.Opt(true), kernel.BrowserTelemetryCategoriesConfigParam{}, nil case "off": - enabled = kernel.Opt(false) + return kernel.Opt(false), kernel.BrowserTelemetryCategoriesConfigParam{}, nil default: - var err error - if p, err = parseTelemetryCategories(s); err != nil { - return enabled, p, err - } - } - if cdpExclude == "" { - return enabled, p, nil + p, err := parseTelemetryCategories(s) + return param.Opt[bool]{}, p, err } - // Exclusion is a control-telemetry setting, so it has no meaning in a request - // that turns capture off. Error messages never lead with a flag token — the - // error style title-cases the first word. - if s == "off" { - return enabled, p, fmt.Errorf("cannot combine --telemetry=off with --telemetry-cdp-exclude: excluding CDP methods only applies while control telemetry is captured") - } - methods, err := parseTelemetryCdpExcludedMethods(cdpExclude) - if err != nil { - return enabled, p, err - } - p.Control.Cdp.ExcludedMethods = methods - return enabled, p, nil } // telemetryExportOff is the --telemetry-export-otlp value that turns export off @@ -261,10 +167,10 @@ func validateTelemetryExportCombo(telemetry, id, name string, canImply bool) err return nil } -// buildNewTelemetryParam converts --telemetry, --telemetry-cdp-exclude and -// --telemetry-export-otlp flag values to the create API param. -func buildNewTelemetryParam(s, cdpExclude, export string) (kernel.BrowserNewParamsTelemetry, error) { - enabled, browser, err := resolveTelemetryFlag(s, cdpExclude) +// buildNewTelemetryParam converts --telemetry and --telemetry-export-otlp flag +// values to the create API param. +func buildNewTelemetryParam(s, export string) (kernel.BrowserNewParamsTelemetry, error) { + enabled, browser, err := resolveTelemetryFlag(s) p := kernel.BrowserNewParamsTelemetry{Enabled: enabled, Browser: browser} if err != nil || export == "" { return p, err @@ -301,37 +207,26 @@ func optIfSet(s string) param.Opt[string] { return kernel.Opt(s) } -// buildUpdateTelemetryParam converts --telemetry and --telemetry-cdp-exclude flag -// values to the update API param. -func buildUpdateTelemetryParam(s, cdpExclude string) (kernel.BrowserUpdateParamsTelemetry, error) { - enabled, browser, err := resolveTelemetryFlag(s, cdpExclude) +// buildUpdateTelemetryParam converts a --telemetry flag value to the update API param. +func buildUpdateTelemetryParam(s string) (kernel.BrowserUpdateParamsTelemetry, error) { + enabled, browser, err := resolveTelemetryFlag(s) return kernel.BrowserUpdateParamsTelemetry{Enabled: enabled, Browser: browser}, err } -// buildManagedAuthTelemetryParam converts --telemetry, --telemetry-cdp-exclude and -// --telemetry-export-otlp flag values to the browser telemetry config carried by an -// auth connection's browser settings, shared by create, update, and login. +// buildManagedAuthTelemetryParam converts --telemetry and --telemetry-export-otlp +// flag values to the browser telemetry config carried by an auth connection's +// browser settings, shared by create, update, and login. // // canImply is true only on create, where there is no stored selection to clobber // and capture can safely be turned on for the user so a destination works on its // own. On update and login it is false: enabling capture there would replace the // connection's current category selection rather than merge onto it. -func buildManagedAuthTelemetryParam(s, cdpExclude, export string, canImply bool) (kernel.ManagedAuthBrowserConfigTelemetryParam, error) { - enabled, browser, err := resolveTelemetryFlag(s, cdpExclude) +func buildManagedAuthTelemetryParam(s, export string, canImply bool) (kernel.ManagedAuthBrowserConfigTelemetryParam, error) { + enabled, browser, err := resolveTelemetryFlag(s) p := kernel.ManagedAuthBrowserConfigTelemetryParam{Enabled: enabled, Browser: browser} - if err != nil { + if err != nil || export == "" { return p, err } - // A connection stores the browser config as sent rather than resolving it, so a - // request carrying only CDP exclusions would drop the connection's category - // selection. On update and login the user has to restate what to capture; on - // create there is nothing to lose. - if cdpExclude != "" && s == "" && !canImply { - return p, fmt.Errorf("setting --telemetry-cdp-exclude also requires --telemetry in the same command: the connection stores its browser config as sent, so exclusions on their own would drop its category selection") - } - if export == "" { - return p, nil - } exEnabled, id, name, err := resolveTelemetryExportFlag(export) if err != nil { return p, err @@ -369,9 +264,6 @@ func formatManagedAuthTelemetry(cfg kernel.ManagedAuthBrowserConfigTelemetry) st } return "disabled" }() - if ex := formatCdpExcludedMethods(cfg.Browser.Control.Cdp.ExcludedMethods); ex != "" { - base += " (excluding CDP methods: " + ex + ")" - } if dest := managedAuthExportDestination(cfg.Export); dest != "" { return base + " (exporting to " + dest + ")" } @@ -395,7 +287,7 @@ func managedAuthExportDestination(ex kernel.ManagedAuthBrowserConfigTelemetryExp // flows automatically whenever a CDP category is captured. var settableCategories = []string{ "console", "network", "page", "interaction", - "control", "connection", "system", "screenshot", "platform", "captcha", + "control", "connection", "system", "screenshot", "captcha", } // streamFilterCategories are the categories accepted by `telemetry stream --categories`. @@ -418,7 +310,6 @@ func telemetryEnabledCategories(cfg kernel.BrowserTelemetryConfig) []string { {"connection", b.Connection.Enabled}, {"system", b.System.Enabled}, {"screenshot", b.Screenshot.Enabled}, - {"platform", b.Platform.Enabled}, {"captcha", b.Captcha.Enabled}, } on := make([]string, 0, len(ordered)) @@ -439,9 +330,6 @@ func printTelemetrySummary(cfg kernel.BrowserTelemetryConfig) { return } pterm.Info.Printf("Telemetry capturing: %s\n", strings.Join(on, ", ")) - if ex := formatCdpExcludedMethods(cfg.Browser.Control.Cdp.ExcludedMethods); ex != "" { - pterm.Info.Printf("Telemetry excluding CDP methods: %s\n", ex) - } if cfg.Export.Otlp.Enabled { // The response reports the resolved destination by ID even when the request // selected it by name. @@ -453,19 +341,6 @@ func printTelemetrySummary(cfg kernel.BrowserTelemetryConfig) { } } -// formatCdpExcludedMethods renders the CDP methods left out of control -// telemetry's cdp_command stream, or "" when every supported method is reported. -func formatCdpExcludedMethods(methods []kernel.BrowserCdpCommandMethod) string { - if len(methods) == 0 { - return "" - } - names := make([]string, 0, len(methods)) - for _, m := range methods { - names = append(names, string(m)) - } - return strings.Join(names, ", ") -} - // shouldEmit applies client-side category/type filters to a telemetry event. func shouldEmit(category, eventType string, categories, types []string) bool { if len(categories) > 0 && !slices.Contains(categories, category) { diff --git a/cmd/browsers_telemetry_test.go b/cmd/browsers_telemetry_test.go index d9458bff..fe3b88e1 100644 --- a/cmd/browsers_telemetry_test.go +++ b/cmd/browsers_telemetry_test.go @@ -299,17 +299,14 @@ func TestShouldEmit(t *testing.T) { } func TestParseTelemetryCategories_OptInList(t *testing.T) { - p, err := parseTelemetryCategories("network,control,captcha,platform") + p, err := parseTelemetryCategories("network,control,captcha") assert.NoError(t, err) // Listed categories are enabled. - for _, c := range []kernel.BrowserTelemetryCategoryConfigParam{p.Network, p.Captcha, p.Platform} { + for _, c := range []kernel.BrowserTelemetryCategoryConfigParam{p.Network, p.Control, p.Captcha} { assert.True(t, c.Enabled.Valid()) assert.True(t, c.Enabled.Value) } - // Control carries its own config type, so it is checked separately. - assert.True(t, p.Control.Enabled.Valid()) - assert.True(t, p.Control.Enabled.Value) // Unlisted categories are omitted (opt-in: the instance treats them as off). assert.False(t, p.Console.Enabled.Valid()) assert.False(t, p.Page.Enabled.Valid()) @@ -339,21 +336,21 @@ func TestParseTelemetryCategories_WhitespaceTolerance(t *testing.T) { // listed categories enabled (Enabled unset). func TestBuildTelemetryParam_WireEncoding(t *testing.T) { t.Run("all", func(t *testing.T) { - p, err := buildNewTelemetryParam("all", "", "") + p, err := buildNewTelemetryParam("all", "") assert.NoError(t, err) assert.True(t, p.Enabled.Valid()) assert.True(t, p.Enabled.Value) assert.False(t, p.Browser.Network.Enabled.Valid()) }) t.Run("off", func(t *testing.T) { - p, err := buildNewTelemetryParam("off", "", "") + p, err := buildNewTelemetryParam("off", "") assert.NoError(t, err) assert.True(t, p.Enabled.Valid()) assert.False(t, p.Enabled.Value) assert.False(t, p.Browser.Network.Enabled.Valid()) }) t.Run("opt-in list sets only Browser", func(t *testing.T) { - p, err := buildNewTelemetryParam("network,control", "", "") + p, err := buildNewTelemetryParam("network,control", "") assert.NoError(t, err) assert.False(t, p.Enabled.Valid(), "Enabled must be unset for an opt-in selection") assert.True(t, p.Browser.Network.Enabled.Valid()) @@ -369,7 +366,7 @@ func TestBuildTelemetryParam_WireEncoding(t *testing.T) { // enabled=false combined with one. func TestBuildTelemetryParam_ExportWireEncoding(t *testing.T) { t.Run("destination by CUID sets id", func(t *testing.T) { - p, err := buildNewTelemetryParam("", "", "abcdefghijklmnopqrstuvwx") + p, err := buildNewTelemetryParam("", "abcdefghijklmnopqrstuvwx") assert.NoError(t, err) otlp := p.Export.Otlp assert.True(t, otlp.Destination.ID.Valid()) @@ -378,7 +375,7 @@ func TestBuildTelemetryParam_ExportWireEncoding(t *testing.T) { assert.False(t, otlp.Enabled.Valid(), "a destination implies enabled server-side") }) t.Run("destination by name sets name", func(t *testing.T) { - p, err := buildNewTelemetryParam("", "", "my-collector") + p, err := buildNewTelemetryParam("", "my-collector") assert.NoError(t, err) otlp := p.Export.Otlp assert.True(t, otlp.Destination.Name.Valid()) @@ -386,20 +383,20 @@ func TestBuildTelemetryParam_ExportWireEncoding(t *testing.T) { assert.False(t, otlp.Destination.ID.Valid(), "id must be unset when name is sent") }) t.Run("destination implies capture on create", func(t *testing.T) { - p, err := buildNewTelemetryParam("", "", "my-collector") + p, err := buildNewTelemetryParam("", "my-collector") assert.NoError(t, err) assert.True(t, p.Enabled.Valid(), "export requires capture, so create implies it") assert.True(t, p.Enabled.Value) }) t.Run("explicit --telemetry selection is preserved", func(t *testing.T) { - p, err := buildNewTelemetryParam("network,control", "", "my-collector") + p, err := buildNewTelemetryParam("network,control", "my-collector") assert.NoError(t, err) assert.False(t, p.Enabled.Valid(), "an opt-in selection must not be overridden") assert.True(t, p.Browser.Network.Enabled.Value) assert.Equal(t, "my-collector", p.Export.Otlp.Destination.Name.Value) }) t.Run("off disables export without a destination", func(t *testing.T) { - p, err := buildNewTelemetryParam("all", "", "off") + p, err := buildNewTelemetryParam("all", "off") assert.NoError(t, err) otlp := p.Export.Otlp assert.True(t, otlp.Enabled.Valid()) @@ -408,7 +405,7 @@ func TestBuildTelemetryParam_ExportWireEncoding(t *testing.T) { assert.False(t, otlp.Destination.Name.Valid()) }) t.Run("off does not imply capture", func(t *testing.T) { - p, err := buildNewTelemetryParam("", "", "off") + p, err := buildNewTelemetryParam("", "off") assert.NoError(t, err) assert.False(t, p.Enabled.Valid(), "disabling export must not turn capture on") }) @@ -417,44 +414,44 @@ func TestBuildTelemetryParam_ExportWireEncoding(t *testing.T) { // same request. Update and login refuse to supply one: doing so would replace // the connection's current category selection. t.Run("update requires an explicit --telemetry alongside a destination", func(t *testing.T) { - _, err := buildManagedAuthTelemetryParam("", "", "my-collector", false) + _, err := buildManagedAuthTelemetryParam("", "my-collector", false) assert.Error(t, err) assert.Contains(t, err.Error(), "also requires --telemetry") }) t.Run("login requires an explicit --telemetry alongside a destination", func(t *testing.T) { - _, err := buildManagedAuthTelemetryParam("", "", "my-collector", false) + _, err := buildManagedAuthTelemetryParam("", "my-collector", false) assert.Error(t, err) assert.Contains(t, err.Error(), "also requires --telemetry") }) t.Run("update never implies capture when --telemetry is given", func(t *testing.T) { - p, err := buildManagedAuthTelemetryParam("console", "", "my-collector", false) + p, err := buildManagedAuthTelemetryParam("console", "my-collector", false) assert.NoError(t, err) assert.False(t, p.Enabled.Valid(), "an opt-in selection must not be widened to the default set") assert.True(t, p.Browser.Console.Enabled.Value) assert.Equal(t, "my-collector", p.Export.Otlp.Destination.Name.Value) }) t.Run("login never implies capture when --telemetry is given", func(t *testing.T) { - p, err := buildManagedAuthTelemetryParam("console", "", "my-collector", false) + p, err := buildManagedAuthTelemetryParam("console", "my-collector", false) assert.NoError(t, err) assert.False(t, p.Enabled.Valid()) assert.Equal(t, "my-collector", p.Export.Otlp.Destination.Name.Value) }) t.Run("update and login allow export=off without --telemetry", func(t *testing.T) { - u, err := buildManagedAuthTelemetryParam("", "", "off", false) + u, err := buildManagedAuthTelemetryParam("", "off", false) assert.NoError(t, err) assert.False(t, u.Export.Otlp.Enabled.Value) - l, err := buildManagedAuthTelemetryParam("", "", "off", false) + l, err := buildManagedAuthTelemetryParam("", "off", false) assert.NoError(t, err) assert.False(t, l.Export.Otlp.Enabled.Value) }) t.Run("auth connection create implies capture", func(t *testing.T) { - p, err := buildManagedAuthTelemetryParam("", "", "my-collector", true) + p, err := buildManagedAuthTelemetryParam("", "my-collector", true) assert.NoError(t, err) assert.True(t, p.Enabled.Valid()) assert.True(t, p.Enabled.Value) }) t.Run("invalid category still errors with export set", func(t *testing.T) { - _, err := buildNewTelemetryParam("bogus", "", "my-collector") + _, err := buildNewTelemetryParam("bogus", "my-collector") assert.Error(t, err) }) t.Run("telemetry=off with a destination is rejected", func(t *testing.T) { @@ -462,9 +459,9 @@ func TestBuildTelemetryParam_ExportWireEncoding(t *testing.T) { name string fn func() error }{ - {"create", func() error { _, e := buildNewTelemetryParam("off", "", "my-collector"); return e }}, - {"auth create", func() error { _, e := buildManagedAuthTelemetryParam("off", "", "my-collector", true); return e }}, - {"auth update/login", func() error { _, e := buildManagedAuthTelemetryParam("off", "", "my-collector", false); return e }}, + {"create", func() error { _, e := buildNewTelemetryParam("off", "my-collector"); return e }}, + {"auth create", func() error { _, e := buildManagedAuthTelemetryParam("off", "my-collector", true); return e }}, + {"auth update/login", func() error { _, e := buildManagedAuthTelemetryParam("off", "my-collector", false); return e }}, } { err := tc.fn() assert.Error(t, err, tc.name) @@ -472,13 +469,13 @@ func TestBuildTelemetryParam_ExportWireEncoding(t *testing.T) { } }) t.Run("telemetry=off with export=off is allowed", func(t *testing.T) { - p, err := buildNewTelemetryParam("off", "", "off") + p, err := buildNewTelemetryParam("off", "off") assert.NoError(t, err) assert.False(t, p.Enabled.Value) assert.False(t, p.Export.Otlp.Enabled.Value) }) t.Run("empty export value errors", func(t *testing.T) { - _, err := buildNewTelemetryParam("all", "", " ") + _, err := buildNewTelemetryParam("all", " ") assert.Error(t, err) }) } @@ -721,82 +718,3 @@ func TestTelemetryEvents_FullScanIgnoresOffsetUsesSince(t *testing.T) { assert.Equal(t, "5m", gotQuery.Since.Value, "--all walks the window from --since") _ = buf } - -func TestParseTelemetryCategories_Platform(t *testing.T) { - p, err := parseTelemetryCategories("platform") - - assert.NoError(t, err) - assert.True(t, p.Platform.Enabled.Valid()) - assert.True(t, p.Platform.Enabled.Value) - // platform is opt-in only, so it must be offered by the flag's error message too. - _, err = parseTelemetryCategories("bogus") - assert.ErrorContains(t, err, "platform") -} - -func TestTelemetryEnabledCategories_Platform(t *testing.T) { - cfg := kernel.BrowserTelemetryConfig{Browser: kernel.BrowserTelemetryCategoriesConfig{}} - cfg.Browser.Platform.Enabled = true - - assert.Equal(t, []string{"platform"}, telemetryEnabledCategories(cfg)) -} - -func TestParseTelemetryCdpExcludedMethods(t *testing.T) { - t.Run("canonicalizes and trims", func(t *testing.T) { - got, err := parseTelemetryCdpExcludedMethods(" input.dispatchmouseevent , Page.captureScreenshot ") - assert.NoError(t, err) - assert.Equal(t, []kernel.BrowserCdpCommandMethod{ - kernel.BrowserCdpCommandMethodInputDispatchMouseEvent, - kernel.BrowserCdpCommandMethodPageCaptureScreenshot, - }, got) - }) - t.Run("none clears the list", func(t *testing.T) { - got, err := parseTelemetryCdpExcludedMethods("none") - assert.NoError(t, err) - assert.NotNil(t, got, "an empty list must still be sent, so the API reports every method again") - assert.Empty(t, got) - }) - t.Run("rejects unknown methods", func(t *testing.T) { - _, err := parseTelemetryCdpExcludedMethods("Page.doesNotExist") - assert.ErrorContains(t, err, "unknown CDP method") - }) -} - -func TestBuildTelemetryParam_CdpExclude(t *testing.T) { - t.Run("merges into control without enabling it", func(t *testing.T) { - p, err := buildNewTelemetryParam("", "Input.dispatchMouseEvent", "") - assert.NoError(t, err) - assert.False(t, p.Enabled.Valid()) - assert.False(t, p.Browser.Control.Enabled.Valid(), "exclusions must not silently flip the control category") - assert.Equal(t, []kernel.BrowserCdpCommandMethod{ - kernel.BrowserCdpCommandMethodInputDispatchMouseEvent, - }, p.Browser.Control.Cdp.ExcludedMethods) - }) - t.Run("combines with a category selection", func(t *testing.T) { - p, err := buildUpdateTelemetryParam("control,network", "Page.captureScreenshot") - assert.NoError(t, err) - assert.True(t, p.Browser.Control.Enabled.Value) - assert.Equal(t, []kernel.BrowserCdpCommandMethod{ - kernel.BrowserCdpCommandMethodPageCaptureScreenshot, - }, p.Browser.Control.Cdp.ExcludedMethods) - }) - t.Run("rejects combining with telemetry off", func(t *testing.T) { - _, err := buildNewTelemetryParam("off", "Page.captureScreenshot", "") - assert.ErrorContains(t, err, "cannot combine --telemetry=off with --telemetry-cdp-exclude") - }) -} - -func TestBuildManagedAuthTelemetryParam_CdpExcludeNeedsCategories(t *testing.T) { - // The connection stores the config verbatim, so exclusions on their own would - // replace its category selection — allowed on create, rejected on update/login. - _, err := buildManagedAuthTelemetryParam("", "Page.navigate", "", false) - assert.ErrorContains(t, err, "also requires --telemetry in the same command") - - p, err := buildManagedAuthTelemetryParam("", "Page.navigate", "", true) - assert.NoError(t, err) - assert.Equal(t, []kernel.BrowserCdpCommandMethod{ - kernel.BrowserCdpCommandMethodPageNavigate, - }, p.Browser.Control.Cdp.ExcludedMethods) - - _, err = buildManagedAuthTelemetryParam("control", "Page.navigate", "", false) - assert.NoError(t, err) -} diff --git a/go.mod b/go.mod index a7c24c52..509431ed 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.1 github.com/golang-jwt/jwt/v5 v5.2.2 github.com/joho/godotenv v1.5.1 - github.com/kernel/kernel-go-sdk v0.93.1-0.20260824182203-5e48c587a312 + github.com/kernel/kernel-go-sdk v0.93.1-0.20260824200655-26309b6ff244 github.com/klauspost/compress v1.18.5 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c github.com/pterm/pterm v0.12.80 diff --git a/go.sum b/go.sum index 6074144b..42f22b66 100644 --- a/go.sum +++ b/go.sum @@ -64,8 +64,8 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= -github.com/kernel/kernel-go-sdk v0.93.1-0.20260824182203-5e48c587a312 h1:AuicZBMEwgADoR6EvMe8n6Mq4SE0O7OTxhE+dTAEsCs= -github.com/kernel/kernel-go-sdk v0.93.1-0.20260824182203-5e48c587a312/go.mod h1:EeZzSuHZVeHKxKCPUzxou2bovNGhXaz0RXrSqKNf1AQ= +github.com/kernel/kernel-go-sdk v0.93.1-0.20260824200655-26309b6ff244 h1:g+SxCHIYaInOVKsSKsieiKzUAcsl19M7ScFCN2Mpzd0= +github.com/kernel/kernel-go-sdk v0.93.1-0.20260824200655-26309b6ff244/go.mod h1:EeZzSuHZVeHKxKCPUzxou2bovNGhXaz0RXrSqKNf1AQ= github.com/klauspost/compress v1.18.5 h1:/h1gH5Ce+VWNLSWqPzOVn6XBO+vJbCNGvjoaGBFW2IE= github.com/klauspost/compress v1.18.5/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= From c6c402b2f0ada60304b78b5c16049d79042e0609 Mon Sep 17 00:00:00 2001 From: "kernel-internal[bot]" <260533166+kernel-internal[bot]@users.noreply.github.com> Date: Mon, 24 Aug 2026 20:52:21 +0000 Subject: [PATCH 11/26] CLI: Update Go SDK to 9de3679 (v0.94.0) and restore the telemetry control/platform split MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Updates kernel-go-sdk to 9de3679a3880b1fff724377144c60e26e630f7b0, which the SDK tags v0.94.0. The supplied /tmp/sdk-diff.patch was empty again, so the diff was recomputed from the SDK clone. 9de3679 merges the release-please branch onto 26309b6, and that merge brings back the surface the previous pin had dropped: the SiteConfigs resource (140 -> 145 configured endpoints) and the control/platform telemetry split. The CLI stopped compiling on BrowserTelemetryCategoriesConfigParam.Control, whose type changed from BrowserTelemetryCategoryConfigParam to BrowserTelemetryControlConfigParam. This is the same flip 484e19f handled, so it reverts 8b5a06b's code changes, leaving cmd/ byte-identical to the 484e19f state: - `--telemetry` accepts ten categories again (captcha, connection, console, control, interaction, network, page, platform, screenshot, system); `platform` is valid. - `--telemetry-cdp-exclude` is back on all eight commands (browsers create/update, browser-pools create/update/acquire, auth connections create/update/login), carrying control.cdp.excluded_methods. The CLI's 38-entry cdpCommandMethods list was diffed against the SDK's BrowserCdpCommandMethod enum at 9de3679 and is identical. Coverage analysis: api.md lists 145 methods, up from 140. All five additions are the SiteConfigs resource (Get, List, ListRecommendations, Lookup, Resolve), and every one carries x-cli-skip: true in openapi.yaml, so none needs a CLI command. The remaining 140 methods are unchanged from the previous pin and all resolve to CLI call sites. A field-level diff of every Params and Param struct between 26309b6 and 9de3679 found additions in only two places: the SiteConfig*Params / LookupRequestParam / ResolveRequestParam structs (skipped with their endpoints) and the telemetry structs restored here (BrowserTelemetryCategoriesConfigParam.Platform, BrowserTelemetryControlConfigParam.Enabled/Cdp, BrowserTelemetryCdpControlConfigParam.ExcludedMethods). The remaining SDK changes are doc-comment rewraps plus new response-only telemetry event types (cdp_command, page_crashed, platform_api_call), which need no flags because `telemetry events --types` filters on free-form strings. Tested against the production API: - browsers create --telemetry=console,control,platform --telemetry-cdp-exclude=Input.dispatchMouseEvent,Page.captureScreenshot — the response echoes platform.enabled and both excluded methods - browsers get --output json (telemetry block round-trips) / update --telemetry=network --telemetry-cdp-exclude=none (clears the list) / delete - browsers telemetry events showed a real platform_api_call event, and --categories platform filtered to it - browser-pools create --telemetry=console,control,platform --telemetry-cdp-exclude=Page.navigate / get (details row renders "excluding CDP methods: Page.navigate") / update --telemetry-cdp-exclude=none / delete - auth connections create --telemetry=console,control,platform --telemetry-cdp-exclude=Page.navigate / update --telemetry=network / delete - validation: --telemetry=bogus lists all ten categories, --telemetry=off with --telemetry-cdp-exclude is rejected, an unknown CDP method lists the 38 valid ones, and --telemetry-cdp-exclude without --telemetry is rejected on auth connections update - read-only sweep: auth context, browsers list, browser-pools list, auth connections list, app list, proxies list, profiles list, extensions list, org entitlements, org limits get, telemetry destinations list, credentials list, projects list, api-keys list, credential-providers list, audit-logs search - go build ./..., go vet ./..., go test ./... all pass Triggered by: kernel/kernel-go-sdk@9de3679a3880b1fff724377144c60e26e630f7b0 Co-Authored-By: Claude Opus 5 --- cmd/auth_connections.go | 60 +++++++----- cmd/browser_pools.go | 87 ++++++++++------- cmd/browser_pools_test.go | 6 +- cmd/browsers.go | 126 +++++++++++++----------- cmd/browsers_telemetry.go | 173 ++++++++++++++++++++++++++++----- cmd/browsers_telemetry_test.go | 130 ++++++++++++++++++++----- go.mod | 2 +- go.sum | 4 +- 8 files changed, 417 insertions(+), 171 deletions(-) diff --git a/cmd/auth_connections.go b/cmd/auth_connections.go index c6aedcfa..d7fc1f9a 100644 --- a/cmd/auth_connections.go +++ b/cmd/auth_connections.go @@ -57,6 +57,7 @@ type AuthConnectionCreateInput struct { NoAutoReauth bool RecordSession BoolFlag Telemetry string + TelemetryCdpExclude string TelemetryExport string Output string } @@ -92,6 +93,7 @@ type AuthConnectionUpdateInput struct { AutoReauth BoolFlag RecordSession BoolFlag Telemetry string + TelemetryCdpExclude string TelemetryExport string Output string } @@ -111,15 +113,16 @@ type AuthConnectionDeleteInput struct { } type AuthConnectionLoginInput struct { - ID string - ProxyID string - ProxyName string - ProxyMode string - Stealth BoolFlag - RecordSession BoolFlag - Telemetry string - TelemetryExport string - Output string + ID string + ProxyID string + ProxyName string + ProxyMode string + Stealth BoolFlag + RecordSession BoolFlag + Telemetry string + TelemetryCdpExclude string + TelemetryExport string + Output string } type AuthConnectionSubmitInput struct { @@ -237,8 +240,8 @@ func (c AuthConnectionCmd) Create(ctx context.Context, in AuthConnectionCreateIn params.ManagedAuthCreateRequest.RecordSession = kernel.Opt(in.RecordSession.Value) } - if in.Telemetry != "" || in.TelemetryExport != "" { - t, err := buildManagedAuthTelemetryParam(in.Telemetry, in.TelemetryExport, true) + if in.Telemetry != "" || in.TelemetryCdpExclude != "" || in.TelemetryExport != "" { + t, err := buildManagedAuthTelemetryParam(in.Telemetry, in.TelemetryCdpExclude, in.TelemetryExport, true) if err != nil { return err } @@ -383,8 +386,8 @@ func (c AuthConnectionCmd) Update(ctx context.Context, in AuthConnectionUpdateIn hasChanges = true } - if in.Telemetry != "" || in.TelemetryExport != "" { - t, err := buildManagedAuthTelemetryParam(in.Telemetry, in.TelemetryExport, false) + if in.Telemetry != "" || in.TelemetryCdpExclude != "" || in.TelemetryExport != "" { + t, err := buildManagedAuthTelemetryParam(in.Telemetry, in.TelemetryCdpExclude, in.TelemetryExport, false) if err != nil { return err } @@ -781,8 +784,8 @@ func (c AuthConnectionCmd) Login(ctx context.Context, in AuthConnectionLoginInpu params.RecordSession = kernel.Opt(in.RecordSession.Value) } - if in.Telemetry != "" || in.TelemetryExport != "" { - t, err := buildManagedAuthTelemetryParam(in.Telemetry, in.TelemetryExport, false) + if in.Telemetry != "" || in.TelemetryCdpExclude != "" || in.TelemetryExport != "" { + t, err := buildManagedAuthTelemetryParam(in.Telemetry, in.TelemetryCdpExclude, in.TelemetryExport, false) if err != nil { return err } @@ -1279,6 +1282,7 @@ func init() { authConnectionsCreateCmd.Flags().Bool("record-session", false, "Record browser sessions for this connection by default (useful for debugging)") authConnectionsCreateCmd.Flags().String("telemetry", "", "Configure telemetry for this connection's browser sessions (opt-in): --telemetry=all (default set), --telemetry=off (disable), or --telemetry=console,network (capture exactly those categories)") authConnectionsCreateCmd.Flags().String("telemetry-export-otlp", "", "Export this connection's captured telemetry over OTLP to one of the org's configured destinations, by ID or name; --telemetry-export-otlp=off disables export. Implies --telemetry=all when --telemetry is not set, since export requires capture") + authConnectionsCreateCmd.Flags().String("telemetry-cdp-exclude", "", "Leave the named CDP methods out of control telemetry's cdp_command events, comma-separated (e.g. Input.dispatchMouseEvent,Page.captureScreenshot); --telemetry-cdp-exclude=none clears the list. Excluded commands are still relayed to the browser, they just produce no event") _ = authConnectionsCreateCmd.MarkFlagRequired("domain") _ = authConnectionsCreateCmd.MarkFlagRequired("profile-name") authConnectionsCreateCmd.MarkFlagsMutuallyExclusive("credential-name", "credential-provider") @@ -1308,6 +1312,7 @@ func init() { authConnectionsUpdateCmd.Flags().Bool("record-session", false, "Set whether browser sessions are recorded by default; use --record-session=false to disable") authConnectionsUpdateCmd.Flags().String("telemetry", "", "Update telemetry for future browser sessions: --telemetry=all (reset to default set), --telemetry=off (disable), or --telemetry=console,network (merge those categories into the current selection)") authConnectionsUpdateCmd.Flags().String("telemetry-export-otlp", "", "Update where future sessions export captured telemetry over OTLP, by destination ID or name; --telemetry-export-otlp=off disables export. Naming a destination requires passing --telemetry in the same command, since export and capture are validated together") + authConnectionsUpdateCmd.Flags().String("telemetry-cdp-exclude", "", "Leave the named CDP methods out of control telemetry's cdp_command events, comma-separated (e.g. Input.dispatchMouseEvent,Page.captureScreenshot); --telemetry-cdp-exclude=none clears the list. Excluded commands are still relayed to the browser, they just produce no event") authConnectionsUpdateCmd.MarkFlagsMutuallyExclusive("credential-name", "credential-provider") authConnectionsUpdateCmd.MarkFlagsMutuallyExclusive("save-credentials", "no-save-credentials") authConnectionsUpdateCmd.MarkFlagsMutuallyExclusive("health-checks", "no-health-checks") @@ -1333,6 +1338,7 @@ func init() { authConnectionsLoginCmd.Flags().Bool("record-session", false, "Override whether this login's browser session is recorded; use --record-session=false to disable") authConnectionsLoginCmd.Flags().String("telemetry", "", "Telemetry override for this login only, merged onto the connection's config: --telemetry=all, --telemetry=off, or --telemetry=console,network") authConnectionsLoginCmd.Flags().String("telemetry-export-otlp", "", "Export override for this login only: an OTLP destination ID or name; --telemetry-export-otlp=off disables export for this login. Naming a destination requires passing --telemetry in the same command, since export and capture are validated together") + authConnectionsLoginCmd.Flags().String("telemetry-cdp-exclude", "", "Leave the named CDP methods out of control telemetry's cdp_command events, comma-separated (e.g. Input.dispatchMouseEvent,Page.captureScreenshot); --telemetry-cdp-exclude=none clears the list. Excluded commands are still relayed to the browser, they just produce no event") // Submit flags addJSONOutputFlag(authConnectionsSubmitCmd) @@ -1387,6 +1393,7 @@ func runAuthConnectionsCreate(cmd *cobra.Command, args []string) error { noHealthChecks, _ := cmd.Flags().GetBool("no-health-checks") noAutoReauth, _ := cmd.Flags().GetBool("no-auto-reauth") telemetry, _ := cmd.Flags().GetString("telemetry") + telemetryCdpExclude, _ := cmd.Flags().GetString("telemetry-cdp-exclude") telemetryExport, _ := cmd.Flags().GetString("telemetry-export-otlp") svc := client.Auth.Connections @@ -1410,6 +1417,7 @@ func runAuthConnectionsCreate(cmd *cobra.Command, args []string) error { NoAutoReauth: noAutoReauth, RecordSession: readBoolFlag(cmd.Flags(), "record-session"), Telemetry: telemetry, + TelemetryCdpExclude: telemetryCdpExclude, TelemetryExport: telemetryExport, Output: output, }) @@ -1443,6 +1451,7 @@ func runAuthConnectionsUpdate(cmd *cobra.Command, args []string) error { noSaveCredentials, _ := cmd.Flags().GetBool("no-save-credentials") healthCheckInterval, _ := cmd.Flags().GetInt("health-check-interval") telemetry, _ := cmd.Flags().GetString("telemetry") + telemetryCdpExclude, _ := cmd.Flags().GetString("telemetry-cdp-exclude") telemetryExport, _ := cmd.Flags().GetString("telemetry-export-otlp") saveCredentialsFlag := BoolFlag{} @@ -1496,6 +1505,7 @@ func runAuthConnectionsUpdate(cmd *cobra.Command, args []string) error { AutoReauth: togglePair("auto-reauth", "no-auto-reauth"), RecordSession: readBoolFlag(cmd.Flags(), "record-session"), Telemetry: telemetry, + TelemetryCdpExclude: telemetryCdpExclude, TelemetryExport: telemetryExport, Output: output, }) @@ -1541,20 +1551,22 @@ func runAuthConnectionsLogin(cmd *cobra.Command, args []string) error { proxyName, _ := cmd.Flags().GetString("proxy-name") proxyMode, _ := cmd.Flags().GetString("proxy-mode") telemetry, _ := cmd.Flags().GetString("telemetry") + telemetryCdpExclude, _ := cmd.Flags().GetString("telemetry-cdp-exclude") telemetryExport, _ := cmd.Flags().GetString("telemetry-export-otlp") svc := client.Auth.Connections c := AuthConnectionCmd{svc: &svc} return c.Login(cmd.Context(), AuthConnectionLoginInput{ - ID: args[0], - ProxyID: proxyID, - ProxyName: proxyName, - ProxyMode: proxyMode, - Stealth: readBoolFlag(cmd.Flags(), "stealth"), - RecordSession: readBoolFlag(cmd.Flags(), "record-session"), - Telemetry: telemetry, - TelemetryExport: telemetryExport, - Output: output, + ID: args[0], + ProxyID: proxyID, + ProxyName: proxyName, + ProxyMode: proxyMode, + Stealth: readBoolFlag(cmd.Flags(), "stealth"), + RecordSession: readBoolFlag(cmd.Flags(), "record-session"), + Telemetry: telemetry, + TelemetryCdpExclude: telemetryCdpExclude, + TelemetryExport: telemetryExport, + Output: output, }) } diff --git a/cmd/browser_pools.go b/cmd/browser_pools.go index c6f7051b..276018d7 100644 --- a/cmd/browser_pools.go +++ b/cmd/browser_pools.go @@ -108,21 +108,24 @@ func (c BrowserPoolsCmd) List(ctx context.Context, in BrowserPoolsListInput) err return nil } -// buildPoolNewTelemetryParam converts a --telemetry flag value to the pool create param. -func buildPoolNewTelemetryParam(s string) (kernel.BrowserPoolNewParamsTelemetry, error) { - enabled, browser, err := resolveTelemetryFlag(s) +// buildPoolNewTelemetryParam converts --telemetry and --telemetry-cdp-exclude flag +// values to the pool create param. +func buildPoolNewTelemetryParam(s, cdpExclude string) (kernel.BrowserPoolNewParamsTelemetry, error) { + enabled, browser, err := resolveTelemetryFlag(s, cdpExclude) return kernel.BrowserPoolNewParamsTelemetry{Enabled: enabled, Browser: browser}, err } -// buildPoolUpdateTelemetryParam converts a --telemetry flag value to the pool update param. -func buildPoolUpdateTelemetryParam(s string) (kernel.BrowserPoolUpdateParamsTelemetry, error) { - enabled, browser, err := resolveTelemetryFlag(s) +// buildPoolUpdateTelemetryParam converts --telemetry and --telemetry-cdp-exclude flag +// values to the pool update param. +func buildPoolUpdateTelemetryParam(s, cdpExclude string) (kernel.BrowserPoolUpdateParamsTelemetry, error) { + enabled, browser, err := resolveTelemetryFlag(s, cdpExclude) return kernel.BrowserPoolUpdateParamsTelemetry{Enabled: enabled, Browser: browser}, err } -// buildPoolAcquireTelemetryParam converts a --telemetry flag value to the acquire override param. -func buildPoolAcquireTelemetryParam(s string) (kernel.BrowserPoolAcquireParamsTelemetry, error) { - enabled, browser, err := resolveTelemetryFlag(s) +// buildPoolAcquireTelemetryParam converts --telemetry and --telemetry-cdp-exclude flag +// values to the acquire override param. +func buildPoolAcquireTelemetryParam(s, cdpExclude string) (kernel.BrowserPoolAcquireParamsTelemetry, error) { + enabled, browser, err := resolveTelemetryFlag(s, cdpExclude) return kernel.BrowserPoolAcquireParamsTelemetry{Enabled: enabled, Browser: browser}, err } @@ -132,7 +135,11 @@ func formatPoolTelemetry(cfg kernel.BrowserTelemetryConfig) string { if len(on) == 0 { return "disabled" } - return strings.Join(on, ", ") + base := strings.Join(on, ", ") + if ex := formatCdpExcludedMethods(cfg.Browser.Control.Cdp.ExcludedMethods); ex != "" { + return base + " (excluding CDP methods: " + ex + ")" + } + return base } type BrowserPoolsCreateInput struct { @@ -155,6 +162,7 @@ type BrowserPoolsCreateInput struct { ChromePolicy string ChromePolicyFile string Telemetry string + TelemetryCdpExclude string Output string } @@ -247,8 +255,8 @@ func (c BrowserPoolsCmd) Create(ctx context.Context, in BrowserPoolsCreateInput) params.ChromePolicy = chromePolicy } - if in.Telemetry != "" { - t, err := buildPoolNewTelemetryParam(in.Telemetry) + if in.Telemetry != "" || in.TelemetryCdpExclude != "" { + t, err := buildPoolNewTelemetryParam(in.Telemetry, in.TelemetryCdpExclude) if err != nil { return err } @@ -269,7 +277,7 @@ func (c BrowserPoolsCmd) Create(ctx context.Context, in BrowserPoolsCreateInput) } else { pterm.Success.Printf("Created browser pool %s\n", pool.ID) } - if in.Telemetry != "" { + if in.Telemetry != "" || in.TelemetryCdpExclude != "" { printTelemetrySummary(pool.BrowserPoolConfig.Telemetry) } return nil @@ -350,6 +358,7 @@ type BrowserPoolsUpdateInput struct { ChromePolicyFile string ClearChromePolicy bool Telemetry string + TelemetryCdpExclude string DiscardAllIdle BoolFlag Output string } @@ -488,8 +497,8 @@ func (c BrowserPoolsCmd) Update(ctx context.Context, in BrowserPoolsUpdateInput) params.SetExtraFields(extraFields) } - if in.Telemetry != "" { - t, err := buildPoolUpdateTelemetryParam(in.Telemetry) + if in.Telemetry != "" || in.TelemetryCdpExclude != "" { + t, err := buildPoolUpdateTelemetryParam(in.Telemetry, in.TelemetryCdpExclude) if err != nil { return err } @@ -510,7 +519,7 @@ func (c BrowserPoolsCmd) Update(ctx context.Context, in BrowserPoolsUpdateInput) } else { pterm.Success.Printf("Updated browser pool %s\n", pool.ID) } - if in.Telemetry != "" { + if in.Telemetry != "" || in.TelemetryCdpExclude != "" { printTelemetrySummary(pool.BrowserPoolConfig.Telemetry) } return nil @@ -535,13 +544,14 @@ func (c BrowserPoolsCmd) Delete(ctx context.Context, in BrowserPoolsDeleteInput) } type BrowserPoolsAcquireInput struct { - IDOrName string - TimeoutSeconds int64 - Name string - StartURL string - Tags map[string]string - Telemetry string - Output string + IDOrName string + TimeoutSeconds int64 + Name string + StartURL string + Tags map[string]string + Telemetry string + TelemetryCdpExclude string + Output string } // buildAcquireParams builds the SDK params for acquiring a browser from a pool. @@ -549,7 +559,7 @@ type BrowserPoolsAcquireInput struct { // path so the per-lease name/tags/start-url/telemetry forwarding cannot silently // diverge between them. The telemetry override merges onto the pool's config for // this lease. -func buildAcquireParams(name string, tags map[string]string, timeoutSeconds int64, telemetry, startURL string) (kernel.BrowserPoolAcquireParams, error) { +func buildAcquireParams(name string, tags map[string]string, timeoutSeconds int64, telemetry, telemetryCdpExclude, startURL string) (kernel.BrowserPoolAcquireParams, error) { params := kernel.BrowserPoolAcquireParams{} if timeoutSeconds > 0 { params.AcquireTimeoutSeconds = kernel.Int(timeoutSeconds) @@ -563,8 +573,8 @@ func buildAcquireParams(name string, tags map[string]string, timeoutSeconds int6 if len(tags) > 0 { params.Tags = kernel.Tags(tags) } - if telemetry != "" { - t, err := buildPoolAcquireTelemetryParam(telemetry) + if telemetry != "" || telemetryCdpExclude != "" { + t, err := buildPoolAcquireTelemetryParam(telemetry, telemetryCdpExclude) if err != nil { return kernel.BrowserPoolAcquireParams{}, err } @@ -578,7 +588,7 @@ func (c BrowserPoolsCmd) Acquire(ctx context.Context, in BrowserPoolsAcquireInpu return err } - params, err := buildAcquireParams(in.Name, in.Tags, in.TimeoutSeconds, in.Telemetry, in.StartURL) + params, err := buildAcquireParams(in.Name, in.Tags, in.TimeoutSeconds, in.Telemetry, in.TelemetryCdpExclude, in.StartURL) if err != nil { return err } @@ -749,6 +759,7 @@ func init() { browserPoolsCreateCmd.Flags().String("chrome-policy", "", "Custom Chrome enterprise policy as a JSON object") browserPoolsCreateCmd.Flags().String("chrome-policy-file", "", "Read Chrome enterprise policy (JSON object) from a file (use '-' for stdin)") browserPoolsCreateCmd.Flags().String("telemetry", "", "Configure telemetry for browsers warmed into the pool (opt-in): --telemetry=all (default set), --telemetry=off (disable), or --telemetry=console,network (capture exactly those categories)") + browserPoolsCreateCmd.Flags().String("telemetry-cdp-exclude", "", "Leave the named CDP methods out of control telemetry's cdp_command events, comma-separated (e.g. Input.dispatchMouseEvent,Page.captureScreenshot); --telemetry-cdp-exclude=none clears the list. Excluded commands are still relayed to the browser, they just produce no event") browserPoolsCreateCmd.MarkFlagsMutuallyExclusive("chrome-policy", "chrome-policy-file") addJSONOutputFlag(browserPoolsGetCmd) @@ -779,6 +790,7 @@ func init() { browserPoolsUpdateCmd.MarkFlagsMutuallyExclusive("chrome-policy", "chrome-policy-file") browserPoolsUpdateCmd.MarkFlagsMutuallyExclusive("private-host", "clear-private-hosts") browserPoolsUpdateCmd.Flags().String("telemetry", "", "Update pool telemetry: --telemetry=all (reset to default set), --telemetry=off (disable), or --telemetry=console,network (merge those categories into the current selection). Applies only to browsers warmed after the update.") + browserPoolsUpdateCmd.Flags().String("telemetry-cdp-exclude", "", "Leave the named CDP methods out of control telemetry's cdp_command events, comma-separated (e.g. Input.dispatchMouseEvent,Page.captureScreenshot); --telemetry-cdp-exclude=none clears the list. Excluded commands are still relayed to the browser, they just produce no event") browserPoolsUpdateCmd.Flags().Bool("discard-all-idle", false, "Discard all idle browsers") addJSONOutputFlag(browserPoolsUpdateCmd) @@ -789,6 +801,7 @@ func init() { browserPoolsAcquireCmd.Flags().String("start-url", "", "URL to navigate the acquired browser to, overriding the pool's start URL for this acquire only (best-effort)") browserPoolsAcquireCmd.Flags().StringArray("tag", nil, "Set a tag KEY=VALUE on the acquired session (repeatable; applies to this lease)") browserPoolsAcquireCmd.Flags().String("telemetry", "", "Telemetry override for this lease only, merged onto the pool's config: --telemetry=all, --telemetry=off, or --telemetry=console,network") + browserPoolsAcquireCmd.Flags().String("telemetry-cdp-exclude", "", "Leave the named CDP methods out of control telemetry's cdp_command events, comma-separated (e.g. Input.dispatchMouseEvent,Page.captureScreenshot); --telemetry-cdp-exclude=none clears the list. Excluded commands are still relayed to the browser, they just produce no event") addJSONOutputFlag(browserPoolsAcquireCmd) browserPoolsReleaseCmd.Flags().String("session-id", "", "Browser session ID to release") @@ -845,6 +858,7 @@ func runBrowserPoolsCreate(cmd *cobra.Command, args []string) error { chromePolicy, _ := cmd.Flags().GetString("chrome-policy") chromePolicyFile, _ := cmd.Flags().GetString("chrome-policy-file") telemetry, _ := cmd.Flags().GetString("telemetry") + telemetryCdpExclude, _ := cmd.Flags().GetString("telemetry-cdp-exclude") output, _ := cmd.Flags().GetString("output") in := BrowserPoolsCreateInput{ @@ -867,6 +881,7 @@ func runBrowserPoolsCreate(cmd *cobra.Command, args []string) error { ChromePolicy: chromePolicy, ChromePolicyFile: chromePolicyFile, Telemetry: telemetry, + TelemetryCdpExclude: telemetryCdpExclude, Output: output, } @@ -908,6 +923,7 @@ func runBrowserPoolsUpdate(cmd *cobra.Command, args []string) error { chromePolicyFile, _ := cmd.Flags().GetString("chrome-policy-file") clearChromePolicy, _ := cmd.Flags().GetBool("clear-chrome-policy") telemetry, _ := cmd.Flags().GetString("telemetry") + telemetryCdpExclude, _ := cmd.Flags().GetString("telemetry-cdp-exclude") discardIdle, _ := cmd.Flags().GetBool("discard-all-idle") output, _ := cmd.Flags().GetString("output") @@ -937,6 +953,7 @@ func runBrowserPoolsUpdate(cmd *cobra.Command, args []string) error { ChromePolicyFile: chromePolicyFile, ClearChromePolicy: clearChromePolicy, Telemetry: telemetry, + TelemetryCdpExclude: telemetryCdpExclude, DiscardAllIdle: BoolFlag{Set: cmd.Flags().Changed("discard-all-idle"), Value: discardIdle}, Output: output, } @@ -959,16 +976,18 @@ func runBrowserPoolsAcquire(cmd *cobra.Command, args []string) error { startURL, _ := cmd.Flags().GetString("start-url") tags, _ := tagsFromFlag(cmd, "tag") telemetry, _ := cmd.Flags().GetString("telemetry") + telemetryCdpExclude, _ := cmd.Flags().GetString("telemetry-cdp-exclude") output, _ := cmd.Flags().GetString("output") c := BrowserPoolsCmd{client: &client.BrowserPools} return c.Acquire(cmd.Context(), BrowserPoolsAcquireInput{ - IDOrName: args[0], - TimeoutSeconds: timeout, - Name: name, - StartURL: startURL, - Tags: tags, - Telemetry: telemetry, - Output: output, + IDOrName: args[0], + TimeoutSeconds: timeout, + Name: name, + StartURL: startURL, + Tags: tags, + Telemetry: telemetry, + TelemetryCdpExclude: telemetryCdpExclude, + Output: output, }) } diff --git a/cmd/browser_pools_test.go b/cmd/browser_pools_test.go index e0a143ff..387f3f18 100644 --- a/cmd/browser_pools_test.go +++ b/cmd/browser_pools_test.go @@ -239,7 +239,7 @@ func TestBrowserPoolsCreate_PrivateHostNormalization(t *testing.T) { // forwarding used by both `browser-pools acquire` and the `browsers create // --pool-id` lease path. func TestBuildAcquireParams(t *testing.T) { - p, err := buildAcquireParams("lease", map[string]string{"env": "prod"}, 30, "console,network", "https://example.com") + p, err := buildAcquireParams("lease", map[string]string{"env": "prod"}, 30, "console,network", "", "https://example.com") assert.NoError(t, err) assert.True(t, p.Name.Valid()) assert.Equal(t, "lease", p.Name.Value) @@ -252,7 +252,7 @@ func TestBuildAcquireParams(t *testing.T) { assert.True(t, p.Telemetry.Browser.Network.Enabled.Value) // Unset inputs produce an empty params struct (nothing forwarded). - empty, err := buildAcquireParams("", nil, 0, "", "") + empty, err := buildAcquireParams("", nil, 0, "", "", "") assert.NoError(t, err) assert.False(t, empty.Name.Valid()) assert.Len(t, empty.Tags, 0) @@ -260,7 +260,7 @@ func TestBuildAcquireParams(t *testing.T) { assert.False(t, empty.StartURL.Valid()) // An invalid category surfaces an error rather than a partial param. - _, err = buildAcquireParams("", nil, 0, "bogus", "") + _, err = buildAcquireParams("", nil, 0, "bogus", "", "") assert.Error(t, err) } diff --git a/cmd/browsers.go b/cmd/browsers.go index 326f88d1..5e4c82b7 100644 --- a/cmd/browsers.go +++ b/cmd/browsers.go @@ -360,31 +360,32 @@ func formatTags(tags kernel.Tags) string { // Inputs for each command type BrowsersCreateInput struct { - TimeoutSeconds int - Stealth BoolFlag - Headless BoolFlag - GPU BoolFlag - Memory string - InvocationID string - Kiosk BoolFlag - ProfileID string - ProfileName string - ProfileSaveChanges BoolFlag - ProxyID string - ProxyName string - ProxyMode string - Region string - PrivateHosts []string - StartURL string - Extensions []string - Viewport string - Telemetry string - TelemetryExport string - ChromePolicy string - ChromePolicyFile string - Name string - Tags map[string]string - Output string + TimeoutSeconds int + Stealth BoolFlag + Headless BoolFlag + GPU BoolFlag + Memory string + InvocationID string + Kiosk BoolFlag + ProfileID string + ProfileName string + ProfileSaveChanges BoolFlag + ProxyID string + ProxyName string + ProxyMode string + Region string + PrivateHosts []string + StartURL string + Extensions []string + Viewport string + Telemetry string + TelemetryCdpExclude string + TelemetryExport string + ChromePolicy string + ChromePolicyFile string + Name string + Tags map[string]string + Output string } type BrowsersDeleteInput struct { @@ -415,6 +416,7 @@ type BrowsersUpdateInput struct { Viewport string Force bool Telemetry string + TelemetryCdpExclude string Name string SetName bool ClearName bool @@ -669,8 +671,8 @@ func (b BrowsersCmd) Create(ctx context.Context, in BrowsersCreateInput) error { } } - if in.Telemetry != "" || in.TelemetryExport != "" { - t, err := buildNewTelemetryParam(in.Telemetry, in.TelemetryExport) + if in.Telemetry != "" || in.TelemetryCdpExclude != "" || in.TelemetryExport != "" { + t, err := buildNewTelemetryParam(in.Telemetry, in.TelemetryCdpExclude, in.TelemetryExport) if err != nil { return err } @@ -705,7 +707,7 @@ func (b BrowsersCmd) Create(ctx context.Context, in BrowsersCreateInput) error { } printBrowserSessionResult(browser.SessionID, browser.CdpWsURL, browser.BrowserLiveViewURL, browser.Profile, browser.ProfileSaveChanges, browser.StartURL, browser.Name, browser.Tags) - if in.Telemetry != "" || in.TelemetryExport != "" { + if in.Telemetry != "" || in.TelemetryCdpExclude != "" || in.TelemetryExport != "" { printTelemetrySummary(browser.Telemetry) } return nil @@ -941,8 +943,8 @@ func (b BrowsersCmd) Update(ctx context.Context, in BrowsersUpdateInput) error { } // Validate that at least one update option is provided - if !hasProxyChange && !hasProfileChange && !hasViewportChange && in.Telemetry == "" && !hasNameChange && !hasTagsChange { - return fmt.Errorf("must specify at least one of: --proxy-id, --proxy-name, --proxy-mode, --clear-proxy, --disable-default-proxy, --profile-id, --profile-name, --viewport, --telemetry, --name, --clear-name, --tag, or --clear-tags") + if !hasProxyChange && !hasProfileChange && !hasViewportChange && in.Telemetry == "" && in.TelemetryCdpExclude == "" && !hasNameChange && !hasTagsChange { + return fmt.Errorf("must specify at least one of: --proxy-id, --proxy-name, --proxy-mode, --clear-proxy, --disable-default-proxy, --profile-id, --profile-name, --viewport, --telemetry, --telemetry-cdp-exclude, --name, --clear-name, --tag, or --clear-tags") } params := kernel.BrowserUpdateParams{} @@ -985,8 +987,8 @@ func (b BrowsersCmd) Update(ctx context.Context, in BrowsersUpdateInput) error { } // Handle telemetry changes - if in.Telemetry != "" { - t, err := buildUpdateTelemetryParam(in.Telemetry) + if in.Telemetry != "" || in.TelemetryCdpExclude != "" { + t, err := buildUpdateTelemetryParam(in.Telemetry, in.TelemetryCdpExclude) if err != nil { return err } @@ -1036,7 +1038,7 @@ func (b BrowsersCmd) Update(ctx context.Context, in BrowsersUpdateInput) error { if hasProfileChange { pterm.Info.Printf("Profile save changes: %t\n", browser.ProfileSaveChanges) } - if in.Telemetry != "" { + if in.Telemetry != "" || in.TelemetryCdpExclude != "" { printTelemetrySummary(browser.Telemetry) } return nil @@ -2682,6 +2684,7 @@ func init() { browsersUpdateCmd.Flags().String("viewport", "", "Browser viewport size (e.g., 1920x1080@25). Supported: 2560x1440@10, 1920x1080@25, 1920x1200@25, 1440x900@25, 1024x768@60, 1200x800@60, 1280x800@60") browsersUpdateCmd.Flags().Bool("force", false, "Force viewport resize even when a live view or recording/replay is active") browsersUpdateCmd.Flags().String("telemetry", "", "Update telemetry: --telemetry=all (reset to default set), --telemetry=off (disable), or --telemetry=console,network (merge those categories into the current selection)") + browsersUpdateCmd.Flags().String("telemetry-cdp-exclude", "", "Leave the named CDP methods out of control telemetry's cdp_command events, comma-separated (e.g. Input.dispatchMouseEvent,Page.captureScreenshot); --telemetry-cdp-exclude=none clears the list. Excluded commands are still relayed to the browser, they just produce no event") browsersUpdateCmd.Flags().String("name", "", "Set a new unique name for the browser session (mutually exclusive with --clear-name)") browsersUpdateCmd.Flags().Bool("clear-name", false, "Clear the browser session name") browsersUpdateCmd.Flags().StringArray("tag", nil, "Set a tag KEY=VALUE (repeatable; up to 50 pairs). Replaces the entire tag set; mutually exclusive with --clear-tags") @@ -2963,6 +2966,7 @@ func init() { browsersCreateCmd.Flags().String("pool-id", "", "Browser pool ID to acquire from (mutually exclusive with --pool-name)") browsersCreateCmd.Flags().String("pool-name", "", "Browser pool name to acquire from (mutually exclusive with --pool-id)") browsersCreateCmd.Flags().String("telemetry", "", "Configure telemetry (opt-in): --telemetry=all (default set), --telemetry=off (disable), or --telemetry=console,network (capture exactly those categories)") + browsersCreateCmd.Flags().String("telemetry-cdp-exclude", "", "Leave the named CDP methods out of control telemetry's cdp_command events, comma-separated (e.g. Input.dispatchMouseEvent,Page.captureScreenshot); --telemetry-cdp-exclude=none clears the list. Excluded commands are still relayed to the browser, they just produce no event") browsersCreateCmd.Flags().String("telemetry-export-otlp", "", "Export captured telemetry over OTLP to one of the org's configured destinations, by ID or name; --telemetry-export-otlp=off disables export. Implies --telemetry=all when --telemetry is not set, since export requires capture") browsersCreateCmd.Flags().String("name", "", "Optional unique name for the browser session (used to find it later; can be changed with 'browsers update --name')") browsersCreateCmd.Flags().StringArray("tag", nil, "Set a tag KEY=VALUE on the session (repeatable; up to 50 pairs)") @@ -3094,6 +3098,7 @@ func runBrowsersCreate(cmd *cobra.Command, args []string) error { poolID, _ := cmd.Flags().GetString("pool-id") poolName, _ := cmd.Flags().GetString("pool-name") telemetry, _ := cmd.Flags().GetString("telemetry") + telemetryCdpExclude, _ := cmd.Flags().GetString("telemetry-cdp-exclude") telemetryExport, _ := cmd.Flags().GetString("telemetry-export-otlp") name, _ := cmd.Flags().GetString("name") tags, _ := tagsFromFlag(cmd, "tag") @@ -3160,7 +3165,7 @@ func runBrowsersCreate(cmd *cobra.Command, args []string) error { if cmd.Flags().Changed("timeout") && timeout > 0 { acquireTimeout = int64(timeout) } - acquireParams, err := buildAcquireParams(name, tags, acquireTimeout, telemetry, startURL) + acquireParams, err := buildAcquireParams(name, tags, acquireTimeout, telemetry, telemetryCdpExclude, startURL) if err != nil { return err } @@ -3202,31 +3207,32 @@ func runBrowsersCreate(cmd *cobra.Command, args []string) error { } in := BrowsersCreateInput{ - TimeoutSeconds: timeout, - Stealth: BoolFlag{Set: cmd.Flags().Changed("stealth"), Value: stealthVal}, - Headless: BoolFlag{Set: cmd.Flags().Changed("headless"), Value: headlessVal}, - GPU: BoolFlag{Set: cmd.Flags().Changed("gpu"), Value: gpuVal}, - Memory: memory, - InvocationID: invocationID, - Kiosk: BoolFlag{Set: cmd.Flags().Changed("kiosk"), Value: kioskVal}, - ProfileID: profileID, - ProfileName: profileName, - ProfileSaveChanges: BoolFlag{Set: cmd.Flags().Changed("save-changes"), Value: saveChanges}, - ProxyID: proxyID, - ProxyName: proxyName, - ProxyMode: proxyMode, - Region: region, - PrivateHosts: privateHosts, - StartURL: startURL, - Extensions: extensions, - Viewport: viewport, - Telemetry: telemetry, - TelemetryExport: telemetryExport, - ChromePolicy: chromePolicy, - ChromePolicyFile: chromePolicyFile, - Name: name, - Tags: tags, - Output: output, + TimeoutSeconds: timeout, + Stealth: BoolFlag{Set: cmd.Flags().Changed("stealth"), Value: stealthVal}, + Headless: BoolFlag{Set: cmd.Flags().Changed("headless"), Value: headlessVal}, + GPU: BoolFlag{Set: cmd.Flags().Changed("gpu"), Value: gpuVal}, + Memory: memory, + InvocationID: invocationID, + Kiosk: BoolFlag{Set: cmd.Flags().Changed("kiosk"), Value: kioskVal}, + ProfileID: profileID, + ProfileName: profileName, + ProfileSaveChanges: BoolFlag{Set: cmd.Flags().Changed("save-changes"), Value: saveChanges}, + ProxyID: proxyID, + ProxyName: proxyName, + ProxyMode: proxyMode, + Region: region, + PrivateHosts: privateHosts, + StartURL: startURL, + Extensions: extensions, + Viewport: viewport, + Telemetry: telemetry, + TelemetryCdpExclude: telemetryCdpExclude, + TelemetryExport: telemetryExport, + ChromePolicy: chromePolicy, + ChromePolicyFile: chromePolicyFile, + Name: name, + Tags: tags, + Output: output, } svc := client.Browsers @@ -3288,6 +3294,7 @@ func runBrowsersUpdate(cmd *cobra.Command, args []string) error { viewport, _ := cmd.Flags().GetString("viewport") force, _ := cmd.Flags().GetBool("force") telemetry, _ := cmd.Flags().GetString("telemetry") + telemetryCdpExclude, _ := cmd.Flags().GetString("telemetry-cdp-exclude") name, _ := cmd.Flags().GetString("name") clearName, _ := cmd.Flags().GetBool("clear-name") tags, tagsProvided := tagsFromFlag(cmd, "tag") @@ -3308,6 +3315,7 @@ func runBrowsersUpdate(cmd *cobra.Command, args []string) error { Viewport: viewport, Force: force, Telemetry: telemetry, + TelemetryCdpExclude: telemetryCdpExclude, Name: name, SetName: cmd.Flags().Changed("name"), ClearName: clearName, diff --git a/cmd/browsers_telemetry.go b/cmd/browsers_telemetry.go index 9a37ef36..03699772 100644 --- a/cmd/browsers_telemetry.go +++ b/cmd/browsers_telemetry.go @@ -76,7 +76,9 @@ func parseTelemetryCategories(s string) (kernel.BrowserTelemetryCategoriesConfig case "interaction": p.Interaction = on() case "control": - p.Control = on() + p.Control = kernel.BrowserTelemetryControlConfigParam{Enabled: kernel.Opt(true)} + case "platform": + p.Platform = on() case "connection": p.Connection = on() case "system": @@ -92,20 +94,112 @@ func parseTelemetryCategories(s string) (kernel.BrowserTelemetryCategoriesConfig return p, nil } -// resolveTelemetryFlag interprets a --telemetry flag value shared by every browser -// and browser-pool command: "all" enables the default set, "off" disables capture, -// and a comma-separated list opts into exactly those categories. It returns the -// resolved (enabled, browser) pair so each endpoint can assemble its own param type. -func resolveTelemetryFlag(s string) (param.Opt[bool], kernel.BrowserTelemetryCategoriesConfigParam, error) { +// cdpCommandMethods are the browser-control commands the CDP proxy reports as +// cdp_command events, and so the values --telemetry-cdp-exclude accepts. +var cdpCommandMethods = []string{ + "Input.dispatchMouseEvent", + "Input.dispatchKeyEvent", + "Input.insertText", + "Input.imeSetComposition", + "Input.dispatchTouchEvent", + "Input.dispatchDragEvent", + "Input.cancelDragging", + "Input.emulateTouchFromMouseEvent", + "Input.synthesizePinchGesture", + "Input.synthesizeScrollGesture", + "Input.synthesizeTapGesture", + "DOM.setFileInputFiles", + "DOM.focus", + "DOM.scrollIntoViewIfNeeded", + "Page.bringToFront", + "Page.captureScreenshot", + "Page.captureSnapshot", + "Page.handleJavaScriptDialog", + "Page.navigate", + "Page.navigateToHistoryEntry", + "Page.reload", + "Page.printToPDF", + "Page.startScreencast", + "Page.stopScreencast", + "Page.stopLoading", + "Page.close", + "Page.setWebLifecycleState", + "Target.activateTarget", + "Target.closeTarget", + "Target.createTarget", + "Target.createBrowserContext", + "Target.disposeBrowserContext", + "Target.openDevTools", + "Browser.cancelDownload", + "Browser.close", + "Browser.setWindowBounds", + "Browser.setContentsSize", + "Autofill.trigger", +} + +// telemetryCdpExcludeNone is the --telemetry-cdp-exclude value that clears the +// exclusion list rather than naming methods to drop. +const telemetryCdpExcludeNone = "none" + +// parseTelemetryCdpExcludedMethods parses a --telemetry-cdp-exclude value into the +// exclusion list carried by the control category. "none" resolves to an empty list, +// which tells the API to report every supported method again. Method names are +// matched case-insensitively and returned in their canonical CDP spelling. +func parseTelemetryCdpExcludedMethods(s string) ([]kernel.BrowserCdpCommandMethod, error) { + methods := []kernel.BrowserCdpCommandMethod{} + if strings.TrimSpace(s) == telemetryCdpExcludeNone { + return methods, nil + } + for _, part := range strings.Split(s, ",") { + name := strings.TrimSpace(part) + if name == "" { + continue + } + i := slices.IndexFunc(cdpCommandMethods, func(m string) bool { return strings.EqualFold(m, name) }) + if i < 0 { + return nil, fmt.Errorf("unknown CDP method %q: must be one of %s, or %q to clear the exclusion list", name, strings.Join(cdpCommandMethods, ", "), telemetryCdpExcludeNone) + } + methods = append(methods, kernel.BrowserCdpCommandMethod(cdpCommandMethods[i])) + } + return methods, nil +} + +// resolveTelemetryFlag interprets the --telemetry and --telemetry-cdp-exclude flag +// values shared by every browser and browser-pool command: "all" enables the default +// set, "off" disables capture, and a comma-separated list opts into exactly those +// categories. Excluded CDP methods are merged into the control category independently +// of the selection, so they survive a later update that only names categories. It +// returns the resolved (enabled, browser) pair so each endpoint can assemble its own +// param type. +func resolveTelemetryFlag(s, cdpExclude string) (param.Opt[bool], kernel.BrowserTelemetryCategoriesConfigParam, error) { + var enabled param.Opt[bool] + var p kernel.BrowserTelemetryCategoriesConfigParam switch s { case "all": - return kernel.Opt(true), kernel.BrowserTelemetryCategoriesConfigParam{}, nil + enabled = kernel.Opt(true) case "off": - return kernel.Opt(false), kernel.BrowserTelemetryCategoriesConfigParam{}, nil + enabled = kernel.Opt(false) default: - p, err := parseTelemetryCategories(s) - return param.Opt[bool]{}, p, err + var err error + if p, err = parseTelemetryCategories(s); err != nil { + return enabled, p, err + } + } + if cdpExclude == "" { + return enabled, p, nil } + // Exclusion is a control-telemetry setting, so it has no meaning in a request + // that turns capture off. Error messages never lead with a flag token — the + // error style title-cases the first word. + if s == "off" { + return enabled, p, fmt.Errorf("cannot combine --telemetry=off with --telemetry-cdp-exclude: excluding CDP methods only applies while control telemetry is captured") + } + methods, err := parseTelemetryCdpExcludedMethods(cdpExclude) + if err != nil { + return enabled, p, err + } + p.Control.Cdp.ExcludedMethods = methods + return enabled, p, nil } // telemetryExportOff is the --telemetry-export-otlp value that turns export off @@ -167,10 +261,10 @@ func validateTelemetryExportCombo(telemetry, id, name string, canImply bool) err return nil } -// buildNewTelemetryParam converts --telemetry and --telemetry-export-otlp flag -// values to the create API param. -func buildNewTelemetryParam(s, export string) (kernel.BrowserNewParamsTelemetry, error) { - enabled, browser, err := resolveTelemetryFlag(s) +// buildNewTelemetryParam converts --telemetry, --telemetry-cdp-exclude and +// --telemetry-export-otlp flag values to the create API param. +func buildNewTelemetryParam(s, cdpExclude, export string) (kernel.BrowserNewParamsTelemetry, error) { + enabled, browser, err := resolveTelemetryFlag(s, cdpExclude) p := kernel.BrowserNewParamsTelemetry{Enabled: enabled, Browser: browser} if err != nil || export == "" { return p, err @@ -207,26 +301,37 @@ func optIfSet(s string) param.Opt[string] { return kernel.Opt(s) } -// buildUpdateTelemetryParam converts a --telemetry flag value to the update API param. -func buildUpdateTelemetryParam(s string) (kernel.BrowserUpdateParamsTelemetry, error) { - enabled, browser, err := resolveTelemetryFlag(s) +// buildUpdateTelemetryParam converts --telemetry and --telemetry-cdp-exclude flag +// values to the update API param. +func buildUpdateTelemetryParam(s, cdpExclude string) (kernel.BrowserUpdateParamsTelemetry, error) { + enabled, browser, err := resolveTelemetryFlag(s, cdpExclude) return kernel.BrowserUpdateParamsTelemetry{Enabled: enabled, Browser: browser}, err } -// buildManagedAuthTelemetryParam converts --telemetry and --telemetry-export-otlp -// flag values to the browser telemetry config carried by an auth connection's -// browser settings, shared by create, update, and login. +// buildManagedAuthTelemetryParam converts --telemetry, --telemetry-cdp-exclude and +// --telemetry-export-otlp flag values to the browser telemetry config carried by an +// auth connection's browser settings, shared by create, update, and login. // // canImply is true only on create, where there is no stored selection to clobber // and capture can safely be turned on for the user so a destination works on its // own. On update and login it is false: enabling capture there would replace the // connection's current category selection rather than merge onto it. -func buildManagedAuthTelemetryParam(s, export string, canImply bool) (kernel.ManagedAuthBrowserConfigTelemetryParam, error) { - enabled, browser, err := resolveTelemetryFlag(s) +func buildManagedAuthTelemetryParam(s, cdpExclude, export string, canImply bool) (kernel.ManagedAuthBrowserConfigTelemetryParam, error) { + enabled, browser, err := resolveTelemetryFlag(s, cdpExclude) p := kernel.ManagedAuthBrowserConfigTelemetryParam{Enabled: enabled, Browser: browser} - if err != nil || export == "" { + if err != nil { return p, err } + // A connection stores the browser config as sent rather than resolving it, so a + // request carrying only CDP exclusions would drop the connection's category + // selection. On update and login the user has to restate what to capture; on + // create there is nothing to lose. + if cdpExclude != "" && s == "" && !canImply { + return p, fmt.Errorf("setting --telemetry-cdp-exclude also requires --telemetry in the same command: the connection stores its browser config as sent, so exclusions on their own would drop its category selection") + } + if export == "" { + return p, nil + } exEnabled, id, name, err := resolveTelemetryExportFlag(export) if err != nil { return p, err @@ -264,6 +369,9 @@ func formatManagedAuthTelemetry(cfg kernel.ManagedAuthBrowserConfigTelemetry) st } return "disabled" }() + if ex := formatCdpExcludedMethods(cfg.Browser.Control.Cdp.ExcludedMethods); ex != "" { + base += " (excluding CDP methods: " + ex + ")" + } if dest := managedAuthExportDestination(cfg.Export); dest != "" { return base + " (exporting to " + dest + ")" } @@ -287,7 +395,7 @@ func managedAuthExportDestination(ex kernel.ManagedAuthBrowserConfigTelemetryExp // flows automatically whenever a CDP category is captured. var settableCategories = []string{ "console", "network", "page", "interaction", - "control", "connection", "system", "screenshot", "captcha", + "control", "connection", "system", "screenshot", "platform", "captcha", } // streamFilterCategories are the categories accepted by `telemetry stream --categories`. @@ -310,6 +418,7 @@ func telemetryEnabledCategories(cfg kernel.BrowserTelemetryConfig) []string { {"connection", b.Connection.Enabled}, {"system", b.System.Enabled}, {"screenshot", b.Screenshot.Enabled}, + {"platform", b.Platform.Enabled}, {"captcha", b.Captcha.Enabled}, } on := make([]string, 0, len(ordered)) @@ -330,6 +439,9 @@ func printTelemetrySummary(cfg kernel.BrowserTelemetryConfig) { return } pterm.Info.Printf("Telemetry capturing: %s\n", strings.Join(on, ", ")) + if ex := formatCdpExcludedMethods(cfg.Browser.Control.Cdp.ExcludedMethods); ex != "" { + pterm.Info.Printf("Telemetry excluding CDP methods: %s\n", ex) + } if cfg.Export.Otlp.Enabled { // The response reports the resolved destination by ID even when the request // selected it by name. @@ -341,6 +453,19 @@ func printTelemetrySummary(cfg kernel.BrowserTelemetryConfig) { } } +// formatCdpExcludedMethods renders the CDP methods left out of control +// telemetry's cdp_command stream, or "" when every supported method is reported. +func formatCdpExcludedMethods(methods []kernel.BrowserCdpCommandMethod) string { + if len(methods) == 0 { + return "" + } + names := make([]string, 0, len(methods)) + for _, m := range methods { + names = append(names, string(m)) + } + return strings.Join(names, ", ") +} + // shouldEmit applies client-side category/type filters to a telemetry event. func shouldEmit(category, eventType string, categories, types []string) bool { if len(categories) > 0 && !slices.Contains(categories, category) { diff --git a/cmd/browsers_telemetry_test.go b/cmd/browsers_telemetry_test.go index fe3b88e1..d9458bff 100644 --- a/cmd/browsers_telemetry_test.go +++ b/cmd/browsers_telemetry_test.go @@ -299,14 +299,17 @@ func TestShouldEmit(t *testing.T) { } func TestParseTelemetryCategories_OptInList(t *testing.T) { - p, err := parseTelemetryCategories("network,control,captcha") + p, err := parseTelemetryCategories("network,control,captcha,platform") assert.NoError(t, err) // Listed categories are enabled. - for _, c := range []kernel.BrowserTelemetryCategoryConfigParam{p.Network, p.Control, p.Captcha} { + for _, c := range []kernel.BrowserTelemetryCategoryConfigParam{p.Network, p.Captcha, p.Platform} { assert.True(t, c.Enabled.Valid()) assert.True(t, c.Enabled.Value) } + // Control carries its own config type, so it is checked separately. + assert.True(t, p.Control.Enabled.Valid()) + assert.True(t, p.Control.Enabled.Value) // Unlisted categories are omitted (opt-in: the instance treats them as off). assert.False(t, p.Console.Enabled.Valid()) assert.False(t, p.Page.Enabled.Valid()) @@ -336,21 +339,21 @@ func TestParseTelemetryCategories_WhitespaceTolerance(t *testing.T) { // listed categories enabled (Enabled unset). func TestBuildTelemetryParam_WireEncoding(t *testing.T) { t.Run("all", func(t *testing.T) { - p, err := buildNewTelemetryParam("all", "") + p, err := buildNewTelemetryParam("all", "", "") assert.NoError(t, err) assert.True(t, p.Enabled.Valid()) assert.True(t, p.Enabled.Value) assert.False(t, p.Browser.Network.Enabled.Valid()) }) t.Run("off", func(t *testing.T) { - p, err := buildNewTelemetryParam("off", "") + p, err := buildNewTelemetryParam("off", "", "") assert.NoError(t, err) assert.True(t, p.Enabled.Valid()) assert.False(t, p.Enabled.Value) assert.False(t, p.Browser.Network.Enabled.Valid()) }) t.Run("opt-in list sets only Browser", func(t *testing.T) { - p, err := buildNewTelemetryParam("network,control", "") + p, err := buildNewTelemetryParam("network,control", "", "") assert.NoError(t, err) assert.False(t, p.Enabled.Valid(), "Enabled must be unset for an opt-in selection") assert.True(t, p.Browser.Network.Enabled.Valid()) @@ -366,7 +369,7 @@ func TestBuildTelemetryParam_WireEncoding(t *testing.T) { // enabled=false combined with one. func TestBuildTelemetryParam_ExportWireEncoding(t *testing.T) { t.Run("destination by CUID sets id", func(t *testing.T) { - p, err := buildNewTelemetryParam("", "abcdefghijklmnopqrstuvwx") + p, err := buildNewTelemetryParam("", "", "abcdefghijklmnopqrstuvwx") assert.NoError(t, err) otlp := p.Export.Otlp assert.True(t, otlp.Destination.ID.Valid()) @@ -375,7 +378,7 @@ func TestBuildTelemetryParam_ExportWireEncoding(t *testing.T) { assert.False(t, otlp.Enabled.Valid(), "a destination implies enabled server-side") }) t.Run("destination by name sets name", func(t *testing.T) { - p, err := buildNewTelemetryParam("", "my-collector") + p, err := buildNewTelemetryParam("", "", "my-collector") assert.NoError(t, err) otlp := p.Export.Otlp assert.True(t, otlp.Destination.Name.Valid()) @@ -383,20 +386,20 @@ func TestBuildTelemetryParam_ExportWireEncoding(t *testing.T) { assert.False(t, otlp.Destination.ID.Valid(), "id must be unset when name is sent") }) t.Run("destination implies capture on create", func(t *testing.T) { - p, err := buildNewTelemetryParam("", "my-collector") + p, err := buildNewTelemetryParam("", "", "my-collector") assert.NoError(t, err) assert.True(t, p.Enabled.Valid(), "export requires capture, so create implies it") assert.True(t, p.Enabled.Value) }) t.Run("explicit --telemetry selection is preserved", func(t *testing.T) { - p, err := buildNewTelemetryParam("network,control", "my-collector") + p, err := buildNewTelemetryParam("network,control", "", "my-collector") assert.NoError(t, err) assert.False(t, p.Enabled.Valid(), "an opt-in selection must not be overridden") assert.True(t, p.Browser.Network.Enabled.Value) assert.Equal(t, "my-collector", p.Export.Otlp.Destination.Name.Value) }) t.Run("off disables export without a destination", func(t *testing.T) { - p, err := buildNewTelemetryParam("all", "off") + p, err := buildNewTelemetryParam("all", "", "off") assert.NoError(t, err) otlp := p.Export.Otlp assert.True(t, otlp.Enabled.Valid()) @@ -405,7 +408,7 @@ func TestBuildTelemetryParam_ExportWireEncoding(t *testing.T) { assert.False(t, otlp.Destination.Name.Valid()) }) t.Run("off does not imply capture", func(t *testing.T) { - p, err := buildNewTelemetryParam("", "off") + p, err := buildNewTelemetryParam("", "", "off") assert.NoError(t, err) assert.False(t, p.Enabled.Valid(), "disabling export must not turn capture on") }) @@ -414,44 +417,44 @@ func TestBuildTelemetryParam_ExportWireEncoding(t *testing.T) { // same request. Update and login refuse to supply one: doing so would replace // the connection's current category selection. t.Run("update requires an explicit --telemetry alongside a destination", func(t *testing.T) { - _, err := buildManagedAuthTelemetryParam("", "my-collector", false) + _, err := buildManagedAuthTelemetryParam("", "", "my-collector", false) assert.Error(t, err) assert.Contains(t, err.Error(), "also requires --telemetry") }) t.Run("login requires an explicit --telemetry alongside a destination", func(t *testing.T) { - _, err := buildManagedAuthTelemetryParam("", "my-collector", false) + _, err := buildManagedAuthTelemetryParam("", "", "my-collector", false) assert.Error(t, err) assert.Contains(t, err.Error(), "also requires --telemetry") }) t.Run("update never implies capture when --telemetry is given", func(t *testing.T) { - p, err := buildManagedAuthTelemetryParam("console", "my-collector", false) + p, err := buildManagedAuthTelemetryParam("console", "", "my-collector", false) assert.NoError(t, err) assert.False(t, p.Enabled.Valid(), "an opt-in selection must not be widened to the default set") assert.True(t, p.Browser.Console.Enabled.Value) assert.Equal(t, "my-collector", p.Export.Otlp.Destination.Name.Value) }) t.Run("login never implies capture when --telemetry is given", func(t *testing.T) { - p, err := buildManagedAuthTelemetryParam("console", "my-collector", false) + p, err := buildManagedAuthTelemetryParam("console", "", "my-collector", false) assert.NoError(t, err) assert.False(t, p.Enabled.Valid()) assert.Equal(t, "my-collector", p.Export.Otlp.Destination.Name.Value) }) t.Run("update and login allow export=off without --telemetry", func(t *testing.T) { - u, err := buildManagedAuthTelemetryParam("", "off", false) + u, err := buildManagedAuthTelemetryParam("", "", "off", false) assert.NoError(t, err) assert.False(t, u.Export.Otlp.Enabled.Value) - l, err := buildManagedAuthTelemetryParam("", "off", false) + l, err := buildManagedAuthTelemetryParam("", "", "off", false) assert.NoError(t, err) assert.False(t, l.Export.Otlp.Enabled.Value) }) t.Run("auth connection create implies capture", func(t *testing.T) { - p, err := buildManagedAuthTelemetryParam("", "my-collector", true) + p, err := buildManagedAuthTelemetryParam("", "", "my-collector", true) assert.NoError(t, err) assert.True(t, p.Enabled.Valid()) assert.True(t, p.Enabled.Value) }) t.Run("invalid category still errors with export set", func(t *testing.T) { - _, err := buildNewTelemetryParam("bogus", "my-collector") + _, err := buildNewTelemetryParam("bogus", "", "my-collector") assert.Error(t, err) }) t.Run("telemetry=off with a destination is rejected", func(t *testing.T) { @@ -459,9 +462,9 @@ func TestBuildTelemetryParam_ExportWireEncoding(t *testing.T) { name string fn func() error }{ - {"create", func() error { _, e := buildNewTelemetryParam("off", "my-collector"); return e }}, - {"auth create", func() error { _, e := buildManagedAuthTelemetryParam("off", "my-collector", true); return e }}, - {"auth update/login", func() error { _, e := buildManagedAuthTelemetryParam("off", "my-collector", false); return e }}, + {"create", func() error { _, e := buildNewTelemetryParam("off", "", "my-collector"); return e }}, + {"auth create", func() error { _, e := buildManagedAuthTelemetryParam("off", "", "my-collector", true); return e }}, + {"auth update/login", func() error { _, e := buildManagedAuthTelemetryParam("off", "", "my-collector", false); return e }}, } { err := tc.fn() assert.Error(t, err, tc.name) @@ -469,13 +472,13 @@ func TestBuildTelemetryParam_ExportWireEncoding(t *testing.T) { } }) t.Run("telemetry=off with export=off is allowed", func(t *testing.T) { - p, err := buildNewTelemetryParam("off", "off") + p, err := buildNewTelemetryParam("off", "", "off") assert.NoError(t, err) assert.False(t, p.Enabled.Value) assert.False(t, p.Export.Otlp.Enabled.Value) }) t.Run("empty export value errors", func(t *testing.T) { - _, err := buildNewTelemetryParam("all", " ") + _, err := buildNewTelemetryParam("all", "", " ") assert.Error(t, err) }) } @@ -718,3 +721,82 @@ func TestTelemetryEvents_FullScanIgnoresOffsetUsesSince(t *testing.T) { assert.Equal(t, "5m", gotQuery.Since.Value, "--all walks the window from --since") _ = buf } + +func TestParseTelemetryCategories_Platform(t *testing.T) { + p, err := parseTelemetryCategories("platform") + + assert.NoError(t, err) + assert.True(t, p.Platform.Enabled.Valid()) + assert.True(t, p.Platform.Enabled.Value) + // platform is opt-in only, so it must be offered by the flag's error message too. + _, err = parseTelemetryCategories("bogus") + assert.ErrorContains(t, err, "platform") +} + +func TestTelemetryEnabledCategories_Platform(t *testing.T) { + cfg := kernel.BrowserTelemetryConfig{Browser: kernel.BrowserTelemetryCategoriesConfig{}} + cfg.Browser.Platform.Enabled = true + + assert.Equal(t, []string{"platform"}, telemetryEnabledCategories(cfg)) +} + +func TestParseTelemetryCdpExcludedMethods(t *testing.T) { + t.Run("canonicalizes and trims", func(t *testing.T) { + got, err := parseTelemetryCdpExcludedMethods(" input.dispatchmouseevent , Page.captureScreenshot ") + assert.NoError(t, err) + assert.Equal(t, []kernel.BrowserCdpCommandMethod{ + kernel.BrowserCdpCommandMethodInputDispatchMouseEvent, + kernel.BrowserCdpCommandMethodPageCaptureScreenshot, + }, got) + }) + t.Run("none clears the list", func(t *testing.T) { + got, err := parseTelemetryCdpExcludedMethods("none") + assert.NoError(t, err) + assert.NotNil(t, got, "an empty list must still be sent, so the API reports every method again") + assert.Empty(t, got) + }) + t.Run("rejects unknown methods", func(t *testing.T) { + _, err := parseTelemetryCdpExcludedMethods("Page.doesNotExist") + assert.ErrorContains(t, err, "unknown CDP method") + }) +} + +func TestBuildTelemetryParam_CdpExclude(t *testing.T) { + t.Run("merges into control without enabling it", func(t *testing.T) { + p, err := buildNewTelemetryParam("", "Input.dispatchMouseEvent", "") + assert.NoError(t, err) + assert.False(t, p.Enabled.Valid()) + assert.False(t, p.Browser.Control.Enabled.Valid(), "exclusions must not silently flip the control category") + assert.Equal(t, []kernel.BrowserCdpCommandMethod{ + kernel.BrowserCdpCommandMethodInputDispatchMouseEvent, + }, p.Browser.Control.Cdp.ExcludedMethods) + }) + t.Run("combines with a category selection", func(t *testing.T) { + p, err := buildUpdateTelemetryParam("control,network", "Page.captureScreenshot") + assert.NoError(t, err) + assert.True(t, p.Browser.Control.Enabled.Value) + assert.Equal(t, []kernel.BrowserCdpCommandMethod{ + kernel.BrowserCdpCommandMethodPageCaptureScreenshot, + }, p.Browser.Control.Cdp.ExcludedMethods) + }) + t.Run("rejects combining with telemetry off", func(t *testing.T) { + _, err := buildNewTelemetryParam("off", "Page.captureScreenshot", "") + assert.ErrorContains(t, err, "cannot combine --telemetry=off with --telemetry-cdp-exclude") + }) +} + +func TestBuildManagedAuthTelemetryParam_CdpExcludeNeedsCategories(t *testing.T) { + // The connection stores the config verbatim, so exclusions on their own would + // replace its category selection — allowed on create, rejected on update/login. + _, err := buildManagedAuthTelemetryParam("", "Page.navigate", "", false) + assert.ErrorContains(t, err, "also requires --telemetry in the same command") + + p, err := buildManagedAuthTelemetryParam("", "Page.navigate", "", true) + assert.NoError(t, err) + assert.Equal(t, []kernel.BrowserCdpCommandMethod{ + kernel.BrowserCdpCommandMethodPageNavigate, + }, p.Browser.Control.Cdp.ExcludedMethods) + + _, err = buildManagedAuthTelemetryParam("control", "Page.navigate", "", false) + assert.NoError(t, err) +} diff --git a/go.mod b/go.mod index 509431ed..4e7fd39c 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.1 github.com/golang-jwt/jwt/v5 v5.2.2 github.com/joho/godotenv v1.5.1 - github.com/kernel/kernel-go-sdk v0.93.1-0.20260824200655-26309b6ff244 + github.com/kernel/kernel-go-sdk v0.94.0 github.com/klauspost/compress v1.18.5 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c github.com/pterm/pterm v0.12.80 diff --git a/go.sum b/go.sum index 42f22b66..f0e19511 100644 --- a/go.sum +++ b/go.sum @@ -64,8 +64,8 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= -github.com/kernel/kernel-go-sdk v0.93.1-0.20260824200655-26309b6ff244 h1:g+SxCHIYaInOVKsSKsieiKzUAcsl19M7ScFCN2Mpzd0= -github.com/kernel/kernel-go-sdk v0.93.1-0.20260824200655-26309b6ff244/go.mod h1:EeZzSuHZVeHKxKCPUzxou2bovNGhXaz0RXrSqKNf1AQ= +github.com/kernel/kernel-go-sdk v0.94.0 h1:YepYs5dadsnZq+gI5Ic4+ky4IIWNpm/791S6YFK2u0Y= +github.com/kernel/kernel-go-sdk v0.94.0/go.mod h1:EeZzSuHZVeHKxKCPUzxou2bovNGhXaz0RXrSqKNf1AQ= github.com/klauspost/compress v1.18.5 h1:/h1gH5Ce+VWNLSWqPzOVn6XBO+vJbCNGvjoaGBFW2IE= github.com/klauspost/compress v1.18.5/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= From ee72f2d2faf2806b70157206a4c52f9186b37c8d Mon Sep 17 00:00:00 2001 From: "kernel-internal[bot]" <260533166+kernel-internal[bot]@users.noreply.github.com> Date: Wed, 26 Aug 2026 01:50:29 +0000 Subject: [PATCH 12/26] CLI: Update Go SDK to c472a30 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps kernel-go-sdk from v0.94.0 to v0.94.1-0.20260826014443-c472a306c236 (c472a30). The only SDK change is internal request routing: "process" is now in the list of path prefixes eligible for direct-to-VM routing, so `kernel browsers process ...` calls go straight to the browser VM instead of through the control plane. No API surface changed — no new methods, no new params. A full enumeration of all 145 SDK methods in api.md against the CLI command tree found no coverage gaps. The 5 SiteConfigs methods are marked x-cli-skip in openapi.yaml and are intentionally not exposed. Every Params struct field maps to an existing flag. Tested against the live API with the new SDK, exercising every browsers process subcommand now affected by direct-to-VM routing: - browsers process exec (exit 0, stdout returned) - browsers process spawn - browsers process status (running, then exited) - browsers process stdin - browsers process stdout-stream (live tick1..tick5 + exit notice) - browsers process resize (PTY 120x40) - browsers process kill (TERM) Plus browsers create/delete for setup and teardown. go build ./... and go test ./... both pass. Co-Authored-By: Claude Opus 5 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 4e7fd39c..5cf41be2 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.1 github.com/golang-jwt/jwt/v5 v5.2.2 github.com/joho/godotenv v1.5.1 - github.com/kernel/kernel-go-sdk v0.94.0 + github.com/kernel/kernel-go-sdk v0.94.1-0.20260826014443-c472a306c236 github.com/klauspost/compress v1.18.5 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c github.com/pterm/pterm v0.12.80 diff --git a/go.sum b/go.sum index f0e19511..1e0b42bb 100644 --- a/go.sum +++ b/go.sum @@ -64,8 +64,8 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= -github.com/kernel/kernel-go-sdk v0.94.0 h1:YepYs5dadsnZq+gI5Ic4+ky4IIWNpm/791S6YFK2u0Y= -github.com/kernel/kernel-go-sdk v0.94.0/go.mod h1:EeZzSuHZVeHKxKCPUzxou2bovNGhXaz0RXrSqKNf1AQ= +github.com/kernel/kernel-go-sdk v0.94.1-0.20260826014443-c472a306c236 h1:QKuH4ly2RzLGzWzLLjrT0/SaOtcRjEe36sVtb0QtJm0= +github.com/kernel/kernel-go-sdk v0.94.1-0.20260826014443-c472a306c236/go.mod h1:EeZzSuHZVeHKxKCPUzxou2bovNGhXaz0RXrSqKNf1AQ= github.com/klauspost/compress v1.18.5 h1:/h1gH5Ce+VWNLSWqPzOVn6XBO+vJbCNGvjoaGBFW2IE= github.com/klauspost/compress v1.18.5/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= From 99b27bb650596fa23e9f8fa938a7dc0f37ec21e8 Mon Sep 17 00:00:00 2001 From: "kernel-internal[bot]" <260533166+kernel-internal[bot]@users.noreply.github.com> Date: Wed, 26 Aug 2026 18:19:49 +0000 Subject: [PATCH 13/26] feat: update Go SDK to 46978e2 and add ap-southeast region Updates kernel-go-sdk to v0.94.1-0.20260826181154-46978e2734f1. Full enumeration of api.md (145 SDK methods) against the CLI command tree found no missing commands or param fields. The only functional change in this SDK bump is a new `ap-southeast` value for the browser session and browser pool region enums. - Add "ap-southeast" to availableRegions(), which backs --region validation for `browsers list`, `browsers create`, `browser-pools list`, and `browser-pools create` - Update the flag help text and README for those four flags Tested against the live API: - browsers create --region ap-southeast -> browsers get (region reported as ap-southeast) -> browsers delete - browser-pools create --region ap-southeast -> browser-pools get (region ap-southeast) -> browser-pools delete - browsers list / browser-pools list --region ap-southeast return the new resources; --region eu-west correctly excludes them - browsers list --region bogus still rejected with the updated "us-east, eu-west, ap-southeast" message - go build ./... and go test ./cmd/... pass Co-Authored-By: Claude Opus 5 --- README.md | 6 +++--- cmd/browser_pools.go | 4 ++-- cmd/browsers.go | 6 +++--- go.mod | 2 +- go.sum | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 4f7655e4..cdb1c9b3 100644 --- a/README.md +++ b/README.md @@ -210,14 +210,14 @@ Commands with JSON output support: - `kernel browsers list` - List running browsers - `--query ` - Search by name, session ID, profile ID, proxy ID, or pool name - - `--region us-east|eu-west` - Filter by geographic region; omit to list sessions in all regions + - `--region us-east|eu-west|ap-southeast` - Filter by geographic region; omit to list sessions in all regions - `--tag ` - Filter by tag, repeatable; a session must match every pair - `--output json`, `-o json` - Output raw JSON array - `kernel browsers create` - Create a new browser session - `-s, --stealth` - Launch browser in stealth mode to avoid detection - `-H, --headless` - Launch browser without GUI access - `--kiosk` - Launch browser in kiosk mode - - `--region us-east|eu-west` - Geographic region for the session. Fixed once the session is created; requires a Start-Up or Enterprise plan and defaults to `us-east`. + - `--region us-east|eu-west|ap-southeast` - Geographic region for the session. Fixed once the session is created; requires a Start-Up or Enterprise plan and defaults to `us-east`. - `--private-host ` - Destination the browser reaches directly through the session's own network instead of Kernel-managed egress, for private hosts on a VPN or tunnel the session joins (repeatable or comma-separated, max 32). Accepts hostname patterns (`*.example.ts.net`), IPs (`10.1.30.63`, `[fd00::1]`), and private CIDRs (`100.64.0.0/10`). Replaces the default private ranges (RFC1918, `100.64.0.0/10`, `fc00::/7`); omit to keep them. Fixed once the session is created. Unrelated to a proxy's `--bypass-host`, which only chooses between upstream proxy and Kernel-managed direct egress. - `--start-url ` - Initial page to open on launch - `--proxy-id ` / `--proxy-name ` - Use that proxy for the session regardless of stealth (mutually exclusive with each other and with `--proxy-mode`) @@ -270,7 +270,7 @@ Commands with JSON output support: ### Browser Pools - `kernel browser-pools list` - List browser pools - - `--region us-east|eu-west` - Filter by geographic region; omit to list pools in all regions + - `--region us-east|eu-west|ap-southeast` - Filter by geographic region; omit to list pools in all regions - `--output json`, `-o json` - Output raw JSON array - `kernel browser-pools create` - Create a browser pool - `--name ` - Optional unique name for the pool diff --git a/cmd/browser_pools.go b/cmd/browser_pools.go index 276018d7..14bc79fa 100644 --- a/cmd/browser_pools.go +++ b/cmd/browser_pools.go @@ -736,7 +736,7 @@ func init() { browserPoolsListCmd.Flags().String("query", "", "Search browser pools by name (IDs match by exact value)") browserPoolsListCmd.Flags().Int("limit", 0, "Maximum number of pools to return") browserPoolsListCmd.Flags().Int("offset", 0, "Number of pools to skip (for pagination)") - browserPoolsListCmd.Flags().String("region", "", "Filter by geographic region: 'us-east' or 'eu-west' (omit to list pools in all regions)") + browserPoolsListCmd.Flags().String("region", "", "Filter by geographic region: 'us-east', 'eu-west', or 'ap-southeast' (omit to list pools in all regions)") addJSONOutputFlag(browserPoolsCreateCmd) browserPoolsCreateCmd.Flags().String("name", "", "Optional unique name for the pool") @@ -751,7 +751,7 @@ func init() { browserPoolsCreateCmd.Flags().String("profile-id", "", "Profile ID") browserPoolsCreateCmd.Flags().String("profile-name", "", "Profile name") browserPoolsCreateCmd.Flags().String("proxy-id", "", "Proxy ID") - browserPoolsCreateCmd.Flags().String("region", "", "Geographic region for the pool: 'us-east' or 'eu-west'. Fixed once the pool is created; requires a Start-Up or Enterprise plan and defaults to us-east") + browserPoolsCreateCmd.Flags().String("region", "", "Geographic region for the pool: 'us-east', 'eu-west', or 'ap-southeast'. Fixed once the pool is created; requires a Start-Up or Enterprise plan and defaults to us-east") browserPoolsCreateCmd.Flags().StringSlice("private-host", nil, "Destinations browsers in the pool reach directly through their own network instead of Kernel-managed egress, for private hosts on a VPN or tunnel they join (repeat or comma-separated, max 32). Accepts hostname patterns ('*.example.ts.net'), IPs ('10.1.30.63', '[fd00::1]'), and private CIDRs ('100.64.0.0/10'). Replaces the default private ranges (RFC1918, 100.64.0.0/10, fc00::/7); omit to keep them") browserPoolsCreateCmd.Flags().String("start-url", "", "Initial page to open for new browsers") browserPoolsCreateCmd.Flags().StringSlice("extension", []string{}, "Extension IDs or names") diff --git a/cmd/browsers.go b/cmd/browsers.go index 5e4c82b7..0e014929 100644 --- a/cmd/browsers.go +++ b/cmd/browsers.go @@ -165,7 +165,7 @@ func parseViewport(viewport string) (width, height, refreshRate int64, err error // availableRegions returns the geographic regions the API accepts for browser // sessions and pools. func availableRegions() []string { - return []string{"us-east", "eu-west"} + return []string{"us-east", "eu-west", "ap-southeast"} } // parseRegionFlag validates a --region value. An empty value means the flag was @@ -2661,7 +2661,7 @@ func init() { browsersListCmd.Flags().Int("limit", 0, "Maximum number of results to return (default 20, max 100)") browsersListCmd.Flags().Int("offset", 0, "Number of results to skip (for pagination)") browsersListCmd.Flags().String("query", "", "Search browsers by name, session ID, profile ID, proxy ID, or pool name") - browsersListCmd.Flags().String("region", "", "Filter by geographic region: 'us-east' or 'eu-west' (omit to list sessions in all regions)") + browsersListCmd.Flags().String("region", "", "Filter by geographic region: 'us-east', 'eu-west', or 'ap-southeast' (omit to list sessions in all regions)") browsersListCmd.Flags().StringArray("tag", nil, "Filter by tag KEY=VALUE (repeatable; a session must match every pair)") // get flags @@ -2957,7 +2957,7 @@ func init() { browsersCreateCmd.Flags().String("proxy-id", "", "Proxy ID to use for the browser session (mutually exclusive with --proxy-name and --proxy-mode)") browsersCreateCmd.Flags().String("proxy-name", "", "Proxy name to use for the browser session; must match exactly one active proxy in the project (mutually exclusive with --proxy-id and --proxy-mode)") browsersCreateCmd.Flags().String("proxy-mode", "", "Proxy egress mode instead of a selected proxy: 'direct' for no proxy regardless of stealth, or 'default' for the browser default (Kernel's stealth proxy when --stealth is set, direct egress otherwise)") - browsersCreateCmd.Flags().String("region", "", "Geographic region for the session: 'us-east' or 'eu-west'. Fixed once the session is created; requires a Start-Up or Enterprise plan and defaults to us-east") + browsersCreateCmd.Flags().String("region", "", "Geographic region for the session: 'us-east', 'eu-west', or 'ap-southeast'. Fixed once the session is created; requires a Start-Up or Enterprise plan and defaults to us-east") browsersCreateCmd.Flags().StringSlice("private-host", nil, "Destinations the browser reaches directly through its own network instead of Kernel-managed egress, for private hosts on a VPN or tunnel the session joins (repeat or comma-separated, max 32). Accepts hostname patterns ('*.example.ts.net'), IPs ('10.1.30.63', '[fd00::1]'), and private CIDRs ('100.64.0.0/10'). Replaces the default private ranges (RFC1918, 100.64.0.0/10, fc00::/7); omit to keep them. Fixed once the session is created") browsersCreateCmd.Flags().String("start-url", "", "Initial page to open on launch") browsersCreateCmd.Flags().StringSlice("extension", []string{}, "Extension IDs or names to load (repeatable; may be passed multiple times or comma-separated)") diff --git a/go.mod b/go.mod index 5cf41be2..ac1f24fc 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.1 github.com/golang-jwt/jwt/v5 v5.2.2 github.com/joho/godotenv v1.5.1 - github.com/kernel/kernel-go-sdk v0.94.1-0.20260826014443-c472a306c236 + github.com/kernel/kernel-go-sdk v0.94.1-0.20260826181154-46978e2734f1 github.com/klauspost/compress v1.18.5 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c github.com/pterm/pterm v0.12.80 diff --git a/go.sum b/go.sum index 1e0b42bb..4c723f14 100644 --- a/go.sum +++ b/go.sum @@ -64,8 +64,8 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= -github.com/kernel/kernel-go-sdk v0.94.1-0.20260826014443-c472a306c236 h1:QKuH4ly2RzLGzWzLLjrT0/SaOtcRjEe36sVtb0QtJm0= -github.com/kernel/kernel-go-sdk v0.94.1-0.20260826014443-c472a306c236/go.mod h1:EeZzSuHZVeHKxKCPUzxou2bovNGhXaz0RXrSqKNf1AQ= +github.com/kernel/kernel-go-sdk v0.94.1-0.20260826181154-46978e2734f1 h1:zf6tNuvXVfUxSyZUrjYo+owt+lk3Vn41OX+NCCP7Y+s= +github.com/kernel/kernel-go-sdk v0.94.1-0.20260826181154-46978e2734f1/go.mod h1:EeZzSuHZVeHKxKCPUzxou2bovNGhXaz0RXrSqKNf1AQ= github.com/klauspost/compress v1.18.5 h1:/h1gH5Ce+VWNLSWqPzOVn6XBO+vJbCNGvjoaGBFW2IE= github.com/klauspost/compress v1.18.5/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= From 3ce0c81c5baf2b7695b0ffd7f895406af7d7c694 Mon Sep 17 00:00:00 2001 From: "kernel-internal[bot]" <260533166+kernel-internal[bot]@users.noreply.github.com> Date: Wed, 26 Aug 2026 18:28:37 +0000 Subject: [PATCH 14/26] chore: update Go SDK to v0.95.0 (0c36fa4) Bumps github.com/kernel/kernel-go-sdk from v0.94.1-0.20260826181154-46978e2734f1 to v0.95.0. The SDK diff between the two versions touches only internal/version.go (release 0.95.0) -- no new methods, params, or fields. A full enumeration of all 152 SDK methods in api.md against every CLI leaf command confirmed no coverage gaps, and a field-level comparison of all 105 SDK *Params structs against CLI flags found no missing flags. Tested: go build ./..., go test ./cmd/... (all pass), kernel browsers list, kernel app list against the live API. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index ac1f24fc..45ca6fa1 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.1 github.com/golang-jwt/jwt/v5 v5.2.2 github.com/joho/godotenv v1.5.1 - github.com/kernel/kernel-go-sdk v0.94.1-0.20260826181154-46978e2734f1 + github.com/kernel/kernel-go-sdk v0.95.0 github.com/klauspost/compress v1.18.5 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c github.com/pterm/pterm v0.12.80 diff --git a/go.sum b/go.sum index 4c723f14..8c92c4ec 100644 --- a/go.sum +++ b/go.sum @@ -64,8 +64,8 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= -github.com/kernel/kernel-go-sdk v0.94.1-0.20260826181154-46978e2734f1 h1:zf6tNuvXVfUxSyZUrjYo+owt+lk3Vn41OX+NCCP7Y+s= -github.com/kernel/kernel-go-sdk v0.94.1-0.20260826181154-46978e2734f1/go.mod h1:EeZzSuHZVeHKxKCPUzxou2bovNGhXaz0RXrSqKNf1AQ= +github.com/kernel/kernel-go-sdk v0.95.0 h1:VoEneqrqqT5i3cO1L6faoHo4PqrndG0pAEs6Abivd5A= +github.com/kernel/kernel-go-sdk v0.95.0/go.mod h1:EeZzSuHZVeHKxKCPUzxou2bovNGhXaz0RXrSqKNf1AQ= github.com/klauspost/compress v1.18.5 h1:/h1gH5Ce+VWNLSWqPzOVn6XBO+vJbCNGvjoaGBFW2IE= github.com/klauspost/compress v1.18.5/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= From 11fa9ed702628d74da3268db9374170f94c102df Mon Sep 17 00:00:00 2001 From: "kernel-internal[bot]" <260533166+kernel-internal[bot]@users.noreply.github.com> Date: Thu, 27 Aug 2026 00:04:44 +0000 Subject: [PATCH 15/26] chore: update Go SDK to d348ffc and repair merge fallout Bumps github.com/kernel/kernel-go-sdk to d348ffc2b54ec8bc313b09abb34184d8cfe5681c (v0.95.1-0.20260826235549). The only API change in this range renames SiteConfigs to ConfigRegistry and moves analysis get/list onto a ConfigRegistry.Analyses subresource. Every config-registry endpoint carries x-cli-skip: true in openapi.yaml, so no CLI coverage is needed. A full enumeration of the remaining 139 SDK methods and their param fields against the CLI found no other gaps. The merge that produced this branch left two conflicts half-resolved, both of which are fixed here: - auth_connections.go kept main's `ReplaceExisting: f.Reason == "rejected"` call sites against this branch's `Reason string` field, so the package did not compile. They now pass the reason through, matching the branch's formatter and its `reason=rejected` assertion. - browsers_telemetry.go listed "platform" in settableCategories but had no matching case in parseTelemetryCategories, so --telemetry=platform failed with an error naming platform as a valid value. Tested: go build ./... and go test ./... pass (previously the cmd package did not compile). Against the live API: `browsers create --telemetry platform` reports "Telemetry capturing: ... platform", and after an in-VM call `browsers telemetry events ` shows a platform/platform_api_call event. `auth connections list` verified; sessions cleaned up. Co-Authored-By: Claude Opus 5 --- cmd/auth_connections.go | 4 ++-- cmd/browsers_telemetry.go | 2 ++ go.mod | 2 +- go.sum | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/cmd/auth_connections.go b/cmd/auth_connections.go index 26dd175f..9edb4036 100644 --- a/cmd/auth_connections.go +++ b/cmd/auth_connections.go @@ -560,7 +560,7 @@ func (c AuthConnectionCmd) Get(ctx context.Context, in AuthConnectionGetInput) e Ref: f.Ref, Hint: f.Hint, Required: f.Required, - ReplaceExisting: f.Reason == "rejected", + Reason: string(f.Reason), })) } tableData = append(tableData, []string{"Fields", strings.Join(fields, "; ")}) @@ -1113,7 +1113,7 @@ func (c AuthConnectionCmd) Follow(ctx context.Context, in AuthConnectionFollowIn Ref: f.Ref, Hint: f.Hint, Required: f.Required, - ReplaceExisting: f.Reason == "rejected", + Reason: string(f.Reason), })) } pterm.Info.Printf(" Fields: %s\n", strings.Join(fields, ", ")) diff --git a/cmd/browsers_telemetry.go b/cmd/browsers_telemetry.go index 203d7c53..2d94f99f 100644 --- a/cmd/browsers_telemetry.go +++ b/cmd/browsers_telemetry.go @@ -83,6 +83,8 @@ func parseTelemetryCategories(s string) (kernel.BrowserTelemetryCategoriesConfig p.System = on() case "screenshot": p.Screenshot = on() + case "platform": + p.Platform = on() case "captcha": p.Captcha = on() default: diff --git a/go.mod b/go.mod index 45ca6fa1..0da0453a 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.1 github.com/golang-jwt/jwt/v5 v5.2.2 github.com/joho/godotenv v1.5.1 - github.com/kernel/kernel-go-sdk v0.95.0 + github.com/kernel/kernel-go-sdk v0.95.1-0.20260826235549-d348ffc2b54e github.com/klauspost/compress v1.18.5 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c github.com/pterm/pterm v0.12.80 diff --git a/go.sum b/go.sum index 8c92c4ec..01448a70 100644 --- a/go.sum +++ b/go.sum @@ -64,8 +64,8 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= -github.com/kernel/kernel-go-sdk v0.95.0 h1:VoEneqrqqT5i3cO1L6faoHo4PqrndG0pAEs6Abivd5A= -github.com/kernel/kernel-go-sdk v0.95.0/go.mod h1:EeZzSuHZVeHKxKCPUzxou2bovNGhXaz0RXrSqKNf1AQ= +github.com/kernel/kernel-go-sdk v0.95.1-0.20260826235549-d348ffc2b54e h1:k2o1cCZ39o7N1uv5tolgt7cpYlgZ7lwI9yzKlMiwvXc= +github.com/kernel/kernel-go-sdk v0.95.1-0.20260826235549-d348ffc2b54e/go.mod h1:EeZzSuHZVeHKxKCPUzxou2bovNGhXaz0RXrSqKNf1AQ= github.com/klauspost/compress v1.18.5 h1:/h1gH5Ce+VWNLSWqPzOVn6XBO+vJbCNGvjoaGBFW2IE= github.com/klauspost/compress v1.18.5/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= From 3ce899db3cd77dc8cf00975ad6494ee0f8eb057d Mon Sep 17 00:00:00 2001 From: "kernel-internal[bot]" <260533166+kernel-internal[bot]@users.noreply.github.com> Date: Thu, 27 Aug 2026 00:13:18 +0000 Subject: [PATCH 16/26] chore: update Go SDK to v0.96.0 (bb4371c) Bumps github.com/kernel/kernel-go-sdk from v0.95.1-0.20260826235549-d348ffc2b54e to v0.96.0 (bb4371c). The upstream diff is release-only (CHANGELOG, README, internal/version.go, release-please manifest) with no API surface changes. Coverage analysis: full enumeration of all 145 SDK methods in api.md against the CLI command tree found no gaps. 5 ConfigRegistry methods are marked x-cli-skip in openapi.yaml and are excluded; the remaining 140 all have CLI commands. A recursive field-level sweep of all 100 param types (606 fields including nested structs) found no missing flags -- the only unreferenced fields are intentional: - AuditLogListParams.PageToken: handled internally by ListAutoPaging - AuthConnectionLoginParams.BrowserTelemetry/Proxy: deprecated in the SDK, superseded by browser.telemetry / browser.proxy, which are covered - BrowserCurlParams.TimeoutMs/ResponseEncoding: `browsers curl` goes through the browser HTTP proxy, where --max-time covers the timeout and binary responses are streamed natively - BrowserComputerBatchParams.Actions.SetCursor/Sleep: `computer batch` takes raw JSON via --actions, so all action types pass through Tested: go build ./..., go vet ./..., go test ./... (all pass); smoke tested against the live API with browsers list, profiles list (pagination footer), and a browsers create -> get -> delete round-trip. Co-Authored-By: Claude Opus 5 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 0da0453a..4950784b 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.1 github.com/golang-jwt/jwt/v5 v5.2.2 github.com/joho/godotenv v1.5.1 - github.com/kernel/kernel-go-sdk v0.95.1-0.20260826235549-d348ffc2b54e + github.com/kernel/kernel-go-sdk v0.96.0 github.com/klauspost/compress v1.18.5 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c github.com/pterm/pterm v0.12.80 diff --git a/go.sum b/go.sum index 01448a70..fc0778f8 100644 --- a/go.sum +++ b/go.sum @@ -64,8 +64,8 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= -github.com/kernel/kernel-go-sdk v0.95.1-0.20260826235549-d348ffc2b54e h1:k2o1cCZ39o7N1uv5tolgt7cpYlgZ7lwI9yzKlMiwvXc= -github.com/kernel/kernel-go-sdk v0.95.1-0.20260826235549-d348ffc2b54e/go.mod h1:EeZzSuHZVeHKxKCPUzxou2bovNGhXaz0RXrSqKNf1AQ= +github.com/kernel/kernel-go-sdk v0.96.0 h1:D5e82/tZItT9qzBgoS1eDlw6J/en8Irf8Buu88exxiA= +github.com/kernel/kernel-go-sdk v0.96.0/go.mod h1:EeZzSuHZVeHKxKCPUzxou2bovNGhXaz0RXrSqKNf1AQ= github.com/klauspost/compress v1.18.5 h1:/h1gH5Ce+VWNLSWqPzOVn6XBO+vJbCNGvjoaGBFW2IE= github.com/klauspost/compress v1.18.5/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= From 77bddaed4d797cfa9fbb0a7b46454ebc266f1eb0 Mon Sep 17 00:00:00 2001 From: "kernel-internal[bot]" <260533166+kernel-internal[bot]@users.noreply.github.com> Date: Fri, 28 Aug 2026 13:03:35 +0000 Subject: [PATCH 17/26] chore: update Go SDK to 6e498fb (captcha task and challenge outcomes) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps github.com/kernel/kernel-go-sdk from v0.96.0 to v0.96.1-0.20260828125604-6e498fbbc12d (6e498fb). The SDK change is response-type only: two new browser telemetry event variants (captcha_solve_started, captcha_challenge_result) plus a challenge_id field on captcha_solve_result. No new API methods and no new request params, so no new commands or flags are needed — the telemetry commands render event category/type generically and the --types filter is free-form, so the new event types flow through unchanged. A full enumeration of all 148 SDK methods in api.md against the CLI command tree found no coverage gaps. The only uncovered endpoints are the /config-registry routes, which are marked x-cli-skip: true in openapi.yaml. Param-field coverage was likewise checked across all 105 *Params structs. Tested: go test ./... passes; browsers create --telemetry=all, browsers telemetry events, browsers telemetry stream, browsers delete all verified against the live API. Co-Authored-By: Claude Opus 5 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 4950784b..f59697e7 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.1 github.com/golang-jwt/jwt/v5 v5.2.2 github.com/joho/godotenv v1.5.1 - github.com/kernel/kernel-go-sdk v0.96.0 + github.com/kernel/kernel-go-sdk v0.96.1-0.20260828125604-6e498fbbc12d github.com/klauspost/compress v1.18.5 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c github.com/pterm/pterm v0.12.80 diff --git a/go.sum b/go.sum index fc0778f8..3549df66 100644 --- a/go.sum +++ b/go.sum @@ -64,8 +64,8 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= -github.com/kernel/kernel-go-sdk v0.96.0 h1:D5e82/tZItT9qzBgoS1eDlw6J/en8Irf8Buu88exxiA= -github.com/kernel/kernel-go-sdk v0.96.0/go.mod h1:EeZzSuHZVeHKxKCPUzxou2bovNGhXaz0RXrSqKNf1AQ= +github.com/kernel/kernel-go-sdk v0.96.1-0.20260828125604-6e498fbbc12d h1:vzv+N66Xr63nepg9plm0E0ogptewKkkSJmhVmRb4M2c= +github.com/kernel/kernel-go-sdk v0.96.1-0.20260828125604-6e498fbbc12d/go.mod h1:EeZzSuHZVeHKxKCPUzxou2bovNGhXaz0RXrSqKNf1AQ= github.com/klauspost/compress v1.18.5 h1:/h1gH5Ce+VWNLSWqPzOVn6XBO+vJbCNGvjoaGBFW2IE= github.com/klauspost/compress v1.18.5/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= From aa1b67c69e6755b9428359c0135d1e0af20d59ea Mon Sep 17 00:00:00 2001 From: "kernel-internal[bot]" <260533166+kernel-internal[bot]@users.noreply.github.com> Date: Mon, 31 Aug 2026 00:48:46 +0000 Subject: [PATCH 18/26] chore: update Go SDK to 94c784a (managed auth reauth reasons) Bumps github.com/kernel/kernel-go-sdk to v0.96.1-0.20260831004050-94c784ab3169 (94c784ab). SDK change is response-side only: ManagedAuthCanReauthReason gains a totp_reauth_allowed value and requirements_satisfiable is redocumented. The CLI renders CanReauthReason as a raw string in `auth connections get`/`list`, so the new value flows through with no code change. Coverage analysis: full enumeration of all 145 methods in api.md against the CLI command tree found no gaps. Every method has a command (the six config-registry and auth exchange endpoints are x-cli-skip), and every field across the 104 params structs maps to a flag or positional arg. Tested: go build ./..., go vet ./..., go test ./... all pass; `kernel auth connections list` and `kernel auth connections get ` against the live API render Can Reauth / Can Reauth Reason correctly. Co-Authored-By: Claude Opus 5 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index f59697e7..314fc3bc 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.1 github.com/golang-jwt/jwt/v5 v5.2.2 github.com/joho/godotenv v1.5.1 - github.com/kernel/kernel-go-sdk v0.96.1-0.20260828125604-6e498fbbc12d + github.com/kernel/kernel-go-sdk v0.96.1-0.20260831004050-94c784ab3169 github.com/klauspost/compress v1.18.5 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c github.com/pterm/pterm v0.12.80 diff --git a/go.sum b/go.sum index 3549df66..aa4ff4bf 100644 --- a/go.sum +++ b/go.sum @@ -64,8 +64,8 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= -github.com/kernel/kernel-go-sdk v0.96.1-0.20260828125604-6e498fbbc12d h1:vzv+N66Xr63nepg9plm0E0ogptewKkkSJmhVmRb4M2c= -github.com/kernel/kernel-go-sdk v0.96.1-0.20260828125604-6e498fbbc12d/go.mod h1:EeZzSuHZVeHKxKCPUzxou2bovNGhXaz0RXrSqKNf1AQ= +github.com/kernel/kernel-go-sdk v0.96.1-0.20260831004050-94c784ab3169 h1:gPikYLp5vAJ5pfe8UbZOnTlhn6IGuwxT56oclbheO5A= +github.com/kernel/kernel-go-sdk v0.96.1-0.20260831004050-94c784ab3169/go.mod h1:EeZzSuHZVeHKxKCPUzxou2bovNGhXaz0RXrSqKNf1AQ= github.com/klauspost/compress v1.18.5 h1:/h1gH5Ce+VWNLSWqPzOVn6XBO+vJbCNGvjoaGBFW2IE= github.com/klauspost/compress v1.18.5/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= From bd990592c4af1b0a0e981ca562511c764e977b7e Mon Sep 17 00:00:00 2001 From: "kernel-internal[bot]" <260533166+kernel-internal[bot]@users.noreply.github.com> Date: Mon, 31 Aug 2026 01:11:48 +0000 Subject: [PATCH 19/26] chore: update Go SDK to v0.97.0 (e9ee30b) Bumps github.com/kernel/kernel-go-sdk from v0.96.1-0.20260831004050-94c784ab3169 to v0.97.0 (e9ee30b). The SDK delta is a release-only bump (CHANGELOG, README, version.go, release-please manifest); no API surface changed. Coverage analysis: enumerated all 145 methods in the SDK api.md and the full CLI command tree (153 commands). The only uncovered SDK methods are the ConfigRegistry endpoints (/config-registry, /lookup, /resolve, /analyses, /analyses/{id}), all marked x-cli-skip: true in openapi.yaml. Param-field cross-check surfaced no missing flags. Tested: go build ./..., go test ./... (all pass), and smoke-tested `kernel browsers list` and `kernel profiles list` against the live API. Co-Authored-By: Claude Opus 5 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 314fc3bc..3b361f0e 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.1 github.com/golang-jwt/jwt/v5 v5.2.2 github.com/joho/godotenv v1.5.1 - github.com/kernel/kernel-go-sdk v0.96.1-0.20260831004050-94c784ab3169 + github.com/kernel/kernel-go-sdk v0.97.0 github.com/klauspost/compress v1.18.5 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c github.com/pterm/pterm v0.12.80 diff --git a/go.sum b/go.sum index aa4ff4bf..8acc36e1 100644 --- a/go.sum +++ b/go.sum @@ -64,8 +64,8 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= -github.com/kernel/kernel-go-sdk v0.96.1-0.20260831004050-94c784ab3169 h1:gPikYLp5vAJ5pfe8UbZOnTlhn6IGuwxT56oclbheO5A= -github.com/kernel/kernel-go-sdk v0.96.1-0.20260831004050-94c784ab3169/go.mod h1:EeZzSuHZVeHKxKCPUzxou2bovNGhXaz0RXrSqKNf1AQ= +github.com/kernel/kernel-go-sdk v0.97.0 h1:jj6dFhiGdjkdFMdEsUDbnWkMJ2js/p1BBipa2QqvWXA= +github.com/kernel/kernel-go-sdk v0.97.0/go.mod h1:EeZzSuHZVeHKxKCPUzxou2bovNGhXaz0RXrSqKNf1AQ= github.com/klauspost/compress v1.18.5 h1:/h1gH5Ce+VWNLSWqPzOVn6XBO+vJbCNGvjoaGBFW2IE= github.com/klauspost/compress v1.18.5/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= From fc5ba8231fa3d6942e32361b1a1ef1b36883ff40 Mon Sep 17 00:00:00 2001 From: "kernel-internal[bot]" <260533166+kernel-internal[bot]@users.noreply.github.com> Date: Wed, 2 Sep 2026 19:12:00 +0000 Subject: [PATCH 20/26] chore: update Go SDK to ed434f7 and add browsers webmcp commands Updates github.com/kernel/kernel-go-sdk to v0.97.1-0.20260902190118-ed434f757fca (ed434f7). SDK changes covered: - New resource client.Browsers.Webmcp -> `kernel browsers webmcp` - `list-tools ` for client.Browsers.Webmcp.ListTools - `invoke-tool ` for client.Browsers.Webmcp.InvokeTool with --tool-ref, --input (JSON, '-' reads stdin), --timeout-sec for InvokeRequestParam.{ToolRef,Input,TimeoutSec} - All /browsers/{id_or_name} sub-resource routes now accept a browser session name. Migrated the renamed path param field (Params.ID -> Params.IDOrName) for replays stop/download, process kill/status/stdin/stdout-stream/resize, and fs watch stop/events, and synced the local service interface signatures to idOrName. Coverage analysis: full enumeration of api.md against the CLI command tree found no other gaps. ConfigRegistry endpoints are x-cli-skip. Tested against the live API: - browsers webmcp list-tools / invoke-tool: correct paths and flag handling; the API returns 404 because /browsers/*/webmcp/* is not deployed yet (verified identically via direct curl). - browsers replays list/start/stop/download, browsers process spawn/status/kill, browsers fs watch start/stop, browsers computer get-mouse-position -- all pass, addressed by session name. - go build ./... and go test ./... pass. Co-Authored-By: Claude Opus 5 --- cmd/browsers.go | 244 ++++++++++++++++++++++++++++++++++++++++-------- go.mod | 2 +- go.sum | 4 +- 3 files changed, 206 insertions(+), 44 deletions(-) diff --git a/cmd/browsers.go b/cmd/browsers.go index 0e014929..60627c25 100644 --- a/cmd/browsers.go +++ b/cmd/browsers.go @@ -39,39 +39,39 @@ type BrowsersService interface { Update(ctx context.Context, idOrName string, body kernel.BrowserUpdateParams, opts ...option.RequestOption) (res *kernel.BrowserUpdateResponse, err error) DeleteByID(ctx context.Context, idOrName string, opts ...option.RequestOption) (err error) HTTPClient(id string, opts ...option.RequestOption) (*http.Client, error) - LoadExtensions(ctx context.Context, id string, body kernel.BrowserLoadExtensionsParams, opts ...option.RequestOption) (err error) + LoadExtensions(ctx context.Context, idOrName string, body kernel.BrowserLoadExtensionsParams, opts ...option.RequestOption) (err error) } // BrowserReplaysService defines the subset we use for browser replays. type BrowserReplaysService interface { - List(ctx context.Context, id string, opts ...option.RequestOption) (res *[]kernel.BrowserReplayListResponse, err error) + List(ctx context.Context, idOrName string, opts ...option.RequestOption) (res *[]kernel.BrowserReplayListResponse, err error) Download(ctx context.Context, replayID string, query kernel.BrowserReplayDownloadParams, opts ...option.RequestOption) (res *http.Response, err error) - Start(ctx context.Context, id string, body kernel.BrowserReplayStartParams, opts ...option.RequestOption) (res *kernel.BrowserReplayStartResponse, err error) + Start(ctx context.Context, idOrName string, body kernel.BrowserReplayStartParams, opts ...option.RequestOption) (res *kernel.BrowserReplayStartResponse, err error) Stop(ctx context.Context, replayID string, body kernel.BrowserReplayStopParams, opts ...option.RequestOption) (err error) } // BrowserFSService defines the subset we use for browser filesystem APIs. type BrowserFSService interface { - NewDirectory(ctx context.Context, id string, body kernel.BrowserFNewDirectoryParams, opts ...option.RequestOption) (err error) - DeleteDirectory(ctx context.Context, id string, body kernel.BrowserFDeleteDirectoryParams, opts ...option.RequestOption) (err error) - DeleteFile(ctx context.Context, id string, body kernel.BrowserFDeleteFileParams, opts ...option.RequestOption) (err error) - DownloadDirZip(ctx context.Context, id string, query kernel.BrowserFDownloadDirZipParams, opts ...option.RequestOption) (res *http.Response, err error) - FileInfo(ctx context.Context, id string, query kernel.BrowserFFileInfoParams, opts ...option.RequestOption) (res *kernel.BrowserFFileInfoResponse, err error) - ListFiles(ctx context.Context, id string, query kernel.BrowserFListFilesParams, opts ...option.RequestOption) (res *[]kernel.BrowserFListFilesResponse, err error) - Move(ctx context.Context, id string, body kernel.BrowserFMoveParams, opts ...option.RequestOption) (err error) - ReadFile(ctx context.Context, id string, query kernel.BrowserFReadFileParams, opts ...option.RequestOption) (res *http.Response, err error) - SetFilePermissions(ctx context.Context, id string, body kernel.BrowserFSetFilePermissionsParams, opts ...option.RequestOption) (err error) - Upload(ctx context.Context, id string, body kernel.BrowserFUploadParams, opts ...option.RequestOption) (err error) - UploadZip(ctx context.Context, id string, body kernel.BrowserFUploadZipParams, opts ...option.RequestOption) (err error) - WriteFile(ctx context.Context, id string, contents io.Reader, body kernel.BrowserFWriteFileParams, opts ...option.RequestOption) (err error) + NewDirectory(ctx context.Context, idOrName string, body kernel.BrowserFNewDirectoryParams, opts ...option.RequestOption) (err error) + DeleteDirectory(ctx context.Context, idOrName string, body kernel.BrowserFDeleteDirectoryParams, opts ...option.RequestOption) (err error) + DeleteFile(ctx context.Context, idOrName string, body kernel.BrowserFDeleteFileParams, opts ...option.RequestOption) (err error) + DownloadDirZip(ctx context.Context, idOrName string, query kernel.BrowserFDownloadDirZipParams, opts ...option.RequestOption) (res *http.Response, err error) + FileInfo(ctx context.Context, idOrName string, query kernel.BrowserFFileInfoParams, opts ...option.RequestOption) (res *kernel.BrowserFFileInfoResponse, err error) + ListFiles(ctx context.Context, idOrName string, query kernel.BrowserFListFilesParams, opts ...option.RequestOption) (res *[]kernel.BrowserFListFilesResponse, err error) + Move(ctx context.Context, idOrName string, body kernel.BrowserFMoveParams, opts ...option.RequestOption) (err error) + ReadFile(ctx context.Context, idOrName string, query kernel.BrowserFReadFileParams, opts ...option.RequestOption) (res *http.Response, err error) + SetFilePermissions(ctx context.Context, idOrName string, body kernel.BrowserFSetFilePermissionsParams, opts ...option.RequestOption) (err error) + Upload(ctx context.Context, idOrName string, body kernel.BrowserFUploadParams, opts ...option.RequestOption) (err error) + UploadZip(ctx context.Context, idOrName string, body kernel.BrowserFUploadZipParams, opts ...option.RequestOption) (err error) + WriteFile(ctx context.Context, idOrName string, contents io.Reader, body kernel.BrowserFWriteFileParams, opts ...option.RequestOption) (err error) } // BrowserProcessService defines the subset we use for browser process APIs. type BrowserProcessService interface { - Exec(ctx context.Context, id string, body kernel.BrowserProcessExecParams, opts ...option.RequestOption) (res *kernel.BrowserProcessExecResponse, err error) + Exec(ctx context.Context, idOrName string, body kernel.BrowserProcessExecParams, opts ...option.RequestOption) (res *kernel.BrowserProcessExecResponse, err error) Kill(ctx context.Context, processID string, params kernel.BrowserProcessKillParams, opts ...option.RequestOption) (res *kernel.BrowserProcessKillResponse, err error) Resize(ctx context.Context, processID string, params kernel.BrowserProcessResizeParams, opts ...option.RequestOption) (res *kernel.BrowserProcessResizeResponse, err error) - Spawn(ctx context.Context, id string, body kernel.BrowserProcessSpawnParams, opts ...option.RequestOption) (res *kernel.BrowserProcessSpawnResponse, err error) + Spawn(ctx context.Context, idOrName string, body kernel.BrowserProcessSpawnParams, opts ...option.RequestOption) (res *kernel.BrowserProcessSpawnResponse, err error) Status(ctx context.Context, processID string, query kernel.BrowserProcessStatusParams, opts ...option.RequestOption) (res *kernel.BrowserProcessStatusResponse, err error) Stdin(ctx context.Context, processID string, params kernel.BrowserProcessStdinParams, opts ...option.RequestOption) (res *kernel.BrowserProcessStdinResponse, err error) StdoutStreamStreaming(ctx context.Context, processID string, query kernel.BrowserProcessStdoutStreamParams, opts ...option.RequestOption) (stream *ssestream.Stream[kernel.BrowserProcessStdoutStreamResponse]) @@ -80,34 +80,40 @@ type BrowserProcessService interface { // BrowserFWatchService defines the subset we use for browser filesystem watch APIs. type BrowserFWatchService interface { EventsStreaming(ctx context.Context, watchID string, query kernel.BrowserFWatchEventsParams, opts ...option.RequestOption) (stream *ssestream.Stream[kernel.BrowserFWatchEventsResponse]) - Start(ctx context.Context, id string, body kernel.BrowserFWatchStartParams, opts ...option.RequestOption) (res *kernel.BrowserFWatchStartResponse, err error) + Start(ctx context.Context, idOrName string, body kernel.BrowserFWatchStartParams, opts ...option.RequestOption) (res *kernel.BrowserFWatchStartResponse, err error) Stop(ctx context.Context, watchID string, body kernel.BrowserFWatchStopParams, opts ...option.RequestOption) (err error) } // BrowserLogService defines the subset we use for browser log APIs. type BrowserLogService interface { - StreamStreaming(ctx context.Context, id string, query kernel.BrowserLogStreamParams, opts ...option.RequestOption) (stream *ssestream.Stream[shared.LogEvent]) + StreamStreaming(ctx context.Context, idOrName string, query kernel.BrowserLogStreamParams, opts ...option.RequestOption) (stream *ssestream.Stream[shared.LogEvent]) } // BrowserPlaywrightService defines the subset we use for Playwright execution. type BrowserPlaywrightService interface { - Execute(ctx context.Context, id string, body kernel.BrowserPlaywrightExecuteParams, opts ...option.RequestOption) (res *kernel.BrowserPlaywrightExecuteResponse, err error) + Execute(ctx context.Context, idOrName string, body kernel.BrowserPlaywrightExecuteParams, opts ...option.RequestOption) (res *kernel.BrowserPlaywrightExecuteResponse, err error) +} + +// BrowserWebmcpService defines the subset we use for WebMCP tool discovery and invocation. +type BrowserWebmcpService interface { + InvokeTool(ctx context.Context, idOrName string, body kernel.BrowserWebmcpInvokeToolParams, opts ...option.RequestOption) (res *kernel.InvocationResult, err error) + ListTools(ctx context.Context, idOrName string, opts ...option.RequestOption) (res *kernel.ToolsResponse, err error) } // BrowserComputerService defines the subset we use for OS-level mouse & screen. type BrowserComputerService interface { - Batch(ctx context.Context, id string, body kernel.BrowserComputerBatchParams, opts ...option.RequestOption) (err error) - CaptureScreenshot(ctx context.Context, id string, body kernel.BrowserComputerCaptureScreenshotParams, opts ...option.RequestOption) (res *http.Response, err error) - ClickMouse(ctx context.Context, id string, body kernel.BrowserComputerClickMouseParams, opts ...option.RequestOption) (err error) - DragMouse(ctx context.Context, id string, body kernel.BrowserComputerDragMouseParams, opts ...option.RequestOption) (err error) - GetMousePosition(ctx context.Context, id string, opts ...option.RequestOption) (res *kernel.BrowserComputerGetMousePositionResponse, err error) - MoveMouse(ctx context.Context, id string, body kernel.BrowserComputerMoveMouseParams, opts ...option.RequestOption) (err error) - PressKey(ctx context.Context, id string, body kernel.BrowserComputerPressKeyParams, opts ...option.RequestOption) (err error) - ReadClipboard(ctx context.Context, id string, opts ...option.RequestOption) (res *kernel.BrowserComputerReadClipboardResponse, err error) - Scroll(ctx context.Context, id string, body kernel.BrowserComputerScrollParams, opts ...option.RequestOption) (err error) - SetCursorVisibility(ctx context.Context, id string, body kernel.BrowserComputerSetCursorVisibilityParams, opts ...option.RequestOption) (res *kernel.BrowserComputerSetCursorVisibilityResponse, err error) - TypeText(ctx context.Context, id string, body kernel.BrowserComputerTypeTextParams, opts ...option.RequestOption) (err error) - WriteClipboard(ctx context.Context, id string, body kernel.BrowserComputerWriteClipboardParams, opts ...option.RequestOption) (err error) + Batch(ctx context.Context, idOrName string, body kernel.BrowserComputerBatchParams, opts ...option.RequestOption) (err error) + CaptureScreenshot(ctx context.Context, idOrName string, body kernel.BrowserComputerCaptureScreenshotParams, opts ...option.RequestOption) (res *http.Response, err error) + ClickMouse(ctx context.Context, idOrName string, body kernel.BrowserComputerClickMouseParams, opts ...option.RequestOption) (err error) + DragMouse(ctx context.Context, idOrName string, body kernel.BrowserComputerDragMouseParams, opts ...option.RequestOption) (err error) + GetMousePosition(ctx context.Context, idOrName string, opts ...option.RequestOption) (res *kernel.BrowserComputerGetMousePositionResponse, err error) + MoveMouse(ctx context.Context, idOrName string, body kernel.BrowserComputerMoveMouseParams, opts ...option.RequestOption) (err error) + PressKey(ctx context.Context, idOrName string, body kernel.BrowserComputerPressKeyParams, opts ...option.RequestOption) (err error) + ReadClipboard(ctx context.Context, idOrName string, opts ...option.RequestOption) (res *kernel.BrowserComputerReadClipboardResponse, err error) + Scroll(ctx context.Context, idOrName string, body kernel.BrowserComputerScrollParams, opts ...option.RequestOption) (err error) + SetCursorVisibility(ctx context.Context, idOrName string, body kernel.BrowserComputerSetCursorVisibilityParams, opts ...option.RequestOption) (res *kernel.BrowserComputerSetCursorVisibilityResponse, err error) + TypeText(ctx context.Context, idOrName string, body kernel.BrowserComputerTypeTextParams, opts ...option.RequestOption) (err error) + WriteClipboard(ctx context.Context, idOrName string, body kernel.BrowserComputerWriteClipboardParams, opts ...option.RequestOption) (err error) } // Regular expression to validate CUID2 identifiers (starts with a letter, 24 lowercase alphanumeric characters). @@ -436,6 +442,7 @@ type BrowsersCmd struct { logs BrowserLogService computer BrowserComputerService playwright BrowserPlaywrightService + webmcp BrowserWebmcpService telemetry BrowserTelemetryService } @@ -1592,7 +1599,7 @@ func (b BrowsersCmd) ReplaysStop(ctx context.Context, in BrowsersReplaysStopInpu if err != nil { return util.CleanedUpSdkError{Err: err} } - err = b.replays.Stop(ctx, in.ReplayID, kernel.BrowserReplayStopParams{ID: br.SessionID}) + err = b.replays.Stop(ctx, in.ReplayID, kernel.BrowserReplayStopParams{IDOrName: br.SessionID}) if err != nil { return util.CleanedUpSdkError{Err: err} } @@ -1601,7 +1608,7 @@ func (b BrowsersCmd) ReplaysStop(ctx context.Context, in BrowsersReplaysStopInpu } func (b BrowsersCmd) ReplaysDownload(ctx context.Context, in BrowsersReplaysDownloadInput) error { - res, err := b.replays.Download(ctx, in.ReplayID, kernel.BrowserReplayDownloadParams{ID: in.Identifier}) + res, err := b.replays.Download(ctx, in.ReplayID, kernel.BrowserReplayDownloadParams{IDOrName: in.Identifier}) if err != nil { return util.CleanedUpSdkError{Err: err} } @@ -1758,6 +1765,113 @@ func (b BrowsersCmd) PlaywrightExecute(ctx context.Context, in BrowsersPlaywrigh return nil } +// WebMCP +type BrowsersWebmcpListToolsInput struct { + Identifier string + Output string +} + +func (b BrowsersCmd) WebmcpListTools(ctx context.Context, in BrowsersWebmcpListToolsInput) error { + if err := validateJSONOutput(in.Output); err != nil { + return err + } + + if b.webmcp == nil { + pterm.Error.Println("webmcp service not available") + return nil + } + br, err := b.browsers.Get(ctx, in.Identifier, kernel.BrowserGetParams{}) + if err != nil { + return util.CleanedUpSdkError{Err: err} + } + res, err := b.webmcp.ListTools(ctx, br.SessionID) + if err != nil { + return util.CleanedUpSdkError{Err: err} + } + + if in.Output == "json" { + return util.PrintPrettyJSON(res) + } + + if res == nil || len(res.Tools) == 0 { + pterm.Info.Println("No WebMCP tools found") + return nil + } + rows := pterm.TableData{{"Name", "Tool Ref", "Page", "Frame", "Description"}} + for _, t := range res.Tools { + frame := "-" + if t.Source.Frame.URL != "" { + frame = truncateURL(t.Source.Frame.URL, 40) + } + rows = append(rows, []string{ + t.Name, + t.ToolRef, + truncateURL(t.Source.PageURL, 40), + frame, + truncateURL(t.Description, 60), + }) + } + PrintTableNoPad(rows, true) + return nil +} + +type BrowsersWebmcpInvokeToolInput struct { + Identifier string + ToolRef string + InputJSON string + TimeoutSec int64 + Output string +} + +func (b BrowsersCmd) WebmcpInvokeTool(ctx context.Context, in BrowsersWebmcpInvokeToolInput) error { + if err := validateJSONOutput(in.Output); err != nil { + return err + } + + if b.webmcp == nil { + pterm.Error.Println("webmcp service not available") + return nil + } + toolInput := map[string]any{} + if strings.TrimSpace(in.InputJSON) != "" { + if err := json.Unmarshal([]byte(in.InputJSON), &toolInput); err != nil { + pterm.Error.Printf("Invalid --input JSON: %v\n", err) + return nil + } + } + br, err := b.browsers.Get(ctx, in.Identifier, kernel.BrowserGetParams{}) + if err != nil { + return util.CleanedUpSdkError{Err: err} + } + req := kernel.InvokeRequestParam{ToolRef: in.ToolRef, Input: toolInput} + if in.TimeoutSec > 0 { + req.TimeoutSec = kernel.Opt(in.TimeoutSec) + } + res, err := b.webmcp.InvokeTool(ctx, br.SessionID, kernel.BrowserWebmcpInvokeToolParams{InvokeRequest: req}) + if err != nil { + return util.CleanedUpSdkError{Err: err} + } + + if in.Output == "json" { + return util.PrintPrettyJSON(res) + } + + rows := pterm.TableData{{"Property", "Value"}, {"Invocation ID", res.InvocationID}, {"Status", string(res.Status)}} + PrintTableNoPad(rows, true) + + if res.Output != nil { + bs, err := json.MarshalIndent(res.Output, "", " ") + if err == nil { + pterm.Info.Println("output:") + fmt.Println(string(bs)) + } + } + if res.ErrorText != "" { + pterm.Error.Printf("error: %s\n", res.ErrorText) + } + return nil +} + func (b BrowsersCmd) ProcessExec(ctx context.Context, in BrowsersProcessExecInput) error { if err := validateJSONOutput(in.Output); err != nil { return err @@ -1907,7 +2021,7 @@ func (b BrowsersCmd) ProcessKill(ctx context.Context, in BrowsersProcessKillInpu if err != nil { return util.CleanedUpSdkError{Err: err} } - params := kernel.BrowserProcessKillParams{ID: br.SessionID, Signal: kernel.BrowserProcessKillParamsSignal(in.Signal)} + params := kernel.BrowserProcessKillParams{IDOrName: br.SessionID, Signal: kernel.BrowserProcessKillParamsSignal(in.Signal)} _, err = b.process.Kill(ctx, in.ProcessID, params) if err != nil { return util.CleanedUpSdkError{Err: err} @@ -1925,7 +2039,7 @@ func (b BrowsersCmd) ProcessStatus(ctx context.Context, in BrowsersProcessStatus if err != nil { return util.CleanedUpSdkError{Err: err} } - res, err := b.process.Status(ctx, in.ProcessID, kernel.BrowserProcessStatusParams{ID: br.SessionID}) + res, err := b.process.Status(ctx, in.ProcessID, kernel.BrowserProcessStatusParams{IDOrName: br.SessionID}) if err != nil { return util.CleanedUpSdkError{Err: err} } @@ -1943,7 +2057,7 @@ func (b BrowsersCmd) ProcessStdin(ctx context.Context, in BrowsersProcessStdinIn if err != nil { return util.CleanedUpSdkError{Err: err} } - _, err = b.process.Stdin(ctx, in.ProcessID, kernel.BrowserProcessStdinParams{ID: br.SessionID, DataB64: in.DataB64}) + _, err = b.process.Stdin(ctx, in.ProcessID, kernel.BrowserProcessStdinParams{IDOrName: br.SessionID, DataB64: in.DataB64}) if err != nil { return util.CleanedUpSdkError{Err: err} } @@ -1960,7 +2074,7 @@ func (b BrowsersCmd) ProcessStdoutStream(ctx context.Context, in BrowsersProcess if err != nil { return util.CleanedUpSdkError{Err: err} } - stream := b.process.StdoutStreamStreaming(ctx, in.ProcessID, kernel.BrowserProcessStdoutStreamParams{ID: br.SessionID}) + stream := b.process.StdoutStreamStreaming(ctx, in.ProcessID, kernel.BrowserProcessStdoutStreamParams{IDOrName: br.SessionID}) if stream == nil { pterm.Error.Println("failed to open stdout stream") return nil @@ -1994,7 +2108,7 @@ func (b BrowsersCmd) ProcessResize(ctx context.Context, in BrowsersProcessResize if err != nil { return util.CleanedUpSdkError{Err: err} } - params := kernel.BrowserProcessResizeParams{ID: br.SessionID, Cols: in.Cols, Rows: in.Rows} + params := kernel.BrowserProcessResizeParams{IDOrName: br.SessionID, Cols: in.Cols, Rows: in.Rows} _, err = b.process.Resize(ctx, in.ProcessID, params) if err != nil { return util.CleanedUpSdkError{Err: err} @@ -2043,7 +2157,7 @@ func (b BrowsersCmd) FSWatchStop(ctx context.Context, in BrowsersFSWatchStopInpu if err != nil { return util.CleanedUpSdkError{Err: err} } - err = b.fsWatch.Stop(ctx, in.WatchID, kernel.BrowserFWatchStopParams{ID: br.SessionID}) + err = b.fsWatch.Stop(ctx, in.WatchID, kernel.BrowserFWatchStopParams{IDOrName: br.SessionID}) if err != nil { return util.CleanedUpSdkError{Err: err} } @@ -2060,7 +2174,7 @@ func (b BrowsersCmd) FSWatchEvents(ctx context.Context, in BrowsersFSWatchEvents if err != nil { return util.CleanedUpSdkError{Err: err} } - stream := b.fsWatch.EventsStreaming(ctx, in.WatchID, kernel.BrowserFWatchEventsParams{ID: br.SessionID}) + stream := b.fsWatch.EventsStreaming(ctx, in.WatchID, kernel.BrowserFWatchEventsParams{IDOrName: br.SessionID}) if stream == nil { pterm.Error.Println("failed to open watch events stream") return nil @@ -2942,6 +3056,19 @@ func init() { playwrightRoot.AddCommand(playwrightExecute) browsersCmd.AddCommand(playwrightRoot) + // webmcp + webmcpRoot := &cobra.Command{Use: "webmcp", Short: "Discover and invoke native page (WebMCP) tools"} + webmcpListTools := &cobra.Command{Use: "list-tools ", Short: "List WebMCP tools across every open tab and embedded frame", Args: cobra.ExactArgs(1), RunE: runBrowsersWebmcpListTools} + addJSONOutputFlag(webmcpListTools) + webmcpInvoke := &cobra.Command{Use: "invoke-tool ", Short: "Invoke a discovered WebMCP tool and wait for its result", Args: cobra.ExactArgs(1), RunE: runBrowsersWebmcpInvokeTool} + webmcpInvoke.Flags().String("tool-ref", "", "Opaque tool reference from 'browsers webmcp list-tools'") + webmcpInvoke.Flags().String("input", "", "Tool input as a JSON object (defaults to {}); use '-' to read from stdin") + webmcpInvoke.Flags().Int64("timeout-sec", 0, "Maximum time to wait for the tool result in seconds (1-120, default 60)") + _ = webmcpInvoke.MarkFlagRequired("tool-ref") + addJSONOutputFlag(webmcpInvoke) + webmcpRoot.AddCommand(webmcpListTools, webmcpInvoke) + browsersCmd.AddCommand(webmcpRoot) + // Add flags for create command addJSONOutputFlag(browsersCreateCmd) browsersCreateCmd.Flags().BoolP("stealth", "s", false, "Launch browser in stealth mode to avoid detection") @@ -3529,6 +3656,41 @@ func runBrowsersPlaywrightExecute(cmd *cobra.Command, args []string) error { return b.PlaywrightExecute(cmd.Context(), BrowsersPlaywrightExecuteInput{Identifier: args[0], Code: strings.TrimSpace(code), Timeout: timeout, Output: output}) } +func runBrowsersWebmcpListTools(cmd *cobra.Command, args []string) error { + client := getKernelClient(cmd) + svc := client.Browsers + output, _ := cmd.Flags().GetString("output") + b := BrowsersCmd{browsers: &svc, webmcp: &svc.Webmcp} + return b.WebmcpListTools(cmd.Context(), BrowsersWebmcpListToolsInput{Identifier: args[0], Output: output}) +} + +func runBrowsersWebmcpInvokeTool(cmd *cobra.Command, args []string) error { + client := getKernelClient(cmd) + svc := client.Browsers + toolRef, _ := cmd.Flags().GetString("tool-ref") + inputJSON, _ := cmd.Flags().GetString("input") + timeoutSec, _ := cmd.Flags().GetInt64("timeout-sec") + output, _ := cmd.Flags().GetString("output") + + if inputJSON == "-" { + data, err := io.ReadAll(os.Stdin) + if err != nil { + pterm.Error.Printf("failed to read stdin: %v\n", err) + return nil + } + inputJSON = string(data) + } + + b := BrowsersCmd{browsers: &svc, webmcp: &svc.Webmcp} + return b.WebmcpInvokeTool(cmd.Context(), BrowsersWebmcpInvokeToolInput{ + Identifier: args[0], + ToolRef: toolRef, + InputJSON: inputJSON, + TimeoutSec: timeoutSec, + Output: output, + }) +} + func runBrowsersFSNewDirectory(cmd *cobra.Command, args []string) error { client := getKernelClient(cmd) svc := client.Browsers diff --git a/go.mod b/go.mod index 3b361f0e..83df8ffd 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.1 github.com/golang-jwt/jwt/v5 v5.2.2 github.com/joho/godotenv v1.5.1 - github.com/kernel/kernel-go-sdk v0.97.0 + github.com/kernel/kernel-go-sdk v0.97.1-0.20260902190118-ed434f757fca github.com/klauspost/compress v1.18.5 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c github.com/pterm/pterm v0.12.80 diff --git a/go.sum b/go.sum index 8acc36e1..1f5fb6c9 100644 --- a/go.sum +++ b/go.sum @@ -64,8 +64,8 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= -github.com/kernel/kernel-go-sdk v0.97.0 h1:jj6dFhiGdjkdFMdEsUDbnWkMJ2js/p1BBipa2QqvWXA= -github.com/kernel/kernel-go-sdk v0.97.0/go.mod h1:EeZzSuHZVeHKxKCPUzxou2bovNGhXaz0RXrSqKNf1AQ= +github.com/kernel/kernel-go-sdk v0.97.1-0.20260902190118-ed434f757fca h1:YJaqLCdRDZDNvPepRucbQIKaapQBTkASy7PeYZB6gP8= +github.com/kernel/kernel-go-sdk v0.97.1-0.20260902190118-ed434f757fca/go.mod h1:EeZzSuHZVeHKxKCPUzxou2bovNGhXaz0RXrSqKNf1AQ= github.com/klauspost/compress v1.18.5 h1:/h1gH5Ce+VWNLSWqPzOVn6XBO+vJbCNGvjoaGBFW2IE= github.com/klauspost/compress v1.18.5/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= From 36bd0eba0dd76fe130f617740e29c8eae1ee95df Mon Sep 17 00:00:00 2001 From: "kernel-internal[bot]" <260533166+kernel-internal[bot]@users.noreply.github.com> Date: Wed, 2 Sep 2026 19:38:19 +0000 Subject: [PATCH 21/26] chore: update Go SDK to v0.98.0 (d02140d) The SDK diff from the CLI's previous pin (ed434f7) to d02140d is a release-only bump: .release-please-manifest.json, CHANGELOG.md, README.md and internal/version.go. No API surface changed. Full enumeration of api.md (147 methods) against the CLI command tree found no coverage gaps. The 5 /config-registry methods are marked x-cli-skip in openapi.yaml; the remaining 142 all have CLI commands, and every *Params field (including the nested *RequestParam structs and the ProxyNewParams config union variants) maps to an existing flag. Tested: go build ./..., go test ./... (all pass), and live API smoke tests of `browsers list`, `profiles list`, `app list`. Co-Authored-By: Claude Opus 5 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 83df8ffd..816bc1a8 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.1 github.com/golang-jwt/jwt/v5 v5.2.2 github.com/joho/godotenv v1.5.1 - github.com/kernel/kernel-go-sdk v0.97.1-0.20260902190118-ed434f757fca + github.com/kernel/kernel-go-sdk v0.98.0 github.com/klauspost/compress v1.18.5 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c github.com/pterm/pterm v0.12.80 diff --git a/go.sum b/go.sum index 1f5fb6c9..4a009f70 100644 --- a/go.sum +++ b/go.sum @@ -64,8 +64,8 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= -github.com/kernel/kernel-go-sdk v0.97.1-0.20260902190118-ed434f757fca h1:YJaqLCdRDZDNvPepRucbQIKaapQBTkASy7PeYZB6gP8= -github.com/kernel/kernel-go-sdk v0.97.1-0.20260902190118-ed434f757fca/go.mod h1:EeZzSuHZVeHKxKCPUzxou2bovNGhXaz0RXrSqKNf1AQ= +github.com/kernel/kernel-go-sdk v0.98.0 h1:PefacBIPuhDU1NBood5wbgy8UWf3z6fmbrjJDn4/LC0= +github.com/kernel/kernel-go-sdk v0.98.0/go.mod h1:EeZzSuHZVeHKxKCPUzxou2bovNGhXaz0RXrSqKNf1AQ= github.com/klauspost/compress v1.18.5 h1:/h1gH5Ce+VWNLSWqPzOVn6XBO+vJbCNGvjoaGBFW2IE= github.com/klauspost/compress v1.18.5/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= From 073992ed2b5969e2ab04dc955230aa7f37b1ca8a Mon Sep 17 00:00:00 2001 From: "kernel-internal[bot]" <260533166+kernel-internal[bot]@users.noreply.github.com> Date: Thu, 3 Sep 2026 14:39:22 +0000 Subject: [PATCH 22/26] chore: update Go SDK to 7a377c7 and surface OTLP destination delivery health Updates github.com/kernel/kernel-go-sdk to v0.98.1-0.20260903142348-7a377c78440a (7a377c7). The only SDK change since v0.98.0 is on the OtlpDestination response, which gained consecutive_failures, last_error, last_error_at and last_export_at. No new endpoints or request params, so a full enumeration of api.md against the command tree turned up no missing commands or flags. 'kernel telemetry destinations get/create/update' now print Delivery, Consecutive Failures, Last Export At, Last Error and Last Error At, and 'list' gained a Delivery column. Delivery keys off consecutive_failures alone, since last_error/last_error_at are retained after a later success and would otherwise read as a live failure. Tested against the live API: telemetry destinations create/get/list/delete, get -o json (health fields pass through), and a browser session created with --telemetry-export-otlp. The API reported consecutive_failures 0 with no health timestamps throughout, so the healthy and never-delivered paths are covered live and the failing and retained-error paths by unit tests. Co-Authored-By: Claude Opus 5 --- cmd/telemetry_destinations.go | 33 ++++++++++++++-- cmd/telemetry_destinations_test.go | 62 ++++++++++++++++++++++++++++++ go.mod | 2 +- go.sum | 4 +- 4 files changed, 95 insertions(+), 6 deletions(-) diff --git a/cmd/telemetry_destinations.go b/cmd/telemetry_destinations.go index f8b4d417..452c3690 100644 --- a/cmd/telemetry_destinations.go +++ b/cmd/telemetry_destinations.go @@ -146,7 +146,7 @@ func (c TelemetryDestinationsCmd) List(ctx context.Context, in TelemetryDestinat return nil } - rows := pterm.TableData{{"ID", "Name", "Endpoint", "Description", "Headers", "Created At"}} + rows := pterm.TableData{{"ID", "Name", "Endpoint", "Description", "Headers", "Delivery", "Created At"}} for _, d := range items { rows = append(rows, []string{ d.ID, @@ -154,6 +154,7 @@ func (c TelemetryDestinationsCmd) List(ctx context.Context, in TelemetryDestinat d.Endpoint, util.OrDash(d.Description), util.OrDash(formatOtlpDestinationHeaders(d.Headers)), + formatOtlpDestinationDelivery(d), util.FormatLocal(d.CreatedAt), }) } @@ -332,6 +333,20 @@ func formatOtlpDestinationHeaders(headers map[string]string) string { return strings.Join(names, ", ") } +// formatOtlpDestinationDelivery summarizes whether exports are currently +// landing. Only ConsecutiveFailures answers that: LastError and LastErrorAt are +// retained after a later success, so a destination can carry both a recorded +// error and a healthy status. +func formatOtlpDestinationDelivery(d kernel.OtlpDestination) string { + if d.ConsecutiveFailures > 0 { + return fmt.Sprintf("failing (%d consecutive)", d.ConsecutiveFailures) + } + if d.LastExportAt.IsZero() && d.LastErrorAt.IsZero() { + return "no deliveries yet" + } + return "ok" +} + func printOtlpDestinationDetail(d *kernel.OtlpDestination) { rows := pterm.TableData{ {"Property", "Value"}, @@ -340,6 +355,13 @@ func printOtlpDestinationDetail(d *kernel.OtlpDestination) { {"Endpoint", d.Endpoint}, {"Description", util.OrDash(d.Description)}, {"Headers", util.OrDash(formatOtlpDestinationHeaders(d.Headers))}, + {"Delivery", formatOtlpDestinationDelivery(*d)}, + {"Consecutive Failures", fmt.Sprintf("%d", d.ConsecutiveFailures)}, + {"Last Export At", util.FormatLocal(d.LastExportAt)}, + // Kept even once exports recover, so it is labelled as the last recorded + // failure rather than as the destination's current state. + {"Last Error", util.OrDash(d.LastError)}, + {"Last Error At", util.FormatLocal(d.LastErrorAt)}, {"Created At", util.FormatLocal(d.CreatedAt)}, {"Updated At", util.FormatLocal(d.UpdatedAt)}, } @@ -379,8 +401,13 @@ var telemetryDestinationsListCmd = &cobra.Command{ var telemetryDestinationsGetCmd = &cobra.Command{ Use: "get ", Short: "Get an OTLP destination by ID or name", - Args: cobra.ExactArgs(1), - RunE: runTelemetryDestinationsGet, + Long: "Get an OTLP destination, including its delivery health.\n\n" + + "Delivery reads Consecutive Failures: zero means the most recently recorded delivery succeeded. " + + "Last Error and Last Error At describe the last failure Kernel recorded and are kept after a later " + + "success, so they can predate Last Export At and do not by themselves mean export is broken. " + + "Response bodies, endpoint URLs and credentials are never returned in Last Error.", + Args: cobra.ExactArgs(1), + RunE: runTelemetryDestinationsGet, } var telemetryDestinationsCreateCmd = &cobra.Command{ diff --git a/cmd/telemetry_destinations_test.go b/cmd/telemetry_destinations_test.go index 47e41020..73d174ec 100644 --- a/cmd/telemetry_destinations_test.go +++ b/cmd/telemetry_destinations_test.go @@ -281,3 +281,65 @@ func TestFormatOtlpDestinationHeaders(t *testing.T) { assert.Equal(t, "", formatOtlpDestinationHeaders(nil)) assert.Equal(t, "Authorization, X-Api-Key", formatOtlpDestinationHeaders(map[string]string{"X-Api-Key": "", "Authorization": ""})) } + +func TestFormatOtlpDestinationDelivery(t *testing.T) { + exported := time.Unix(1_700_000_000, 0) + failed := time.Unix(1_600_000_000, 0) + + assert.Equal(t, "no deliveries yet", formatOtlpDestinationDelivery(kernel.OtlpDestination{})) + assert.Equal(t, "ok", formatOtlpDestinationDelivery(kernel.OtlpDestination{LastExportAt: exported})) + assert.Equal(t, "failing (3 consecutive)", formatOtlpDestinationDelivery(kernel.OtlpDestination{ + ConsecutiveFailures: 3, + LastExportAt: exported, + LastErrorAt: exported, + })) + // A retained error from before the last success must not read as failing. + assert.Equal(t, "ok", formatOtlpDestinationDelivery(kernel.OtlpDestination{ + LastExportAt: exported, + LastError: "http_401", + LastErrorAt: failed, + })) +} + +func TestTelemetryDestinationsGet_ShowsDeliveryHealth(t *testing.T) { + buf := capturePtermOutput(t) + fake := &FakeTelemetryDestinationsService{GetFunc: func(ctx context.Context, idOrName string, opts ...option.RequestOption) (*kernel.OtlpDestination, error) { + return &kernel.OtlpDestination{ + ID: "d1", + Name: "honeycomb", + Endpoint: "https://api.honeycomb.io", + ConsecutiveFailures: 2, + LastError: "http_401", + LastErrorAt: time.Unix(1_700_000_000, 0), + LastExportAt: time.Unix(1_600_000_000, 0), + CreatedAt: time.Unix(0, 0), + UpdatedAt: time.Unix(0, 0), + }, nil + }} + c := TelemetryDestinationsCmd{destinations: fake} + require.NoError(t, c.Get(context.Background(), TelemetryDestinationsGetInput{Identifier: "d1"})) + out := buf.String() + assert.Contains(t, out, "failing (2 consecutive)") + assert.Contains(t, out, "http_401") + assert.Contains(t, out, "Last Export At") +} + +func TestTelemetryDestinationsList_ShowsDeliveryColumn(t *testing.T) { + buf := capturePtermOutput(t) + items := []kernel.OtlpDestination{{ + ID: "d1", + Name: "honeycomb", + Endpoint: "https://api.honeycomb.io", + ConsecutiveFailures: 5, + CreatedAt: time.Unix(0, 0), + UpdatedAt: time.Unix(0, 0), + }} + fake := &FakeTelemetryDestinationsService{ListFunc: func(ctx context.Context, query kernel.TelemetryDestinationListParams, opts ...option.RequestOption) (*pagination.OffsetPagination[kernel.OtlpDestination], error) { + return &pagination.OffsetPagination[kernel.OtlpDestination]{Items: items}, nil + }} + c := TelemetryDestinationsCmd{destinations: fake} + require.NoError(t, c.List(context.Background(), TelemetryDestinationsListInput{Page: 1, PerPage: 20})) + out := buf.String() + assert.Contains(t, out, "Delivery") + assert.Contains(t, out, "failing (5 consecutive)") +} diff --git a/go.mod b/go.mod index 816bc1a8..bc751a59 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.1 github.com/golang-jwt/jwt/v5 v5.2.2 github.com/joho/godotenv v1.5.1 - github.com/kernel/kernel-go-sdk v0.98.0 + github.com/kernel/kernel-go-sdk v0.98.1-0.20260903142348-7a377c78440a github.com/klauspost/compress v1.18.5 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c github.com/pterm/pterm v0.12.80 diff --git a/go.sum b/go.sum index 4a009f70..671e4b7c 100644 --- a/go.sum +++ b/go.sum @@ -64,8 +64,8 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= -github.com/kernel/kernel-go-sdk v0.98.0 h1:PefacBIPuhDU1NBood5wbgy8UWf3z6fmbrjJDn4/LC0= -github.com/kernel/kernel-go-sdk v0.98.0/go.mod h1:EeZzSuHZVeHKxKCPUzxou2bovNGhXaz0RXrSqKNf1AQ= +github.com/kernel/kernel-go-sdk v0.98.1-0.20260903142348-7a377c78440a h1:ox8aHPzZHvognOoyjXeECk/tFh1Gg+ceY5D9DrLTdFA= +github.com/kernel/kernel-go-sdk v0.98.1-0.20260903142348-7a377c78440a/go.mod h1:EeZzSuHZVeHKxKCPUzxou2bovNGhXaz0RXrSqKNf1AQ= github.com/klauspost/compress v1.18.5 h1:/h1gH5Ce+VWNLSWqPzOVn6XBO+vJbCNGvjoaGBFW2IE= github.com/klauspost/compress v1.18.5/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= From 75eae00a9d6b6fda34c92019e1dcdc88bd191a44 Mon Sep 17 00:00:00 2001 From: "kernel-internal[bot]" Date: Fri, 4 Sep 2026 18:33:47 +0000 Subject: [PATCH 23/26] chore: update Go SDK to 31c5fee and add vaults commands Update kernel-go-sdk to 31c5fee384421d8c66f9c8bb5e5ef0c0ac7e194a, which adds the Vaults resource (11 endpoints) and links vaults to browser sessions. New commands (kernel vaults): - create, get, list, delete for client.Vaults.{Upsert,Get,List,Delete} - items {create,get,list,update,delete,events,perform-operation} for client.Vaults.Items.* Vault item specs are discriminated unions spanning four provider variants, so they are taken as JSON via --spec / --spec-file (matching the --chrome-policy convention) rather than a flag per provider-conditional field. New flags: - browsers create --vault for BrowserNewParams.Vaults (repeatable, ID or name) - browsers get now shows Vaults and Usage Status for the new response fields vaults list uses the page-based pagination UX (--page/--per-page + footer). Tested against the real API: vaults create/get/list/delete (incl. pagination footer), items create for wallet(link), wallet(agentcard) and card(agentcard) via both --spec and --spec-file -, items get (incl. --wait/--expand), list, update (verified persisted), events (incl. --after/--wait), perform-operation, delete; browsers create --vault by both name and ID, verified the Vaults row in browsers get and Usage Status on a deleted session. All test resources cleaned up. go build, go vet and go test ./... pass. Co-Authored-By: Claude Opus 5 --- cmd/browsers.go | 48 +++ cmd/vaults.go | 950 ++++++++++++++++++++++++++++++++++++++++++++++++ go.mod | 2 +- go.sum | 4 +- 4 files changed, 1001 insertions(+), 3 deletions(-) create mode 100644 cmd/vaults.go diff --git a/cmd/browsers.go b/cmd/browsers.go index 60627c25..5af2cd39 100644 --- a/cmd/browsers.go +++ b/cmd/browsers.go @@ -252,6 +252,24 @@ func formatPrivateHosts(network kernel.BrowserNetworkConfig) string { return strings.Join(network.PrivateHosts, ", ") } +// formatVaultReferences renders the vaults linked to a session for table output, +// preferring each vault's name and falling back to its ID. It returns an empty +// string when no vaults are linked, so the row can be omitted entirely. +func formatVaultReferences(vaults []kernel.VaultReference) string { + if len(vaults) == 0 { + return "" + } + labels := make([]string, 0, len(vaults)) + for _, vault := range vaults { + if vault.Name != "" { + labels = append(labels, vault.Name) + continue + } + labels = append(labels, vault.ID) + } + return strings.Join(labels, ", ") +} + // parseStringMapFlag parses repeated KEY=value flag values into a map. It returns a nil // map when no values were given, so callers can distinguish "flag absent" from "flag set // to an empty map". @@ -383,6 +401,7 @@ type BrowsersCreateInput struct { PrivateHosts []string StartURL string Extensions []string + Vaults []string Viewport string Telemetry string TelemetryCdpExclude string @@ -662,6 +681,24 @@ func (b BrowsersCmd) Create(ctx context.Context, in BrowsersCreateInput) error { } } + // Map vaults (IDs or names) into params.Vaults. Links are immutable once the + // session is created. + if len(in.Vaults) > 0 { + for _, vault := range in.Vaults { + val := strings.TrimSpace(vault) + if val == "" { + continue + } + item := kernel.VaultReferenceParam{} + if cuidRegex.MatchString(val) { + item.ID = kernel.Opt(val) + } else { + item.Name = kernel.Opt(val) + } + params.Vaults = append(params.Vaults, item) + } + } + // Add viewport if specified if in.Viewport != "" { width, height, refreshRate, err := parseViewport(in.Viewport) @@ -848,9 +885,17 @@ func (b BrowsersCmd) Get(ctx context.Context, in BrowsersGetInput) error { tableData = append(tableData, []string{"Proxy", proxy}) } tableData = append(tableData, []string{"Private Hosts", formatPrivateHosts(browser.Network)}) + if vaults := formatVaultReferences(browser.Vaults); vaults != "" { + tableData = append(tableData, []string{"Vaults", vaults}) + } if !browser.DeletedAt.IsZero() { tableData = append(tableData, []string{"Deleted At", util.FormatLocal(browser.DeletedAt)}) } + // Only populated for deleted sessions, where "pending" means the usage figures + // above are not yet the final billed ones. + if browser.UsageStatus != "" { + tableData = append(tableData, []string{"Usage Status", string(browser.UsageStatus)}) + } PrintTableNoPad(tableData, true) return nil @@ -3088,6 +3133,7 @@ func init() { browsersCreateCmd.Flags().StringSlice("private-host", nil, "Destinations the browser reaches directly through its own network instead of Kernel-managed egress, for private hosts on a VPN or tunnel the session joins (repeat or comma-separated, max 32). Accepts hostname patterns ('*.example.ts.net'), IPs ('10.1.30.63', '[fd00::1]'), and private CIDRs ('100.64.0.0/10'). Replaces the default private ranges (RFC1918, 100.64.0.0/10, fc00::/7); omit to keep them. Fixed once the session is created") browsersCreateCmd.Flags().String("start-url", "", "Initial page to open on launch") browsersCreateCmd.Flags().StringSlice("extension", []string{}, "Extension IDs or names to load (repeatable; may be passed multiple times or comma-separated)") + browsersCreateCmd.Flags().StringSlice("vault", []string{}, "Vault IDs or names to link to the session (repeatable; may be passed multiple times or comma-separated). Fixed once the session is created") browsersCreateCmd.Flags().String("viewport", "", "Browser viewport size (e.g., 1920x1080@25). Supported: 2560x1440@10, 1920x1080@25, 1920x1200@25, 1440x900@25, 1024x768@60, 1200x800@60, 1280x800@60") browsersCreateCmd.Flags().Bool("viewport-interactive", false, "Interactively select viewport size from list") browsersCreateCmd.Flags().String("pool-id", "", "Browser pool ID to acquire from (mutually exclusive with --pool-name)") @@ -3220,6 +3266,7 @@ func runBrowsersCreate(cmd *cobra.Command, args []string) error { privateHosts, _ := cmd.Flags().GetStringSlice("private-host") startURL, _ := cmd.Flags().GetString("start-url") extensions, _ := cmd.Flags().GetStringSlice("extension") + vaults, _ := cmd.Flags().GetStringSlice("vault") viewport, _ := cmd.Flags().GetString("viewport") viewportInteractive, _ := cmd.Flags().GetBool("viewport-interactive") poolID, _ := cmd.Flags().GetString("pool-id") @@ -3351,6 +3398,7 @@ func runBrowsersCreate(cmd *cobra.Command, args []string) error { PrivateHosts: privateHosts, StartURL: startURL, Extensions: extensions, + Vaults: vaults, Viewport: viewport, Telemetry: telemetry, TelemetryCdpExclude: telemetryCdpExclude, diff --git a/cmd/vaults.go b/cmd/vaults.go new file mode 100644 index 00000000..e7c6314a --- /dev/null +++ b/cmd/vaults.go @@ -0,0 +1,950 @@ +package cmd + +import ( + "context" + "encoding/json" + "fmt" + "io" + "os" + "strings" + + "github.com/kernel/cli/pkg/interactive" + "github.com/kernel/cli/pkg/util" + "github.com/kernel/kernel-go-sdk" + "github.com/kernel/kernel-go-sdk/option" + "github.com/kernel/kernel-go-sdk/packages/pagination" + "github.com/pterm/pterm" + "github.com/samber/lo" + "github.com/spf13/cobra" +) + +// VaultsService defines the subset of the Kernel SDK vault client that we use. +type VaultsService interface { + Get(ctx context.Context, idOrName string, opts ...option.RequestOption) (res *kernel.Vault, err error) + List(ctx context.Context, query kernel.VaultListParams, opts ...option.RequestOption) (res *pagination.OffsetPagination[kernel.Vault], err error) + Delete(ctx context.Context, idOrName string, opts ...option.RequestOption) (err error) + Upsert(ctx context.Context, body kernel.VaultUpsertParams, opts ...option.RequestOption) (res *kernel.Vault, err error) +} + +// VaultItemsService defines the subset of the Kernel SDK vault item client that we use. +type VaultItemsService interface { + Get(ctx context.Context, key string, params kernel.VaultItemGetParams, opts ...option.RequestOption) (res *kernel.VaultItemUnion, err error) + Update(ctx context.Context, key string, params kernel.VaultItemUpdateParams, opts ...option.RequestOption) (res *kernel.VaultItemUnion, err error) + List(ctx context.Context, idOrName string, opts ...option.RequestOption) (res *[]kernel.VaultItemUnion, err error) + Delete(ctx context.Context, key string, body kernel.VaultItemDeleteParams, opts ...option.RequestOption) (err error) + Events(ctx context.Context, key string, params kernel.VaultItemEventsParams, opts ...option.RequestOption) (res *[]kernel.VaultItemEvent, err error) + PerformOperation(ctx context.Context, key string, params kernel.VaultItemPerformOperationParams, opts ...option.RequestOption) (res *kernel.VaultItemUnion, err error) + Upsert(ctx context.Context, key string, params kernel.VaultItemUpsertParams, opts ...option.RequestOption) (res *kernel.VaultItemUnion, err error) +} + +// VaultsCmd handles vault and vault item operations independent of cobra. +type VaultsCmd struct { + vaults VaultsService + items VaultItemsService + prompter interactive.Prompter +} + +type VaultsListInput struct { + Page int + PerPage int + Output string +} + +type VaultsGetInput struct { + Identifier string + Output string +} + +type VaultsCreateInput struct { + Name string + Output string +} + +type VaultsDeleteInput struct { + Identifier string + SkipConfirm bool +} + +type VaultItemsListInput struct { + Vault string + Output string +} + +type VaultItemsGetInput struct { + Vault string + Key string + Wait int + Expand []string + Output string +} + +type VaultItemsCreateInput struct { + Vault string + Key string + Type string + Spec string + SpecFile string + Output string +} + +type VaultItemsUpdateInput struct { + Vault string + Key string + Spec string + SpecFile string + Output string +} + +type VaultItemsDeleteInput struct { + Vault string + Key string + SkipConfirm bool +} + +type VaultItemsEventsInput struct { + Vault string + Key string + After string + Wait int + Output string +} + +type VaultItemsPerformOperationInput struct { + Vault string + Key string + Type string + Output string +} + +// --- Vaults --- + +func (v VaultsCmd) List(ctx context.Context, in VaultsListInput) error { + if err := validateJSONOutput(in.Output); err != nil { + return err + } + + page := in.Page + perPage := in.PerPage + if page <= 0 { + page = 1 + } + if perPage <= 0 { + perPage = 20 + } + + if in.Output != "json" { + pterm.Info.Println("Fetching vaults...") + } + + params := kernel.VaultListParams{} + params.Limit = kernel.Opt(int64(perPage + 1)) + params.Offset = kernel.Opt(int64((page - 1) * perPage)) + + result, err := v.vaults.List(ctx, params) + if err != nil { + return util.CleanedUpSdkError{Err: err} + } + + var items []kernel.Vault + if result != nil { + items = result.Items + } + + hasMore := len(items) > perPage + if hasMore { + items = items[:perPage] + } + itemsThisPage := len(items) + + if in.Output == "json" { + return util.PrintPrettyJSONSlice(items) + } + + if len(items) == 0 { + pterm.Info.Println("No vaults found") + return nil + } + + rows := pterm.TableData{{"Vault ID", "Name", "Created At", "Updated At"}} + for _, vault := range items { + rows = append(rows, []string{ + vault.ID, + vault.Name, + util.FormatLocal(vault.CreatedAt), + util.FormatLocal(vault.UpdatedAt), + }) + } + PrintTableNoPad(rows, true) + + pterm.Printf("\nPage: %d Per-page: %d Items this page: %d Has more: %s\n", page, perPage, itemsThisPage, lo.Ternary(hasMore, "yes", "no")) + if hasMore { + pterm.Printf("Next: %s\n", fmt.Sprintf("kernel vaults list --page %d --per-page %d", page+1, perPage)) + } + + return nil +} + +func (v VaultsCmd) Get(ctx context.Context, in VaultsGetInput) error { + if err := validateJSONOutput(in.Output); err != nil { + return err + } + + vault, err := v.vaults.Get(ctx, in.Identifier) + if err != nil { + return util.CleanedUpSdkError{Err: err} + } + if vault == nil || vault.ID == "" { + if in.Output == "json" { + fmt.Println("null") + return nil + } + pterm.Error.Printf("Vault '%s' not found\n", in.Identifier) + return nil + } + + if in.Output == "json" { + return util.PrintPrettyJSON(vault) + } + + printVaultTable(vault) + return nil +} + +func (v VaultsCmd) Create(ctx context.Context, in VaultsCreateInput) error { + if err := validateJSONOutput(in.Output); err != nil { + return err + } + if strings.TrimSpace(in.Name) == "" { + return fmt.Errorf("--name is required") + } + + vault, err := v.vaults.Upsert(ctx, kernel.VaultUpsertParams{Name: in.Name}) + if err != nil { + return util.CleanedUpSdkError{Err: err} + } + + if in.Output == "json" { + return util.PrintPrettyJSON(vault) + } + + printVaultTable(vault) + return nil +} + +func (v VaultsCmd) Delete(ctx context.Context, in VaultsDeleteInput) error { + if !in.SkipConfirm { + ok, err := v.prompter.Confirm( + fmt.Sprintf("delete vault '%s'", in.Identifier), + fmt.Sprintf("Are you sure you want to delete vault '%s'? Its items are invalidated.", in.Identifier), + ) + if err != nil { + return err + } + if !ok { + pterm.Info.Println("Deletion cancelled") + return nil + } + } + + if err := v.vaults.Delete(ctx, in.Identifier); err != nil { + if util.IsNotFound(err) { + pterm.Info.Printf("Vault '%s' not found\n", in.Identifier) + return nil + } + return util.CleanedUpSdkError{Err: err} + } + pterm.Success.Printf("Deleted vault: %s\n", in.Identifier) + return nil +} + +// --- Vault items --- + +func (v VaultsCmd) ItemsList(ctx context.Context, in VaultItemsListInput) error { + if err := validateJSONOutput(in.Output); err != nil { + return err + } + + if in.Output != "json" { + pterm.Info.Printf("Fetching items in vault '%s'...\n", in.Vault) + } + + res, err := v.items.List(ctx, in.Vault) + if err != nil { + return util.CleanedUpSdkError{Err: err} + } + + var items []kernel.VaultItemUnion + if res != nil { + items = *res + } + + if in.Output == "json" { + return util.PrintPrettyJSONSlice(items) + } + + if len(items) == 0 { + pterm.Info.Printf("No items found in vault '%s'\n", in.Vault) + return nil + } + + rows := pterm.TableData{{"Key", "Type", "Provider", "Status", "Created At", "Updated At"}} + for _, item := range items { + rows = append(rows, []string{ + item.Key, + orDash(item.Type), + orDash(item.State.Provider), + orDash(item.State.Status), + util.FormatLocal(item.CreatedAt), + util.FormatLocal(item.UpdatedAt), + }) + } + PrintTableNoPad(rows, true) + return nil +} + +func (v VaultsCmd) ItemsGet(ctx context.Context, in VaultItemsGetInput) error { + if err := validateJSONOutput(in.Output); err != nil { + return err + } + + params := kernel.VaultItemGetParams{IDOrName: in.Vault} + if in.Wait > 0 { + params.Wait = kernel.Opt(int64(in.Wait)) + } + if expand := normalizeList(in.Expand); len(expand) > 0 { + params.Expand = expand + } + + item, err := v.items.Get(ctx, in.Key, params) + if err != nil { + return util.CleanedUpSdkError{Err: err} + } + if item == nil || item.ID == "" { + if in.Output == "json" { + fmt.Println("null") + return nil + } + pterm.Error.Printf("Vault item '%s' not found in vault '%s'\n", in.Key, in.Vault) + return nil + } + + if in.Output == "json" { + return util.PrintPrettyJSON(item) + } + + printVaultItemTable(item) + return nil +} + +func (v VaultsCmd) ItemsCreate(ctx context.Context, in VaultItemsCreateInput) error { + if err := validateJSONOutput(in.Output); err != nil { + return err + } + + itemType := strings.ToLower(strings.TrimSpace(in.Type)) + if itemType != "wallet" && itemType != "card" { + return fmt.Errorf("invalid --type %q: must be one of wallet, card", in.Type) + } + + raw, err := readVaultItemSpec(in.Spec, in.SpecFile) + if err != nil { + return err + } + if len(raw) == 0 { + return fmt.Errorf("must specify one of --spec or --spec-file") + } + + params := kernel.VaultItemUpsertParams{IDOrName: in.Vault} + switch itemType { + case "wallet": + var spec kernel.WalletVaultItemSpecUnionParam + if err := json.Unmarshal(raw, &spec); err != nil { + return fmt.Errorf("invalid JSON in wallet spec: %w", err) + } + params.OfWallet = &kernel.VaultItemUpsertParamsBodyWallet{Spec: spec} + case "card": + var spec kernel.CardVaultItemSpecUnionParam + if err := json.Unmarshal(raw, &spec); err != nil { + return fmt.Errorf("invalid JSON in card spec: %w", err) + } + params.OfCard = &kernel.VaultItemUpsertParamsBodyCard{Spec: spec} + } + + item, err := v.items.Upsert(ctx, in.Key, params) + if err != nil { + return util.CleanedUpSdkError{Err: err} + } + + if in.Output == "json" { + return util.PrintPrettyJSON(item) + } + + printVaultItemTable(item) + return nil +} + +func (v VaultsCmd) ItemsUpdate(ctx context.Context, in VaultItemsUpdateInput) error { + if err := validateJSONOutput(in.Output); err != nil { + return err + } + + raw, err := readVaultItemSpec(in.Spec, in.SpecFile) + if err != nil { + return err + } + if len(raw) == 0 { + return fmt.Errorf("must specify one of --spec or --spec-file") + } + + var spec kernel.CardVaultItemSpecUnionParam + if err := json.Unmarshal(raw, &spec); err != nil { + return fmt.Errorf("invalid JSON in card spec: %w", err) + } + + item, err := v.items.Update(ctx, in.Key, kernel.VaultItemUpdateParams{ + IDOrName: in.Vault, + Spec: spec, + }) + if err != nil { + return util.CleanedUpSdkError{Err: err} + } + + if in.Output == "json" { + return util.PrintPrettyJSON(item) + } + + printVaultItemTable(item) + return nil +} + +func (v VaultsCmd) ItemsDelete(ctx context.Context, in VaultItemsDeleteInput) error { + if !in.SkipConfirm { + ok, err := v.prompter.Confirm( + fmt.Sprintf("delete vault item '%s'", in.Key), + fmt.Sprintf("Are you sure you want to delete item '%s' from vault '%s'? Its secret value is invalidated.", in.Key, in.Vault), + ) + if err != nil { + return err + } + if !ok { + pterm.Info.Println("Deletion cancelled") + return nil + } + } + + if err := v.items.Delete(ctx, in.Key, kernel.VaultItemDeleteParams{IDOrName: in.Vault}); err != nil { + if util.IsNotFound(err) { + pterm.Info.Printf("Vault item '%s' not found in vault '%s'\n", in.Key, in.Vault) + return nil + } + return util.CleanedUpSdkError{Err: err} + } + pterm.Success.Printf("Deleted vault item: %s\n", in.Key) + return nil +} + +func (v VaultsCmd) ItemsEvents(ctx context.Context, in VaultItemsEventsInput) error { + if err := validateJSONOutput(in.Output); err != nil { + return err + } + + params := kernel.VaultItemEventsParams{IDOrName: in.Vault} + if in.After != "" { + params.After = kernel.Opt(in.After) + } + if in.Wait > 0 { + params.Wait = kernel.Opt(int64(in.Wait)) + } + + res, err := v.items.Events(ctx, in.Key, params) + if err != nil { + return util.CleanedUpSdkError{Err: err} + } + + var events []kernel.VaultItemEvent + if res != nil { + events = *res + } + + if in.Output == "json" { + return util.PrintPrettyJSONSlice(events) + } + + if len(events) == 0 { + pterm.Info.Printf("No events found for item '%s'\n", in.Key) + return nil + } + + rows := pterm.TableData{{"Event ID", "Name", "Browser ID", "Created At"}} + for _, event := range events { + rows = append(rows, []string{ + event.ID, + event.Name, + orDash(event.BrowserID), + util.FormatLocal(event.CreatedAt), + }) + } + PrintTableNoPad(rows, true) + return nil +} + +func (v VaultsCmd) ItemsPerformOperation(ctx context.Context, in VaultItemsPerformOperationInput) error { + if err := validateJSONOutput(in.Output); err != nil { + return err + } + + opType := strings.ToLower(strings.TrimSpace(in.Type)) + if opType == "" { + return fmt.Errorf("--type is required") + } + + item, err := v.items.PerformOperation(ctx, in.Key, kernel.VaultItemPerformOperationParams{ + IDOrName: in.Vault, + Type: kernel.VaultItemPerformOperationParamsType(opType), + }) + if err != nil { + return util.CleanedUpSdkError{Err: err} + } + + if in.Output == "json" { + return util.PrintPrettyJSON(item) + } + + printVaultItemTable(item) + return nil +} + +// --- Display helpers --- + +func printVaultTable(vault *kernel.Vault) { + rows := pterm.TableData{{"Property", "Value"}} + rows = append(rows, []string{"ID", vault.ID}) + rows = append(rows, []string{"Name", vault.Name}) + rows = append(rows, []string{"Created At", util.FormatLocal(vault.CreatedAt)}) + rows = append(rows, []string{"Updated At", util.FormatLocal(vault.UpdatedAt)}) + PrintTableNoPad(rows, true) +} + +func printVaultItemTable(item *kernel.VaultItemUnion) { + rows := pterm.TableData{{"Property", "Value"}} + rows = append(rows, []string{"ID", item.ID}) + rows = append(rows, []string{"Key", item.Key}) + rows = append(rows, []string{"Type", orDash(item.Type)}) + rows = append(rows, []string{"Provider", orDash(item.State.Provider)}) + rows = append(rows, []string{"Status", orDash(item.State.Status)}) + if item.State.StatusReason != "" { + rows = append(rows, []string{"Status Reason", item.State.StatusReason}) + } + if item.Action.Name != "" { + rows = append(rows, []string{"Action", item.Action.Name}) + } + if item.Action.URL != "" { + rows = append(rows, []string{"Action URL", item.Action.URL}) + } + if ops := vaultItemOperationTypes(item); len(ops) > 0 { + rows = append(rows, []string{"Available Operations", strings.Join(ops, ", ")}) + } + if exp := vaultItemExpansionTypes(item); len(exp) > 0 { + rows = append(rows, []string{"Available Expansions", strings.Join(exp, ", ")}) + } + rows = append(rows, []string{"Created At", util.FormatLocal(item.CreatedAt)}) + rows = append(rows, []string{"Updated At", util.FormatLocal(item.UpdatedAt)}) + if !item.ExpiresAt.IsZero() { + rows = append(rows, []string{"Expires At", util.FormatLocal(item.ExpiresAt)}) + } + PrintTableNoPad(rows, true) + + // The operation descriptions tell the caller which operation to invoke next, + // so surface them rather than only the bare type names. + if descriptions := vaultItemOperationDescriptions(item); len(descriptions) > 0 { + pterm.Println() + pterm.DefaultSection.Println("Available operations") + for _, d := range descriptions { + pterm.Printf(" %s: %s\n", d[0], d[1]) + } + } +} + +// vaultItemOperationTypes flattens the wallet/card variants of available_operations +// into their type names. +func vaultItemOperationTypes(item *kernel.VaultItemUnion) []string { + var out []string + for _, op := range item.AvailableOperations.OfVaultItemWalletAvailableOperations { + out = append(out, op.Type) + } + for _, op := range item.AvailableOperations.OfVaultItemCardAvailableOperations { + out = append(out, op.Type) + } + return out +} + +func vaultItemOperationDescriptions(item *kernel.VaultItemUnion) [][2]string { + var out [][2]string + for _, op := range item.AvailableOperations.OfVaultItemWalletAvailableOperations { + out = append(out, [2]string{op.Type, op.Description}) + } + for _, op := range item.AvailableOperations.OfVaultItemCardAvailableOperations { + out = append(out, [2]string{op.Type, op.Description}) + } + return out +} + +func vaultItemExpansionTypes(item *kernel.VaultItemUnion) []string { + var out []string + for _, e := range item.AvailableExpansions.OfVaultItemWalletAvailableExpansions { + out = append(out, e.Type) + } + for _, e := range item.AvailableExpansions.OfVaultItemCardAvailableExpansions { + out = append(out, e.Type) + } + return out +} + +func orDash(s string) string { + if s == "" { + return "-" + } + return s +} + +// normalizeList splits comma-separated entries out of a repeatable string flag +// and drops blanks, so --expand a,b and --expand a --expand b behave the same. +func normalizeList(values []string) []string { + var out []string + for _, value := range values { + for _, part := range strings.Split(value, ",") { + if trimmed := strings.TrimSpace(part); trimmed != "" { + out = append(out, trimmed) + } + } + } + return out +} + +// readVaultItemSpec resolves the --spec / --spec-file inputs into raw JSON. The two +// inputs are mutually exclusive (enforced by cobra); a file path of "-" reads stdin. +// It returns nil when neither input is set. +func readVaultItemSpec(inline, file string) ([]byte, error) { + data := strings.TrimSpace(inline) + if file != "" { + var b []byte + var err error + if file == "-" { + b, err = io.ReadAll(os.Stdin) + } else { + b, err = os.ReadFile(file) + } + if err != nil { + return nil, fmt.Errorf("failed to read spec file: %w", err) + } + data = strings.TrimSpace(string(b)) + } + + if data == "" { + return nil, nil + } + if !json.Valid([]byte(data)) { + return nil, fmt.Errorf("invalid JSON in spec (must be a JSON object)") + } + return []byte(data), nil +} + +// --- Cobra wiring --- + +var vaultsCmd = &cobra.Command{ + Use: "vaults", + Aliases: []string{"vault"}, + Short: "Manage vaults", + Long: "Manage project-scoped vaults and the items they hold.\n\n" + + "A vault is a named container for payment items. Link vaults to a browser session with " + + "'kernel browsers create --vault' so the session can use their items.", + Run: func(cmd *cobra.Command, args []string) { + _ = cmd.Help() + }, +} + +var vaultsListCmd = &cobra.Command{ + Use: "list", + Short: "List vaults in the current project", + Args: cobra.NoArgs, + RunE: runVaultsList, +} + +var vaultsGetCmd = &cobra.Command{ + Use: "get ", + Short: "Get a vault by ID or name", + Args: cobra.ExactArgs(1), + RunE: runVaultsGet, +} + +var vaultsCreateCmd = &cobra.Command{ + Use: "create --name ", + Short: "Create or retrieve a vault by name", + Long: "Create a vault with the given name. The name is immutable, and creating with a name that " + + "already exists returns the existing vault rather than failing.", + Args: cobra.NoArgs, + RunE: runVaultsCreate, +} + +var vaultsDeleteCmd = &cobra.Command{ + Use: "delete ", + Short: "Delete a vault by ID or name", + Long: "Delete a vault. Every item it holds is invalidated along with it.", + Args: cobra.ExactArgs(1), + RunE: runVaultsDelete, +} + +var vaultItemsCmd = &cobra.Command{ + Use: "items", + Aliases: []string{"item"}, + Short: "Manage vault items", + Long: "Manage the items held in a vault.\n\n" + + "An item is either a wallet (an authorized funding source) or a card (a payment credential minted " + + "from a wallet). Items advertise the operations valid in their current state; run 'kernel vaults items get' " + + "and read Available Operations before invoking one with 'kernel vaults items perform-operation'.", + Run: func(cmd *cobra.Command, args []string) { + _ = cmd.Help() + }, +} + +var vaultItemsListCmd = &cobra.Command{ + Use: "list ", + Short: "List items in a vault", + Long: "List the items in a vault. Secret values are never returned.", + Args: cobra.ExactArgs(1), + RunE: runVaultItemsList, +} + +var vaultItemsGetCmd = &cobra.Command{ + Use: "get ", + Short: "Get a vault item", + Long: "Get a vault item along with the operations currently valid for it.\n\n" + + "--wait holds for up to that many seconds while the item is pending authorization or approval. " + + "--expand requests live provider data listed under Available Expansions; expanded data is fetched " + + "from the provider and is not persisted in the item.", + Args: cobra.ExactArgs(2), + RunE: runVaultItemsGet, +} + +var vaultItemsCreateCmd = &cobra.Command{ + Use: "create --type --spec ", + Short: "Create or retrieve a vault item by key", + Long: "Create a vault item under the given key. The key is immutable, and creating with a key that " + + "already exists returns the existing item rather than failing.\n\n" + + "--spec takes the provider-specific spec as a JSON object, discriminated by its \"provider\" field.\n\n" + + "Wallet examples:\n" + + " --type wallet --spec '{\"provider\":\"agentcard\",\"user_id\":\"usr_123\"}'\n" + + " --type wallet --spec '{\"provider\":\"link\",\"authorization\":{\"method\":\"oauth\",\"client\":{\"type\":\"kernel_managed\"}}}'\n\n" + + "Card example:\n" + + " --type card --spec '{\"provider\":\"agentcard\",\"wallet\":\"my-wallet\",\"merchant\":\"Acme\",\"amount\":1250,\"currency\":\"USD\"}'\n\n" + + "Amounts are integers in minor currency units (1250 = $12.50).", + Args: cobra.ExactArgs(2), + RunE: runVaultItemsCreate, +} + +var vaultItemsUpdateCmd = &cobra.Command{ + Use: "update --spec ", + Short: "Update a card item's specification", + Long: "Update a card item's specification before or between authorizations. Only card items can be " + + "updated; --spec takes the full replacement card spec as a JSON object.", + Args: cobra.ExactArgs(2), + RunE: runVaultItemsUpdate, +} + +var vaultItemsDeleteCmd = &cobra.Command{ + Use: "delete ", + Short: "Delete a vault item", + Long: "Delete a vault item. Its secret value is invalidated.", + Args: cobra.ExactArgs(2), + RunE: runVaultItemsDelete, +} + +var vaultItemsEventsCmd = &cobra.Command{ + Use: "events ", + Short: "List audit events for a vault item", + Long: "List the immutable audit events recorded for a vault item, oldest first.\n\n" + + "--after returns only events after the given event ID, and --wait long-polls for up to that many " + + "seconds when there is nothing new yet, so the two together follow an item's progress.", + Args: cobra.ExactArgs(2), + RunE: runVaultItemsEvents, +} + +var vaultItemsPerformOperationCmd = &cobra.Command{ + Use: "perform-operation --type ", + Short: "Perform an operation advertised by a vault item", + Long: "Perform one of the operations the item currently advertises. Run 'kernel vaults items get' first " + + "and invoke only an operation listed under Available Operations, following its description. " + + "Operations may call an external provider and return the item's updated state.", + Args: cobra.ExactArgs(2), + RunE: runVaultItemsPerformOperation, +} + +func init() { + vaultsCmd.AddCommand(vaultsListCmd) + vaultsCmd.AddCommand(vaultsGetCmd) + vaultsCmd.AddCommand(vaultsCreateCmd) + vaultsCmd.AddCommand(vaultsDeleteCmd) + vaultsCmd.AddCommand(vaultItemsCmd) + + vaultItemsCmd.AddCommand(vaultItemsListCmd) + vaultItemsCmd.AddCommand(vaultItemsGetCmd) + vaultItemsCmd.AddCommand(vaultItemsCreateCmd) + vaultItemsCmd.AddCommand(vaultItemsUpdateCmd) + vaultItemsCmd.AddCommand(vaultItemsDeleteCmd) + vaultItemsCmd.AddCommand(vaultItemsEventsCmd) + vaultItemsCmd.AddCommand(vaultItemsPerformOperationCmd) + + addJSONOutputFlag(vaultsListCmd) + vaultsListCmd.Flags().Int("page", 1, "Page number (1-based)") + vaultsListCmd.Flags().Int("per-page", 20, "Items per page (default 20)") + + addJSONOutputFlag(vaultsGetCmd) + + addJSONOutputFlag(vaultsCreateCmd) + vaultsCreateCmd.Flags().String("name", "", "Immutable name used to create or retrieve the vault (required)") + _ = vaultsCreateCmd.MarkFlagRequired("name") + + vaultsDeleteCmd.Flags().BoolP("yes", "y", false, "Skip confirmation prompt") + + addJSONOutputFlag(vaultItemsListCmd) + + addJSONOutputFlag(vaultItemsGetCmd) + vaultItemsGetCmd.Flags().Int("wait", 0, "Hold for up to this many seconds while the item is pending authorization or approval (max 60)") + vaultItemsGetCmd.Flags().StringArray("expand", nil, "Live fields to include, from the item's available expansions (repeatable or comma-separated; e.g. payment_methods)") + + addJSONOutputFlag(vaultItemsCreateCmd) + vaultItemsCreateCmd.Flags().String("type", "", "Item type: wallet or card (required)") + vaultItemsCreateCmd.Flags().String("spec", "", "Provider-specific item spec as a JSON object") + vaultItemsCreateCmd.Flags().String("spec-file", "", "Read the item spec (JSON object) from a file (use '-' for stdin)") + vaultItemsCreateCmd.MarkFlagsMutuallyExclusive("spec", "spec-file") + _ = vaultItemsCreateCmd.MarkFlagRequired("type") + + addJSONOutputFlag(vaultItemsUpdateCmd) + vaultItemsUpdateCmd.Flags().String("spec", "", "Replacement card spec as a JSON object") + vaultItemsUpdateCmd.Flags().String("spec-file", "", "Read the card spec (JSON object) from a file (use '-' for stdin)") + vaultItemsUpdateCmd.MarkFlagsMutuallyExclusive("spec", "spec-file") + + vaultItemsDeleteCmd.Flags().BoolP("yes", "y", false, "Skip confirmation prompt") + + addJSONOutputFlag(vaultItemsEventsCmd) + vaultItemsEventsCmd.Flags().String("after", "", "Return only events after this event ID") + vaultItemsEventsCmd.Flags().Int("wait", 0, "Long-poll for new events for up to this many seconds (max 60)") + + addJSONOutputFlag(vaultItemsPerformOperationCmd) + vaultItemsPerformOperationCmd.Flags().String("type", "authorize", "Operation to perform, from the item's available operations") + + rootCmd.AddCommand(vaultsCmd) +} + +func getVaultsHandler(cmd *cobra.Command) VaultsCmd { + client := getKernelClient(cmd) + svc := client.Vaults + items := client.Vaults.Items + return VaultsCmd{vaults: &svc, items: &items, prompter: interactive.NewPrompter()} +} + +func runVaultsList(cmd *cobra.Command, args []string) error { + output, _ := cmd.Flags().GetString("output") + page, _ := cmd.Flags().GetInt("page") + perPage, _ := cmd.Flags().GetInt("per-page") + return getVaultsHandler(cmd).List(cmd.Context(), VaultsListInput{ + Page: page, + PerPage: perPage, + Output: output, + }) +} + +func runVaultsGet(cmd *cobra.Command, args []string) error { + output, _ := cmd.Flags().GetString("output") + return getVaultsHandler(cmd).Get(cmd.Context(), VaultsGetInput{Identifier: args[0], Output: output}) +} + +func runVaultsCreate(cmd *cobra.Command, args []string) error { + name, _ := cmd.Flags().GetString("name") + output, _ := cmd.Flags().GetString("output") + return getVaultsHandler(cmd).Create(cmd.Context(), VaultsCreateInput{Name: name, Output: output}) +} + +func runVaultsDelete(cmd *cobra.Command, args []string) error { + skip, _ := cmd.Flags().GetBool("yes") + return getVaultsHandler(cmd).Delete(cmd.Context(), VaultsDeleteInput{Identifier: args[0], SkipConfirm: skip}) +} + +func runVaultItemsList(cmd *cobra.Command, args []string) error { + output, _ := cmd.Flags().GetString("output") + return getVaultsHandler(cmd).ItemsList(cmd.Context(), VaultItemsListInput{Vault: args[0], Output: output}) +} + +func runVaultItemsGet(cmd *cobra.Command, args []string) error { + output, _ := cmd.Flags().GetString("output") + wait, _ := cmd.Flags().GetInt("wait") + expand, _ := cmd.Flags().GetStringArray("expand") + return getVaultsHandler(cmd).ItemsGet(cmd.Context(), VaultItemsGetInput{ + Vault: args[0], + Key: args[1], + Wait: wait, + Expand: expand, + Output: output, + }) +} + +func runVaultItemsCreate(cmd *cobra.Command, args []string) error { + output, _ := cmd.Flags().GetString("output") + itemType, _ := cmd.Flags().GetString("type") + spec, _ := cmd.Flags().GetString("spec") + specFile, _ := cmd.Flags().GetString("spec-file") + return getVaultsHandler(cmd).ItemsCreate(cmd.Context(), VaultItemsCreateInput{ + Vault: args[0], + Key: args[1], + Type: itemType, + Spec: spec, + SpecFile: specFile, + Output: output, + }) +} + +func runVaultItemsUpdate(cmd *cobra.Command, args []string) error { + output, _ := cmd.Flags().GetString("output") + spec, _ := cmd.Flags().GetString("spec") + specFile, _ := cmd.Flags().GetString("spec-file") + return getVaultsHandler(cmd).ItemsUpdate(cmd.Context(), VaultItemsUpdateInput{ + Vault: args[0], + Key: args[1], + Spec: spec, + SpecFile: specFile, + Output: output, + }) +} + +func runVaultItemsDelete(cmd *cobra.Command, args []string) error { + skip, _ := cmd.Flags().GetBool("yes") + return getVaultsHandler(cmd).ItemsDelete(cmd.Context(), VaultItemsDeleteInput{ + Vault: args[0], + Key: args[1], + SkipConfirm: skip, + }) +} + +func runVaultItemsEvents(cmd *cobra.Command, args []string) error { + output, _ := cmd.Flags().GetString("output") + after, _ := cmd.Flags().GetString("after") + wait, _ := cmd.Flags().GetInt("wait") + return getVaultsHandler(cmd).ItemsEvents(cmd.Context(), VaultItemsEventsInput{ + Vault: args[0], + Key: args[1], + After: after, + Wait: wait, + Output: output, + }) +} + +func runVaultItemsPerformOperation(cmd *cobra.Command, args []string) error { + output, _ := cmd.Flags().GetString("output") + opType, _ := cmd.Flags().GetString("type") + return getVaultsHandler(cmd).ItemsPerformOperation(cmd.Context(), VaultItemsPerformOperationInput{ + Vault: args[0], + Key: args[1], + Type: opType, + Output: output, + }) +} diff --git a/go.mod b/go.mod index bc751a59..f468e82b 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.1 github.com/golang-jwt/jwt/v5 v5.2.2 github.com/joho/godotenv v1.5.1 - github.com/kernel/kernel-go-sdk v0.98.1-0.20260903142348-7a377c78440a + github.com/kernel/kernel-go-sdk v0.98.1-0.20260904181826-31c5fee38442 github.com/klauspost/compress v1.18.5 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c github.com/pterm/pterm v0.12.80 diff --git a/go.sum b/go.sum index 671e4b7c..f90ecaeb 100644 --- a/go.sum +++ b/go.sum @@ -64,8 +64,8 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= -github.com/kernel/kernel-go-sdk v0.98.1-0.20260903142348-7a377c78440a h1:ox8aHPzZHvognOoyjXeECk/tFh1Gg+ceY5D9DrLTdFA= -github.com/kernel/kernel-go-sdk v0.98.1-0.20260903142348-7a377c78440a/go.mod h1:EeZzSuHZVeHKxKCPUzxou2bovNGhXaz0RXrSqKNf1AQ= +github.com/kernel/kernel-go-sdk v0.98.1-0.20260904181826-31c5fee38442 h1:eJlEvDsLczaMx7TGoh1l/wwa0wQfL2GYlmL8QyMUI5A= +github.com/kernel/kernel-go-sdk v0.98.1-0.20260904181826-31c5fee38442/go.mod h1:EeZzSuHZVeHKxKCPUzxou2bovNGhXaz0RXrSqKNf1AQ= github.com/klauspost/compress v1.18.5 h1:/h1gH5Ce+VWNLSWqPzOVn6XBO+vJbCNGvjoaGBFW2IE= github.com/klauspost/compress v1.18.5/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= From c3ed6f1099c2acdc1cec25cdca3a68a592d774ac Mon Sep 17 00:00:00 2001 From: "kernel-internal[bot]" <260533166+kernel-internal[bot]@users.noreply.github.com> Date: Fri, 4 Sep 2026 18:43:54 +0000 Subject: [PATCH 24/26] chore: update Go SDK to v0.99.0 (b228059), test and document vaults MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps github.com/kernel/kernel-go-sdk from 31c5fee to v0.99.0 (b228059). That range is the release commit only — release metadata and changelog, no API surface — so the vault commands already on this branch cover every method in api.md that is not marked x-cli-skip. A full enumeration of api.md against the CLI found no other gaps: the only endpoints without commands are the Config Registry ones and /auth/connections/{id}/exchange, all x-cli-skip. What this commit adds on top of the version bump: - cmd/vaults_test.go: coverage for the new commands, which shipped without any. Pins the list pagination contract (limit = per-page + 1, the extra item trimmed before display, footer and Next hint), the wallet/card spec discrimination for items create/update, --spec vs --spec-file, --wait / --expand / --after plumbing, and the delete confirmations. The two delete paths get the non-interactive fail-fast tests the repo requires of any command that can prompt. - cmd/browsers_test.go: --vault maps Kernel-shaped values to IDs and anything else to names, and drops blanks. - README.md: a Vaults section in the command reference (vaults and vault items, with spec examples) and the browsers create --vault flag. Tested against the production API with the bumped SDK: vaults create/get/list/delete, items create (wallet+agentcard via --spec), list/get (incl. --wait), events, perform-operation (409 as expected for an unauthorized wallet), delete, and browsers create --vault — verified the Vaults row in browsers get and Usage Status on the deleted session. All test resources cleaned up. go build, go vet and go test ./... pass. Co-Authored-By: Claude Opus 5 --- README.md | 66 ++++++ cmd/browsers_test.go | 42 ++++ cmd/vaults_test.go | 542 +++++++++++++++++++++++++++++++++++++++++++ go.mod | 2 +- go.sum | 4 +- 5 files changed, 653 insertions(+), 3 deletions(-) create mode 100644 cmd/vaults_test.go diff --git a/README.md b/README.md index 1ced9238..607f944e 100644 --- a/README.md +++ b/README.md @@ -223,6 +223,7 @@ Commands with JSON output support: - `--proxy-mode direct|default` - Egress mode instead of a selected proxy: `direct` for no proxy regardless of stealth, `default` for the stealth-derived default (Kernel's stealth proxy with `--stealth`, direct egress otherwise). Omit all proxy flags to get the default. - `--name ` - Optional unique name for the session (used to find it later by name; can be changed with `browsers update --name`) - `--tag ` - Set a tag on the session, repeatable; up to 50 pairs + - `--vault ` - Link a project-scoped vault to the session so it can use the vault's items (repeatable or comma-separated). Fixed once the session is created; `browsers get` lists the linked vaults. - `--pool-id ` - Acquire a browser from the specified pool (mutually exclusive with --pool-name; ignores other session flags). `--name`/`--tag` still apply to the acquired session. - `--pool-name ` - Acquire a browser from the pool name (mutually exclusive with --pool-id; ignores other session flags) - `--telemetry=all` - Enable telemetry for all categories @@ -511,6 +512,71 @@ Destinations are the OTLP/HTTP endpoints sessions export to, managed per project - `--to ` - Directory to extract the profile into (required) - `--format ` - Archive format to request: `tar.zst` (compressed, default) or `tar` (decompressed server-side) +### Vaults + +A vault is a named, project-scoped container for payment items. Vault names and +item keys are immutable, so `create` behaves as an upsert: creating with a name +or key that already exists returns what is there rather than failing. Link +vaults to a session with `kernel browsers create --vault `. + +- `kernel vaults list` - List vaults in the current project + - `--page ` - Page number, 1-based (default 1) + - `--per-page ` - Items per page (default 20) + - `--output json`, `-o json` - Output raw JSON array + - When more vaults are available, the CLI prints the exact command to fetch the next page +- `kernel vaults get ` - Get a vault by ID or name + - `--output json`, `-o json` - Output raw JSON object +- `kernel vaults create --name ` - Create or retrieve a vault by name + - `--name ` - Immutable vault name (required) + - `--output json`, `-o json` - Output raw JSON object +- `kernel vaults delete ` - Delete a vault; every item it holds is invalidated + - `-y, --yes` - Skip confirmation prompt + +#### Vault Items + +An item is either a wallet (an authorized funding source) or a card (a payment +credential minted from a wallet). Items advertise the operations valid in their +current state, so run `kernel vaults items get` and read `Available Operations` +before invoking one. + +- `kernel vaults items list ` - List a vault's items; secret values are never returned + - `--output json`, `-o json` - Output raw JSON array +- `kernel vaults items get ` - Get an item and the operations currently valid for it + - `--wait ` - Hold for up to this many seconds while the item is pending authorization or approval (max 60) + - `--expand ` - Request live provider data listed under `Available Expansions`, e.g. `payment_methods` (repeatable or comma-separated). Expanded data is fetched from the provider and is not persisted in the item. + - `--output json`, `-o json` - Output raw JSON object +- `kernel vaults items create --type --spec ` - Create or retrieve an item by key + - `--type wallet|card` - Item type (required) + - `--spec ` - Provider-specific spec as a JSON object, discriminated by its `provider` field. Amounts are integers in minor currency units (`1250` = $12.50). + - `--spec-file ` - Read the spec from a file (use `-` for stdin). Mutually exclusive with `--spec`. + - `--output json`, `-o json` - Output raw JSON object + + Examples: + + ```bash + kernel vaults items create my-vault my-wallet --type wallet \ + --spec '{"provider":"agentcard","user_id":"usr_123"}' + + kernel vaults items create my-vault my-wallet --type wallet \ + --spec '{"provider":"link","authorization":{"method":"oauth","client":{"type":"kernel_managed"}}}' + + kernel vaults items create my-vault my-card --type card \ + --spec '{"provider":"agentcard","wallet":"my-wallet","merchant":"Acme","amount":1250,"currency":"USD"}' + ``` + +- `kernel vaults items update --spec ` - Update a card item's spec before or between authorizations + - `--spec ` / `--spec-file ` - Full replacement card spec (only card items can be updated) + - `--output json`, `-o json` - Output raw JSON object +- `kernel vaults items perform-operation ` - Perform an operation the item advertises + - `--type ` - Operation to perform (default `authorize`). Operations may call an external provider and return the item's updated state. + - `--output json`, `-o json` - Output raw JSON object +- `kernel vaults items events ` - List an item's immutable audit events, oldest first + - `--after ` - Return only events after this event ID + - `--wait ` - Long-poll for new events for up to this many seconds (max 60). Together with `--after`, this follows an item's progress. + - `--output json`, `-o json` - Output raw JSON array +- `kernel vaults items delete ` - Delete an item; its secret value is invalidated + - `-y, --yes` - Skip confirmation prompt + ### Projects - `kernel projects list` - List projects (up to 100 by default) diff --git a/cmd/browsers_test.go b/cmd/browsers_test.go index a039f2fd..6e91fb9a 100644 --- a/cmd/browsers_test.go +++ b/cmd/browsers_test.go @@ -518,6 +518,48 @@ func TestBrowsersCreate_WithNameAndTags(t *testing.T) { assert.Contains(t, out, "env=staging, team=backend") } +func TestBrowsersCreate_WithVaults(t *testing.T) { + setupStdoutCapture(t) + + var captured kernel.BrowserNewParams + fake := &FakeBrowsersService{ + NewFunc: func(ctx context.Context, body kernel.BrowserNewParams, opts ...option.RequestOption) (*kernel.BrowserNewResponse, error) { + captured = body + return &kernel.BrowserNewResponse{SessionID: "sess-vaults"}, nil + }, + } + + b := BrowsersCmd{browsers: fake} + err := b.Create(context.Background(), BrowsersCreateInput{ + // A Kernel-shaped identifier is sent as an ID, anything else as a name, + // and blank entries are dropped. + Vaults: []string{"gtw36zdwv9as2etqetxpnspl", " payments ", ""}, + }) + assert.NoError(t, err) + + require.Len(t, captured.Vaults, 2) + assert.Equal(t, "gtw36zdwv9as2etqetxpnspl", captured.Vaults[0].ID.Value) + assert.False(t, captured.Vaults[0].Name.Valid()) + assert.Equal(t, "payments", captured.Vaults[1].Name.Value) + assert.False(t, captured.Vaults[1].ID.Valid()) +} + +func TestBrowsersCreate_WithoutVaults(t *testing.T) { + setupStdoutCapture(t) + + var captured kernel.BrowserNewParams + fake := &FakeBrowsersService{ + NewFunc: func(ctx context.Context, body kernel.BrowserNewParams, opts ...option.RequestOption) (*kernel.BrowserNewResponse, error) { + captured = body + return &kernel.BrowserNewResponse{SessionID: "sess-no-vaults"}, nil + }, + } + + b := BrowsersCmd{browsers: fake} + assert.NoError(t, b.Create(context.Background(), BrowsersCreateInput{})) + assert.Empty(t, captured.Vaults) +} + func TestBrowsersCreate_WithPrivateHosts(t *testing.T) { setupStdoutCapture(t) diff --git a/cmd/vaults_test.go b/cmd/vaults_test.go new file mode 100644 index 00000000..01b590c9 --- /dev/null +++ b/cmd/vaults_test.go @@ -0,0 +1,542 @@ +package cmd + +import ( + "context" + "encoding/json" + "os" + "path/filepath" + "testing" + "time" + + "github.com/kernel/cli/pkg/interactive" + kernel "github.com/kernel/kernel-go-sdk" + "github.com/kernel/kernel-go-sdk/option" + "github.com/kernel/kernel-go-sdk/packages/pagination" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" +) + +// FakeVaultsService implements VaultsService +type FakeVaultsService struct { + GetFunc func(ctx context.Context, idOrName string, opts ...option.RequestOption) (*kernel.Vault, error) + ListFunc func(ctx context.Context, query kernel.VaultListParams, opts ...option.RequestOption) (*pagination.OffsetPagination[kernel.Vault], error) + DeleteFunc func(ctx context.Context, idOrName string, opts ...option.RequestOption) error + UpsertFunc func(ctx context.Context, body kernel.VaultUpsertParams, opts ...option.RequestOption) (*kernel.Vault, error) +} + +func (f *FakeVaultsService) Get(ctx context.Context, idOrName string, opts ...option.RequestOption) (*kernel.Vault, error) { + if f.GetFunc != nil { + return f.GetFunc(ctx, idOrName, opts...) + } + return &kernel.Vault{ID: "v1", Name: idOrName, CreatedAt: time.Unix(0, 0), UpdatedAt: time.Unix(0, 0)}, nil +} + +func (f *FakeVaultsService) List(ctx context.Context, query kernel.VaultListParams, opts ...option.RequestOption) (*pagination.OffsetPagination[kernel.Vault], error) { + if f.ListFunc != nil { + return f.ListFunc(ctx, query, opts...) + } + return &pagination.OffsetPagination[kernel.Vault]{Items: []kernel.Vault{}}, nil +} + +func (f *FakeVaultsService) Delete(ctx context.Context, idOrName string, opts ...option.RequestOption) error { + if f.DeleteFunc != nil { + return f.DeleteFunc(ctx, idOrName, opts...) + } + return nil +} + +func (f *FakeVaultsService) Upsert(ctx context.Context, body kernel.VaultUpsertParams, opts ...option.RequestOption) (*kernel.Vault, error) { + if f.UpsertFunc != nil { + return f.UpsertFunc(ctx, body, opts...) + } + return &kernel.Vault{ID: "v1", Name: body.Name, CreatedAt: time.Unix(0, 0), UpdatedAt: time.Unix(0, 0)}, nil +} + +// FakeVaultItemsService implements VaultItemsService +type FakeVaultItemsService struct { + GetFunc func(ctx context.Context, key string, params kernel.VaultItemGetParams, opts ...option.RequestOption) (*kernel.VaultItemUnion, error) + UpdateFunc func(ctx context.Context, key string, params kernel.VaultItemUpdateParams, opts ...option.RequestOption) (*kernel.VaultItemUnion, error) + ListFunc func(ctx context.Context, idOrName string, opts ...option.RequestOption) (*[]kernel.VaultItemUnion, error) + DeleteFunc func(ctx context.Context, key string, body kernel.VaultItemDeleteParams, opts ...option.RequestOption) error + EventsFunc func(ctx context.Context, key string, params kernel.VaultItemEventsParams, opts ...option.RequestOption) (*[]kernel.VaultItemEvent, error) + PerformOperationFunc func(ctx context.Context, key string, params kernel.VaultItemPerformOperationParams, opts ...option.RequestOption) (*kernel.VaultItemUnion, error) + UpsertFunc func(ctx context.Context, key string, params kernel.VaultItemUpsertParams, opts ...option.RequestOption) (*kernel.VaultItemUnion, error) +} + +func (f *FakeVaultItemsService) Get(ctx context.Context, key string, params kernel.VaultItemGetParams, opts ...option.RequestOption) (*kernel.VaultItemUnion, error) { + if f.GetFunc != nil { + return f.GetFunc(ctx, key, params, opts...) + } + return &kernel.VaultItemUnion{ID: "i1", Key: key, Type: "wallet"}, nil +} + +func (f *FakeVaultItemsService) Update(ctx context.Context, key string, params kernel.VaultItemUpdateParams, opts ...option.RequestOption) (*kernel.VaultItemUnion, error) { + if f.UpdateFunc != nil { + return f.UpdateFunc(ctx, key, params, opts...) + } + return &kernel.VaultItemUnion{ID: "i1", Key: key, Type: "card"}, nil +} + +func (f *FakeVaultItemsService) List(ctx context.Context, idOrName string, opts ...option.RequestOption) (*[]kernel.VaultItemUnion, error) { + if f.ListFunc != nil { + return f.ListFunc(ctx, idOrName, opts...) + } + items := []kernel.VaultItemUnion{} + return &items, nil +} + +func (f *FakeVaultItemsService) Delete(ctx context.Context, key string, body kernel.VaultItemDeleteParams, opts ...option.RequestOption) error { + if f.DeleteFunc != nil { + return f.DeleteFunc(ctx, key, body, opts...) + } + return nil +} + +func (f *FakeVaultItemsService) Events(ctx context.Context, key string, params kernel.VaultItemEventsParams, opts ...option.RequestOption) (*[]kernel.VaultItemEvent, error) { + if f.EventsFunc != nil { + return f.EventsFunc(ctx, key, params, opts...) + } + events := []kernel.VaultItemEvent{} + return &events, nil +} + +func (f *FakeVaultItemsService) PerformOperation(ctx context.Context, key string, params kernel.VaultItemPerformOperationParams, opts ...option.RequestOption) (*kernel.VaultItemUnion, error) { + if f.PerformOperationFunc != nil { + return f.PerformOperationFunc(ctx, key, params, opts...) + } + return &kernel.VaultItemUnion{ID: "i1", Key: key, Type: "card"}, nil +} + +func (f *FakeVaultItemsService) Upsert(ctx context.Context, key string, params kernel.VaultItemUpsertParams, opts ...option.RequestOption) (*kernel.VaultItemUnion, error) { + if f.UpsertFunc != nil { + return f.UpsertFunc(ctx, key, params, opts...) + } + return &kernel.VaultItemUnion{ID: "i1", Key: key, Type: "wallet"}, nil +} + +// vaultItemFromJSON builds a VaultItemUnion the way the SDK does, so tests +// exercise the same union field population the API responses produce. +func vaultItemFromJSON(t *testing.T, raw string) kernel.VaultItemUnion { + t.Helper() + var item kernel.VaultItemUnion + require.NoError(t, json.Unmarshal([]byte(raw), &item)) + return item +} + +func TestVaultsList_Empty(t *testing.T) { + buf := capturePtermOutput(t) + v := VaultsCmd{vaults: &FakeVaultsService{}} + require.NoError(t, v.List(context.Background(), VaultsListInput{Page: 1, PerPage: 20})) + assert.Contains(t, buf.String(), "No vaults found") +} + +func TestVaultsList_PaginationFooter(t *testing.T) { + buf := capturePtermOutput(t) + // Three vaults for a page size of two: the extra item is what signals that + // another page exists, and must not be displayed. + rows := []kernel.Vault{ + {ID: "v1", Name: "alpha", CreatedAt: time.Unix(0, 0), UpdatedAt: time.Unix(0, 0)}, + {ID: "v2", Name: "beta", CreatedAt: time.Unix(0, 0), UpdatedAt: time.Unix(0, 0)}, + {ID: "v3", Name: "gamma", CreatedAt: time.Unix(0, 0), UpdatedAt: time.Unix(0, 0)}, + } + var got kernel.VaultListParams + fake := &FakeVaultsService{ListFunc: func(ctx context.Context, query kernel.VaultListParams, opts ...option.RequestOption) (*pagination.OffsetPagination[kernel.Vault], error) { + got = query + return &pagination.OffsetPagination[kernel.Vault]{Items: rows}, nil + }} + v := VaultsCmd{vaults: fake} + require.NoError(t, v.List(context.Background(), VaultsListInput{Page: 2, PerPage: 2})) + + assert.Equal(t, int64(3), got.Limit.Value, "requests one extra item to detect the next page") + assert.Equal(t, int64(2), got.Offset.Value) + + out := buf.String() + assert.Contains(t, out, "alpha") + assert.Contains(t, out, "beta") + assert.NotContains(t, out, "gamma", "the extra item is trimmed before display") + assert.Contains(t, out, "Page: 2 Per-page: 2 Items this page: 2 Has more: yes") + assert.Contains(t, out, "Next: kernel vaults list --page 3 --per-page 2") +} + +func TestVaultsList_DefaultsPageAndPerPage(t *testing.T) { + _ = capturePtermOutput(t) + var got kernel.VaultListParams + fake := &FakeVaultsService{ListFunc: func(ctx context.Context, query kernel.VaultListParams, opts ...option.RequestOption) (*pagination.OffsetPagination[kernel.Vault], error) { + got = query + return &pagination.OffsetPagination[kernel.Vault]{Items: []kernel.Vault{}}, nil + }} + v := VaultsCmd{vaults: fake} + require.NoError(t, v.List(context.Background(), VaultsListInput{})) + + assert.Equal(t, int64(21), got.Limit.Value, "defaults to 20 per page plus the lookahead item") + assert.Equal(t, int64(0), got.Offset.Value) +} + +func TestVaultsCreate_RequiresName(t *testing.T) { + _ = capturePtermOutput(t) + v := VaultsCmd{vaults: &FakeVaultsService{}} + err := v.Create(context.Background(), VaultsCreateInput{Name: " "}) + require.Error(t, err) + assert.Contains(t, err.Error(), "--name is required") +} + +func TestVaultsCreate_PassesName(t *testing.T) { + buf := capturePtermOutput(t) + var got kernel.VaultUpsertParams + fake := &FakeVaultsService{UpsertFunc: func(ctx context.Context, body kernel.VaultUpsertParams, opts ...option.RequestOption) (*kernel.Vault, error) { + got = body + return &kernel.Vault{ID: "v1", Name: body.Name, CreatedAt: time.Unix(0, 0), UpdatedAt: time.Unix(0, 0)}, nil + }} + v := VaultsCmd{vaults: fake} + require.NoError(t, v.Create(context.Background(), VaultsCreateInput{Name: "payments"})) + + assert.Equal(t, "payments", got.Name) + out := buf.String() + assert.Contains(t, out, "v1") + assert.Contains(t, out, "payments") +} + +func TestVaultsDelete_FailsFastWhenNonInteractive(t *testing.T) { + _ = capturePtermOutput(t) + fake := &FakeVaultsService{DeleteFunc: func(ctx context.Context, idOrName string, opts ...option.RequestOption) error { + t.Fatal("delete must not be called without confirmation") + return nil + }} + v := VaultsCmd{vaults: fake, prompter: interactive.NewPrompterWithTerminal(false)} + + err := v.Delete(context.Background(), VaultsDeleteInput{Identifier: "payments"}) + require.Error(t, err) + assert.Contains(t, err.Error(), "delete vault 'payments'") + assert.Contains(t, err.Error(), "--yes") +} + +func TestVaultsDelete_SkipConfirm(t *testing.T) { + buf := capturePtermOutput(t) + var deleted string + fake := &FakeVaultsService{DeleteFunc: func(ctx context.Context, idOrName string, opts ...option.RequestOption) error { + deleted = idOrName + return nil + }} + v := VaultsCmd{vaults: fake, prompter: interactive.NewPrompterWithTerminal(false)} + + require.NoError(t, v.Delete(context.Background(), VaultsDeleteInput{Identifier: "payments", SkipConfirm: true})) + assert.Equal(t, "payments", deleted) + assert.Contains(t, buf.String(), "Deleted vault: payments") +} + +func TestVaultItemsDelete_FailsFastWhenNonInteractive(t *testing.T) { + _ = capturePtermOutput(t) + fake := &FakeVaultItemsService{DeleteFunc: func(ctx context.Context, key string, body kernel.VaultItemDeleteParams, opts ...option.RequestOption) error { + t.Fatal("delete must not be called without confirmation") + return nil + }} + v := VaultsCmd{items: fake, prompter: interactive.NewPrompterWithTerminal(false)} + + err := v.ItemsDelete(context.Background(), VaultItemsDeleteInput{Vault: "payments", Key: "wallet"}) + require.Error(t, err) + assert.Contains(t, err.Error(), "delete vault item 'wallet'") + assert.Contains(t, err.Error(), "--yes") +} + +func TestVaultItemsDelete_ScopesToVault(t *testing.T) { + buf := capturePtermOutput(t) + var got kernel.VaultItemDeleteParams + fake := &FakeVaultItemsService{DeleteFunc: func(ctx context.Context, key string, body kernel.VaultItemDeleteParams, opts ...option.RequestOption) error { + got = body + return nil + }} + v := VaultsCmd{items: fake, prompter: interactive.NewPrompterWithTerminal(false)} + + require.NoError(t, v.ItemsDelete(context.Background(), VaultItemsDeleteInput{Vault: "payments", Key: "wallet", SkipConfirm: true})) + assert.Equal(t, "payments", got.IDOrName) + assert.Contains(t, buf.String(), "Deleted vault item: wallet") +} + +func TestVaultItemsGet_SendsWaitAndExpand(t *testing.T) { + _ = capturePtermOutput(t) + var got kernel.VaultItemGetParams + fake := &FakeVaultItemsService{GetFunc: func(ctx context.Context, key string, params kernel.VaultItemGetParams, opts ...option.RequestOption) (*kernel.VaultItemUnion, error) { + got = params + return &kernel.VaultItemUnion{ID: "i1", Key: key, Type: "wallet"}, nil + }} + v := VaultsCmd{items: fake} + require.NoError(t, v.ItemsGet(context.Background(), VaultItemsGetInput{ + Vault: "payments", + Key: "wallet", + Wait: 30, + Expand: []string{"payment_methods, ", ""}, + })) + + assert.Equal(t, "payments", got.IDOrName) + assert.Equal(t, int64(30), got.Wait.Value) + assert.Equal(t, []string{"payment_methods"}, got.Expand, "comma-separated entries are split and blanks dropped") +} + +func TestVaultItemsGet_OmitsUnsetWaitAndExpand(t *testing.T) { + _ = capturePtermOutput(t) + var got kernel.VaultItemGetParams + fake := &FakeVaultItemsService{GetFunc: func(ctx context.Context, key string, params kernel.VaultItemGetParams, opts ...option.RequestOption) (*kernel.VaultItemUnion, error) { + got = params + return &kernel.VaultItemUnion{ID: "i1", Key: key, Type: "wallet"}, nil + }} + v := VaultsCmd{items: fake} + require.NoError(t, v.ItemsGet(context.Background(), VaultItemsGetInput{Vault: "payments", Key: "wallet"})) + + assert.False(t, got.Wait.Valid()) + assert.Empty(t, got.Expand) +} + +func TestVaultItemsGet_RendersOperationsAndAction(t *testing.T) { + buf := capturePtermOutput(t) + item := vaultItemFromJSON(t, `{ + "id":"i1", + "key":"wallet", + "type":"wallet", + "spec":{"provider":"agentcard"}, + "state":{"provider":"agentcard","status":"pending_authorization"}, + "action":{"name":"card_enrollment","url":"https://vault.example.com/enroll"}, + "available_operations":[{"type":"authorize","description":"Authorize the wallet."}], + "available_expansions":[{"type":"payment_methods","description":"Live payment methods."}], + "created_at":"1970-01-01T00:00:00Z", + "updated_at":"1970-01-01T00:00:00Z" + }`) + fake := &FakeVaultItemsService{GetFunc: func(ctx context.Context, key string, params kernel.VaultItemGetParams, opts ...option.RequestOption) (*kernel.VaultItemUnion, error) { + return &item, nil + }} + v := VaultsCmd{items: fake} + require.NoError(t, v.ItemsGet(context.Background(), VaultItemsGetInput{Vault: "payments", Key: "wallet"})) + + out := buf.String() + assert.Contains(t, out, "pending_authorization") + assert.Contains(t, out, "card_enrollment") + assert.Contains(t, out, "https://vault.example.com/enroll") + assert.Contains(t, out, "authorize") + assert.Contains(t, out, "payment_methods") + assert.Contains(t, out, "Authorize the wallet.", "operation descriptions say which operation to invoke next") +} + +func TestVaultItemsCreate_RejectsUnknownType(t *testing.T) { + _ = capturePtermOutput(t) + v := VaultsCmd{items: &FakeVaultItemsService{}} + err := v.ItemsCreate(context.Background(), VaultItemsCreateInput{Vault: "payments", Key: "k", Type: "cheque", Spec: "{}"}) + require.Error(t, err) + assert.Contains(t, err.Error(), "invalid --type") +} + +func TestVaultItemsCreate_RequiresSpec(t *testing.T) { + _ = capturePtermOutput(t) + v := VaultsCmd{items: &FakeVaultItemsService{}} + err := v.ItemsCreate(context.Background(), VaultItemsCreateInput{Vault: "payments", Key: "k", Type: "wallet"}) + require.Error(t, err) + assert.Contains(t, err.Error(), "must specify one of --spec or --spec-file") +} + +func TestVaultItemsCreate_RejectsInvalidJSON(t *testing.T) { + _ = capturePtermOutput(t) + v := VaultsCmd{items: &FakeVaultItemsService{}} + err := v.ItemsCreate(context.Background(), VaultItemsCreateInput{Vault: "payments", Key: "k", Type: "wallet", Spec: "{not json"}) + require.Error(t, err) + assert.Contains(t, err.Error(), "invalid JSON in spec") +} + +func TestVaultItemsCreate_WalletSpec(t *testing.T) { + _ = capturePtermOutput(t) + var got kernel.VaultItemUpsertParams + fake := &FakeVaultItemsService{UpsertFunc: func(ctx context.Context, key string, params kernel.VaultItemUpsertParams, opts ...option.RequestOption) (*kernel.VaultItemUnion, error) { + got = params + return &kernel.VaultItemUnion{ID: "i1", Key: key, Type: "wallet"}, nil + }} + v := VaultsCmd{items: fake} + require.NoError(t, v.ItemsCreate(context.Background(), VaultItemsCreateInput{ + Vault: "payments", + Key: "wallet", + Type: "WALLET", + Spec: `{"provider":"link","authorization":{"method":"oauth","client":{"type":"kernel_managed"}}}`, + })) + + assert.Equal(t, "payments", got.IDOrName) + require.NotNil(t, got.OfWallet) + assert.Nil(t, got.OfCard) + + body, err := json.Marshal(got.OfWallet.Spec) + require.NoError(t, err) + assert.JSONEq(t, `{"provider":"link","authorization":{"method":"oauth","client":{"type":"kernel_managed"}}}`, string(body)) +} + +func TestVaultItemsCreate_CardSpec(t *testing.T) { + _ = capturePtermOutput(t) + var got kernel.VaultItemUpsertParams + fake := &FakeVaultItemsService{UpsertFunc: func(ctx context.Context, key string, params kernel.VaultItemUpsertParams, opts ...option.RequestOption) (*kernel.VaultItemUnion, error) { + got = params + return &kernel.VaultItemUnion{ID: "i1", Key: key, Type: "card"}, nil + }} + v := VaultsCmd{items: fake} + require.NoError(t, v.ItemsCreate(context.Background(), VaultItemsCreateInput{ + Vault: "payments", + Key: "card", + Type: "card", + Spec: `{"provider":"agentcard","wallet":"my-wallet","merchant":"Acme","amount":1250,"currency":"USD"}`, + })) + + require.NotNil(t, got.OfCard) + assert.Nil(t, got.OfWallet) + + body, err := json.Marshal(got.OfCard.Spec) + require.NoError(t, err) + assert.JSONEq(t, `{"provider":"agentcard","wallet":"my-wallet","merchant":"Acme","amount":1250,"currency":"USD"}`, string(body)) +} + +func TestVaultItemsCreate_SpecFile(t *testing.T) { + _ = capturePtermOutput(t) + path := filepath.Join(t.TempDir(), "spec.json") + require.NoError(t, os.WriteFile(path, []byte(" {\"provider\":\"agentcard\",\"user_id\":\"usr_123\"}\n"), 0o600)) + + var got kernel.VaultItemUpsertParams + fake := &FakeVaultItemsService{UpsertFunc: func(ctx context.Context, key string, params kernel.VaultItemUpsertParams, opts ...option.RequestOption) (*kernel.VaultItemUnion, error) { + got = params + return &kernel.VaultItemUnion{ID: "i1", Key: key, Type: "wallet"}, nil + }} + v := VaultsCmd{items: fake} + require.NoError(t, v.ItemsCreate(context.Background(), VaultItemsCreateInput{ + Vault: "payments", + Key: "wallet", + Type: "wallet", + SpecFile: path, + })) + + require.NotNil(t, got.OfWallet) + body, err := json.Marshal(got.OfWallet.Spec) + require.NoError(t, err) + assert.JSONEq(t, `{"provider":"agentcard","user_id":"usr_123"}`, string(body)) +} + +func TestVaultItemsUpdate_SendsCardSpec(t *testing.T) { + _ = capturePtermOutput(t) + var got kernel.VaultItemUpdateParams + fake := &FakeVaultItemsService{UpdateFunc: func(ctx context.Context, key string, params kernel.VaultItemUpdateParams, opts ...option.RequestOption) (*kernel.VaultItemUnion, error) { + got = params + return &kernel.VaultItemUnion{ID: "i1", Key: key, Type: "card"}, nil + }} + v := VaultsCmd{items: fake} + require.NoError(t, v.ItemsUpdate(context.Background(), VaultItemsUpdateInput{ + Vault: "payments", + Key: "card", + Spec: `{"provider":"agentcard","wallet":"my-wallet","merchant":"Acme","amount":500,"currency":"USD"}`, + })) + + assert.Equal(t, "payments", got.IDOrName) + body, err := json.Marshal(got.Spec) + require.NoError(t, err) + assert.JSONEq(t, `{"provider":"agentcard","wallet":"my-wallet","merchant":"Acme","amount":500,"currency":"USD"}`, string(body)) +} + +func TestVaultItemsUpdate_RequiresSpec(t *testing.T) { + _ = capturePtermOutput(t) + v := VaultsCmd{items: &FakeVaultItemsService{}} + err := v.ItemsUpdate(context.Background(), VaultItemsUpdateInput{Vault: "payments", Key: "card"}) + require.Error(t, err) + assert.Contains(t, err.Error(), "must specify one of --spec or --spec-file") +} + +func TestVaultItemsPerformOperation_SendsType(t *testing.T) { + _ = capturePtermOutput(t) + var got kernel.VaultItemPerformOperationParams + fake := &FakeVaultItemsService{PerformOperationFunc: func(ctx context.Context, key string, params kernel.VaultItemPerformOperationParams, opts ...option.RequestOption) (*kernel.VaultItemUnion, error) { + got = params + return &kernel.VaultItemUnion{ID: "i1", Key: key, Type: "card"}, nil + }} + v := VaultsCmd{items: fake} + require.NoError(t, v.ItemsPerformOperation(context.Background(), VaultItemsPerformOperationInput{ + Vault: "payments", + Key: "card", + Type: "Authorize", + })) + + assert.Equal(t, "payments", got.IDOrName) + assert.Equal(t, kernel.VaultItemPerformOperationParamsTypeAuthorize, got.Type) +} + +func TestVaultItemsPerformOperation_RequiresType(t *testing.T) { + _ = capturePtermOutput(t) + v := VaultsCmd{items: &FakeVaultItemsService{}} + err := v.ItemsPerformOperation(context.Background(), VaultItemsPerformOperationInput{Vault: "payments", Key: "card", Type: " "}) + require.Error(t, err) + assert.Contains(t, err.Error(), "--type is required") +} + +func TestVaultItemsEvents_SendsAfterAndWait(t *testing.T) { + buf := capturePtermOutput(t) + var got kernel.VaultItemEventsParams + fake := &FakeVaultItemsService{EventsFunc: func(ctx context.Context, key string, params kernel.VaultItemEventsParams, opts ...option.RequestOption) (*[]kernel.VaultItemEvent, error) { + got = params + events := []kernel.VaultItemEvent{{ + ID: "e1", + Name: "wallet_authorization_started", + BrowserID: "b1", + CreatedAt: time.Unix(0, 0), + }} + return &events, nil + }} + v := VaultsCmd{items: fake} + require.NoError(t, v.ItemsEvents(context.Background(), VaultItemsEventsInput{ + Vault: "payments", + Key: "wallet", + After: "e0", + Wait: 10, + })) + + assert.Equal(t, "payments", got.IDOrName) + assert.Equal(t, "e0", got.After.Value) + assert.Equal(t, int64(10), got.Wait.Value) + + out := buf.String() + assert.Contains(t, out, "e1") + assert.Contains(t, out, "wallet_authorization_started") + assert.Contains(t, out, "b1") +} + +func TestVaultItemsEvents_Empty(t *testing.T) { + buf := capturePtermOutput(t) + v := VaultsCmd{items: &FakeVaultItemsService{}} + require.NoError(t, v.ItemsEvents(context.Background(), VaultItemsEventsInput{Vault: "payments", Key: "wallet"})) + assert.Contains(t, buf.String(), "No events found for item 'wallet'") +} + +func TestVaultItemsList_RendersRows(t *testing.T) { + buf := capturePtermOutput(t) + item := vaultItemFromJSON(t, `{ + "id":"i1", + "key":"card", + "type":"card", + "spec":{"provider":"agentcard","merchant":"Acme"}, + "state":{"provider":"agentcard","status":"ready"}, + "created_at":"1970-01-01T00:00:00Z", + "updated_at":"1970-01-01T00:00:00Z" + }`) + fake := &FakeVaultItemsService{ListFunc: func(ctx context.Context, idOrName string, opts ...option.RequestOption) (*[]kernel.VaultItemUnion, error) { + items := []kernel.VaultItemUnion{item} + return &items, nil + }} + v := VaultsCmd{items: fake} + require.NoError(t, v.ItemsList(context.Background(), VaultItemsListInput{Vault: "payments"})) + + out := buf.String() + assert.Contains(t, out, "card") + assert.Contains(t, out, "agentcard") + assert.Contains(t, out, "ready") +} + +func TestVaultItemsList_Empty(t *testing.T) { + buf := capturePtermOutput(t) + v := VaultsCmd{items: &FakeVaultItemsService{}} + require.NoError(t, v.ItemsList(context.Background(), VaultItemsListInput{Vault: "payments"})) + assert.Contains(t, buf.String(), "No items found in vault 'payments'") +} + +func TestFormatVaultReferences(t *testing.T) { + assert.Empty(t, formatVaultReferences(nil), "no vaults means the row is omitted entirely") + assert.Equal(t, "payments, v2", formatVaultReferences([]kernel.VaultReference{ + {ID: "v1", Name: "payments"}, + {ID: "v2"}, + }), "names are preferred, IDs are the fallback") +} diff --git a/go.mod b/go.mod index f468e82b..0ea38e0e 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.1 github.com/golang-jwt/jwt/v5 v5.2.2 github.com/joho/godotenv v1.5.1 - github.com/kernel/kernel-go-sdk v0.98.1-0.20260904181826-31c5fee38442 + github.com/kernel/kernel-go-sdk v0.99.0 github.com/klauspost/compress v1.18.5 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c github.com/pterm/pterm v0.12.80 diff --git a/go.sum b/go.sum index f90ecaeb..c3ed3ba0 100644 --- a/go.sum +++ b/go.sum @@ -64,8 +64,8 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= -github.com/kernel/kernel-go-sdk v0.98.1-0.20260904181826-31c5fee38442 h1:eJlEvDsLczaMx7TGoh1l/wwa0wQfL2GYlmL8QyMUI5A= -github.com/kernel/kernel-go-sdk v0.98.1-0.20260904181826-31c5fee38442/go.mod h1:EeZzSuHZVeHKxKCPUzxou2bovNGhXaz0RXrSqKNf1AQ= +github.com/kernel/kernel-go-sdk v0.99.0 h1:L8P3JNwF46/oWmwhrc8BNbgK8vTUh5HlYnPXqXT4qlU= +github.com/kernel/kernel-go-sdk v0.99.0/go.mod h1:EeZzSuHZVeHKxKCPUzxou2bovNGhXaz0RXrSqKNf1AQ= github.com/klauspost/compress v1.18.5 h1:/h1gH5Ce+VWNLSWqPzOVn6XBO+vJbCNGvjoaGBFW2IE= github.com/klauspost/compress v1.18.5/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= From b4ac39e241137f65ce3f30a94dddfb6fff0b131e Mon Sep 17 00:00:00 2001 From: "kernel-internal[bot]" <260533166+kernel-internal[bot]@users.noreply.github.com> Date: Fri, 4 Sep 2026 19:40:45 +0000 Subject: [PATCH 25/26] chore: update Go SDK to 6ec0643 (vault provider errors, no test-mode cards) Bumps github.com/kernel/kernel-go-sdk from v0.99.0 to v0.99.1-0.20260904193100-6ec0643c8bd4. SDK changes in this range are confined to vaultitem.go: - CardVaultItemSpecLink{,Param}.Test removed (test-mode card creation is no longer supported; cards are live-only), along with the union accessor CardVaultItemSpecUnionParam.GetTest and the Test response fields. - VaultItemService.PerformOperation documents a new 429 `spend_request_rate_limited` provider error. No CLI changes were required: - The CLI never referenced the Test field. `kernel vaults items create/update` accept the provider spec as raw JSON via --spec/--spec-file and unmarshal straight into CardVaultItemSpecUnionParam, so the field removal needs no flag or help-text edit (no test-mode references exist anywhere in the repo). Coverage analysis: full enumeration of all 158 methods in the SDK api.md against cmd/. 153 require CLI coverage and all are covered; the 5 exceptions are the config-registry endpoints marked x-cli-skip in openapi.yaml. Three SSE endpoints (browsers logs stream, process stdout stream, telemetry stream) are covered via their *Streaming SDK variants. Param fields were enumerated transitively from every *Params struct; the only unreferenced fields are deprecated ones already superseded in the CLI (AuthConnectionLoginParams .BrowserTelemetry/.Proxy -> params.Browser.Telemetry/.Proxy) and BrowserCurlParams.TimeoutMs/ResponseEncoding, which do not apply because `kernel browsers curl` intentionally proxies raw HTTP through the SDK browser transport (--max-time covers the timeout; encoding is moot when streaming bytes). Tested against the production API: vaults list, vaults get, vaults items list, vaults items get (card/link item deserializes correctly without the removed test field), vaults items events, browsers list, app list, profiles list. go build, go vet, and go test ./... all pass. Co-Authored-By: Claude Opus 5 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 0ea38e0e..4bb4aab9 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.1 github.com/golang-jwt/jwt/v5 v5.2.2 github.com/joho/godotenv v1.5.1 - github.com/kernel/kernel-go-sdk v0.99.0 + github.com/kernel/kernel-go-sdk v0.99.1-0.20260904193100-6ec0643c8bd4 github.com/klauspost/compress v1.18.5 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c github.com/pterm/pterm v0.12.80 diff --git a/go.sum b/go.sum index c3ed3ba0..0caae332 100644 --- a/go.sum +++ b/go.sum @@ -64,8 +64,8 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= -github.com/kernel/kernel-go-sdk v0.99.0 h1:L8P3JNwF46/oWmwhrc8BNbgK8vTUh5HlYnPXqXT4qlU= -github.com/kernel/kernel-go-sdk v0.99.0/go.mod h1:EeZzSuHZVeHKxKCPUzxou2bovNGhXaz0RXrSqKNf1AQ= +github.com/kernel/kernel-go-sdk v0.99.1-0.20260904193100-6ec0643c8bd4 h1:9mOJSq+HJVFvYESW4kA8TvZxoclSApYOYH7SKFTkI+8= +github.com/kernel/kernel-go-sdk v0.99.1-0.20260904193100-6ec0643c8bd4/go.mod h1:EeZzSuHZVeHKxKCPUzxou2bovNGhXaz0RXrSqKNf1AQ= github.com/klauspost/compress v1.18.5 h1:/h1gH5Ce+VWNLSWqPzOVn6XBO+vJbCNGvjoaGBFW2IE= github.com/klauspost/compress v1.18.5/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= From 669ea71b93d6c6208f53b4730bb7ed6603b87a55 Mon Sep 17 00:00:00 2001 From: "kernel-internal[bot]" <260533166+kernel-internal[bot]@users.noreply.github.com> Date: Fri, 4 Sep 2026 19:44:03 +0000 Subject: [PATCH 26/26] chore: pin Go SDK to tagged v0.100.0 (07e74ed) Re-pins github.com/kernel/kernel-go-sdk from the pseudo-version v0.99.1-0.20260904193100-6ec0643c8bd4 (set in b4ac39e) to the tagged release v0.100.0. 07e74ed is the merge commit that release-please tagged as v0.100.0, so this is the same code under a proper semver tag rather than a commit pseudo-version. No API-surface change relative to b4ac39e; the vault card `test` field removal was already analysed and required no CLI change, since vault item specs are passed through as raw JSON via --spec/--spec-file. Re-verified after the bump: full enumeration of api.md (158 methods) against the CLI command tree found no missing commands (the 5 /config-registry endpoints are x-cli-skip in openapi.yaml), and a field-level sweep of all 114 *Params structs against every command's flags found no missing flags. Tested: go build ./... and go test ./... pass; `vaults list`, `vaults items list`, and `vaults items get` on a provider=link card item all return correct output against the live API. Co-Authored-By: Claude Opus 5 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 4bb4aab9..c00426c4 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.1 github.com/golang-jwt/jwt/v5 v5.2.2 github.com/joho/godotenv v1.5.1 - github.com/kernel/kernel-go-sdk v0.99.1-0.20260904193100-6ec0643c8bd4 + github.com/kernel/kernel-go-sdk v0.100.0 github.com/klauspost/compress v1.18.5 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c github.com/pterm/pterm v0.12.80 diff --git a/go.sum b/go.sum index 0caae332..84a83f5a 100644 --- a/go.sum +++ b/go.sum @@ -64,8 +64,8 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= -github.com/kernel/kernel-go-sdk v0.99.1-0.20260904193100-6ec0643c8bd4 h1:9mOJSq+HJVFvYESW4kA8TvZxoclSApYOYH7SKFTkI+8= -github.com/kernel/kernel-go-sdk v0.99.1-0.20260904193100-6ec0643c8bd4/go.mod h1:EeZzSuHZVeHKxKCPUzxou2bovNGhXaz0RXrSqKNf1AQ= +github.com/kernel/kernel-go-sdk v0.100.0 h1:8RKNKk0js3BHdwEkDd0aPX17OEGSHVrI26akNUwttzU= +github.com/kernel/kernel-go-sdk v0.100.0/go.mod h1:EeZzSuHZVeHKxKCPUzxou2bovNGhXaz0RXrSqKNf1AQ= github.com/klauspost/compress v1.18.5 h1:/h1gH5Ce+VWNLSWqPzOVn6XBO+vJbCNGvjoaGBFW2IE= github.com/klauspost/compress v1.18.5/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=