refactor: drop --offset, align telemetry events flags with stream

Address review: remove the --offset flag (it advertised an X-Next-Offset
cursor the command never emits; --all owns multi-page paging). Rename
--category to --categories to match the telemetry stream sibling, and
drop the now-inaccurate "ignored with --all"/"ignored when --offset"
help clauses. Expand the param-mapping test to cover since/until and
multi-event emit.

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

Author: archandatta

cmd/browsers.go

@@ -2751,12 +2751,11 @@ followed automatically by Chromium.`,
 	telemetryRoot.AddCommand(telemetryStream)
 
 	telemetryEvents := &cobra.Command{Use: "events <id>", Short: "Read recorded telemetry events", Args: cobra.ExactArgs(1), RunE: runBrowsersTelemetryEvents}
-	telemetryEvents.Flags().Int64("limit", 0, "Max events per page (1-100, default 20). Ignored with --all")
-	telemetryEvents.Flags().Int64("offset", 0, "Pagination cursor: the X-Next-Offset value from a previous page")
-	telemetryEvents.Flags().String("since", "", "Window start: RFC-3339 timestamp or duration like 5m (default 5m). Ignored when --offset is set")
+	telemetryEvents.Flags().Int64("limit", 0, "Max events per page (1-100, default 20)")
+	telemetryEvents.Flags().String("since", "", "Window start: RFC-3339 timestamp or duration like 5m (default 5m)")
 	telemetryEvents.Flags().String("until", "", "Window end (exclusive): RFC-3339 timestamp or duration like 5m")
-	telemetryEvents.Flags().StringSlice("category", []string{}, "Filter by event category (console,network,page,interaction,control,connection,system,screenshot,captcha,monitor)")
-	telemetryEvents.Flags().Bool("all", false, "Walk the cursor and fetch every page")
+	telemetryEvents.Flags().StringSlice("categories", []string{}, "Filter by event category (console,network,page,interaction,control,connection,system,screenshot,captcha,monitor)")
+	telemetryEvents.Flags().Bool("all", false, "Fetch every page instead of just the first")
 	telemetryEvents.Flags().StringP("output", "o", "", "Output format: json for newline-delimited JSON envelopes")
 	telemetryRoot.AddCommand(telemetryEvents)
 

cmd/browsers_telemetry.go

@@ -239,7 +239,6 @@ func runBrowsersTelemetryStream(cmd *cobra.Command, args []string) error {
 type BrowsersTelemetryEventsInput struct {
 	Identifier string
 	Limit      int64
-	Offset     int64
 	Since      string
 	Until      string
 	Categories []string
@@ -256,17 +255,14 @@ func (b BrowsersCmd) TelemetryEvents(ctx context.Context, in BrowsersTelemetryEv
 	}
 	for _, c := range in.Categories {
 		if !slices.Contains(streamFilterCategories, c) {
-			return fmt.Errorf("invalid --category value %q: must be one of %s", c, strings.Join(streamFilterCategories, ", "))
+			return fmt.Errorf("invalid --categories value %q: must be one of %s", c, strings.Join(streamFilterCategories, ", "))
 		}
 	}
 
 	params := kernel.BrowserTelemetryEventsParams{}
 	if in.Limit > 0 {
 		params.Limit = kernel.Opt(in.Limit)
 	}
-	if in.Offset > 0 {
-		params.Offset = kernel.Opt(in.Offset)
-	}
 	if in.Since != "" {
 		params.Since = kernel.Opt(in.Since)
 	}
@@ -327,16 +323,14 @@ func runBrowsersTelemetryEvents(cmd *cobra.Command, args []string) error {
 	svc := client.Browsers
 	out, _ := cmd.Flags().GetString("output")
 	limit, _ := cmd.Flags().GetInt64("limit")
-	offset, _ := cmd.Flags().GetInt64("offset")
 	since, _ := cmd.Flags().GetString("since")
 	until, _ := cmd.Flags().GetString("until")
-	categories, _ := cmd.Flags().GetStringSlice("category")
+	categories, _ := cmd.Flags().GetStringSlice("categories")
 	all, _ := cmd.Flags().GetBool("all")
 	b := BrowsersCmd{browsers: &svc, telemetry: &svc.Telemetry}
 	return b.TelemetryEvents(cmd.Context(), BrowsersTelemetryEventsInput{
 		Identifier: args[0],
 		Limit:      limit,
-		Offset:     offset,
 		Since:      since,
 		Until:      until,
 		Categories: categories,

cmd/browsers_telemetry_test.go

@@ -110,22 +110,32 @@ func TestTelemetryEvents_SinglePageTextAndParams(t *testing.T) {
 	var gotQuery kernel.BrowserTelemetryEventsParams
 	fakeTelemetry := &FakeBrowserTelemetryService{EventsFunc: func(id string, query kernel.BrowserTelemetryEventsParams) (*pagination.OffsetPagination[kernel.BrowserTelemetryEventsResponse], error) {
 		gotID, gotQuery = id, query
-		return telemetryEventsPage(t, `{"event":{"type":"network_response","category":"network","ts":1000000},"seq":7}`), nil
+		return telemetryEventsPage(t,
+			`{"event":{"type":"network_response","category":"network","ts":1000000},"seq":7}`,
+			`{"event":{"type":"network_request","category":"network","ts":2000000},"seq":8}`,
+		), nil
 	}}
 	b := BrowsersCmd{browsers: fakeBrowsers, telemetry: fakeTelemetry}
 
 	err := b.TelemetryEvents(context.Background(), BrowsersTelemetryEventsInput{
 		Identifier: "session123",
 		Limit:      5,
+		Since:      "5m",
+		Until:      "2020-01-01T00:00:00Z",
 		Categories: []string{"network"},
 	})
 
 	assert.NoError(t, err)
 	assert.Equal(t, "session123", gotID)
 	assert.Equal(t, int64(5), gotQuery.Limit.Value)
+	assert.Equal(t, "5m", gotQuery.Since.Value)
+	assert.Equal(t, "2020-01-01T00:00:00Z", gotQuery.Until.Value)
 	assert.Equal(t, []kernel.BrowserTelemetryEventsParamsCategory{"network"}, gotQuery.Category)
-	assert.Contains(t, outBuf.String(), "network_response")
-	assert.Contains(t, outBuf.String(), "7")
+	out := outBuf.String()
+	assert.Contains(t, out, "network_response")
+	assert.Contains(t, out, "network_request")
+	assert.Contains(t, out, "7")
+	assert.Contains(t, out, "8")
 }
 
 func TestTelemetryEvents_SinglePageJSON(t *testing.T) {