Merge branch 'main' into hypeship/1pw-fill-unknown-wording

Author: rgarcia

AGENTS.md

@@ -25,4 +25,4 @@ Be mindful that these operations affect production resources.
 - The Makefile's `lint` target uses `|| true`, so it always exits 0 even when lint issues exist. Pre-existing lint warnings (errcheck, staticcheck) are present in the codebase and expected.
 - The `go-keyring` dependency requires D-Bus and `libsecret` on Linux. These are pre-installed in the Cloud VM.
 - `kernel create` works locally without authentication. Most other commands (`deploy`, `invoke`, `browsers`, etc.) require a `KERNEL_API_KEY` env var or `kernel login` OAuth flow.
-- Go module path is `github.com/kernel/cli`. The project requires Go 1.25.0 (specified in `go.mod`).
+- Go module path is `github.com/kernel/cli`. The project requires Go 1.27.2 (specified in `go.mod`).

DEVELOPMENT.md

@@ -12,7 +12,7 @@ brew install onkernel/tap/kernel
 
 Install the following tools:
 
-- Go 1.25+ ( https://go.dev/doc/install ); the required version is recorded in `go.mod`
+- Go 1.27+ ( https://go.dev/doc/install ); the required version is recorded in `go.mod`
 - [Goreleaser Pro](https://goreleaser.com/install/#pro) - **IMPORTANT: You must install goreleaser-pro, not the standard version, as this is required for our release process**
 - [chglog](https://github.com/goreleaser/chglog)
 

README.md

@@ -157,6 +157,7 @@ type BrowserPoolsCreateInput struct {
 	ProxyID                string
 	Region                 string
 	PrivateHosts           []string
+	ProxyRoutes            []string
 	StartURL               string
 	Extensions             []string
 	Viewport               string
@@ -240,7 +241,14 @@ func (c BrowserPoolsCmd) Create(ctx context.Context, in BrowserPoolsCreateInput)
 	if err != nil {
 		return err
 	}
-	if len(network.PrivateHosts) > 0 {
+	routes, err := parseProxyRoutes(in.ProxyRoutes)
+	if err != nil {
+		return err
+	}
+	if len(routes) > 0 {
+		network.ProxyRoutes = routes
+	}
+	if len(network.PrivateHosts) > 0 || len(network.ProxyRoutes) > 0 {
 		params.Network = network
 	}
 
@@ -334,6 +342,7 @@ func (c BrowserPoolsCmd) Get(ctx context.Context, in BrowserPoolsGetInput) error
 		{"Extensions", formatExtensions(cfg.Extensions)},
 		{"Viewport", formatViewport(cfg.Viewport)},
 		{"Private Hosts", formatPrivateHosts(cfg.Network)},
+		{"Proxy Routes", formatProxyRoutes(cfg.Network)},
 		{"Telemetry", formatPoolTelemetry(cfg.Telemetry)},
 	}
 
@@ -363,6 +372,8 @@ type BrowserPoolsUpdateInput struct {
 	ClearExtensions        bool
 	PrivateHosts           []string
 	ClearPrivateHosts      bool
+	ProxyRoutes            []string
+	ClearProxyRoutes       bool
 	Viewport               string
 	ChromePolicy           string
 	ChromePolicyFile       string
@@ -395,6 +406,9 @@ func validateBrowserPoolUpdateInput(in BrowserPoolsUpdateInput) error {
 	if len(normalizePrivateHosts(in.PrivateHosts)) > 0 && in.ClearPrivateHosts {
 		return fmt.Errorf("cannot specify both --private-host and --clear-private-hosts")
 	}
+	if len(in.ProxyRoutes) > 0 && in.ClearProxyRoutes {
+		return fmt.Errorf("cannot specify both --proxy-route and --clear-proxy-routes")
+	}
 	return nil
 }
 
@@ -494,7 +508,14 @@ func (c BrowserPoolsCmd) Update(ctx context.Context, in BrowserPoolsUpdateInput)
 	if err != nil {
 		return err
 	}
-	if len(network.PrivateHosts) > 0 {
+	routes, err := parseProxyRoutes(in.ProxyRoutes)
+	if err != nil {
+		return err
+	}
+	if len(routes) > 0 {
+		network.ProxyRoutes = routes
+	}
+	if len(network.PrivateHosts) > 0 || len(network.ProxyRoutes) > 0 {
 		params.Network = network
 	}
 
@@ -509,6 +530,14 @@ func (c BrowserPoolsCmd) Update(ctx context.Context, in BrowserPoolsUpdateInput)
 	}
 	if in.ClearPrivateHosts {
 		extraFields["network"] = map[string]any{}
+	} else if in.ClearProxyRoutes {
+		// The API replaces the whole network object, so keep any --private-host
+		// entries alongside the explicit empty route list.
+		clearRoutes := map[string]any{"proxy_routes": []any{}}
+		if len(network.PrivateHosts) > 0 {
+			clearRoutes["private_hosts"] = network.PrivateHosts
+		}
+		extraFields["network"] = clearRoutes
 	}
 	if len(extraFields) > 0 {
 		params.SetExtraFields(extraFields)
@@ -811,6 +840,7 @@ func init() {
 	browserPoolsCreateCmd.Flags().String("proxy-id", "", "Proxy ID")
 	browserPoolsCreateCmd.Flags().String("region", "", "Geographic region for the pool: 'us-east', 'us-west', '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().StringArray("proxy-route", nil, "Route HOST[,HOST...]=PROXY through a proxy for browsers in the pool (repeatable, max 10 routes and 50 hosts per route). PROXY is an ID by default; use id:ID or name:NAME explicitly. Exact hosts beat wildcards (longer suffixes win); *.example.com excludes example.com. Unmatched hosts use --proxy-id or default egress. Requires proxy v3")
 	browserPoolsCreateCmd.Flags().String("start-url", "", "Initial page to open for new browsers")
 	browserPoolsCreateCmd.Flags().StringSlice("extension", []string{}, "Extension IDs or names")
 	browserPoolsCreateCmd.Flags().String("viewport", "", "Viewport size (e.g. 1280x800)")
@@ -841,13 +871,18 @@ func init() {
 	browserPoolsUpdateCmd.Flags().StringSlice("extension", []string{}, "Extension IDs or names")
 	browserPoolsUpdateCmd.Flags().Bool("clear-extensions", false, "Remove all pool extensions")
 	browserPoolsUpdateCmd.Flags().StringSlice("private-host", nil, "Replace the destinations browsers in the pool reach directly through their own network instead of Kernel-managed egress (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'). Only applies to browsers created after the update")
-	browserPoolsUpdateCmd.Flags().Bool("clear-private-hosts", false, "Remove the private-host override and restore the default private ranges")
+	browserPoolsUpdateCmd.Flags().Bool("clear-private-hosts", false, "Remove the pool's network configuration (private-host override and proxy routes) and restore the default private ranges")
+	browserPoolsUpdateCmd.Flags().StringArray("proxy-route", nil, "Replace the pool's proxy routes with HOST[,HOST...]=PROXY (repeatable, max 10 routes and 50 hosts per route). PROXY is an ID by default; use id:ID or name:NAME explicitly. Network flags replace the pool's whole network configuration, so pass --private-host too to keep a private-host override. Only applies to browsers created after the update. Requires proxy v3")
+	browserPoolsUpdateCmd.Flags().Bool("clear-proxy-routes", false, "Remove the pool's proxy routes (combine with --private-host to keep a private-host override)")
 	browserPoolsUpdateCmd.Flags().String("viewport", "", "Viewport size (e.g. 1280x800)")
 	browserPoolsUpdateCmd.Flags().String("chrome-policy", "", "Custom Chrome enterprise policy as a JSON object")
 	browserPoolsUpdateCmd.Flags().String("chrome-policy-file", "", "Read Chrome enterprise policy (JSON object) from a file (use '-' for stdin)")
 	browserPoolsUpdateCmd.Flags().Bool("clear-chrome-policy", false, "Remove the pool's custom Chrome enterprise policy")
 	browserPoolsUpdateCmd.MarkFlagsMutuallyExclusive("chrome-policy", "chrome-policy-file")
 	browserPoolsUpdateCmd.MarkFlagsMutuallyExclusive("private-host", "clear-private-hosts")
+	browserPoolsUpdateCmd.MarkFlagsMutuallyExclusive("proxy-route", "clear-proxy-routes")
+	browserPoolsUpdateCmd.MarkFlagsMutuallyExclusive("proxy-route", "clear-private-hosts")
+	browserPoolsUpdateCmd.MarkFlagsMutuallyExclusive("clear-proxy-routes", "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")
@@ -915,6 +950,7 @@ func runBrowserPoolsCreate(cmd *cobra.Command, args []string) error {
 	proxyID, _ := cmd.Flags().GetString("proxy-id")
 	region, _ := cmd.Flags().GetString("region")
 	privateHosts, _ := cmd.Flags().GetStringSlice("private-host")
+	proxyRoutes, _ := cmd.Flags().GetStringArray("proxy-route")
 	startURL, _ := cmd.Flags().GetString("start-url")
 	extensions, _ := cmd.Flags().GetStringSlice("extension")
 	viewport, _ := cmd.Flags().GetString("viewport")
@@ -939,6 +975,7 @@ func runBrowserPoolsCreate(cmd *cobra.Command, args []string) error {
 		ProxyID:                proxyID,
 		Region:                 region,
 		PrivateHosts:           privateHosts,
+		ProxyRoutes:            proxyRoutes,
 		StartURL:               startURL,
 		Extensions:             extensions,
 		Viewport:               viewport,
@@ -983,6 +1020,8 @@ func runBrowserPoolsUpdate(cmd *cobra.Command, args []string) error {
 	clearExtensions, _ := cmd.Flags().GetBool("clear-extensions")
 	privateHosts, _ := cmd.Flags().GetStringSlice("private-host")
 	clearPrivateHosts, _ := cmd.Flags().GetBool("clear-private-hosts")
+	proxyRoutes, _ := cmd.Flags().GetStringArray("proxy-route")
+	clearProxyRoutes, _ := cmd.Flags().GetBool("clear-proxy-routes")
 	viewport, _ := cmd.Flags().GetString("viewport")
 	chromePolicy, _ := cmd.Flags().GetString("chrome-policy")
 	chromePolicyFile, _ := cmd.Flags().GetString("chrome-policy-file")
@@ -1014,6 +1053,8 @@ func runBrowserPoolsUpdate(cmd *cobra.Command, args []string) error {
 		ClearExtensions:        clearExtensions,
 		PrivateHosts:           privateHosts,
 		ClearPrivateHosts:      clearPrivateHosts,
+		ProxyRoutes:            proxyRoutes,
+		ClearProxyRoutes:       clearProxyRoutes,
 		Viewport:               viewport,
 		ChromePolicy:           chromePolicy,
 		ChromePolicyFile:       chromePolicyFile,

cmd/browser_pools.go

@@ -602,6 +602,11 @@ func TestBrowserPoolsUpdate_RejectsInvalidDurableInputs(t *testing.T) {
 			input:   BrowserPoolsUpdateInput{PrivateHosts: []string{"internal.example"}, ClearPrivateHosts: true},
 			wantErr: "cannot specify both --private-host and --clear-private-hosts",
 		},
+		{
+			name:    "conflicting proxy route modes",
+			input:   BrowserPoolsUpdateInput{ProxyRoutes: []string{"a.example=proxy-1"}, ClearProxyRoutes: true},
+			wantErr: "cannot specify both --proxy-route and --clear-proxy-routes",
+		},
 	}
 
 	for _, tt := range tests {
@@ -639,6 +644,48 @@ func TestBrowserPoolsCreate_WithPrivateHosts(t *testing.T) {
 	assert.Equal(t, []string{"*.example.ts.net", "100.64.0.0/10"}, captured.Network.PrivateHosts)
 }
 
+func TestBrowserPoolsCreate_WithProxyRoutes(t *testing.T) {
+	setupStdoutCapture(t)
+
+	var captured kernel.BrowserPoolNewParams
+	fake := &FakeBrowserPoolsService{
+		NewFunc: func(ctx context.Context, body kernel.BrowserPoolNewParams, opts ...option.RequestOption) (*kernel.BrowserPool, error) {
+			captured = body
+			return &kernel.BrowserPool{ID: "pool-routes"}, nil
+		},
+	}
+	c := BrowserPoolsCmd{client: fake}
+
+	require.NoError(t, c.Create(context.Background(), BrowserPoolsCreateInput{
+		Size:        1,
+		ProxyRoutes: []string{"api.ipify.org,*.ipify.org=name:my-dc-proxy", "other.example=proxy-456"},
+	}))
+	require.Len(t, captured.Network.ProxyRoutes, 2)
+	assert.Equal(t, []string{"api.ipify.org", "*.ipify.org"}, captured.Network.ProxyRoutes[0].Hosts)
+	assert.Equal(t, "my-dc-proxy", captured.Network.ProxyRoutes[0].Proxy.Name.Value)
+	assert.Equal(t, "proxy-456", captured.Network.ProxyRoutes[1].Proxy.ID.Value)
+	assert.Empty(t, captured.Network.PrivateHosts)
+
+	assert.Error(t, c.Create(context.Background(), BrowserPoolsCreateInput{Size: 1, ProxyRoutes: []string{"host="}}))
+}
+
+func TestBrowserPoolsGet_ShowsProxyRoutes(t *testing.T) {
+	setupStdoutCapture(t)
+
+	fake := &FakeBrowserPoolsService{
+		GetFunc: func(ctx context.Context, id string, opts ...option.RequestOption) (*kernel.BrowserPool, error) {
+			var pool kernel.BrowserPool
+			err := json.Unmarshal([]byte(`{"id":"pool-1","browser_pool_config":{"size":1,"network":{"proxy_routes":[{"hosts":["*.ipify.org"],"proxy":{"name":"my-dc-proxy"}}]}}}`), &pool)
+			return &pool, err
+		},
+	}
+	require.NoError(t, (BrowserPoolsCmd{client: fake}).Get(context.Background(), BrowserPoolsGetInput{IDOrName: "pool-1"}))
+
+	out := outBuf.String()
+	assert.Contains(t, out, "Proxy Routes")
+	assert.Contains(t, out, "*.ipify.org = my-dc-proxy")
+}
+
 func TestBrowserPoolsUpdate_PrivateHostModes(t *testing.T) {
 	tests := []struct {
 		name     string
@@ -655,6 +702,26 @@ func TestBrowserPoolsUpdate_PrivateHostModes(t *testing.T) {
 			input:    BrowserPoolsUpdateInput{ClearPrivateHosts: true},
 			wantJSON: `"network":{}`,
 		},
+		{
+			name:     "replace proxy routes",
+			input:    BrowserPoolsUpdateInput{ProxyRoutes: []string{"*.ipify.org=name:dc"}},
+			wantJSON: `"network":{"proxy_routes":[{"hosts":["*.ipify.org"],"proxy":{"name":"dc"}}]}`,
+		},
+		{
+			name:     "routes with private hosts",
+			input:    BrowserPoolsUpdateInput{PrivateHosts: []string{"10.0.0.0/8"}, ProxyRoutes: []string{"a.example=proxy-1"}},
+			wantJSON: `"network":{"private_hosts":["10.0.0.0/8"],"proxy_routes":[{"hosts":["a.example"],"proxy":{"id":"proxy-1"}}]}`,
+		},
+		{
+			name:     "clear proxy routes",
+			input:    BrowserPoolsUpdateInput{ClearProxyRoutes: true},
+			wantJSON: `"network":{"proxy_routes":[]}`,
+		},
+		{
+			name:     "clear proxy routes keeps private hosts",
+			input:    BrowserPoolsUpdateInput{PrivateHosts: []string{"10.0.0.0/8"}, ClearProxyRoutes: true},
+			wantJSON: `"network":{"private_hosts":["10.0.0.0/8"],"proxy_routes":[]}`,
+		},
 	}
 
 	for _, tt := range tests {