Skip to content

refactor(browsers): reuse browser lookup logic #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
masnwilliams merged 4 commits into from
Dec 8, 2025
Merged

refactor(browsers): reuse browser lookup logic #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
557ebec
refactor(browsers): reuse browser lookup logic
masnwilliams Dec 5, 2025
dea7297
feat(browsers): add get command for browser details
masnwilliams Dec 5, 2025
bb8503f
refactor(browsers): reuse table builder for session info
masnwilliams Dec 8, 2025
be7d1c5
fix(browsers): rename Persistence ID to Persistent ID
masnwilliams Dec 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
161 changes: 127 additions & 34 deletions cmd/browsers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import (
// BrowsersService defines the subset of the Kernel SDK browser client that we use.
// See https://github.com/onkernel/kernel-go-sdk/blob/main/browser.go
type BrowsersService interface {
Get(ctx context.Context, id string, opts ...option.RequestOption) (res *kernel.BrowserGetResponse, err error)
List(ctx context.Context, query kernel.BrowserListParams, opts ...option.RequestOption) (res *pagination.OffsetPagination[kernel.BrowserListResponse], err error)
New(ctx context.Context, body kernel.BrowserNewParams, opts ...option.RequestOption) (res *kernel.BrowserNewResponse, err error)
Delete(ctx context.Context, body kernel.BrowserDeleteParams, opts ...option.RequestOption) (err error)
Expand Down Expand Up @@ -173,6 +174,11 @@ type BrowsersViewInput struct {
Identifier string
}

type BrowsersGetInput struct {
Identifier string
Output string
}

// BrowsersCmd is a cobra-independent command handler for browsers operations.
type BrowsersCmd struct {
browsers BrowsersService
Expand Down Expand Up @@ -359,6 +365,12 @@ func (b BrowsersCmd) Create(ctx context.Context, in BrowsersCreateInput) error {
}

func printBrowserSessionResult(sessionID, cdpURL, liveViewURL string, persistence kernel.BrowserPersistence, profile kernel.Profile) {
tableData := buildBrowserTableData(sessionID, cdpURL, liveViewURL, persistence, profile)
PrintTableNoPad(tableData, true)
}

// buildBrowserTableData creates a base table with common browser session fields.
func buildBrowserTableData(sessionID, cdpURL, liveViewURL string, persistence kernel.BrowserPersistence, profile kernel.Profile) pterm.TableData {
tableData := pterm.TableData{
{"Property", "Value"},
{"Session ID", sessionID},
Expand All @@ -377,29 +389,15 @@ func printBrowserSessionResult(sessionID, cdpURL, liveViewURL string, persistenc
}
tableData = append(tableData, []string{"Profile", profVal})
}

PrintTableNoPad(tableData, true)
return tableData
}

func (b BrowsersCmd) Delete(ctx context.Context, in BrowsersDeleteInput) error {
if !in.SkipConfirm {
page, err := b.browsers.List(ctx, kernel.BrowserListParams{})
found, err := b.resolveBrowserByIdentifier(ctx, in.Identifier)
if err != nil {
return util.CleanedUpSdkError{Err: err}
}
if page == nil || page.Items == nil || len(page.Items) == 0 {
pterm.Error.Println("No browsers found")
return nil
}

var found *kernel.BrowserListResponse
for _, br := range page.Items {
if br.SessionID == in.Identifier || br.Persistence.ID == in.Identifier {
bCopy := br
found = &bCopy
break
}
}
if found == nil {
pterm.Error.Printf("Browser '%s' not found\n", in.Identifier)
return nil
Expand Down Expand Up @@ -459,31 +457,81 @@ func (b BrowsersCmd) Delete(ctx context.Context, in BrowsersDeleteInput) error {
}

func (b BrowsersCmd) View(ctx context.Context, in BrowsersViewInput) error {
page, err := b.browsers.List(ctx, kernel.BrowserListParams{})
browser, err := b.browsers.Get(ctx, in.Identifier)
if err != nil {
return util.CleanedUpSdkError{Err: err}
}

if page == nil || page.Items == nil || len(page.Items) == 0 {
pterm.Error.Println("No browsers found")
if browser == nil {
pterm.Error.Printf("Browser '%s' not found\n", in.Identifier)
Copy link

@cursor cursor bot Dec 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bug: View function lost persistence ID lookup compatibility

The View function previously supported looking up browsers by either session ID or persistence ID (by iterating through list results). The refactored code now calls b.browsers.Get() directly with the identifier, which likely only accepts session IDs. This breaks backward compatibility for users who pass a persistent ID to kernel browsers view <persistence-id>. The Delete function correctly uses resolveBrowserByIdentifier which explicitly supports both identifier types for backward compatibility, but View and the new Get function bypass this helper.

Additional Locations (1)

Fix in Cursor Fix in Web

return nil
}

var foundBrowser *kernel.BrowserListResponse
for _, browser := range page.Items {
if browser.Persistence.ID == in.Identifier || browser.SessionID == in.Identifier {
foundBrowser = &browser
break
if browser.BrowserLiveViewURL == "" {
if browser.Headless {
pterm.Warning.Println("This browser is running in headless mode and does not have a live view URL")
} else {
pterm.Warning.Println("No live view URL available for this browser")
}
return nil
}

fmt.Println(browser.BrowserLiveViewURL)
return nil
}

func (b BrowsersCmd) Get(ctx context.Context, in BrowsersGetInput) error {
if in.Output != "" && in.Output != "json" {
pterm.Error.Println("unsupported --output value: use 'json'")
return nil
}

if foundBrowser == nil {
browser, err := b.browsers.Get(ctx, in.Identifier)
if err != nil {
return util.CleanedUpSdkError{Err: err}
}
if browser == nil {
pterm.Error.Printf("Browser '%s' not found\n", in.Identifier)
return nil
}

// Output just the URL
pterm.Info.Println(foundBrowser.BrowserLiveViewURL)
if in.Output == "json" {
bs, err := json.MarshalIndent(browser, "", " ")
if err != nil {
return err
}
fmt.Println(string(bs))
return nil
}

// Build table starting with common browser fields
tableData := buildBrowserTableData(
browser.SessionID,
browser.CdpWsURL,
browser.BrowserLiveViewURL,
browser.Persistence,
browser.Profile,
)

// Append additional detailed fields
tableData = append(tableData, []string{"Created At", util.FormatLocal(browser.CreatedAt)})
tableData = append(tableData, []string{"Timeout (seconds)", fmt.Sprintf("%d", browser.TimeoutSeconds)})
tableData = append(tableData, []string{"Headless", fmt.Sprintf("%t", browser.Headless)})
tableData = append(tableData, []string{"Stealth", fmt.Sprintf("%t", browser.Stealth)})
tableData = append(tableData, []string{"Kiosk Mode", fmt.Sprintf("%t", browser.KioskMode)})
if browser.Viewport.Width > 0 && browser.Viewport.Height > 0 {
viewportStr := fmt.Sprintf("%dx%d", browser.Viewport.Width, browser.Viewport.Height)
if browser.Viewport.RefreshRate > 0 {
viewportStr = fmt.Sprintf("%s@%d", viewportStr, browser.Viewport.RefreshRate)
}
tableData = append(tableData, []string{"Viewport", viewportStr})
}
if browser.ProxyID != "" {
tableData = append(tableData, []string{"Proxy ID", browser.ProxyID})
}
if !browser.DeletedAt.IsZero() {
tableData = append(tableData, []string{"Deleted At", util.FormatLocal(browser.DeletedAt)})
}

PrintTableNoPad(tableData, true)
return nil
}

Expand Down Expand Up @@ -1831,17 +1879,29 @@ var browsersViewCmd = &cobra.Command{
RunE: runBrowsersView,
}

var browsersGetCmd = &cobra.Command{
Use: "get <id>",
Short: "Get detailed information about a browser session",
Long: "Retrieve and display detailed information about a specific browser session including configuration, URLs, and status.",
Args: cobra.ExactArgs(1),
RunE: runBrowsersGet,
}

func init() {
// list flags
browsersListCmd.Flags().StringP("output", "o", "", "Output format: json for raw API response")
browsersListCmd.Flags().Bool("include-deleted", false, "Include soft-deleted browser sessions in the results")
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)")

// get flags
browsersGetCmd.Flags().StringP("output", "o", "", "Output format: json for raw API response")

browsersCmd.AddCommand(browsersListCmd)
browsersCmd.AddCommand(browsersCreateCmd)
browsersCmd.AddCommand(browsersDeleteCmd)
browsersCmd.AddCommand(browsersViewCmd)
browsersCmd.AddCommand(browsersGetCmd)

// logs
logsRoot := &cobra.Command{Use: "logs", Short: "Browser logs operations"}
Expand Down Expand Up @@ -2226,6 +2286,18 @@ func runBrowsersView(cmd *cobra.Command, args []string) error {
return b.View(cmd.Context(), in)
}

func runBrowsersGet(cmd *cobra.Command, args []string) error {
client := getKernelClient(cmd)
out, _ := cmd.Flags().GetString("output")

svc := client.Browsers
b := BrowsersCmd{browsers: &svc}
return b.Get(cmd.Context(), BrowsersGetInput{
Identifier: args[0],
Output: out,
})
}

func runBrowsersLogsStream(cmd *cobra.Command, args []string) error {
client := getKernelClient(cmd)
svc := client.Browsers
Expand Down Expand Up @@ -2643,16 +2715,37 @@ func truncateURL(url string, maxLen int) string {
return url[:maxLen-3] + "..."
}

// resolveBrowserByIdentifier finds a browser by session ID or persistent ID (backward compatibility).
func (b BrowsersCmd) resolveBrowserByIdentifier(ctx context.Context, identifier string) (*kernel.BrowserListResponse, error) {
// listAllBrowsers fetches all browsers by paginating through all pages.
func (b BrowsersCmd) listAllBrowsers(ctx context.Context) ([]kernel.BrowserListResponse, error) {
var allBrowsers []kernel.BrowserListResponse
page, err := b.browsers.List(ctx, kernel.BrowserListParams{})
if err != nil {
return nil, err
}
if page == nil || page.Items == nil {
return nil, nil
for page != nil && len(page.Items) > 0 {
allBrowsers = append(allBrowsers, page.Items...)
page = safeGetNextPage(page)
}
return allBrowsers, nil
}

// safeGetNextPage attempts to get the next page, returning nil if unavailable or on error.
func safeGetNextPage(page *pagination.OffsetPagination[kernel.BrowserListResponse]) *pagination.OffsetPagination[kernel.BrowserListResponse] {
defer func() { recover() }()
nextPage, err := page.GetNextPage()
if err != nil {
return nil
}
return nextPage
}

// resolveBrowserByIdentifier finds a browser by session ID or persistent ID (backward compatibility).
func (b BrowsersCmd) resolveBrowserByIdentifier(ctx context.Context, identifier string) (*kernel.BrowserListResponse, error) {
browsers, err := b.listAllBrowsers(ctx)
if err != nil {
return nil, err
}
for _, br := range page.Items {
for _, br := range browsers {
if br.SessionID == identifier || br.Persistence.ID == identifier {
bCopy := br
return &bCopy, nil
Expand Down
Loading