High-performance browser automation bridge and multi-instance orchestrator with advanced stealth injection and real-time dashboard.
refactor: finish browser abstraction cleanup
Bosch44299b78d7d3
diff --git a/docs/architecture/browser-abstraction.md b/docs/architecture/browser-abstraction.mdindex bb6ed3a4..8873f777 100644--- a/docs/architecture/browser-abstraction.md+++ b/docs/architecture/browser-abstraction.md@@ -13,7 +13,7 @@ Current branch points:|---|---|---|| Launch flags | `internal/bridge/runtime/init.go` | `IsCloakBrowserProvider()` gate + `CloakBrowserFlagArgs()` || Geo alignment | `internal/bridge/runtime/geo_align.go` | `switch NormalizeBrowserProvider(...)` |-| Binary discovery | `internal/browserprobe/binary.go` | Parallel `DiscoverChromeBinary`, `DiscoverCloakBrowserBinary` |+| Binary discovery | `internal/browsers/runtimekit/runtimekit.go` | Provider-driven `FindBrowserBinary(...)` discovery || Doctor registry | `internal/doctor/runner.go` | `if IsCloakBrowserProvider()` adds checks || Config validation | `internal/config/browser_targets.go` | Hardcoded `{chrome, cloak}` allowlist |@@ -198,7 +198,7 @@ geo := b.GeoAlignment(geoCfg)Extract-then-rewire. Each step lands independently with no behavior change.1. **Skeleton.** Add `internal/browsers/` with the interface, registry, and empty `chrome` package. Wire a barrel import in one place (`cmd/pinchtab/root.go`). No call sites change yet.-2. **Chrome extraction.** Move `DiscoverChromeBinary`, chrome flag builders, chrome geo logic into `browsers/chrome/`. Old call sites delegate to `browsers.Get("chrome")`. Tests stay green.+2. **Chrome extraction.** Move Chrome-specific launch helpers, geo logic, and provider discovery behind `browsers/chrome/` plus shared `runtimekit` entry points. Old call sites delegate through `browsers.Get("chrome")` / `FindBrowserBinary(...)`. Tests stay green.3. **Cloak extraction.** Move stealth flag builder, cloak geo, cloak binary discovery into `browsers/cloak/` as composition over chrome. Remove `IsCloakBrowserProvider()` callers one at a time.4. **Doctor migration.** Move provider-specific checks into `browsers/{chrome,cloak}/doctor.go`. `doctor/runner.go` collapses to a registry walk.5. **Geo migration.** Replace `geo_align.go` switch with `b.GeoAlignment(...)` call. Delete `geo_align.go` body.diff --git a/docs/architecture/browser-runtime.md b/docs/architecture/browser-runtime.mdindex 746b0474..706fb93f 100644--- a/docs/architecture/browser-runtime.md+++ b/docs/architecture/browser-runtime.md@@ -113,7 +113,7 @@ type Instance struct{} // implements browsers.RuntimeInstance (post-lau```The Bridge calls `browser.NewRuntimeInstance(browserCtx, headless)`-during `EnsureChrome()` and holds the returned `RuntimeInstance` for the+during `EnsureBrowser()` and holds the returned `RuntimeInstance` for thesession lifetime.## TabHandlediff --git a/docs/deep-dive/lite-engin-prototype.md b/docs/deep-dive/lite-engin-prototype.mdindex 0398e534..bc980d8b 100644--- a/docs/deep-dive/lite-engin-prototype.md+++ b/docs/deep-dive/lite-engin-prototype.md@@ -89,7 +89,7 @@ No handler, config, or CMD changes needed.|------|--------|| `internal/config/config_types.go` | Added `Engine` field to RuntimeConfig + ServerConfig || `internal/handlers/handlers.go` | Added `Router *engine.Router` field, `useLite()` helper |-| `internal/handlers/navigation.go` | Lite fast path before ensureChrome |+| `internal/handlers/navigation.go` | Lite fast path before ensureBrowser || `internal/handlers/snapshot.go` | Lite fast path with SnapshotNode → A11yNode conversion || `internal/handlers/text.go` | Lite fast path returning plain text || `cmd/pinchtab/cmd_bridge.go` | Resolves engine mode (`resolveBridgeEngine`) from CLI flag and config |diff --git a/docs/endpoints.md b/docs/endpoints.mdindex feb468de..a03e63e4 100644--- a/docs/endpoints.md+++ b/docs/endpoints.md@@ -6,7 +6,7 @@ This page summarizes the live HTTP surface exposed by PinchTab. Some routes are```textGET /health-POST /ensure-chrome+POST /ensure-browserPOST /browser/restartGET /openapi.jsonGET /help (alias for /openapi.json)diff --git a/docs/implementations/chrome-profile-lock-recovery.md b/docs/implementations/chrome-profile-lock-recovery.mdindex 63c5fa19..5cb74f9c 100644--- a/docs/implementations/chrome-profile-lock-recovery.md+++ b/docs/implementations/chrome-profile-lock-recovery.md@@ -1,6 +1,6 @@-# Chrome Profile Lock Recovery+# Browser Profile Lock Recovery-Chrome uses a `SingletonLock` file in its user data directory to prevent multiple instances from sharing the same profile simultaneously. If PinchTab or Chrome crashes, this lock file (and associated `SingletonSocket` and `SingletonCookie` files) can be left behind, preventing the next PinchTab startup from succeeding with the error:+Chromium-based browsers use a `SingletonLock` file in their user data directory to prevent multiple instances from sharing the same profile simultaneously. If PinchTab or the browser crashes, this lock file (and associated `SingletonSocket` and `SingletonCookie` files) can be left behind, preventing the next PinchTab startup from succeeding with the error:> "The profile appears to be in use by another Chromium process"@@ -12,7 +12,7 @@ The recovery process follows a multi-layered approach to distinguish between a t### 1. Detection-During initialization in `internal/bridge/runtime/init.go` (with bridge wiring in `internal/bridge/bridge_lifecycle.go`), if Chrome fails to start, PinchTab checks the error message for signatures of a profile lock:+During initialization in `internal/bridge/runtime/init.go` (with bridge wiring in `internal/bridge/bridge_lifecycle.go`), if browser startup fails, PinchTab checks the error message for signatures of a profile lock:- `The profile appears to be in use by another Chromium process`- `The profile appears to be in use by another Chrome process`- `process_singleton_posix.cc` (indicating a failure in the ProcessSingleton logic)@@ -22,7 +22,7 @@ During initialization in `internal/bridge/runtime/init.go` (with bridge wiring iTo safely clear a lock, PinchTab must be certain no *other* active PinchTab instance is currently using that profile.- **`pinchtab.pid`**: When a bridge starts, it writes its own PID to `$PROFILE_DIR/pinchtab.pid`.-- **Ownership Check**: Before clearing any Chrome locks, PinchTab reads this file.+- **Ownership Check**: Before clearing any browser locks, PinchTab reads this file.- If the PID in the file is still running **and** is verified to be a `pinchtab` process (by inspecting its command-line arguments), it assumes another PinchTab instance is active and **does not** touch the locks.- This verification prevents issues with PID reuse where a dead PinchTab instance's PID is reassigned to a different process.- If the PID is not running or is not a PinchTab process, the previous instance is considered "dead," and the profile is eligible for recovery.@@ -33,10 +33,10 @@ If a headless PinchTab instance cannot acquire a lock on the requested profile d### 4a. Stale Process Termination-Even if the previous PinchTab instance is dead, orphaned Chrome processes might still be holding the profile lock.+Even if the previous PinchTab instance is dead, orphaned browser processes might still be holding the profile lock.- **Process Listing**: PinchTab scans the system process list for any processes launched with the same `--user-data-dir`.-- **Aggressive Cleanup**: If the `pinchtab.pid` check confirms no active owner, PinchTab sends `SIGKILL` to any orphaned Chrome processes associated with that profile. This is necessary because Chrome's internal "singleton" logic can be extremely stubborn if it thinks another process is even partially alive.+- **Aggressive Cleanup**: If the `pinchtab.pid` check confirms no active owner, PinchTab sends `SIGKILL` to any orphaned browser processes associated with that profile. This is necessary because Chromium's internal "singleton" logic can be extremely stubborn if it thinks another process is even partially alive.### 4b. Lock File Removal@@ -47,7 +47,7 @@ Once stale processes are terminated, PinchTab removes the following files from t### 5. Automatic Retry-After clearing the stale state, `InitChrome` automatically retries the startup sequence once. This makes the recovery transparent to the user and the API caller (e.g., the first `/health` check will succeed after a brief internal recovery delay).+After clearing the stale state, `InitBrowser` automatically retries the startup sequence once. This makes the recovery transparent to the user and the API caller (e.g., the first `/health` check will succeed after a brief internal recovery delay).## Implementation Details@@ -55,13 +55,13 @@ The logic is distributed across these components:- **`internal/bridge/profile_lock.go`**: Core logic for detection, PID lock management (`AcquireProfileLock`), and stale file removal.- **`internal/bridge/profile_lock_pid_*.go`**: Platform-specific implementations for PID probing and process killing (supports Unix-like systems and Windows).-- **`internal/bridge/runtime/init.go`**: Orchestrates the retry logic within `startChromeWithRecovery`.-- **`internal/bridge/bridge_lifecycle.go`**: Calls `AcquireProfileLock` and `EnsureChrome` during bridge startup.+- **`internal/bridge/runtime/init.go`**: Orchestrates the retry logic within `startBrowserWithRecovery`.+- **`internal/bridge/bridge_lifecycle.go`**: Calls `AcquireProfileLock` and `EnsureBrowser` during bridge startup.- **`internal/server/bridge.go`**: Ensures clean shutdown via signal handling to prevent locks from being left behind in the first place.## Multi-Instance Safety-By combining the Chrome-level `SingletonLock` with the application-level `pinchtab.pid`, PinchTab achieves:+By combining the browser-level `SingletonLock` with the application-level `pinchtab.pid`, PinchTab achieves:1. **Safety**: It never kills a browser being used by a healthy PinchTab instance.2. **Resilience**: It automatically "self-heals" after a crash or power failure.3. **Transparency**: Users don't need to manually `rm -rf` profile directories to fix "in use" errors.diff --git a/docs/implementations/parallel-tab-execution.md b/docs/implementations/parallel-tab-execution.mdindex 9efaa6a7..39a877be 100644--- a/docs/implementations/parallel-tab-execution.md+++ b/docs/implementations/parallel-tab-execution.md@@ -42,7 +42,7 @@ HTTP POST /tabs/{id}/action (e.g., Click button)Handler: HandleAction()│▼-Bridge.EnsureChrome() [lazy init on first request]+Bridge.EnsureBrowser() [lazy init on first request]│▼Bridge.TabContext(tabID) [get chromedp.Context for tab]diff --git a/internal/bridge/api.go b/internal/bridge/api.goindex 2a543c23..f82e8665 100644--- a/internal/bridge/api.go+++ b/internal/bridge/api.go@@ -54,7 +54,7 @@ type BridgeAPI interface {Lock(tabID, owner string, ttl time.Duration) errorUnlock(tabID, owner string) error- EnsureChrome(cfg *config.RuntimeConfig) error+ EnsureBrowser(cfg *config.RuntimeConfig) errorRestartBrowser(cfg *config.RuntimeConfig) errorStealthStatus() *stealth.Statusdiff --git a/internal/bridge/bridge.go b/internal/bridge/bridge.goindex fad3a3ad..8a7f9c6e 100644--- a/internal/bridge/bridge.go+++ b/internal/bridge/bridge.go@@ -43,7 +43,7 @@ type Bridge struct {pointerByTab map[string]pointerState// Runtime is the provider-specific RuntimeInstance for this browser- // session. Initialized during EnsureChrome. Nil before launch.+ // session. Initialized during EnsureBrowser. Nil before launch.Runtime browsers.RuntimeInstance// Lazy initialization / restart coordinationdiff --git a/internal/bridge/bridge_lifecycle.go b/internal/bridge/bridge_lifecycle.goindex 0fe6e2c6..55b027e0 100644--- a/internal/bridge/bridge_lifecycle.go+++ b/internal/bridge/bridge_lifecycle.go@@ -146,7 +146,7 @@ func (b *Bridge) EnsureBrowser(cfg *config.RuntimeConfig) error {if b.BrowserCtx.Err() == nil {return nil}- slog.Warn("chrome browser context cancelled, re-initializing")+ slog.Warn("browser context cancelled, re-initializing")b.initialized = falseb.BrowserCtx = nilb.BrowserCancel = nil@@ -171,7 +171,7 @@ func (b *Bridge) EnsureBrowser(cfg *config.RuntimeConfig) error {return b.ensureRemoteCDPLocked(cfg)}- slog.Debug("ensure chrome called", "headless", cfg.Headless, "profile", cfg.ProfileDir)+ slog.Debug("ensure browser called", "headless", cfg.Headless, "profile", cfg.ProfileDir)if err := AcquireProfileLock(cfg.ProfileDir); err != nil {if cfg.Headless {@@ -194,11 +194,11 @@ func (b *Bridge) EnsureBrowser(cfg *config.RuntimeConfig) error {}}- slog.Info("starting chrome with confirmed profile", "headless", cfg.Headless, "profile", cfg.ProfileDir)+ slog.Info("starting browser with confirmed profile", "headless", cfg.Headless, "profile", cfg.ProfileDir)b.ensureStealthBundle()- allocCtx, allocCancel, browserCtx, browserCancel, launchMode, err := InitChrome(cfg, b.StealthBundle)+ allocCtx, allocCancel, browserCtx, browserCancel, launchMode, err := InitBrowser(cfg, b.StealthBundle)if err != nil {- return fmt.Errorf("failed to initialize chrome: %w", err)+ return fmt.Errorf("failed to initialize browser: %w", err)}b.AllocCtx = allocCtx@@ -260,11 +260,6 @@ func (b *Bridge) prepareConfigForLaunch(cfg *config.RuntimeConfig) {}}-// EnsureChrome is the compatibility alias for older callers.-func (b *Bridge) EnsureChrome(cfg *config.RuntimeConfig) error {- return b.EnsureBrowser(cfg)-}-// RestartBrowser performs a soft restart: drains in-flight requests, tears// down browser contexts, and re-initializes via EnsureBrowser.func (b *Bridge) RestartBrowser(cfg *config.RuntimeConfig) error {diff --git a/internal/bridge/init.go b/internal/bridge/init.goindex e44f5697..c4b06bf5 100644--- a/internal/bridge/init.go+++ b/internal/bridge/init.go@@ -10,21 +10,21 @@ import (const popupGuardInitScript = stealth.PopupGuardInitScript-// InitChrome initializes a Chrome browser for a Bridge instance.-func InitChrome(cfg *config.RuntimeConfig, bundle *stealth.Bundle) (context.Context, context.CancelFunc, context.Context, context.CancelFunc, stealth.LaunchMode, error) {- return bridgeruntime.InitChrome(cfg, bundle, bridgeruntime.Hooks{+// InitBrowser initializes a browser for a Bridge instance.+func InitBrowser(cfg *config.RuntimeConfig, bundle *stealth.Bundle) (context.Context, context.CancelFunc, context.Context, context.CancelFunc, stealth.LaunchMode, error) {+ return bridgeruntime.InitBrowser(cfg, bundle, bridgeruntime.Hooks{SetHumanRandSeed: SetHumanRandSeed,- IsChromeProfileLockError: isChromeProfileLockError,- ClearStaleChromeProfile: clearStaleChromeProfileLock,- ConfigureChromeProcessCmd: configureChromeProcess,+ IsProfileLockError: isProfileLockError,+ ClearStaleProfileLocks: clearStaleProfileLocks,+ ConfigureBrowserProcess: configureBrowserProcess,QuarantineCorruptedProfile: quarantineCorruptedProfile,})}-func baseChromeFlagArgs() []string {- return bridgeruntime.BaseChromeFlagArgs()+func baseBrowserFlagArgs() []string {+ return bridgeruntime.BaseBrowserFlagArgs()}-func buildChromeArgs(cfg *config.RuntimeConfig, port int) []string {- return bridgeruntime.BuildChromeArgs(cfg, port)+func buildBrowserArgs(cfg *config.RuntimeConfig, port int) []string {+ return bridgeruntime.BuildBrowserArgs(cfg, port)}diff --git a/internal/bridge/init_test.go b/internal/bridge/init_test.goindex 8135a6db..ba1980a0 100644--- a/internal/bridge/init_test.go+++ b/internal/bridge/init_test.go@@ -10,8 +10,8 @@ import ("github.com/pinchtab/pinchtab/internal/config")-func TestBuildChromeArgsSuppressesCrashDialogs(t *testing.T) {- args := buildChromeArgs(&config.RuntimeConfig{}, 9222)+func TestBuildBrowserArgsSuppressesCrashDialogs(t *testing.T) {+ args := buildBrowserArgs(&config.RuntimeConfig{}, 9222)for _, want := range []string{"--disable-session-crashed-bubble",@@ -19,13 +19,13 @@ func TestBuildChromeArgsSuppressesCrashDialogs(t *testing.T) {"--noerrdialogs",} {if !slices.Contains(args, want) {- t.Fatalf("missing chrome arg %q in %v", want, args)+ t.Fatalf("missing browser arg %q in %v", want, args)}}}-func TestBuildChromeArgsIncludesStealthLaunchFlags(t *testing.T) {- args := buildChromeArgs(&config.RuntimeConfig{}, 9222)+func TestBuildBrowserArgsIncludesStealthLaunchFlags(t *testing.T) {+ args := buildBrowserArgs(&config.RuntimeConfig{}, 9222)for _, want := range []string{"--enable-automation=false",@@ -34,13 +34,13 @@ func TestBuildChromeArgsIncludesStealthLaunchFlags(t *testing.T) {"--lang=en-US",} {if !slices.Contains(args, want) {- t.Fatalf("missing chrome arg %q in %v", want, args)+ t.Fatalf("missing browser arg %q in %v", want, args)}}}-func TestBuildChromeArgsHeadlessUsesSoftwareRendering(t *testing.T) {- args := buildChromeArgs(&config.RuntimeConfig{Headless: true}, 9222)+func TestBuildBrowserArgsHeadlessUsesSoftwareRendering(t *testing.T) {+ args := buildBrowserArgs(&config.RuntimeConfig{Headless: true}, 9222)for _, want := range []string{"--headless=new",@@ -50,15 +50,15 @@ func TestBuildChromeArgsHeadlessUsesSoftwareRendering(t *testing.T) {"--enable-unsafe-swiftshader",} {if !slices.Contains(args, want) {- t.Fatalf("missing headless chrome arg %q in %v", want, args)+ t.Fatalf("missing headless browser arg %q in %v", want, args)}}}-func TestBuildChromeArgsIncludesGlobalUserAgent(t *testing.T) {+func TestBuildBrowserArgsIncludesGlobalUserAgent(t *testing.T) {// HEADED + no custom UA: Chrome must run WITHOUT --user-agent so its// native, complete high-entropy UA Client Hints are served.- args := buildChromeArgs(&config.RuntimeConfig{ChromeVersion: "144.0.7559.133"}, 9222)+ args := buildBrowserArgs(&config.RuntimeConfig{BrowserVersion: "144.0.7559.133"}, 9222)for _, arg := range args {if strings.HasPrefix(arg, "--user-agent=") {t.Fatalf("did not expect a pinned user-agent in headed mode without a custom UA, got %v", args)@@ -70,7 +70,7 @@ func TestBuildChromeArgsIncludesGlobalUserAgent(t *testing.T) {// headless tell never reaches the page or workers. The native UA-CH is// already degraded in headless, so the PR #580 UA-CH realism rationale// does not apply here.- headless := buildChromeArgs(&config.RuntimeConfig{ChromeVersion: "144.0.7559.133", Headless: true}, 9222)+ headless := buildBrowserArgs(&config.RuntimeConfig{BrowserVersion: "144.0.7559.133", Headless: true}, 9222)var headlessUA stringfor _, arg := range headless {if strings.HasPrefix(arg, "--user-agent=") {@@ -89,7 +89,7 @@ func TestBuildChromeArgsIncludesGlobalUserAgent(t *testing.T) {}// Explicit custom UA: it must be pinned (independent of headless).- custom := buildChromeArgs(&config.RuntimeConfig{ChromeVersion: "144.0.7559.133", UserAgent: "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/144.0.0.0 Safari/537.36"}, 9222)+ custom := buildBrowserArgs(&config.RuntimeConfig{BrowserVersion: "144.0.7559.133", UserAgent: "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/144.0.0.0 Safari/537.36"}, 9222)found := falsefor _, arg := range custom {if strings.HasPrefix(arg, "--user-agent=Mozilla/5.0") {@@ -102,10 +102,10 @@ func TestBuildChromeArgsIncludesGlobalUserAgent(t *testing.T) {}}-func TestBuildChromeArgsSanitizesUnsafeAndReservedExtraFlags(t *testing.T) {- args := buildChromeArgs(&config.RuntimeConfig{- ChromeVersion: "144.0.7559.133",- ChromeExtraFlags: "--disable-gpu --user-agent=Bad/1.0 --disable-web-security --ash-no-nudges",+func TestBuildBrowserArgsSanitizesUnsafeAndReservedExtraFlags(t *testing.T) {+ args := buildBrowserArgs(&config.RuntimeConfig{+ BrowserVersion: "144.0.7559.133",+ BrowserExtraFlags: "--disable-gpu --user-agent=Bad/1.0 --disable-web-security --ash-no-nudges",}, 9222)if !slices.Contains(args, "--disable-gpu") {@@ -121,8 +121,8 @@ func TestBuildChromeArgsSanitizesUnsafeAndReservedExtraFlags(t *testing.T) {}}-func TestBuildChromeArgsSkipsMissingExtensionPaths(t *testing.T) {- args := buildChromeArgs(&config.RuntimeConfig{+func TestBuildBrowserArgsSkipsMissingExtensionPaths(t *testing.T) {+ args := buildBrowserArgs(&config.RuntimeConfig{ExtensionPaths: []string{filepath.Join(t.TempDir(), "missing-extension")},}, 9222)@@ -136,13 +136,13 @@ func TestBuildChromeArgsSkipsMissingExtensionPaths(t *testing.T) {}}-func TestBuildChromeArgsIncludesExistingExtensionPaths(t *testing.T) {+func TestBuildBrowserArgsIncludesExistingExtensionPaths(t *testing.T) {extensionDir := filepath.Join(t.TempDir(), "extensions", "example")if err := os.MkdirAll(extensionDir, 0o755); err != nil {t.Fatalf("MkdirAll() error = %v", err)}- args := buildChromeArgs(&config.RuntimeConfig{+ args := buildBrowserArgs(&config.RuntimeConfig{ExtensionPaths: []string{extensionDir},}, 9222)@@ -158,8 +158,8 @@ func TestBuildChromeArgsIncludesExistingExtensionPaths(t *testing.T) {}}-func TestBuildChromeArgsIncludesProxyFlagsWhenConfigured(t *testing.T) {- args := buildChromeArgs(&config.RuntimeConfig{+func TestBuildBrowserArgsIncludesProxyFlagsWhenConfigured(t *testing.T) {+ args := buildBrowserArgs(&config.RuntimeConfig{Proxy: config.BrowserProxyConfig{Server: "http://proxy.example.com:8080",BypassList: []string{"*.local", "127.0.0.1"},@@ -177,7 +177,7 @@ func TestBuildChromeArgsIncludesProxyFlagsWhenConfigured(t *testing.T) {hasBypass = true}if strings.Contains(a, "alice") || strings.Contains(a, "s3cr3t") {- t.Fatalf("proxy credentials leaked into Chrome args: %q", a)+ t.Fatalf("proxy credentials leaked into browser args: %q", a)}}if !hasProxy {@@ -188,8 +188,8 @@ func TestBuildChromeArgsIncludesProxyFlagsWhenConfigured(t *testing.T) {}}-func TestBuildChromeArgsOmitsProxyFlagsWhenDisabled(t *testing.T) {- args := buildChromeArgs(&config.RuntimeConfig{}, 9222)+func TestBuildBrowserArgsOmitsProxyFlagsWhenDisabled(t *testing.T) {+ args := buildBrowserArgs(&config.RuntimeConfig{}, 9222)for _, a := range args {if strings.HasPrefix(a, "--proxy-server=") || strings.HasPrefix(a, "--proxy-bypass-list=") {t.Fatalf("did not expect proxy flag without config: %q", a)@@ -197,8 +197,8 @@ func TestBuildChromeArgsOmitsProxyFlagsWhenDisabled(t *testing.T) {}}-func TestBaseChromeFlagArgsDisablesMetricsReporting(t *testing.T) {- args := baseChromeFlagArgs()+func TestBaseBrowserFlagArgsDisablesMetricsReporting(t *testing.T) {+ args := baseBrowserFlagArgs()for _, want := range []string{"--disable-metrics-reporting", "--metrics-recording-only"} {found := falsefor _, arg := range args {@@ -213,8 +213,8 @@ func TestBaseChromeFlagArgsDisablesMetricsReporting(t *testing.T) {}}-func TestBaseChromeFlagArgsPreservesPopupBlockingAndSiteIsolation(t *testing.T) {- args := baseChromeFlagArgs()+func TestBaseBrowserFlagArgsPreservesPopupBlockingAndSiteIsolation(t *testing.T) {+ args := baseBrowserFlagArgs()for _, forbidden := range []string{"--disable-popup-blocking","--no-sandbox",diff --git a/internal/bridge/proc_linux.go b/internal/bridge/proc_linux.goindex 16bb8e61..2b30a99b 100644--- a/internal/bridge/proc_linux.go+++ b/internal/bridge/proc_linux.go@@ -7,11 +7,11 @@ import ("syscall")-// configureChromeProcess sets parent death signal on Linux so Chrome dies+// configureBrowserProcess sets parent death signal on Linux so the browser dies// when the Go process exits unexpectedly.-// Does NOT set Setpgid — Chrome stays in the parent's process group so the+// Does NOT set Setpgid — the browser stays in the parent's process group so the// orchestrator can kill the entire bridge group at once.-func configureChromeProcess(cmd *exec.Cmd) {+func configureBrowserProcess(cmd *exec.Cmd) {cmd.SysProcAttr = &syscall.SysProcAttr{Pdeathsig: syscall.SIGKILL,}diff --git a/internal/bridge/proc_other.go b/internal/bridge/proc_other.goindex 9b70a477..2615f22f 100644--- a/internal/bridge/proc_other.go+++ b/internal/bridge/proc_other.go@@ -4,7 +4,7 @@ package bridgeimport "os/exec"-// configureChromeProcess is a no-op on macOS.-// Chrome inherits the parent's process group. The orchestrator kills the+// configureBrowserProcess is a no-op on macOS.+// The browser inherits the parent's process group. The orchestrator kills the// entire bridge group, and in standalone bridge mode, Cleanup() handles it.-func configureChromeProcess(_ *exec.Cmd) {}+func configureBrowserProcess(_ *exec.Cmd) {}diff --git a/internal/bridge/proc_windows.go b/internal/bridge/proc_windows.goindex 188ef67c..52fee233 100644--- a/internal/bridge/proc_windows.go+++ b/internal/bridge/proc_windows.go@@ -4,5 +4,5 @@ package bridgeimport "os/exec"-// configureChromeProcess is a no-op on Windows.-func configureChromeProcess(_ *exec.Cmd) {}+// configureBrowserProcess is a no-op on Windows.+func configureBrowserProcess(_ *exec.Cmd) {}diff --git a/internal/bridge/profile_lock.go b/internal/bridge/profile_lock.goindex 068f0b0e..0da6a4f9 100644--- a/internal/bridge/profile_lock.go+++ b/internal/bridge/profile_lock.go@@ -1,13 +1,15 @@-// profile_lock.go handles stale Chrome profile lock recovery.+// profile_lock.go handles stale browser profile lock recovery for+// Chromium-based providers.//-// When a container restarts (or Chrome crashes), Chrome's SingletonLock,-// SingletonSocket, and SingletonCookie files may be left behind in the profile-// directory. On next startup Chrome sees these and refuses to launch with+// When a container restarts (or the browser crashes), Chromium's+// SingletonLock, SingletonSocket, and SingletonCookie files may be left behind+// in the profile directory. On next startup the browser sees these and refuses+// to launch with// "The profile appears to be in use by another Chromium process".//// This code detects that error, checks whether the owning process is actually// still running (via PID probe and process listing), and removes the stale-// lock files if it's safe to do so. It retries Chrome startup once after+// lock files if it's safe to do so. It retries browser startup once after// clearing the locks.package bridge@@ -31,9 +33,9 @@ var isProfileOwnedByRunningPinchtabMock = isProfileOwnedByRunningPinchtabvar isPinchTabProcessFunc = isPinchTabProcess// lockStartupGrace is the window after a PID file is written during which the-// Chrome process check is skipped. AcquireProfileLock writes the PID before-// InitChrome launches the browser, so a second process must not treat the-// missing Chrome as a stale lock during this startup window.+// browser process check is skipped. AcquireProfileLock writes the PID before+// InitBrowser launches the browser, so a second process must not treat the+// missing browser as a stale lock during this startup window.var lockStartupGrace = 2 * time.Minutevar chromeSingletonFiles = []string{@@ -49,7 +51,7 @@ type chromeProfileProcess struct {Command string}-func isChromeProfileLockError(msg string) bool {+func isProfileLockError(msg string) bool {if msg == "" {return false}@@ -58,7 +60,7 @@ func isChromeProfileLockError(msg string) bool {strings.Contains(msg, "process_singleton")}-func clearStaleChromeProfileLock(profileDir, errMsg string) (bool, error) {+func clearStaleProfileLocks(profileDir, errMsg string) (bool, error) {if strings.TrimSpace(profileDir) == "" {return false, nil}@@ -66,15 +68,15 @@ func clearStaleChromeProfileLock(profileDir, errMsg string) (bool, error) {if pid, ok := extractChromeProfileLockPID(errMsg); ok {running, err := chromePIDIsRunning(pid)if err != nil {- slog.Warn("failed to probe chrome lock pid; falling back to process listing", "profile", profileDir, "pid", pid, "err", err)+ slog.Warn("failed to probe browser lock pid; falling back to process listing", "profile", profileDir, "pid", pid, "err", err)} else if running {// If we find the PID from the error message is still running,// check if it's actually managed by another active PinchTab.if owned, ptPid := isProfileOwnedByRunningPinchtabMock(profileDir); owned {- slog.Warn("chrome profile lock appears active and owned by another pinchtab; leaving singleton files in place", "profile", profileDir, "pid", pid, "pinchtab_pid", ptPid)+ slog.Warn("browser profile lock appears active and owned by another pinchtab; leaving singleton files in place", "profile", profileDir, "pid", pid, "pinchtab_pid", ptPid)return false, nil}- slog.Warn("chrome profile lock appears active but pinchtab owner is dead; proceeding with stale cleanup", "profile", profileDir, "pid", pid)+ slog.Warn("browser profile lock appears active but pinchtab owner is dead; proceeding with stale cleanup", "profile", profileDir, "pid", pid)}}@@ -92,14 +94,14 @@ func clearStaleChromeProfileLock(profileDir, errMsg string) (bool, error) {for _, proc := range processes {pids = append(pids, proc.PID)}- slog.Warn("chrome profile lock appears active and owned by another pinchtab; leaving singleton files in place", "profile", profileDir, "pids", strings.Join(pids, ","), "pinchtab_pid", ptPid)+ slog.Warn("browser profile lock appears active and owned by another pinchtab; leaving singleton files in place", "profile", profileDir, "pids", strings.Join(pids, ","), "pinchtab_pid", ptPid)return false, nil}- // If no other PinchTab owns this profile, we can safely kill the stale Chrome processes.- slog.Warn("chrome profile lock appears active but no pinchtab owner found; killing stale processes", "profile", profileDir)+ // If no other PinchTab owns this profile, we can safely kill the stale browser processes.+ slog.Warn("browser profile lock appears active but no pinchtab owner found; killing stale processes", "profile", profileDir)if err := killChromeProfileProcesses(processes); err != nil {- slog.Error("failed to kill stale chrome processes", "profile", profileDir, "err", err)+ slog.Error("failed to kill stale browser processes", "profile", profileDir, "err", err)return false, nil}}@@ -172,8 +174,8 @@ func isProfileOwnedByRunningPinchtab(profileDir string) (bool, int) {// Even if the PID is running, check if it's actually a pinchtab process// to handle PID reuse.if isPinchTabProcessFunc(pid) {- // Skip the Chrome check while the PID file is fresh: AcquireProfileLock- // writes the file before InitChrome launches the browser, so a second+ // Skip the browser check while the PID file is fresh: AcquireProfileLock+ // writes the file before InitBrowser launches the browser, so a second// process must not steal the lock during that startup window.if info, statErr := os.Stat(pidFile); statErr == nil && time.Since(info.ModTime()) < lockStartupGrace {slog.Debug("profile lock belongs to a recently started pinchtab; treating as active",@@ -182,12 +184,12 @@ func isProfileOwnedByRunningPinchtab(profileDir string) (bool, int) {}processes, procErr := chromeProfileProcessLister(profileDir)if procErr == nil && len(processes) == 0 {- slog.Debug("pinchtab pid file points to a running pinchtab but no chrome is using the profile; treating lock as stale",+ slog.Debug("pinchtab pid file points to a running pinchtab but no browser is using the profile; treating lock as stale","profile", profileDir, "pid", pid)return false, 0}if procErr != nil {- slog.Debug("unable to verify chrome ownership for running pinchtab pid; keeping profile locked",+ slog.Debug("unable to verify browser ownership for running pinchtab pid; keeping profile locked","profile", profileDir, "pid", pid, "err", procErr)}slog.Debug("profile is owned by another active pinchtab", "profile", profileDir, "pid", pid)diff --git a/internal/bridge/profile_lock_test.go b/internal/bridge/profile_lock_test.goindex 4c042e1c..cf2dae09 100644--- a/internal/bridge/profile_lock_test.go+++ b/internal/bridge/profile_lock_test.go@@ -74,11 +74,11 @@ func TestQuarantineCorruptedProfile_EmptyPath(t *testing.T) {}}-func TestIsChromeProfileLockError(t *testing.T) {+func TestIsProfileLockError(t *testing.T) {t.Parallel()msg := "chrome failed to start: [2046:2046:0309/221021.856597:ERROR:chrome/browser/process_singleton_posix.cc:363] The profile appears to be in use by another Chromium process"- if !isChromeProfileLockError(msg) {+ if !isProfileLockError(msg) {t.Fatal("expected profile lock error to be detected")}}@@ -115,7 +115,7 @@ func TestExtractChromeProfileLockPID(t *testing.T) {}}-func TestClearStaleChromeProfileLockRemovesSingletonFiles(t *testing.T) {+func TestClearStaleProfileLocksRemovesSingletonFiles(t *testing.T) {profileDir := t.TempDir()for _, name := range chromeSingletonFiles {if err := os.WriteFile(filepath.Join(profileDir, name), []byte("x"), 0644); err != nil {@@ -141,9 +141,9 @@ func TestClearStaleChromeProfileLockRemovesSingletonFiles(t *testing.T) {isProfileOwnedByRunningPinchtabMock = origMock})- removed, err := clearStaleChromeProfileLock(profileDir, "")+ removed, err := clearStaleProfileLocks(profileDir, "")if err != nil {- t.Fatalf("clearStaleChromeProfileLock() error = %v", err)+ t.Fatalf("clearStaleProfileLocks() error = %v", err)}if !removed {t.Fatal("expected singleton files to be removed")@@ -156,7 +156,7 @@ func TestClearStaleChromeProfileLockRemovesSingletonFiles(t *testing.T) {}}-func TestClearStaleChromeProfileLockLeavesActiveProfileUntouched(t *testing.T) {+func TestClearStaleProfileLocksLeavesActiveProfileUntouched(t *testing.T) {profileDir := t.TempDir()lockPath := filepath.Join(profileDir, chromeSingletonFiles[0])if err := os.WriteFile(lockPath, []byte("x"), 0644); err != nil {@@ -181,9 +181,9 @@ func TestClearStaleChromeProfileLockLeavesActiveProfileUntouched(t *testing.T) {isProfileOwnedByRunningPinchtabMock = origMock})- removed, err := clearStaleChromeProfileLock(profileDir, "")+ removed, err := clearStaleProfileLocks(profileDir, "")if err != nil {- t.Fatalf("clearStaleChromeProfileLock() error = %v", err)+ t.Fatalf("clearStaleProfileLocks() error = %v", err)}if removed {t.Fatal("expected active profile lock to remain in place")@@ -193,7 +193,7 @@ func TestClearStaleChromeProfileLockLeavesActiveProfileUntouched(t *testing.T) {}}-func TestClearStaleChromeProfileLockFallsBackToPIDProbe(t *testing.T) {+func TestClearStaleProfileLocksFallsBackToPIDProbe(t *testing.T) {profileDir := t.TempDir()lockPath := filepath.Join(profileDir, chromeSingletonFiles[0])if err := os.WriteFile(lockPath, []byte("x"), 0644); err != nil {@@ -221,9 +221,9 @@ func TestClearStaleChromeProfileLockFallsBackToPIDProbe(t *testing.T) {isProfileOwnedByRunningPinchtabMock = origMock})- removed, err := clearStaleChromeProfileLock(profileDir, "another Chromium process (36)")+ removed, err := clearStaleProfileLocks(profileDir, "another Chromium process (36)")if err != nil {- t.Fatalf("clearStaleChromeProfileLock() error = %v", err)+ t.Fatalf("clearStaleProfileLocks() error = %v", err)}if !removed {t.Fatal("expected singleton file to be removed after stale pid probe")diff --git a/internal/bridge/runtime/geo_align_test.go b/internal/bridge/runtime/geo_align_test.goindex 35721cde..5899ffb2 100644--- a/internal/bridge/runtime/geo_align_test.go+++ b/internal/bridge/runtime/geo_align_test.go@@ -74,15 +74,18 @@ func TestBuildChromeArgsWithBundleUsesProvidedGeoAlignment(t *testing.T) {old := geoProviderForConfigFunct.Cleanup(func() { geoProviderForConfigFunc = old })geoProviderForConfigFunc = func(*config.RuntimeConfig) geo.Provider {- t.Fatal("buildChromeArgsWithBundle should use cached alignment")+ t.Fatal("buildBrowserArgsWithBundle should use cached alignment")return geo.Noop{}}- args := buildChromeArgsWithBundle(&config.RuntimeConfig{+ args, _, err := buildBrowserArgsWithBundle(&config.RuntimeConfig{DefaultBrowser: config.BrowserCloak,}, nil, 9222, launchGeoAlignment{flags: []string{"--fingerprint-locale=en-GB"},})+ if err != nil {+ t.Fatalf("buildBrowserArgsWithBundle() error = %v", err)+ }if !stealth.HasLaunchArg(args, "--fingerprint-locale=en-GB") {t.Fatalf("cached geo flag missing from args: %v", args)}@@ -204,17 +207,17 @@ func TestApplyGeoAlignment_UnknownProviderNoop(t *testing.T) {}}-func TestBuildChromeArgs_ChromeDoesNotApplyProxyGeoFlagsByDefault(t *testing.T) {+func TestBuildBrowserArgs_ChromeDoesNotApplyProxyGeoFlagsByDefault(t *testing.T) {old := geoProviderForConfigFunct.Cleanup(func() { geoProviderForConfigFunc = old })geoProviderForConfigFunc = func(*config.RuntimeConfig) geo.Provider {- t.Fatal("BuildChromeArgs should not perform geo lookup for the chrome provider")+ t.Fatal("BuildBrowserArgs should not perform geo lookup for the chrome provider")return geo.Noop{}}cfg := &config.RuntimeConfig{DefaultBrowser: config.BrowserChrome,- ChromeVersion: "144.0.0.0",+ BrowserVersion: "144.0.0.0",Proxy: config.BrowserProxyConfig{Server: "http://proxy.example.com:8080",Geo: &config.BrowserProxyGeoConfig{@@ -223,18 +226,18 @@ func TestBuildChromeArgs_ChromeDoesNotApplyProxyGeoFlagsByDefault(t *testing.T)},},}- args := BuildChromeArgs(cfg, 9222)+ args := BuildBrowserArgs(cfg, 9222)for _, blocked := range []string{"--lang=en-GB","--webrtc-ip-handling-policy=disable_non_proxied_udp",} {if stealth.HasLaunchArg(args, blocked) {- t.Errorf("BuildChromeArgs() included proxy-derived geo flag %q in %v", blocked, args)+ t.Errorf("BuildBrowserArgs() included proxy-derived geo flag %q in %v", blocked, args)}}}-func TestBuildChromeArgs_CloakAppliesGeoFlagsAndRespectsExplicit(t *testing.T) {+func TestBuildBrowserArgs_CloakAppliesGeoFlagsAndRespectsExplicit(t *testing.T) {cfg := &config.RuntimeConfig{DefaultBrowser: config.BrowserCloak,Cloak: config.CloakBrowserRuntimeConfig{@@ -248,7 +251,7 @@ func TestBuildChromeArgs_CloakAppliesGeoFlagsAndRespectsExplicit(t *testing.T) {},},}- args := BuildChromeArgs(cfg, 9222)+ args := BuildBrowserArgs(cfg, 9222)// Locale derived (no explicit cloak locale)if !stealth.HasLaunchArg(args, "--fingerprint-locale=en-GB") {t.Errorf("expected --fingerprint-locale=en-GB in %v", args)diff --git a/internal/bridge/runtime/init.go b/internal/bridge/runtime/init.goindex 860aadbb..eeb78fe6 100644--- a/internal/bridge/runtime/init.go+++ b/internal/bridge/runtime/init.go@@ -11,14 +11,13 @@ import ("os""os/exec"goruntime "runtime"- "strconv""strings""time""github.com/chromedp/chromedp""github.com/pinchtab/pinchtab/internal/browsers"- _ "github.com/pinchtab/pinchtab/internal/browsers/chrome"- _ "github.com/pinchtab/pinchtab/internal/browsers/cloak"+ _ "github.com/pinchtab/pinchtab/internal/browsers/builtin"+ "github.com/pinchtab/pinchtab/internal/browsers/runtimekit""github.com/pinchtab/pinchtab/internal/config""github.com/pinchtab/pinchtab/internal/config/geo""github.com/pinchtab/pinchtab/internal/stealth"@@ -40,10 +39,10 @@ type launchGeoAlignment struct {}type Hooks struct {- SetHumanRandSeed func(int64)- IsChromeProfileLockError func(string) bool- ClearStaleChromeProfile func(profileDir, errMsg string) (bool, error)- ConfigureChromeProcessCmd func(*exec.Cmd)+ SetHumanRandSeed func(int64)+ IsProfileLockError func(string) bool+ ClearStaleProfileLocks func(profileDir, errMsg string) (bool, error)+ ConfigureBrowserProcess func(*exec.Cmd)// QuarantineCorruptedProfile moves profileDir aside and recreates an// empty dir at the same path. Used to recover from silent CDP attach// failures (observed with CloakBrowser when the profile dir holds@@ -51,23 +50,27 @@ type Hooks struct {QuarantineCorruptedProfile func(profileDir string) (string, error)}-// InitChrome initializes a Chrome browser for a Bridge instance.+// InitBrowser initializes a browser for a Bridge instance.//-// When cfg.CDPAttachURL is set, this skips launching a Chrome process and-// connects to the externally-managed Chrome at that browser-level CDP+// When cfg.CDPAttachURL is set, this skips launching a browser process and+// connects to the externally-managed browser at that browser-level CDP// WebSocket URL. The returned cancel funcs only release the chromedp-// allocator + browser context; the external Chrome process is left alive.-func InitChrome(cfg *config.RuntimeConfig, bundle *stealth.Bundle, hooks Hooks) (context.Context, context.CancelFunc, context.Context, context.CancelFunc, stealth.LaunchMode, error) {+// allocator + browser context; the external browser process is left alive.+func InitBrowser(cfg *config.RuntimeConfig, bundle *stealth.Bundle, hooks Hooks) (context.Context, context.CancelFunc, context.Context, context.CancelFunc, stealth.LaunchMode, error) {if cfg != nil && strings.TrimSpace(cfg.CDPAttachURL) != "" {- return initChromeFromExistingCDP(cfg, bundle)+ return initBrowserFromExistingCDP(cfg, bundle)}- slog.Info("starting chrome initialization", "headless", cfg.Headless, "profile", cfg.ProfileDir, "binary", cfg.ChromeBinary)+ targetBinary := runtimekit.FindBrowserBinary(config.NormalizeBrowser(cfg.DefaultBrowser))+ if strings.TrimSpace(cfg.BrowserBinary) != "" {+ targetBinary = strings.TrimSpace(cfg.BrowserBinary)+ }+ slog.Info("starting browser initialization", "headless", cfg.Headless, "profile", cfg.ProfileDir, "binary", targetBinary)browserID := config.NormalizeBrowser(cfg.DefaultBrowser)if b, ok := browsers.Get(browserID); ok {tcfg := browsers.TargetConfig{Provider: browserID,- Binary: strings.TrimSpace(cfg.ChromeBinary),+ Binary: targetBinary,}if err := b.ValidateTarget(tcfg); err != nil {return nil, nil, nil, nil, stealth.LaunchModeUninitialized, missingBrowserBinaryError(cfg)@@ -79,12 +82,15 @@ func InitChrome(cfg *config.RuntimeConfig, bundle *stealth.Bundle, hooks Hooks)if err != nil {return nil, nil, nil, nil, stealth.LaunchModeUninitialized, fmt.Errorf("failed to resolve proxy geo alignment: %w", err)}- allocCtx, allocCancel, opts, debugPort := setupAllocator(cfg, bundle, hooks, geoAlignment)- browserCtx, browserCancel, launchMode, err := startChrome(allocCtx, cfg, bundle, opts, debugPort, hooks, geoAlignment)+ allocCtx, allocCancel, opts, debugPort, err := setupAllocator(cfg, bundle, hooks, geoAlignment)+ if err != nil {+ return nil, nil, nil, nil, stealth.LaunchModeUninitialized, err+ }+ browserCtx, browserCancel, launchMode, err := startBrowser(allocCtx, cfg, bundle, opts, debugPort, hooks, geoAlignment)if err != nil {allocCancel()- slog.Error("chrome initialization failed", "headless", cfg.Headless, "error", err.Error())- return nil, nil, nil, nil, stealth.LaunchModeUninitialized, fmt.Errorf("failed to start chrome: %w", err)+ slog.Error("browser initialization failed", "headless", cfg.Headless, "error", err.Error())+ return nil, nil, nil, nil, stealth.LaunchModeUninitialized, fmt.Errorf("failed to start browser: %w", err)}if proxyAuthEnabled(cfg.Proxy) {@@ -95,16 +101,16 @@ func InitChrome(cfg *config.RuntimeConfig, bundle *stealth.Bundle, hooks Hooks)}}- slog.Info("chrome initialized successfully", "headless", cfg.Headless, "profile", cfg.ProfileDir)+ slog.Info("browser initialized successfully", "headless", cfg.Headless, "profile", cfg.ProfileDir)return allocCtx, allocCancel, browserCtx, browserCancel, launchMode, nil}-// initChromeFromExistingCDP attaches the bridge to a Chrome that is already+// initBrowserFromExistingCDP attaches the bridge to a browser that is already// running outside pinchtab (e.g. the user's everyday browser launched with// --remote-debugging-port=NNNN). No process is spawned and no profile lock// is taken. The allocator is a chromedp remote allocator; the returned-// cancel funcs release only the chromedp side, never the external Chrome.-func initChromeFromExistingCDP(cfg *config.RuntimeConfig, bundle *stealth.Bundle) (context.Context, context.CancelFunc, context.Context, context.CancelFunc, stealth.LaunchMode, error) {+// cancel funcs release only the chromedp side, never the external browser.+func initBrowserFromExistingCDP(cfg *config.RuntimeConfig, bundle *stealth.Bundle) (context.Context, context.CancelFunc, context.Context, context.CancelFunc, stealth.LaunchMode, error) {browserID, _ := config.ParseBrowser(cfg.DefaultBrowser, cfg.BrowsersAvailable)if browserID == "" {browserID = config.NormalizeBrowser(cfg.DefaultBrowser)@@ -115,14 +121,14 @@ func initChromeFromExistingCDP(cfg *config.RuntimeConfig, bundle *stealth.Bundle}wsURL := strings.TrimSpace(cfg.CDPAttachURL)- slog.Info("attaching to existing Chrome via CDP", "cdpUrl", wsURL)+ slog.Info("attaching to existing browser via CDP", "cdpUrl", wsURL)remoteAllocCtx, remoteAllocCancel := chromedp.NewRemoteAllocator(context.Background(), wsURL)browserCtx, browserCancel := chromedp.NewContext(remoteAllocCtx)// Touch the browser so we fail fast if the CDP URL is unreachable. We// intentionally do NOT inject the stealth/UA script here — the user's- // Chrome is theirs, and rewriting its launch contract would be both+ // browser is theirs, and rewriting its launch contract would be both// surprising and likely break extensions, profile features, and// already-open tabs.if err := chromedp.Run(browserCtx, chromedp.ActionFunc(func(ctx context.Context) error {@@ -133,22 +139,38 @@ func initChromeFromExistingCDP(cfg *config.RuntimeConfig, bundle *stealth.Bundlereturn nil, nil, nil, nil, stealth.LaunchModeUninitialized, fmt.Errorf("failed to attach to CDP at %s: %w", wsURL, err)}- slog.Info("attached to existing Chrome via CDP", "cdpUrl", wsURL)+ slog.Info("attached to existing browser via CDP", "cdpUrl", wsURL)return remoteAllocCtx, remoteAllocCancel, browserCtx, browserCancel, stealth.LaunchModeAttached, nil}-func findChromeBinary() string {- return FindChromeBinary()+// FindBrowserBinary exposes the launch-time browser discovery used by runtime+// initialization so diagnostics can report against the same search path.+func FindBrowserBinary() string {+ return runtimekit.FindBrowserBinary("chrome")}-// FindChromeBinary exposes the launch-time Chrome discovery used by runtime-// initialization so diagnostics can report against the same search path.-func FindChromeBinary() string {- b, ok := browsers.Get("chrome")- if !ok {- return ""+type providerLaunchPlan struct {+ browser browsers.Browser+ args []string+ env []string+ binary string+}++func providerLaunchConfig(cfg *config.RuntimeConfig, binary string, debugPort int) browsers.LaunchConfig {+ return runtimekit.LaunchConfigFromRuntime(cfg, binary, debugPort, launchNeedsNoSandbox())+}++func resolveProviderLaunchPlan(cfg *config.RuntimeConfig, launchCfg browsers.LaunchConfig) (providerLaunchPlan, error) {+ plan, err := runtimekit.ResolveProviderLaunchPlan(cfg, launchCfg)+ if err != nil {+ return providerLaunchPlan{}, fmt.Errorf("%s launch args: %w", config.NormalizeBrowser(cfg.DefaultBrowser), err)}- return b.DiscoverBinary().Found+ return providerLaunchPlan{+ browser: plan.Browser,+ args: plan.Args,+ env: plan.Env,+ binary: plan.Binary,+ }, nil}func appendExecAllocatorFlag(opts []chromedp.ExecAllocatorOption, flag string) []chromedp.ExecAllocatorOption {@@ -173,37 +195,32 @@ func appendExecAllocatorFlags(opts []chromedp.ExecAllocatorOption, flags []strinreturn opts}-func setupAllocator(cfg *config.RuntimeConfig, bundle *stealth.Bundle, hooks Hooks, geoAlignment launchGeoAlignment) (context.Context, context.CancelFunc, []chromedp.ExecAllocatorOption, int) {+func setupAllocator(cfg *config.RuntimeConfig, bundle *stealth.Bundle, hooks Hooks, geoAlignment launchGeoAlignment) (context.Context, context.CancelFunc, []chromedp.ExecAllocatorOption, int, error) {opts := []chromedp.ExecAllocatorOption{chromedp.NoFirstRun,chromedp.NoDefaultBrowserCheck,}- browserID := config.NormalizeBrowser(cfg.DefaultBrowser)- launchCfg := browsers.LaunchConfig{- Mode: defaultBrowserToLaunchMode(cfg.DefaultBrowser),- Cloak: browsers.CloakFingerprint{- FingerprintSeed: cfg.Cloak.FingerprintSeed,- Platform: cfg.Cloak.Platform,- Locale: cfg.Cloak.Locale,- Timezone: cfg.Cloak.Timezone,- WebRTCIP: cfg.Cloak.WebRTCIP,- FontsDir: cfg.Cloak.FontsDir,- StorageQuotaMB: cfg.Cloak.StorageQuotaMB,- },- }- providerArgs, _, _ := browsers.MustGet(browserID).BuildLaunchArgs(launchCfg)- opts = appendExecAllocatorFlags(opts, providerArgs)+ debugPort := 0+ if cfg.BrowserDebugPort > 0 {+ debugPort = cfg.BrowserDebugPort+ } else if port, err := findFreePort(cfg.InstancePortStart, cfg.InstancePortEnd); err == nil {+ debugPort = port+ }+ binary := strings.TrimSpace(cfg.BrowserBinary)+ if binary == "" {+ binary = runtimekit.FindBrowserBinary(config.NormalizeBrowser(cfg.DefaultBrowser))+ }+ plan, err := resolveProviderLaunchPlan(cfg, runtimekit.LaunchConfigFromRuntime(cfg, binary, debugPort, launchNeedsNoSandbox()))+ if err != nil {+ return nil, nil, nil, 0, err+ }+ opts = appendExecAllocatorFlags(opts, plan.args)opts = appendExecAllocatorFlags(opts, bundle.Launch.Args)opts = appendExecAllocatorFlags(opts, config.BrowserProxyFlags(cfg.Proxy))-opts = appendExecAllocatorFlags(opts, geoAlignment.flags)- chromeBinary := cfg.ChromeBinary- if chromeBinary == "" {- chromeBinary = findChromeBinary()- }- if chromeBinary != "" {- opts = append(opts, chromedp.ExecPath(chromeBinary))+ if plan.binary != "" {+ opts = append(opts, chromedp.ExecPath(plan.binary))}if cfg.Headless {@@ -257,77 +274,71 @@ func setupAllocator(cfg *config.RuntimeConfig, bundle *stealth.Bundle, hooks Hooopts = append(opts, chromedp.Flag("tz", cfg.Timezone))}- extraFlags := config.AllowedChromeExtraFlags(cfg.ChromeExtraFlags)+ extraFlags := config.AllowedBrowserExtraFlags(cfg.BrowserExtraFlags)if cfg.DisableInProcessGPU {// Kill switch from the crash-recovery path: strip a user-supplied// --in-process-gpu so a crash loop can't repeat after retry.extraFlags = stripInProcessGPUFlag(extraFlags)}opts = appendExecAllocatorFlags(opts, extraFlags)- for _, flag := range appendChromeCompatibilityFlags(nil) {+ for _, flag := range appendBrowserCompatibilityFlags(nil) {opts = appendExecAllocatorFlag(opts, flag)}- debugPort := 0- if cfg.ChromeDebugPort > 0 {- debugPort = cfg.ChromeDebugPort- opts = append(opts, chromedp.Flag("remote-debugging-port", strconv.Itoa(debugPort)))- } else if port, err := findFreePort(cfg.InstancePortStart, cfg.InstancePortEnd); err == nil {- debugPort = port- opts = append(opts, chromedp.Flag("remote-debugging-port", strconv.Itoa(port)))- }- opts = append(opts, chromedp.CombinedOutput(newPrefixedLogWriter(os.Stdout, "chrome")))+ opts = append(opts, chromedp.CombinedOutput(newPrefixedLogWriter(os.Stdout, "browser")))opts = append(opts, chromedp.ModifyCmdFunc(func(cmd *exec.Cmd) {- if len(geoAlignment.env) > 0 {+ if len(plan.env) > 0 || len(geoAlignment.env) > 0 {if cmd.Env == nil {cmd.Env = os.Environ()}+ if len(plan.env) > 0 {+ cmd.Env = mergeGeoEnv(cmd.Env, plan.env)+ }cmd.Env = mergeGeoEnv(cmd.Env, geoAlignment.env)}- if hooks.ConfigureChromeProcessCmd != nil {- hooks.ConfigureChromeProcessCmd(cmd)+ if hooks.ConfigureBrowserProcess != nil {+ hooks.ConfigureBrowserProcess(cmd)}}))ctx, cancel := context.WithCancel(context.Background())- return ctx, cancel, opts, debugPort+ return ctx, cancel, opts, debugPort, nil}-func chromeLaunchArgs(headless bool) []string {- args, _, _ := browsers.MustGet("chrome").BuildLaunchArgs(browsers.LaunchConfig{Headless: headless})- return args+func browserLaunchArgs(headless bool) []string {+ return runtimekit.BaseFlagArgs("chrome", headless)}-func BaseChromeFlagArgs() []string {- return chromeLaunchArgs(false)+func BaseBrowserFlagArgs() []string {+ return browserLaunchArgs(false)}-func appendChromeCompatibilityFlags(args []string) []string {- if chromeNeedsNoSandbox() {+func appendBrowserCompatibilityFlags(args []string) []string {+ if launchNeedsNoSandbox() {return append(args, "--no-sandbox")}return args}-func chromeNeedsNoSandbox() bool {- if runtimeGOOS != "linux" {- return false- }- if osGeteuid() == 0 {- return true- }- if _, err := os.Stat(containerMarkerPath); err == nil {- return true- }- return false+func launchNeedsNoSandbox() bool {+ _, err := os.Stat(containerMarkerPath)+ return runtimekit.ChromeNeedsNoSandbox(runtimeGOOS, osGeteuid(), err == nil)}-func BuildChromeArgs(cfg *config.RuntimeConfig, port int) []string {+func BuildBrowserArgs(cfg *config.RuntimeConfig, port int) []string {geoAlignment, err := resolveLaunchGeoAlignment(context.Background(), cfg)if err != nil {- return buildChromeArgsWithBundle(cfg, nil, port, launchGeoAlignment{})+ args, _, buildErr := buildBrowserArgsWithBundle(cfg, nil, port, launchGeoAlignment{})+ if buildErr != nil {+ return nil+ }+ return args+ }+ args, _, err := buildBrowserArgsWithBundle(cfg, nil, port, geoAlignment)+ if err != nil {+ return nil}- return buildChromeArgsWithBundle(cfg, nil, port, geoAlignment)+ return args}func existingExtensionPaths(paths []string) []string {@@ -343,60 +354,28 @@ func existingExtensionPaths(paths []string) []string {return validPaths}-func buildChromeArgsWithBundle(cfg *config.RuntimeConfig, bundle *stealth.Bundle, port int, geoAlignment launchGeoAlignment) []string {+func buildBrowserArgsWithBundle(cfg *config.RuntimeConfig, bundle *stealth.Bundle, port int, geoAlignment launchGeoAlignment) ([]string, []string, error) {bundle = ensureStealthBundle(cfg, bundle)-- browserID := config.NormalizeBrowser(cfg.DefaultBrowser)- launchCfg := browsers.LaunchConfig{- Mode: defaultBrowserToLaunchMode(cfg.DefaultBrowser),- Headless: cfg.Headless,- DebugPort: port,- ExtensionPaths: cfg.ExtensionPaths,- ProfileDir: cfg.ProfileDir,- Timezone: cfg.Timezone,- ExtraFlags: config.AllowedChromeExtraFlags(cfg.ChromeExtraFlags),- NoSandbox: chromeNeedsNoSandbox(),- Cloak: browsers.CloakFingerprint{- FingerprintSeed: cfg.Cloak.FingerprintSeed,- Platform: cfg.Cloak.Platform,- Locale: cfg.Cloak.Locale,- Timezone: cfg.Cloak.Timezone,- WebRTCIP: cfg.Cloak.WebRTCIP,- FontsDir: cfg.Cloak.FontsDir,- StorageQuotaMB: cfg.Cloak.StorageQuotaMB,- },- }- args, _, _ := browsers.MustGet(browserID).BuildLaunchArgs(launchCfg)+ binary := strings.TrimSpace(cfg.BrowserBinary)+ if binary == "" {+ binary = runtimekit.FindBrowserBinary(config.NormalizeBrowser(cfg.DefaultBrowser))+ }+ plan, err := resolveProviderLaunchPlan(cfg, runtimekit.LaunchConfigFromRuntime(cfg, binary, port, launchNeedsNoSandbox()))+ if err != nil {+ return nil, nil, err+ }+ args := append([]string(nil), plan.args...)args = append(args, bundle.Launch.Args...)args = append(args, config.BrowserProxyFlags(cfg.Proxy)...)args = append(args, geoAlignment.flags...)- return args+ env := append([]string(nil), plan.env...)+ return args, env, nil}func CloakBrowserFlagArgs(cfg *config.RuntimeConfig) []string {- if cfg == nil || !config.IsCloakBrowser(cfg.DefaultBrowser) {- return nil- }- cloak := cfg.Cloak- args := []string{}- add := func(name, value string) {- value = strings.TrimSpace(value)- if value != "" {- args = append(args, name+"="+value)- }- }- add("--fingerprint", cloak.FingerprintSeed)- add("--fingerprint-platform", cloak.Platform)- add("--fingerprint-locale", cloak.Locale)- add("--fingerprint-timezone", cloak.Timezone)- add("--fingerprint-webrtc-ip", cloak.WebRTCIP)- add("--fingerprint-fonts-dir", cloak.FontsDir)- if cloak.StorageQuotaMB > 0 {- args = append(args, "--fingerprint-storage-quota="+strconv.Itoa(cloak.StorageQuotaMB))- }- return args+ return runtimekit.CloakBrowserFlagArgs(cfg)}func applyStartupStealth(ctx context.Context, cfg *config.RuntimeConfig, bundle *stealth.Bundle, script string) error {diff --git a/internal/bridge/runtime/init_test.go b/internal/bridge/runtime/init_test.goindex 0d2d76ea..5df67eae 100644--- a/internal/bridge/runtime/init_test.go+++ b/internal/bridge/runtime/init_test.go@@ -16,7 +16,7 @@ import ("github.com/pinchtab/pinchtab/internal/stealth")-func TestChromeNeedsNoSandbox(t *testing.T) {+func TestBrowserNeedsNoSandbox(t *testing.T) {origGOOS := runtimeGOOSorigGeteuid := osGeteuidorigMarker := containerMarkerPath@@ -30,12 +30,12 @@ func TestChromeNeedsNoSandbox(t *testing.T) {osGeteuid = func() int { return 1000 }containerMarkerPath = t.TempDir() + "/missing-dockerenv"- if chromeNeedsNoSandbox() {+ if launchNeedsNoSandbox() {t.Fatal("expected no-sandbox compatibility to be disabled without root or container marker")}osGeteuid = func() int { return 0 }- if !chromeNeedsNoSandbox() {+ if !launchNeedsNoSandbox() {t.Fatal("expected root user to enable no-sandbox compatibility")}osGeteuid = func() int { return 1000 }@@ -44,12 +44,12 @@ func TestChromeNeedsNoSandbox(t *testing.T) {if err := os.WriteFile(containerMarkerPath, []byte(""), 0o644); err != nil {t.Fatalf("WriteFile() error = %v", err)}- if !chromeNeedsNoSandbox() {+ if !launchNeedsNoSandbox() {t.Fatal("expected container marker to enable no-sandbox compatibility")}}-func TestShouldRetryChromeStartupWithDirectLaunch(t *testing.T) {+func TestShouldRetryBrowserStartupWithDirectLaunch(t *testing.T) {canceledParent, cancel := context.WithCancel(context.Background())cancel()@@ -99,14 +99,14 @@ func TestShouldRetryChromeStartupWithDirectLaunch(t *testing.T) {for _, tt := range tests {t.Run(tt.name, func(t *testing.T) {- if got := shouldRetryChromeStartupWithDirectLaunch(tt.parentCtx, tt.err); got != tt.want {- t.Fatalf("shouldRetryChromeStartupWithDirectLaunch() = %v, want %v", got, tt.want)+ if got := shouldRetryBrowserStartupWithDirectLaunch(tt.parentCtx, tt.err); got != tt.want {+ t.Fatalf("shouldRetryBrowserStartupWithDirectLaunch() = %v, want %v", got, tt.want)}})}}-func TestBuildChromeArgs_CloakProviderUsesNativeFingerprintFlags(t *testing.T) {+func TestBuildBrowserArgs_CloakProviderUsesNativeFingerprintFlags(t *testing.T) {cfg := &config.RuntimeConfig{DefaultBrowser: config.BrowserCloak,Cloak: config.CloakBrowserRuntimeConfig{@@ -121,7 +121,7 @@ func TestBuildChromeArgs_CloakProviderUsesNativeFingerprintFlags(t *testing.T) {},}- args := BuildChromeArgs(cfg, 9222)+ args := BuildBrowserArgs(cfg, 9222)for _, want := range []string{"--fingerprint=42069","--fingerprint-platform=windows",@@ -132,7 +132,7 @@ func TestBuildChromeArgs_CloakProviderUsesNativeFingerprintFlags(t *testing.T) {"--fingerprint-storage-quota=2048",} {if !stealth.HasLaunchArg(args, want) {- t.Fatalf("BuildChromeArgs() missing %q in %v", want, args)+ t.Fatalf("BuildBrowserArgs() missing %q in %v", want, args)}}for _, blocked := range []string{@@ -142,18 +142,18 @@ func TestBuildChromeArgs_CloakProviderUsesNativeFingerprintFlags(t *testing.T) {"--enable-network-information-downlink-max",} {if stealth.HasLaunchArg(args, blocked) {- t.Fatalf("BuildChromeArgs() included PinchTab stealth arg %q in native Cloak mode: %v", blocked, args)+ t.Fatalf("BuildBrowserArgs() included PinchTab stealth arg %q in native Cloak mode: %v", blocked, args)}}if stealth.HasLaunchArgPrefix(args, "--user-agent=") {- t.Fatalf("BuildChromeArgs() included PinchTab user-agent override in native Cloak mode: %v", args)+ t.Fatalf("BuildBrowserArgs() included PinchTab user-agent override in native Cloak mode: %v", args)}}-func TestBuildChromeArgs_DefaultChromeProviderKeepsChromeLaunchContract(t *testing.T) {+func TestBuildBrowserArgs_DefaultChromeProviderKeepsChromeLaunchContract(t *testing.T) {cfg := &config.RuntimeConfig{DefaultBrowser: config.BrowserChrome,- ChromeVersion: "144.0.0.0",+ BrowserVersion: "144.0.0.0",ExtensionPaths: []string{},// Headless is PinchTab's default deployment mode and is also the mode in// which the launch contract pins --user-agent: under headless Chrome the@@ -163,7 +163,7 @@ func TestBuildChromeArgs_DefaultChromeProviderKeepsChromeLaunchContract(t *testiHeadless: true,}- args := BuildChromeArgs(cfg, 9222)+ args := BuildBrowserArgs(cfg, 9222)for _, want := range []string{"--remote-debugging-port=9222","--disable-background-networking",@@ -175,11 +175,11 @@ func TestBuildChromeArgs_DefaultChromeProviderKeepsChromeLaunchContract(t *testi"--disable-extensions",} {if !stealth.HasLaunchArg(args, want) {- t.Fatalf("BuildChromeArgs() missing Chrome provider arg %q in %v", want, args)+ t.Fatalf("BuildBrowserArgs() missing Chrome provider arg %q in %v", want, args)}}if !stealth.HasLaunchArgPrefix(args, "--user-agent=Mozilla/5.0") {- t.Fatalf("BuildChromeArgs() missing Chrome provider user-agent in %v", args)+ t.Fatalf("BuildBrowserArgs() missing Chrome provider user-agent in %v", args)}for _, blockedPrefix := range []string{"--fingerprint=",@@ -191,7 +191,7 @@ func TestBuildChromeArgs_DefaultChromeProviderKeepsChromeLaunchContract(t *testi"--fingerprint-storage-quota=",} {if stealth.HasLaunchArgPrefix(args, blockedPrefix) {- t.Fatalf("BuildChromeArgs() included Cloak flag prefix %q in Chrome provider mode: %v", blockedPrefix, args)+ t.Fatalf("BuildBrowserArgs() included Cloak flag prefix %q in Chrome provider mode: %v", blockedPrefix, args)}}}@@ -282,6 +282,32 @@ func (noCDPBrowser) NewRuntimeInstance(_ context.Context, _ bool) browsers.Runtivar registerNoCDPOnce sync.Once+func TestResolveProviderLaunchPlan_UsesProviderDiscovery(t *testing.T) {+ cfg := &config.RuntimeConfig{DefaultBrowser: config.BrowserCloak}+ want := browsers.MustGet(config.BrowserCloak).DiscoverBinary().Found++ plan, err := resolveProviderLaunchPlan(cfg, providerLaunchConfig(cfg, "", 0))+ if err != nil {+ t.Fatalf("resolveProviderLaunchPlan() error = %v", err)+ }+ if plan.binary != want {+ t.Fatalf("binary = %q, want provider discovery path %q", plan.binary, want)+ }+}++func TestResolveProviderLaunchPlan_PropagatesProviderBuildError(t *testing.T) {+ cfg := &config.RuntimeConfig{DefaultBrowser: config.BrowserCloak}+ _, err := resolveProviderLaunchPlan(cfg, browsers.LaunchConfig{+ Mode: browsers.LaunchModeLite,+ })+ if err == nil {+ t.Fatal("expected provider launch error")+ }+ if !strings.Contains(err.Error(), "does not support") {+ t.Fatalf("error = %v, want provider launch error context", err)+ }+}+func TestInitRemoteCDP_RejectsUnsupportedProvider(t *testing.T) {registerNoCDPOnce.Do(func() {browsers.Register(&noCDPBrowser{})@@ -291,7 +317,7 @@ func TestInitRemoteCDP_RejectsUnsupportedProvider(t *testing.T) {DefaultBrowser: "nocdpstub",CDPAttachURL: "ws://127.0.0.1:9222",}- _, _, _, _, _, err := InitChrome(cfg, nil, Hooks{})+ _, _, _, _, _, err := InitBrowser(cfg, nil, Hooks{})if err == nil {t.Fatal("expected error for unsupported CDP provider")}diff --git a/internal/bridge/runtime/recovery.go b/internal/bridge/runtime/recovery.goindex 21d1f8dd..c8d2b387 100644--- a/internal/bridge/runtime/recovery.go+++ b/internal/bridge/runtime/recovery.go@@ -19,11 +19,11 @@ import ("github.com/pinchtab/pinchtab/internal/stealth")-func startChrome(parentCtx context.Context, cfg *config.RuntimeConfig, bundle *stealth.Bundle, opts []chromedp.ExecAllocatorOption, debugPort int, hooks Hooks, geoAlignment launchGeoAlignment) (context.Context, context.CancelFunc, stealth.LaunchMode, error) {- return startChromeWithRecovery(parentCtx, cfg, bundle, opts, debugPort, hooks, geoAlignment, false, false)+func startBrowser(parentCtx context.Context, cfg *config.RuntimeConfig, bundle *stealth.Bundle, opts []chromedp.ExecAllocatorOption, debugPort int, hooks Hooks, geoAlignment launchGeoAlignment) (context.Context, context.CancelFunc, stealth.LaunchMode, error) {+ return startBrowserWithRecovery(parentCtx, cfg, bundle, opts, debugPort, hooks, geoAlignment, false, false)}-func startChromeWithRecovery(parentCtx context.Context, cfg *config.RuntimeConfig, bundle *stealth.Bundle, opts []chromedp.ExecAllocatorOption, debugPort int, hooks Hooks, geoAlignment launchGeoAlignment, retriedProfileLock, retriedProfileCorruption bool) (context.Context, context.CancelFunc, stealth.LaunchMode, error) {+func startBrowserWithRecovery(parentCtx context.Context, cfg *config.RuntimeConfig, bundle *stealth.Bundle, opts []chromedp.ExecAllocatorOption, debugPort int, hooks Hooks, geoAlignment launchGeoAlignment, retriedProfileLock, retriedProfileCorruption bool) (context.Context, context.CancelFunc, stealth.LaunchMode, error) {allocCtx, allocCancel := chromedp.NewExecAllocator(parentCtx, opts...)browserCtx, browserCancel := chromedp.NewContext(allocCtx)@@ -32,7 +32,7 @@ func startChromeWithRecovery(parentCtx context.Context, cfg *config.RuntimeConfihooks.SetHumanRandSeed(bundle.Seed)}- const chromeStartupTimeout = 20 * time.Second+ const browserStartupTimeout = 20 * time.Secondtype runResult struct{ err error }runCh := make(chan runResult, 1)startTs := time.Now()@@ -46,8 +46,8 @@ func startChromeWithRecovery(parentCtx context.Context, cfg *config.RuntimeConfiselect {case res := <-runCh:err = res.err- case <-time.After(chromeStartupTimeout):- err = fmt.Errorf("chrome startup timeout after %v: %w", chromeStartupTimeout, context.DeadlineExceeded)+ case <-time.After(browserStartupTimeout):+ err = fmt.Errorf("browser startup timeout after %v: %w", browserStartupTimeout, context.DeadlineExceeded)}if err != nil {@@ -67,11 +67,11 @@ func startChromeWithRecovery(parentCtx context.Context, cfg *config.RuntimeConfiallocCancel()errMsg := err.Error()- if !retriedProfileLock && hooks.IsChromeProfileLockError != nil && hooks.IsChromeProfileLockError(errMsg) {- if hooks.ClearStaleChromeProfile != nil {- if recovered, _ := hooks.ClearStaleChromeProfile(cfg.ProfileDir, errMsg); recovered {+ if !retriedProfileLock && hooks.IsProfileLockError != nil && hooks.IsProfileLockError(errMsg) {+ if hooks.ClearStaleProfileLocks != nil {+ if recovered, _ := hooks.ClearStaleProfileLocks(cfg.ProfileDir, errMsg); recovered {time.Sleep(250 * time.Millisecond)- return startChromeWithRecovery(parentCtx, cfg, bundle, opts, debugPort, hooks, geoAlignment, true, retriedProfileCorruption)+ return startBrowserWithRecovery(parentCtx, cfg, bundle, opts, debugPort, hooks, geoAlignment, true, retriedProfileCorruption)}}}@@ -83,7 +83,7 @@ func startChromeWithRecovery(parentCtx context.Context, cfg *config.RuntimeConfi"quarantinedTo", quarantinePath,"elapsedMs", elapsed.Milliseconds())time.Sleep(500 * time.Millisecond)- return startChromeWithRecovery(parentCtx, cfg, bundle, opts, debugPort, hooks, geoAlignment, retriedProfileLock, true)+ return startBrowserWithRecovery(parentCtx, cfg, bundle, opts, debugPort, hooks, geoAlignment, retriedProfileLock, true)} else {slog.Warn("cloakbrowser silently dropped CDP attach; profile quarantine failed","originalProfile", cfg.ProfileDir,@@ -91,16 +91,16 @@ func startChromeWithRecovery(parentCtx context.Context, cfg *config.RuntimeConfi}}- if shouldRetryChromeStartupWithDirectLaunch(parentCtx, err) && debugPort > 0 {- slog.Warn("chrome startup failed via allocator, trying direct-launch fallback", "port", debugPort, "error", errMsg)+ if shouldRetryBrowserStartupWithDirectLaunch(parentCtx, err) && debugPort > 0 {+ slog.Warn("browser startup failed via allocator, trying direct-launch fallback", "port", debugPort, "error", errMsg)time.Sleep(500 * time.Millisecond)- return startChromeWithRemoteAllocator(parentCtx, cfg, bundle, debugPort, bundle.Script, geoAlignment)+ return startBrowserWithRemoteAllocator(parentCtx, cfg, bundle, debugPort, bundle.Script, geoAlignment)}if silentDrop {- return nil, nil, stealth.LaunchModeUninitialized, fmt.Errorf("failed to connect to chrome: %w (cloakbrowser dropped CDP attach silently after %dms; profile %q may be corrupted — try removing it or use a fresh profile)", err, elapsed.Milliseconds(), cfg.ProfileDir)+ return nil, nil, stealth.LaunchModeUninitialized, fmt.Errorf("failed to connect to browser: %w (cloakbrowser dropped CDP attach silently after %dms; profile %q may be corrupted — try removing it or use a fresh profile)", err, elapsed.Milliseconds(), cfg.ProfileDir)}- return nil, nil, stealth.LaunchModeUninitialized, fmt.Errorf("failed to connect to chrome: %w", err)+ return nil, nil, stealth.LaunchModeUninitialized, fmt.Errorf("failed to connect to browser: %w", err)}if err := chromedp.Run(browserCtx, chromedp.ActionFunc(func(ctx context.Context) error {@@ -125,7 +125,7 @@ func isStartupTimeout(err error) bool {return strings.Contains(msg, "deadline exceeded") || strings.Contains(msg, "context deadline exceeded")}-func shouldRetryChromeStartupWithDirectLaunch(parentCtx context.Context, err error) bool {+func shouldRetryBrowserStartupWithDirectLaunch(parentCtx context.Context, err error) bool {if isStartupTimeout(err) {return true}@@ -138,28 +138,37 @@ func shouldRetryChromeStartupWithDirectLaunch(parentCtx context.Context, err errreturn strings.Contains(err.Error(), "context canceled")}-func startChromeWithRemoteAllocator(parentCtx context.Context, cfg *config.RuntimeConfig, bundle *stealth.Bundle, debugPort int, injectedStealthScript string, geoAlignment launchGeoAlignment) (context.Context, context.CancelFunc, stealth.LaunchMode, error) {- chromeBinary := cfg.ChromeBinary- if chromeBinary == "" {- chromeBinary = findChromeBinary()+func startBrowserWithRemoteAllocator(parentCtx context.Context, cfg *config.RuntimeConfig, bundle *stealth.Bundle, debugPort int, injectedStealthScript string, geoAlignment launchGeoAlignment) (context.Context, context.CancelFunc, stealth.LaunchMode, error) {+ plan, err := resolveProviderLaunchPlan(cfg, providerLaunchConfig(cfg, strings.TrimSpace(cfg.BrowserBinary), debugPort))+ if err != nil {+ return nil, nil, stealth.LaunchModeUninitialized, err}- if chromeBinary == "" {+ if plan.binary == "" {return nil, nil, stealth.LaunchModeUninitialized, missingBrowserBinaryError(cfg)}- args := buildChromeArgsWithBundle(cfg, bundle, debugPort, geoAlignment)- // #nosec G204 -- chromeBinary from user config or shared browser discovery- cmd := exec.Command(chromeBinary, args...)- cmd.Stdout = newPrefixedLogWriter(os.Stdout, "chrome stdout")- cmd.Stderr = newPrefixedLogWriter(os.Stderr, "chrome stderr")+ args, providerEnv, err := buildBrowserArgsWithBundle(cfg, bundle, debugPort, geoAlignment)+ if err != nil {+ return nil, nil, stealth.LaunchModeUninitialized, err+ }+ // #nosec G204 -- browser binary from user config or shared browser discovery+ cmd := exec.Command(plan.binary, args...)+ cmd.Stdout = newPrefixedLogWriter(os.Stdout, "browser stdout")+ cmd.Stderr = newPrefixedLogWriter(os.Stderr, "browser stderr")+ if len(providerEnv) > 0 {+ cmd.Env = mergeGeoEnv(os.Environ(), providerEnv)+ }if len(geoAlignment.env) > 0 {- cmd.Env = mergeGeoEnv(os.Environ(), geoAlignment.env)+ if cmd.Env == nil {+ cmd.Env = os.Environ()+ }+ cmd.Env = mergeGeoEnv(cmd.Env, geoAlignment.env)}if err := cmd.Start(); err != nil {- return nil, nil, stealth.LaunchModeUninitialized, fmt.Errorf("failed to start chrome directly: %w", err)+ return nil, nil, stealth.LaunchModeUninitialized, fmt.Errorf("failed to start browser directly: %w", err)}- // Reap the chrome process when it exits to prevent zombies.+ // Reap the browser process when it exits to prevent zombies.waitDone := make(chan struct{})go func() {_ = cmd.Wait()@@ -171,10 +180,10 @@ func startChromeWithRemoteAllocator(parentCtx context.Context, cfg *config.Runti<-waitDone}- wsURL, err := waitForChromeDevTools(debugPort, 30*time.Second)+ wsURL, err := waitForBrowserDevTools(debugPort, 30*time.Second)if err != nil {killAndReap()- return nil, nil, stealth.LaunchModeUninitialized, fmt.Errorf("chrome devtools not ready on port %d: %w", debugPort, err)+ return nil, nil, stealth.LaunchModeUninitialized, fmt.Errorf("browser devtools not ready on port %d: %w", debugPort, err)}remoteAllocCtx, remoteAllocCancel := chromedp.NewRemoteAllocator(parentCtx, wsURL)@@ -207,7 +216,7 @@ func findFreePort(start, end int) (int, error) {return 0, fmt.Errorf("no free port available in range %d-%d", start, end)}-func waitForChromeDevTools(port int, timeout time.Duration) (string, error) {+func waitForBrowserDevTools(port int, timeout time.Duration) (string, error) {endpoint := fmt.Sprintf("http://127.0.0.1:%d/json/version", port)client := &http.Client{Timeout: 2 * time.Second}deadline := time.Now().Add(timeout)@@ -226,5 +235,5 @@ func waitForChromeDevTools(port int, timeout time.Duration) (string, error) {}time.Sleep(250 * time.Millisecond)}- return "", fmt.Errorf("chrome devtools not ready on port %d after %v", port, timeout)+ return "", fmt.Errorf("browser devtools not ready on port %d after %v", port, timeout)}diff --git a/internal/bridge/screenshot.go b/internal/bridge/screenshot.goindex 2ff87119..988273a7 100644--- a/internal/bridge/screenshot.go+++ b/internal/bridge/screenshot.go@@ -10,6 +10,14 @@ import ("github.com/pinchtab/pinchtab/internal/cdptk")+type ScreenshotFormat = page.CaptureScreenshotFormat+type ScreenshotClip = page.Viewport++const (+ ScreenshotFormatJpeg = page.CaptureScreenshotFormatJpeg+ ScreenshotFormatPng = page.CaptureScreenshotFormatPng+)+// MinScale / MaxScale bound the bitmap rescale factor. Anything outside is// almost certainly a mistake or a DoS — 50× would ask the renderer for a// multi-gigapixel image.@@ -216,6 +224,102 @@ func CaptureScreenshot(ctx context.Context, opts ScreenshotOpts) ([]byte, error)return buf, err}+// ScreenshotClipForNode returns a page-coordinate clip for a backend node ID.+// Handlers use this bridge-owned helper so CDP details stay out of the handler+// layer.+func ScreenshotClipForNode(ctx context.Context, nodeID int64) (*ScreenshotClip, error) {+ // Bring target element into view before computing clip coordinates.+ if err := chromedp.Run(ctx, chromedp.ActionFunc(func(ctx context.Context) error {+ return chromedp.FromContext(ctx).Target.Execute(ctx, "DOM.scrollIntoViewIfNeeded", map[string]any{+ "backendNodeId": nodeID,+ }, nil)+ })); err != nil {+ return nil, fmt.Errorf("scroll into view: %w", err)+ }++ var resolveResult json.RawMessage+ if err := chromedp.Run(ctx, chromedp.ActionFunc(func(ctx context.Context) error {+ return chromedp.FromContext(ctx).Target.Execute(ctx, "DOM.resolveNode", map[string]any{+ "backendNodeId": nodeID,+ }, &resolveResult)+ })); err != nil {+ return nil, fmt.Errorf("resolve node: %w", err)+ }++ var resolved struct {+ Object struct {+ ObjectID string `json:"objectId"`+ } `json:"object"`+ }+ if err := json.Unmarshal(resolveResult, &resolved); err != nil {+ return nil, fmt.Errorf("parse resolved node: %w", err)+ }+ if resolved.Object.ObjectID == "" {+ return nil, fmt.Errorf("element not found in DOM (backendNodeId=%d)", nodeID)+ }++ const boxFn = `function() {+ const rect = this.getBoundingClientRect();+ let x = rect.left + (window.scrollX || window.pageXOffset || 0);+ let y = rect.top + (window.scrollY || window.pageYOffset || 0);+ try {+ let current = window;+ while (current && current.parent && current !== current.parent) {+ const frameEl = current.frameElement;+ if (!frameEl) {+ break;+ }+ const parent = current.parent;+ const frameRect = frameEl.getBoundingClientRect();+ x += frameRect.left + (parent.scrollX || parent.pageXOffset || 0);+ y += frameRect.top + (parent.scrollY || parent.pageYOffset || 0);+ current = parent;+ }+ } catch (e) {+ // Cross-origin ancestors can block frame traversal. Keep the deepest+ // reachable page coordinates in that case.+ }+ return { x, y, width: rect.width, height: rect.height };+ }`++ var callResult json.RawMessage+ if err := chromedp.Run(ctx, chromedp.ActionFunc(func(ctx context.Context) error {+ return chromedp.FromContext(ctx).Target.Execute(ctx, "Runtime.callFunctionOn", map[string]any{+ "functionDeclaration": boxFn,+ "objectId": resolved.Object.ObjectID,+ "returnByValue": true,+ }, &callResult)+ })); err != nil {+ return nil, fmt.Errorf("read element box: %w", err)+ }++ var boxCall struct {+ Result struct {+ Value struct {+ X float64 `json:"x"`+ Y float64 `json:"y"`+ Width float64 `json:"width"`+ Height float64 `json:"height"`+ } `json:"value"`+ } `json:"result"`+ }+ if err := json.Unmarshal(callResult, &boxCall); err != nil {+ return nil, fmt.Errorf("parse element box: %w", err)+ }++ box := boxCall.Result.Value+ if box.Width <= 0 || box.Height <= 0 {+ return nil, fmt.Errorf("element box is empty (width=%.2f height=%.2f)", box.Width, box.Height)+ }+ return &ScreenshotClip{+ X: box.X,+ Y: box.Y,+ Width: box.Width,+ Height: box.Height,+ Scale: 1,+ }, nil+}+// CaptureScreenshot is the provider-aware entry point used across the BridgeAPI// (screencast polling, recorder, annotated capture). It delegates to the shared// package-level CaptureScreenshot engine so every provider gets the samediff --git a/internal/bridge/worker_stealth.go b/internal/bridge/worker_stealth.goindex f9d0c6d1..50be6f96 100644--- a/internal/bridge/worker_stealth.go+++ b/internal/bridge/worker_stealth.go@@ -53,7 +53,7 @@ func (b *Bridge) applyWorkerStealth(parent context.Context, targetID target.ID,ua = b.StealthBundle.LaunchUserAgent()}- persona := workerStealthPersona(ua, b.Config.ChromeVersion)+ persona := workerStealthPersona(ua, b.Config.BrowserVersion)if err := chromedp.Run(runCtx,chromedp.ActionFunc(func(ctx context.Context) error {diff --git a/internal/bridge/worker_stealth_test.go b/internal/bridge/worker_stealth_test.goindex 0c047781..0abff737 100644--- a/internal/bridge/worker_stealth_test.go+++ b/internal/bridge/worker_stealth_test.go@@ -12,13 +12,13 @@ import (// custom UA is configured, so the page now uses Chrome's NATIVE userAgent// (which can be any installed Chrome build, e.g. 146.x). The worker stealth// parity path in applyWorkerStealth still calls-// BuildPersona(launchUA, cfg.ChromeVersion), which synthesizes a UA from+// BuildPersona(launchUA, cfg.BrowserVersion), which synthesizes a UA from// the static configured major even when launchUA is empty — and then// workerStealthParityScript overrides the worker's navigator.userAgent to// that synthesized value. The result: page UA != worker UA. This test// reproduces the regression.func TestWorkerStealthParityDefersToNativeUAWhenNoCustomUA(t *testing.T) {- cfg := &config.RuntimeConfig{ChromeVersion: "144.0.7559.133"}+ cfg := &config.RuntimeConfig{BrowserVersion: "144.0.7559.133"}bundle := stealth.NewBundle(cfg, 1)launchUA := bundle.LaunchUserAgent()@@ -26,9 +26,9 @@ func TestWorkerStealthParityDefersToNativeUAWhenNoCustomUA(t *testing.T) {t.Fatalf("precondition: with no custom UA, LaunchUserAgent must be empty, got %q", launchUA)}- persona := workerStealthPersona(launchUA, cfg.ChromeVersion)+ persona := workerStealthPersona(launchUA, cfg.BrowserVersion)if persona.UserAgent != "" {- t.Fatalf("worker persona must defer to native nav.userAgent when no custom UA is configured; got %q (this is forced onto the worker and creates a page/worker UA mismatch when installed Chrome is not %s)", persona.UserAgent, cfg.ChromeVersion)+ t.Fatalf("worker persona must defer to native nav.userAgent when no custom UA is configured; got %q (this is forced onto the worker and creates a page/worker UA mismatch when installed Chrome is not %s)", persona.UserAgent, cfg.BrowserVersion)}if persona.NavigatorPlatform != "" {t.Fatalf("worker persona must defer to native nav.platform when no custom UA is configured; got %q", persona.NavigatorPlatform)@@ -44,7 +44,7 @@ func TestWorkerStealthParityDefersToNativeUAWhenNoCustomUA(t *testing.T) {// native userAgent leaks "HeadlessChrome"). Workers must carry that same// pinned UA so the page and workers stay in lockstep.func TestWorkerStealthParityAppliesPinnedUserAgentWhenHeadless(t *testing.T) {- cfg := &config.RuntimeConfig{ChromeVersion: "144.0.7559.133", Headless: true}+ cfg := &config.RuntimeConfig{BrowserVersion: "144.0.7559.133", Headless: true}bundle := stealth.NewBundle(cfg, 1)launchUA := bundle.LaunchUserAgent()@@ -55,7 +55,7 @@ func TestWorkerStealthParityAppliesPinnedUserAgentWhenHeadless(t *testing.T) {t.Fatalf("pinned headless UA must not contain HeadlessChrome, got %q", launchUA)}- persona := workerStealthPersona(launchUA, cfg.ChromeVersion)+ persona := workerStealthPersona(launchUA, cfg.BrowserVersion)if persona.UserAgent != launchUA {t.Fatalf("worker persona must carry the pinned headless UA, got %q want %q", persona.UserAgent, launchUA)}@@ -65,7 +65,7 @@ func TestWorkerStealthParityAppliesPinnedUserAgentWhenHeadless(t *testing.T) {// that same UA so it matches the page.func TestWorkerStealthParityAppliesCustomUserAgent(t *testing.T) {customUA := "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/144.0.0.0 Safari/537.36"- cfg := &config.RuntimeConfig{ChromeVersion: "144.0.7559.133", UserAgent: customUA}+ cfg := &config.RuntimeConfig{BrowserVersion: "144.0.7559.133", UserAgent: customUA}bundle := stealth.NewBundle(cfg, 1)launchUA := bundle.LaunchUserAgent()@@ -73,7 +73,7 @@ func TestWorkerStealthParityAppliesCustomUserAgent(t *testing.T) {t.Fatalf("precondition: explicit custom UA must be pinned, got %q", launchUA)}- persona := workerStealthPersona(launchUA, cfg.ChromeVersion)+ persona := workerStealthPersona(launchUA, cfg.BrowserVersion)if persona.UserAgent != customUA {t.Fatalf("worker persona must carry the explicit custom UA, got %q", persona.UserAgent)}diff --git a/internal/browsers/all/all.go b/internal/browsers/all/all.goindex 32cb2e4b..5c0d39dc 100644--- a/internal/browsers/all/all.go+++ b/internal/browsers/all/all.go@@ -2,7 +2,7 @@package allimport (- _ "github.com/pinchtab/pinchtab/internal/browsers/chrome"- _ "github.com/pinchtab/pinchtab/internal/browsers/cloak"- _ "github.com/pinchtab/pinchtab/internal/browsers/ghostchrome"+ _ "github.com/pinchtab/pinchtab/internal/browsers/chrome/chromekit"+ _ "github.com/pinchtab/pinchtab/internal/browsers/cloak/cloakkit"+ _ "github.com/pinchtab/pinchtab/internal/browsers/ghostchrome/bridgekit")diff --git a/internal/browsers/builtin/all.go b/internal/browsers/builtin/all.gonew file mode 100644index 00000000..19072daa--- /dev/null+++ b/internal/browsers/builtin/all.go@@ -0,0 +1,9 @@+// Package builtin registers the built-in browser providers without any+// server/bridge-side hook wiring. It is safe to import from bridge/runtime.+package builtin++import (+ _ "github.com/pinchtab/pinchtab/internal/browsers/chrome"+ _ "github.com/pinchtab/pinchtab/internal/browsers/cloak"+ _ "github.com/pinchtab/pinchtab/internal/browsers/ghostchrome"+)diff --git a/internal/browsers/chrome/chromekit/register.go b/internal/browsers/chrome/chromekit/register.gonew file mode 100644index 00000000..40528381--- /dev/null+++ b/internal/browsers/chrome/chromekit/register.go@@ -0,0 +1,16 @@+package chromekit++import (+ "github.com/pinchtab/pinchtab/internal/bridge"+ _ "github.com/pinchtab/pinchtab/internal/browsers/chrome"+ "github.com/pinchtab/pinchtab/internal/browsers/providerhooks"+)++func init() {+ providerhooks.Register("chrome", providerhooks.Hooks{+ CleanupProfile: bridge.CleanupOrphanedChromeProcesses,+ Shutdown: func() {+ bridge.KillAllPinchtabChrome()+ },+ })+}diff --git a/internal/browsers/cloak/cloakkit/register.go b/internal/browsers/cloak/cloakkit/register.gonew file mode 100644index 00000000..fbb375a8--- /dev/null+++ b/internal/browsers/cloak/cloakkit/register.go@@ -0,0 +1,16 @@+package cloakkit++import (+ "github.com/pinchtab/pinchtab/internal/bridge"+ _ "github.com/pinchtab/pinchtab/internal/browsers/cloak"+ "github.com/pinchtab/pinchtab/internal/browsers/providerhooks"+)++func init() {+ providerhooks.Register("cloak", providerhooks.Hooks{+ CleanupProfile: bridge.CleanupOrphanedChromeProcesses,+ Shutdown: func() {+ bridge.KillAllPinchtabChrome()+ },+ })+}diff --git a/internal/browsers/ghostchrome/bridge_proxy.go b/internal/browsers/ghostchrome/bridge_proxy.goindex d713d425..4e4082dd 100644--- a/internal/browsers/ghostchrome/bridge_proxy.go+++ b/internal/browsers/ghostchrome/bridge_proxy.go@@ -48,20 +48,20 @@ const (type BridgeProxy struct {chrome ChromeBridge // underlying Chrome bridge (all unhandled methods forwarded here)lite *staticfetch.Browser // static fetch browser (may be nil → pure passthrough)- ensureChrome func() error // ensures Chrome is running before escalation+ ensureBrowser func() error // ensures the browser runtime is running before escalationtabMap tabMapping // lite tabID → Chrome tabIDescalationMu sync.Map // lite tabID → *sync.Mutex (serializes per-tab escalation)}// NewBridgeProxy creates a BridgeProxy that transparently routes between-// the static fetch browser and the Chrome bridge. The ensureChrome+// the static fetch browser and the Chrome bridge. The ensureBrowser// function is called before escalating a lite tab to Chrome; it should-// call bridge.EnsureChrome with the appropriate config.-func NewBridgeProxy(chrome ChromeBridge, lite *staticfetch.Browser, ensureChrome func() error) *BridgeProxy {+// call the bridge browser-init path with the appropriate config.+func NewBridgeProxy(chrome ChromeBridge, lite *staticfetch.Browser, ensureBrowser func() error) *BridgeProxy {return &BridgeProxy{chrome: chrome,lite: lite,- ensureChrome: ensureChrome,+ ensureBrowser: ensureBrowser,}}@@ -108,8 +108,8 @@ func (p *BridgeProxy) TabContext(tabID string) (context.Context, string, error)}// Escalate: ensure Chrome is running and create a tab.- if p.ensureChrome != nil {- if ensureErr := p.ensureChrome(); ensureErr != nil {+ if p.ensureBrowser != nil {+ if ensureErr := p.ensureBrowser(); ensureErr != nil {return nil, "", ensureErr}}diff --git a/internal/browsers/ghostchrome/bridge_proxy_test.go b/internal/browsers/ghostchrome/bridge_proxy_test.goindex 87c5a37f..f9b22fcd 100644--- a/internal/browsers/ghostchrome/bridge_proxy_test.go+++ b/internal/browsers/ghostchrome/bridge_proxy_test.go@@ -70,14 +70,14 @@ func (m *mockChromeBridge) AvailableActions() []string {return []string{ActionClick, ActionType, ActionPress}}-// ---------- ensure chrome helper ----------+// ---------- ensure browser helper -----------type ensureChromeTracker struct {+type ensureBrowserTracker struct {calls interr error}-func (t *ensureChromeTracker) fn() func() error {+func (t *ensureBrowserTracker) fn() func() error {return func() error {t.calls++return t.err@@ -88,7 +88,7 @@ func (t *ensureChromeTracker) fn() func() error {func TestBridgeProxy_TabContext_ChromeTabPassthrough(t *testing.T) {mb := newMockChromeBridge()- ec := &ensureChromeTracker{}+ ec := &ensureBrowserTracker{}proxy := NewBridgeProxy(mb, staticfetch.NewBrowser(), ec.fn())ctx, resolved, err := proxy.TabContext("chrome-tab-1")@@ -101,9 +101,9 @@ func TestBridgeProxy_TabContext_ChromeTabPassthrough(t *testing.T) {if resolved != "chrome-tab-1" {t.Fatalf("expected resolved = %q, got %q", "chrome-tab-1", resolved)}- // Should not have called EnsureChrome or CreateTab.+ // Should not have called EnsureBrowser or CreateTab.if ec.calls != 0 {- t.Fatalf("expected 0 EnsureChrome calls, got %d", ec.calls)+ t.Fatalf("expected 0 EnsureBrowser calls, got %d", ec.calls)}if len(mb.createTabURLs) != 0 {t.Fatalf("expected 0 CreateTab calls, got %d", len(mb.createTabURLs))@@ -112,7 +112,7 @@ func TestBridgeProxy_TabContext_ChromeTabPassthrough(t *testing.T) {func TestBridgeProxy_TabContext_LiteTabEscalates(t *testing.T) {mb := newMockChromeBridge()- ec := &ensureChromeTracker{}+ ec := &ensureBrowserTracker{}lite := staticfetch.NewBrowser()ts := startTestHTTPServer(t)@@ -133,9 +133,9 @@ func TestBridgeProxy_TabContext_LiteTabEscalates(t *testing.T) {if ctx == nil {t.Fatal("expected non-nil context")}- // Should have escalated: EnsureChrome + CreateTab.+ // Should have escalated: EnsureBrowser + CreateTab.if ec.calls != 1 {- t.Fatalf("expected 1 EnsureChrome call, got %d", ec.calls)+ t.Fatalf("expected 1 EnsureBrowser call, got %d", ec.calls)}if len(mb.createTabURLs) != 1 {t.Fatalf("expected 1 CreateTab call, got %d", len(mb.createTabURLs))@@ -151,7 +151,7 @@ func TestBridgeProxy_TabContext_LiteTabEscalates(t *testing.T) {func TestBridgeProxy_TabContext_CachedEscalation(t *testing.T) {mb := newMockChromeBridge()- ec := &ensureChromeTracker{}+ ec := &ensureBrowserTracker{}lite := staticfetch.NewBrowser()ts := startTestHTTPServer(t)@@ -171,7 +171,7 @@ func TestBridgeProxy_TabContext_CachedEscalation(t *testing.T) {t.Fatalf("first call: %v", err)}if ec.calls != 1 {- t.Fatalf("expected 1 EnsureChrome call, got %d", ec.calls)+ t.Fatalf("expected 1 EnsureBrowser call, got %d", ec.calls)}// Second call — uses cached mapping, no new escalation.@@ -179,9 +179,9 @@ func TestBridgeProxy_TabContext_CachedEscalation(t *testing.T) {if err != nil {t.Fatalf("second call: %v", err)}- // Should NOT have called EnsureChrome again.+ // Should NOT have called EnsureBrowser again.if ec.calls != 1 {- t.Fatalf("expected still 1 EnsureChrome call, got %d", ec.calls)+ t.Fatalf("expected still 1 EnsureBrowser call, got %d", ec.calls)}if len(mb.createTabURLs) != 1 {t.Fatalf("expected still 1 CreateTab call, got %d", len(mb.createTabURLs))@@ -193,7 +193,7 @@ func TestBridgeProxy_TabContext_CachedEscalation(t *testing.T) {func TestBridgeProxy_TabContext_StaleCachedTab(t *testing.T) {mb := newMockChromeBridge()- ec := &ensureChromeTracker{}+ ec := &ensureBrowserTracker{}lite := staticfetch.NewBrowser()ts := startTestHTTPServer(t)@@ -223,7 +223,7 @@ func TestBridgeProxy_TabContext_StaleCachedTab(t *testing.T) {t.Fatalf("second call: %v", err)}if ec.calls != 2 {- t.Fatalf("expected 2 EnsureChrome calls, got %d", ec.calls)+ t.Fatalf("expected 2 EnsureBrowser calls, got %d", ec.calls)}if len(mb.createTabURLs) != 2 {t.Fatalf("expected 2 CreateTab calls, got %d", len(mb.createTabURLs))@@ -235,7 +235,7 @@ func TestBridgeProxy_TabContext_StaleCachedTab(t *testing.T) {func TestBridgeProxy_TabContext_ConcurrentEscalation(t *testing.T) {mb := newMockChromeBridge()- ec := &ensureChromeTracker{}+ ec := &ensureBrowserTracker{}lite := staticfetch.NewBrowser()ts := startTestHTTPServer(t)diff --git a/internal/browsers/ghostchrome/bridgekit/bridge_adapter.go b/internal/browsers/ghostchrome/bridgekit/bridge_adapter.goindex 2d42d397..ce33e66d 100644--- a/internal/browsers/ghostchrome/bridgekit/bridge_adapter.go+++ b/internal/browsers/ghostchrome/bridgekit/bridge_adapter.go@@ -19,6 +19,7 @@ import ("github.com/pinchtab/pinchtab/internal/browserops""github.com/pinchtab/pinchtab/internal/browsers/ghostchrome""github.com/pinchtab/pinchtab/internal/browsers/ghostchrome/staticfetch"+ "github.com/pinchtab/pinchtab/internal/browsers/providerhooks""github.com/pinchtab/pinchtab/internal/config")@@ -72,20 +73,23 @@ func NewBridgeAdapter(chromeBridge bridge.BridgeAPI, cfg *config.RuntimeConfig)}func ensureBrowser(b bridge.BridgeAPI, cfg *config.RuntimeConfig) error {- if provider, ok := b.(interface {- EnsureBrowser(*config.RuntimeConfig) error- }); ok {- return provider.EnsureBrowser(cfg)- }- return b.EnsureChrome(cfg)+ return b.EnsureBrowser(cfg)}func (a *BridgeAdapter) EnsureBrowser(cfg *config.RuntimeConfig) error {return ensureBrowser(a.BridgeAPI, cfg)}-func (a *BridgeAdapter) EnsureChrome(cfg *config.RuntimeConfig) error {- return a.EnsureBrowser(cfg)+func init() {+ providerhooks.Register("ghost-chrome", providerhooks.Hooks{+ DecorateBridge: func(api bridge.BridgeAPI, cfg *config.RuntimeConfig) bridge.BridgeAPI {+ return NewBridgeAdapter(api, cfg)+ },+ CleanupProfile: bridge.CleanupOrphanedChromeProcesses,+ Shutdown: func() {+ bridge.KillAllPinchtabChrome()+ },+ })}func (a *BridgeAdapter) TabContext(tabID string) (*bridge.TabHandle, string, error) {diff --git a/internal/browsers/ghostchrome/bridgekit/bridge_adapter_test.go b/internal/browsers/ghostchrome/bridgekit/bridge_adapter_test.goindex a5e6c357..733addc2 100644--- a/internal/browsers/ghostchrome/bridgekit/bridge_adapter_test.go+++ b/internal/browsers/ghostchrome/bridgekit/bridge_adapter_test.go@@ -138,7 +138,7 @@ func (c *chromeBridgeAPI) Text(_ context.Context, _ string, _ bridge.ContentParareturn c.mock.textResult, c.mock.textErr}-func (c *chromeBridgeAPI) EnsureChrome(_ *config.RuntimeConfig) error { return nil }+func (c *chromeBridgeAPI) EnsureBrowser(_ *config.RuntimeConfig) error { return nil }func (c *chromeBridgeAPI) GetRefCache(string) *bridge.RefCache { return nil }func (c *chromeBridgeAPI) SetRefCache(string, *bridge.RefCache) {}diff --git a/internal/browsers/providerhooks/hooks.go b/internal/browsers/providerhooks/hooks.gonew file mode 100644index 00000000..d962125f--- /dev/null+++ b/internal/browsers/providerhooks/hooks.go@@ -0,0 +1,62 @@+package providerhooks++import (+ "sync"++ "github.com/pinchtab/pinchtab/internal/bridge"+ "github.com/pinchtab/pinchtab/internal/config"+)++// Hooks lets browser providers expose optional bridge decoration and+// lifecycle cleanup behavior without leaking concrete implementations into+// generic server/orchestrator code.+type Hooks struct {+ DecorateBridge func(bridge.BridgeAPI, *config.RuntimeConfig) bridge.BridgeAPI+ CleanupProfile func(string)+ Shutdown func()+}++var (+ mu sync.RWMutex+ registry = map[string]Hooks{}+)++// Register stores provider-specific hooks under a normalized browser ID.+func Register(browserID string, hooks Hooks) {+ mu.Lock()+ defer mu.Unlock()+ registry[browserID] = hooks+}++// DecorateBridge applies the provider's bridge decorator when one exists.+func DecorateBridge(browserID string, api bridge.BridgeAPI, cfg *config.RuntimeConfig) bridge.BridgeAPI {+ mu.RLock()+ hooks, ok := registry[browserID]+ mu.RUnlock()+ if !ok || hooks.DecorateBridge == nil {+ return api+ }+ return hooks.DecorateBridge(api, cfg)+}++// CleanupProfile runs provider-specific orphan cleanup for a profile path.+func CleanupProfile(browserID, profileDir string) {+ mu.RLock()+ hooks, ok := registry[browserID]+ mu.RUnlock()+ if !ok || hooks.CleanupProfile == nil {+ return+ }+ hooks.CleanupProfile(profileDir)+}++// Shutdown runs provider-specific process cleanup during server shutdown.+func Shutdown(browserID string) {+ mu.RLock()+ hooks, ok := registry[browserID]+ mu.RUnlock()+ if !ok || hooks.Shutdown == nil {+ return+ }+ hooks.Shutdown()+}diff --git a/internal/browsers/runtimekit/runtimekit.go b/internal/browsers/runtimekit/runtimekit.gonew file mode 100644index 00000000..5201ba96--- /dev/null+++ b/internal/browsers/runtimekit/runtimekit.go@@ -0,0 +1,133 @@+package runtimekit++import (+ goruntime "runtime"+ "strings"++ "github.com/pinchtab/pinchtab/internal/browsers"+ "github.com/pinchtab/pinchtab/internal/config"+)++// ProviderLaunchPlan is the resolved launch contract for a browser provider.+type ProviderLaunchPlan struct {+ Browser browsers.Browser+ Args []string+ Env []string+ Binary string+}++func RuntimeProxyConfig(cfg *config.RuntimeConfig) browsers.ProxyConfig {+ if cfg == nil {+ return browsers.ProxyConfig{}+ }+ out := browsers.ProxyConfig{+ Server: cfg.Proxy.Server,+ Username: cfg.Proxy.Username,+ Password: cfg.Proxy.Password,+ }+ if len(cfg.Proxy.BypassList) > 0 {+ out.BypassList = append([]string(nil), cfg.Proxy.BypassList...)+ }+ if cfg.Proxy.Geo != nil {+ out.Geo = &browsers.GeoConfig{+ Timezone: cfg.Proxy.Geo.Timezone,+ Locale: cfg.Proxy.Geo.Locale,+ WebRTCIP: cfg.Proxy.Geo.WebRTCIP,+ CountryISO: cfg.Proxy.Geo.CountryISO,+ }+ }+ return out+}++func LaunchConfigFromRuntime(cfg *config.RuntimeConfig, binary string, debugPort int, noSandbox bool) browsers.LaunchConfig {+ return browsers.LaunchConfig{+ Mode: defaultBrowserToLaunchMode(cfg.DefaultBrowser),+ Binary: binary,+ ProfileDir: cfg.ProfileDir,+ Proxy: RuntimeProxyConfig(cfg),+ ExtraFlags: config.AllowedBrowserExtraFlags(cfg.BrowserExtraFlags),+ Headless: cfg.Headless,+ Timezone: cfg.Timezone,+ ExtensionPaths: cfg.ExtensionPaths,+ DebugPort: debugPort,+ NoRestore: cfg.NoRestore,+ UserAgent: cfg.UserAgent,+ NoSandbox: noSandbox,+ Cloak: browsers.CloakFingerprint{+ FingerprintSeed: cfg.Cloak.FingerprintSeed,+ Platform: cfg.Cloak.Platform,+ Locale: cfg.Cloak.Locale,+ Timezone: cfg.Cloak.Timezone,+ WebRTCIP: cfg.Cloak.WebRTCIP,+ FontsDir: cfg.Cloak.FontsDir,+ StorageQuotaMB: cfg.Cloak.StorageQuotaMB,+ },+ }+}++func ResolveProviderLaunchPlan(cfg *config.RuntimeConfig, launchCfg browsers.LaunchConfig) (ProviderLaunchPlan, error) {+ browserID := config.NormalizeBrowser(cfg.DefaultBrowser)+ browser := browsers.MustGet(browserID)+ if strings.TrimSpace(launchCfg.Binary) == "" {+ launchCfg.Binary = browser.DiscoverBinary().Found+ }+ args, env, err := browser.BuildLaunchArgs(launchCfg)+ if err != nil {+ return ProviderLaunchPlan{}, err+ }+ return ProviderLaunchPlan{+ Browser: browser,+ Args: args,+ Env: env,+ Binary: strings.TrimSpace(launchCfg.Binary),+ }, nil+}++func FindBrowserBinary(browserID string) string {+ b, ok := browsers.Get(browserID)+ if !ok {+ return ""+ }+ return b.DiscoverBinary().Found+}++func BaseFlagArgs(browserID string, headless bool) []string {+ args, _, _ := browsers.MustGet(browserID).BuildLaunchArgs(browsers.LaunchConfig{Headless: headless})+ return args+}++func CloakBrowserFlagArgs(cfg *config.RuntimeConfig) []string {+ if cfg == nil || !config.IsCloakBrowser(cfg.DefaultBrowser) {+ return nil+ }+ args, _, err := browsers.MustGet(config.BrowserCloak).BuildLaunchArgs(+ LaunchConfigFromRuntime(cfg, "", 0, ChromeNeedsNoSandbox(goruntime.GOOS, 0, false)),+ )+ if err != nil {+ return nil+ }+ out := make([]string, 0, len(args))+ for _, arg := range args {+ if strings.HasPrefix(arg, "--fingerprint") {+ out = append(out, arg)+ }+ }+ return out+}++func ChromeNeedsNoSandbox(goos string, euid int, inContainer bool) bool {+ if goos != "linux" {+ return false+ }+ if euid == 0 {+ return true+ }+ return inContainer+}++func defaultBrowserToLaunchMode(defaultBrowser string) browsers.LaunchMode {+ if config.NormalizeBrowser(defaultBrowser) == config.BrowserGhostChrome {+ return browsers.LaunchModeAuto+ }+ return browsers.LaunchModeChrome+}diff --git a/internal/config/browser_settings.go b/internal/config/browser_settings.gonew file mode 100644index 00000000..c8df4e9f--- /dev/null+++ b/internal/config/browser_settings.go@@ -0,0 +1,47 @@+package config++import "strings"++// BrowserBinary returns the serialized browser binary override.+func (fc *FileConfig) BrowserBinary() string {+ if fc == nil {+ return ""+ }+ return strings.TrimSpace(fc.Browser.BrowserBinary)+}++// BrowserDebugPort returns the serialized remote-debugging port override.+func (fc *FileConfig) BrowserDebugPort() int {+ if fc == nil || fc.Browser.BrowserDebugPort == nil {+ return 0+ }+ return *fc.Browser.BrowserDebugPort+}++// SetBrowserDebugPort stores the serialized remote-debugging port override.+func (fc *FileConfig) SetBrowserDebugPort(port int) {+ if fc == nil {+ return+ }+ if port <= 0 {+ fc.Browser.BrowserDebugPort = nil+ return+ }+ fc.Browser.BrowserDebugPort = intPtrIfPositive(port)+}++// BrowserExtraFlags returns the serialized browser extra-flags string.+func (fc *FileConfig) BrowserExtraFlags() string {+ if fc == nil {+ return ""+ }+ return fc.Browser.BrowserExtraFlags+}++// BrowserVersion returns the serialized browser version override.+func (fc *FileConfig) BrowserVersion() string {+ if fc == nil {+ return ""+ }+ return fc.Browser.BrowserVersion+}diff --git a/internal/config/browser_settings_test.go b/internal/config/browser_settings_test.gonew file mode 100644index 00000000..41adf7f6--- /dev/null+++ b/internal/config/browser_settings_test.go@@ -0,0 +1,36 @@+package config++import "testing"++func TestFileConfigBrowserAccessors(t *testing.T) {+ fc := &FileConfig{+ Browser: BrowserConfig{+ BrowserVersion: "144.0.0.0",+ BrowserBinary: " /opt/browser ",+ BrowserExtraFlags: "--flag",+ },+ }++ if got := fc.BrowserVersion(); got != "144.0.0.0" {+ t.Fatalf("BrowserVersion() = %q", got)+ }+ if got := fc.BrowserBinary(); got != "/opt/browser" {+ t.Fatalf("BrowserBinary() = %q", got)+ }+ if got := fc.BrowserDebugPort(); got != 0 {+ t.Fatalf("BrowserDebugPort() = %d, want 0", got)+ }+ if got := fc.BrowserExtraFlags(); got != "--flag" {+ t.Fatalf("BrowserExtraFlags() = %q", got)+ }++ fc.SetBrowserDebugPort(9555)+ if fc.Browser.BrowserDebugPort == nil || *fc.Browser.BrowserDebugPort != 9555 {+ t.Fatalf("BrowserDebugPort = %v, want 9555", fc.Browser.BrowserDebugPort)+ }++ fc.SetBrowserDebugPort(0)+ if fc.Browser.BrowserDebugPort != nil {+ t.Fatalf("BrowserDebugPort = %v, want nil", fc.Browser.BrowserDebugPort)+ }+}diff --git a/internal/config/browser_targets.go b/internal/config/browser_targets.goindex 42240375..3830e1e9 100644--- a/internal/config/browser_targets.go+++ b/internal/config/browser_targets.go@@ -102,7 +102,7 @@ func ValidateBrowserTargets(bc BrowserConfig) []error {if b, ok := browsers.Get(provID); ok {binary := strings.TrimSpace(t.Binary)if binary == "" {- binary = strings.TrimSpace(bc.ChromeBinary)+ binary = strings.TrimSpace(bc.BrowserBinary)}tcfg := browsers.TargetConfig{Provider: provID,@@ -175,7 +175,7 @@ func ValidateBrowserTargets(bc BrowserConfig) []error {}func validateTargetExtraFlags(targetName, raw string) []error {- flagErrs := validateChromeExtraFlags(raw)+ flagErrs := validateBrowserExtraFlags(raw)if len(flagErrs) == 0 {return nil}@@ -200,8 +200,8 @@ func migrateLegacyBrowserConfig(bc *BrowserConfig, browsersDefault string) (synt}hasLegacy := strings.TrimSpace(bc.Provider) != "" ||- strings.TrimSpace(bc.ChromeBinary) != "" ||- strings.TrimSpace(bc.ChromeExtraFlags) != "" ||+ strings.TrimSpace(bc.BrowserBinary) != "" ||+ strings.TrimSpace(bc.BrowserExtraFlags) != "" ||hasCloakBrowserConfig(bc.Cloak) ||!bc.Proxy.IsZero()@@ -223,8 +223,8 @@ func migrateLegacyBrowserConfig(bc *BrowserConfig, browsersDefault string) (syntprovider := NormalizeBrowser(providerRaw)target := BrowserTargetConfig{Provider: provider,- Binary: bc.ChromeBinary,- ExtraFlags: bc.ChromeExtraFlags,+ Binary: bc.BrowserBinary,+ ExtraFlags: bc.BrowserExtraFlags,Cloak: cloneCloakBrowserConfig(bc.Cloak),Proxy: cloneBrowserProxyConfig(bc.Proxy),}@@ -385,10 +385,10 @@ func applyTargetToRuntime(out *RuntimeConfig, t BrowserTargetConfig) {}out.DefaultBrowser = NormalizeBrowser(t.Provider)if strings.TrimSpace(t.Binary) != "" {- out.ChromeBinary = t.Binary+ out.BrowserBinary = t.Binary}if strings.TrimSpace(t.ExtraFlags) != "" {- out.ChromeExtraFlags = t.ExtraFlags+ out.BrowserExtraFlags = t.ExtraFlags}out.Cloak = mergeCloakConfig(out.Cloak, t.Cloak)if !t.Proxy.IsZero() {diff --git a/internal/config/browser_targets_test.go b/internal/config/browser_targets_test.goindex d34d3637..77c234af 100644--- a/internal/config/browser_targets_test.go+++ b/internal/config/browser_targets_test.go@@ -10,8 +10,8 @@ import (func TestMigrateLegacyBrowserConfig_LegacyOnlySynthesizesDefaultTarget(t *testing.T) {bc := BrowserConfig{- Provider: BrowserChrome,- ChromeBinary: "/usr/bin/chrome",+ Provider: BrowserChrome,+ BrowserBinary: "/usr/bin/chrome",}synthesized, conflict := migrateLegacyBrowserConfig(&bc, "")if !synthesized {@@ -37,8 +37,8 @@ func TestMigrateLegacyBrowserConfig_LegacyOnlySynthesizesDefaultTarget(t *testinfunc TestMigrateLegacyBrowserConfig_CloakLegacyCopiesCloakSubBlock(t *testing.T) {bc := BrowserConfig{- Provider: BrowserCloak,- ChromeBinary: "/opt/cloak/chrome",+ Provider: BrowserCloak,+ BrowserBinary: "/opt/cloak/chrome",Cloak: CloakBrowserConfig{FingerprintSeed: "42",Platform: "linux",@@ -119,7 +119,7 @@ func TestMigrateLegacyBrowserConfig_TargetsOnlyLeftIntact(t *testing.T) {func TestMigrateLegacyBrowserConfig_BothPresentExplicitWinsAndFlagsConflict(t *testing.T) {bc := BrowserConfig{Provider: BrowserChrome,- ChromeBinary: "/legacy/chrome",+ BrowserBinary: "/legacy/chrome",DefaultTarget: "explicit",Targets: BrowserTargetsConfig{"explicit": {Provider: BrowserChrome, Binary: "/explicit/chrome"},@@ -139,8 +139,8 @@ func TestMigrateLegacyBrowserConfig_BothPresentExplicitWinsAndFlagsConflict(t *tt.Fatalf("explicit defaultTarget overwritten: %q", bc.DefaultTarget)}// Legacy fields preserved on the file config for round-trip.- if bc.Provider != BrowserChrome || bc.ChromeBinary != "/legacy/chrome" {- t.Fatalf("legacy fields lost; got Provider=%q Binary=%q", bc.Provider, bc.ChromeBinary)+ if bc.Provider != BrowserChrome || bc.BrowserBinary != "/legacy/chrome" {+ t.Fatalf("legacy fields lost; got Provider=%q Binary=%q", bc.Provider, bc.BrowserBinary)}}@@ -157,7 +157,7 @@ func TestMigrateLegacyBrowserConfig_EmptyConfigNoop(t *testing.T) {func TestMigrateLegacyBrowserConfig_CloakWithBrowsersDefault(t *testing.T) {bc := BrowserConfig{- ChromeBinary: "/opt/cloakbrowser/chrome",+ BrowserBinary: "/opt/cloakbrowser/chrome",Cloak: CloakBrowserConfig{FingerprintSeed: "42069",Platform: "linux",@@ -277,9 +277,9 @@ func TestValidateBrowserTargets_RejectsCloakTargetWithoutBinary(t *testing.T) {func TestValidateBrowserTargets_CloakTargetCanInheritGlobalBinary(t *testing.T) {bc := BrowserConfig{- ChromeBinary: "/opt/cloak/chrome",- DefaultTarget: "cloak",- ChromeExtraFlags: "--global-flag",+ BrowserBinary: "/opt/cloak/chrome",+ DefaultTarget: "cloak",+ BrowserExtraFlags: "--global-flag",Targets: BrowserTargetsConfig{"cloak": {Provider: BrowserCloak},},@@ -489,9 +489,9 @@ func TestResolveDefaultBrowserTarget_LegacyNoTargetsReturnsFreshConfig(t *testinfunc TestResolveDefaultBrowserTarget_SingleTargetPromotesEffectiveConfig(t *testing.T) {cfg := &RuntimeConfig{- DefaultBrowser: BrowserChrome,- ChromeBinary: "/global/chrome",- ChromeExtraFlags: "--global-flag",+ DefaultBrowser: BrowserChrome,+ BrowserBinary: "/global/chrome",+ BrowserExtraFlags: "--global-flag",Targets: BrowserTargetsConfig{"only": {Provider: BrowserCloak,@@ -514,16 +514,16 @@ func TestResolveDefaultBrowserTarget_SingleTargetPromotesEffectiveConfig(t *testif resolved.Config.DefaultBrowser != BrowserCloak {t.Fatalf("effective provider = %q, want cloak", resolved.Config.DefaultBrowser)}- if resolved.Config.ChromeBinary != "/opt/cloak/chrome" {- t.Fatalf("effective binary = %q, want /opt/cloak/chrome", resolved.Config.ChromeBinary)+ if resolved.Config.BrowserBinary != "/opt/cloak/chrome" {+ t.Fatalf("effective binary = %q, want /opt/cloak/chrome", resolved.Config.BrowserBinary)}- if resolved.Config.ChromeExtraFlags != "--target-flag" {- t.Fatalf("effective extraFlags = %q, want --target-flag", resolved.Config.ChromeExtraFlags)+ if resolved.Config.BrowserExtraFlags != "--target-flag" {+ t.Fatalf("effective extraFlags = %q, want --target-flag", resolved.Config.BrowserExtraFlags)}if resolved.Config.Cloak.Timezone != "UTC" {t.Fatalf("effective cloak timezone = %q, want UTC", resolved.Config.Cloak.Timezone)}- if cfg.DefaultBrowser != BrowserChrome || cfg.ChromeBinary != "/global/chrome" {+ if cfg.DefaultBrowser != BrowserChrome || cfg.BrowserBinary != "/global/chrome" {t.Fatalf("input cfg was mutated: %+v", cfg)}}@@ -824,7 +824,7 @@ func TestFileConfig_TargetsRoundTrip(t *testing.T) {fc := FileConfig{Browser: BrowserConfig{Provider: BrowserChrome,- ChromeBinary: "/usr/bin/chrome",+ BrowserBinary: "/usr/bin/chrome",DefaultTarget: "chrome-local",FallbackOrder: []string{"chrome-local"},Targets: BrowserTargetsConfig{@@ -853,7 +853,7 @@ func TestFileConfig_TargetsRoundTrip(t *testing.T) {t.Fatalf("Targets[chrome-local] lost; got %+v", back.Browser.Targets)}// Legacy fields preserved.- if back.Browser.Provider != BrowserChrome || back.Browser.ChromeBinary != "/usr/bin/chrome" {+ if back.Browser.Provider != BrowserChrome || back.Browser.BrowserBinary != "/usr/bin/chrome" {t.Fatalf("legacy fields lost: %+v", back.Browser)}}@@ -861,8 +861,8 @@ func TestFileConfig_TargetsRoundTrip(t *testing.T) {func TestFileConfig_LegacyOnlyMarshalOmitsNewKeys(t *testing.T) {fc := FileConfig{Browser: BrowserConfig{- Provider: BrowserChrome,- ChromeBinary: "/usr/bin/chrome",+ Provider: BrowserChrome,+ BrowserBinary: "/usr/bin/chrome",},}data, err := json.Marshal(fc)@@ -879,9 +879,9 @@ func TestFileConfig_LegacyOnlyMarshalOmitsNewKeys(t *testing.T) {func baseRuntimeForOverride() *RuntimeConfig {return &RuntimeConfig{- DefaultBrowser: BrowserChrome,- ChromeBinary: "/global/chrome",- ChromeExtraFlags: "--global-flag",+ DefaultBrowser: BrowserChrome,+ BrowserBinary: "/global/chrome",+ BrowserExtraFlags: "--global-flag",Cloak: CloakBrowserRuntimeConfig{FingerprintSeed: "global-seed",Platform: "linux",@@ -932,16 +932,16 @@ func TestApplyTargetOverride_OverridesProviderBinaryFlags(t *testing.T) {if got.DefaultBrowser != BrowserCloak {t.Errorf("provider = %q, want %q", got.DefaultBrowser, BrowserCloak)}- if got.ChromeBinary != "/opt/cloak/cloakbrowser" {- t.Errorf("binary = %q, want /opt/cloak/cloakbrowser", got.ChromeBinary)+ if got.BrowserBinary != "/opt/cloak/cloakbrowser" {+ t.Errorf("binary = %q, want /opt/cloak/cloakbrowser", got.BrowserBinary)}- if got.ChromeExtraFlags != "--target-flag" {- t.Errorf("extraFlags = %q, want --target-flag", got.ChromeExtraFlags)+ if got.BrowserExtraFlags != "--target-flag" {+ t.Errorf("extraFlags = %q, want --target-flag", got.BrowserExtraFlags)}// Input MUST be untouched.if cfg.DefaultBrowser != BrowserChrome ||- cfg.ChromeBinary != "/global/chrome" ||- cfg.ChromeExtraFlags != "--global-flag" {+ cfg.BrowserBinary != "/global/chrome" ||+ cfg.BrowserExtraFlags != "--global-flag" {t.Errorf("input cfg was mutated: %+v", cfg)}}@@ -955,11 +955,11 @@ func TestApplyTargetOverride_EmptyBinary_KeepsGlobalBinary(t *testing.T) {},}got := ApplyTargetOverride(cfg, "cloak")- if got.ChromeBinary != "/global/chrome" {- t.Errorf("binary = %q, want global /global/chrome (inherit)", got.ChromeBinary)+ if got.BrowserBinary != "/global/chrome" {+ t.Errorf("binary = %q, want global /global/chrome (inherit)", got.BrowserBinary)}- if got.ChromeExtraFlags != "--global-flag" {- t.Errorf("extraFlags = %q, want global --global-flag (inherit)", got.ChromeExtraFlags)+ if got.BrowserExtraFlags != "--global-flag" {+ t.Errorf("extraFlags = %q, want global --global-flag (inherit)", got.BrowserExtraFlags)}if got.DefaultBrowser != BrowserCloak {t.Errorf("provider = %q, want cloak", got.DefaultBrowser)diff --git a/internal/config/chrome_flags.go b/internal/config/chrome_flags.goindex 0be78e79..539f31d5 100644--- a/internal/config/chrome_flags.go+++ b/internal/config/chrome_flags.go@@ -5,25 +5,25 @@ import ("strings")-// AllowedChromeExtraFlags returns the subset of browser.extraFlags that are+// AllowedBrowserExtraFlags returns the subset of browser.extraFlags that are// allowed to reach the browser process after security and ownership checks.-func AllowedChromeExtraFlags(raw string) []string {- allowed, _ := assessChromeExtraFlags(raw)+func AllowedBrowserExtraFlags(raw string) []string {+ allowed, _ := assessBrowserExtraFlags(raw)return allowed}-// SanitizeChromeExtraFlags rewrites browser.extraFlags to contain only the+// SanitizeBrowserExtraFlags rewrites browser.extraFlags to contain only the// allowed subset. Invalid, unsafe, and reserved flags are dropped.-func SanitizeChromeExtraFlags(raw string) string {- return strings.Join(AllowedChromeExtraFlags(raw), " ")+func SanitizeBrowserExtraFlags(raw string) string {+ return strings.Join(AllowedBrowserExtraFlags(raw), " ")}-func validateChromeExtraFlags(raw string) []error {- _, errs := assessChromeExtraFlags(raw)+func validateBrowserExtraFlags(raw string) []error {+ _, errs := assessBrowserExtraFlags(raw)return errs}-func assessChromeExtraFlags(raw string) ([]string, []error) {+func assessBrowserExtraFlags(raw string) ([]string, []error) {fields := strings.Fields(raw)allowed := make([]string, 0, len(fields))var errs []error@@ -53,7 +53,7 @@ func validateChromeExtraFlag(flag string) error {if reservedField, ok := reservedChromeExtraFlagFields[lowerName]; ok {return chromeExtraFlagsError(flag, fmt.Sprintf("is owned by PinchTab launch config; use %s instead", reservedField))}- if msg, ok := disallowedChromeExtraFlags[lowerName]; ok {+ if msg, ok := disallowedBrowserExtraFlags[lowerName]; ok {return chromeExtraFlagsError(flag, msg)}if lowerName == "--disable-features" && disablesSiteIsolation(value) {@@ -107,7 +107,7 @@ var reservedChromeExtraFlagFields = map[string]string{"--window-size": "the built-in runtime window model",}-var disallowedChromeExtraFlags = map[string]string{+var disallowedBrowserExtraFlags = map[string]string{"--allow-running-insecure-content": "weakens browser security and is not allowed","--disable-site-isolation-for-policy": "weakens browser security and is not allowed","--disable-site-isolation-trials": "weakens browser security and is not allowed",diff --git a/internal/config/cloak_roundtrip_test.go b/internal/config/cloak_roundtrip_test.goindex 0ea00700..4ca01350 100644--- a/internal/config/cloak_roundtrip_test.go+++ b/internal/config/cloak_roundtrip_test.go@@ -81,7 +81,7 @@ func TestCloakTargetResolution(t *testing.T) {cfg.DefaultBrowser = "cloak"cfg.Cloak.DisableDefaultStealthArgs = truecfg.Cloak.FingerprintSeed = "42069"- cfg.ChromeBinary = "/opt/cloakbrowser/chrome"+ cfg.BrowserBinary = "/opt/cloakbrowser/chrome"// The FileConfigFromRuntime → Load round-trip produces targets via migration.fc := config.FileConfigFromRuntime(cfg)diff --git a/internal/config/config_file.go b/internal/config/config_file.goindex 349c95ad..d759facd 100644--- a/internal/config/config_file.go+++ b/internal/config/config_file.go@@ -170,7 +170,7 @@ func DefaultFileConfig() FileConfig {StateDir: userConfigDir(),},Browser: BrowserConfig{- ChromeVersion: "144.0.7559.133",+ BrowserVersion: "144.0.7559.133",ExtensionPaths: []string{defaultExtensionsDir(userConfigDir())},},Browsers: BrowsersConfig{diff --git a/internal/config/config_file_json.go b/internal/config/config_file_json.goindex a5ca8714..0e887965 100644--- a/internal/config/config_file_json.go+++ b/internal/config/config_file_json.go@@ -30,13 +30,13 @@ type serverConfigJSON struct {}type browserConfigJSON struct {- Provider string `json:"provider,omitempty"`- ChromeVersion string `json:"version"`- ChromeBinary string `json:"binary"`- ChromeDebugPort *int `json:"remoteDebuggingPort,omitempty"`- ChromeExtraFlags string `json:"extraFlags"`- Cloak *cloakBrowserConfigJSON `json:"cloak,omitempty"`- ExtensionPaths []string `json:"extensionPaths"`+ Provider string `json:"provider,omitempty"`+ BrowserVersion string `json:"version"`+ BrowserBinary string `json:"binary"`+ BrowserDebugPort *int `json:"remoteDebuggingPort,omitempty"`+ BrowserExtraFlags string `json:"extraFlags"`+ Cloak *cloakBrowserConfigJSON `json:"cloak,omitempty"`+ ExtensionPaths []string `json:"extensionPaths"`// Pointer so omitempty drops the field for legacy configs (byte-identical round-trip).Proxy *BrowserProxyConfig `json:"proxy,omitempty"`DefaultTarget string `json:"defaultTarget,omitempty"`diff --git a/internal/config/config_file_marshal.go b/internal/config/config_file_marshal.goindex 5d563c73..b42ef6af 100644--- a/internal/config/config_file_marshal.go+++ b/internal/config/config_file_marshal.go@@ -173,17 +173,17 @@ func (fc FileConfig) MarshalJSON() ([]byte, error) {CookieSecure: fc.Server.CookieSecure,},Browser: browserConfigJSON{- Provider: fc.Browser.Provider, // removed; kept for round-trip fidelity, omitted when empty via omitempty- ChromeVersion: fc.Browser.ChromeVersion,- ChromeBinary: fc.Browser.ChromeBinary,- ChromeDebugPort: fc.Browser.ChromeDebugPort,- ChromeExtraFlags: fc.Browser.ChromeExtraFlags,- Cloak: cloakBrowserConfigJSONFromFile(fc.Browser.Provider, fc.Browser.Cloak),- ExtensionPaths: copyStringSlice(fc.Browser.ExtensionPaths),- Proxy: browserProxyJSONFromFile(fc.Browser.Proxy),- DefaultTarget: fc.Browser.DefaultTarget,- FallbackOrder: fc.Browser.FallbackOrder,- Targets: fc.Browser.Targets,+ Provider: fc.Browser.Provider, // removed; kept for round-trip fidelity, omitted when empty via omitempty+ BrowserVersion: fc.Browser.BrowserVersion,+ BrowserBinary: fc.Browser.BrowserBinary,+ BrowserDebugPort: fc.Browser.BrowserDebugPort,+ BrowserExtraFlags: fc.Browser.BrowserExtraFlags,+ Cloak: cloakBrowserConfigJSONFromFile(fc.Browser.Provider, fc.Browser.Cloak),+ ExtensionPaths: copyStringSlice(fc.Browser.ExtensionPaths),+ Proxy: browserProxyJSONFromFile(fc.Browser.Proxy),+ DefaultTarget: fc.Browser.DefaultTarget,+ FallbackOrder: fc.Browser.FallbackOrder,+ Targets: fc.Browser.Targets,},InstanceDefaults: instanceDefaultsConfigJSON{Mode: fc.InstanceDefaults.Mode,@@ -451,16 +451,16 @@ func FileConfigFromRuntime(cfg *RuntimeConfig) FileConfig {},Browser: BrowserConfig{// Provider intentionally omitted — deprecated in favor of browsers.default.- ChromeVersion: cfg.ChromeVersion,- ChromeBinary: cfg.ChromeBinary,- ChromeDebugPort: intPtrIfPositive(cfg.ChromeDebugPort),- ChromeExtraFlags: cfg.ChromeExtraFlags,- Cloak: cloakBrowserConfigFromRuntime(cfg),- ExtensionPaths: append([]string(nil), cfg.ExtensionPaths...),- Proxy: cloneBrowserProxyConfig(cfg.Proxy),- DefaultTarget: cfg.DefaultTarget,- FallbackOrder: append([]string(nil), cfg.FallbackOrder...),- Targets: cloneBrowserTargetsConfig(cfg.Targets),+ BrowserVersion: cfg.BrowserVersion,+ BrowserBinary: cfg.BrowserBinary,+ BrowserDebugPort: intPtrIfPositive(cfg.BrowserDebugPort),+ BrowserExtraFlags: cfg.BrowserExtraFlags,+ Cloak: cloakBrowserConfigFromRuntime(cfg),+ ExtensionPaths: append([]string(nil), cfg.ExtensionPaths...),+ Proxy: cloneBrowserProxyConfig(cfg.Proxy),+ DefaultTarget: cfg.DefaultTarget,+ FallbackOrder: append([]string(nil), cfg.FallbackOrder...),+ Targets: cloneBrowserTargetsConfig(cfg.Targets),},InstanceDefaults: InstanceDefaultsConfig{Mode: mode,@@ -620,8 +620,8 @@ func reconcileDefaultTargetProvider(bc *BrowserConfig, browsersDefault string, c// browsers.default won; rewrite the default target from the authoritative// runtime fields so the round-trip preserves the selected provider.target.Provider = want- target.Binary = cfg.ChromeBinary- target.ExtraFlags = cfg.ChromeExtraFlags+ target.Binary = cfg.BrowserBinary+ target.ExtraFlags = cfg.BrowserExtraFlagstarget.Cloak = cloakBrowserConfigFromRuntime(cfg)target.Proxy = cloneBrowserProxyConfig(cfg.Proxy)bc.Targets[DefaultBrowserTargetName] = targetdiff --git a/internal/config/config_file_test.go b/internal/config/config_file_test.goindex df3a656d..89622565 100644--- a/internal/config/config_file_test.go+++ b/internal/config/config_file_test.go@@ -563,7 +563,7 @@ func TestFileConfigJSONEmitsCloakBrowserConfig(t *testing.T) {disableDefaultStealthArgs := truefc := DefaultFileConfig()fc.Browser.Provider = BrowserCloak- fc.Browser.ChromeBinary = "/opt/cloakbrowser/chrome"+ fc.Browser.BrowserBinary = "/opt/cloakbrowser/chrome"fc.Browser.Cloak = CloakBrowserConfig{FingerprintSeed: "42069",Platform: "windows",@@ -610,7 +610,7 @@ func TestFileConfigJSONEmitsExplicitCloakFalseOnChromeProvider(t *testing.T) {func TestFileConfigFromRuntimeEmitsCloakStorageQuotaZeroForCloakProvider(t *testing.T) {fc := FileConfigFromRuntime(&RuntimeConfig{DefaultBrowser: BrowserCloak,- ChromeBinary: "/opt/cloakbrowser/chrome",+ BrowserBinary: "/opt/cloakbrowser/chrome",Cloak: CloakBrowserRuntimeConfig{StorageQuotaMB: 0,DisableDefaultStealthArgs: true,diff --git a/internal/config/config_load.go b/internal/config/config_load.goindex 46fa7703..d6258420 100644--- a/internal/config/config_load.go+++ b/internal/config/config_load.go@@ -78,7 +78,7 @@ func Load() *RuntimeConfig {ProfileDir: "",ProfilesBaseDir: "",DefaultProfile: "default",- ChromeVersion: "144.0.7559.133",+ BrowserVersion: "144.0.7559.133",Timezone: "",BlockImages: false,BlockMedia: false,@@ -86,8 +86,8 @@ func Load() *RuntimeConfig {MaxTabs: 20,MaxParallelTabs: 0,DefaultBrowser: BrowserChrome,- ChromeBinary: "", // Set via config.json only- ChromeExtraFlags: "",+ BrowserBinary: "", // Set via config.json only+ BrowserExtraFlags: "",Cloak: CloakBrowserRuntimeConfig{DisableDefaultStealthArgs: true},ExtensionPaths: []string{defaultExtensionsDir(userConfigDir())},UserAgent: "",@@ -471,17 +471,17 @@ func applyFileConfig(cfg *RuntimeConfig, fc *FileConfig) {cfg.Cloak.DisableDefaultStealthArgs = true}- if fc.Browser.ChromeVersion != "" {- cfg.ChromeVersion = fc.Browser.ChromeVersion+ if fc.Browser.BrowserVersion != "" {+ cfg.BrowserVersion = fc.Browser.BrowserVersion}- if fc.Browser.ChromeBinary != "" {- cfg.ChromeBinary = fc.Browser.ChromeBinary+ if fc.Browser.BrowserBinary != "" {+ cfg.BrowserBinary = fc.Browser.BrowserBinary}- if fc.Browser.ChromeDebugPort != nil && *fc.Browser.ChromeDebugPort > 0 {- cfg.ChromeDebugPort = *fc.Browser.ChromeDebugPort+ if fc.Browser.BrowserDebugPort != nil && *fc.Browser.BrowserDebugPort > 0 {+ cfg.BrowserDebugPort = *fc.Browser.BrowserDebugPort}- if fc.Browser.ChromeExtraFlags != "" {- cfg.ChromeExtraFlags = SanitizeChromeExtraFlags(fc.Browser.ChromeExtraFlags)+ if fc.Browser.BrowserExtraFlags != "" {+ cfg.BrowserExtraFlags = SanitizeBrowserExtraFlags(fc.Browser.BrowserExtraFlags)}applyCloakBrowserConfigToRuntime(cfg, fc.Browser.Cloak)if !fc.Browser.Proxy.IsZero() {diff --git a/internal/config/config_load_test.go b/internal/config/config_load_test.goindex 00404e52..55a74131 100644--- a/internal/config/config_load_test.go+++ b/internal/config/config_load_test.go@@ -677,18 +677,18 @@ func TestApplyFileConfigToRuntime_CookieSecure(t *testing.T) {}}-func TestApplyFileConfigToRuntime_SanitizesChromeExtraFlags(t *testing.T) {+func TestApplyFileConfigToRuntime_SanitizesBrowserExtraFlags(t *testing.T) {cfg := &RuntimeConfig{}fc := &FileConfig{Browser: BrowserConfig{- ChromeExtraFlags: "--disable-gpu --user-agent=Bad/1.0 --disable-web-security --ash-no-nudges",+ BrowserExtraFlags: "--disable-gpu --user-agent=Bad/1.0 --disable-web-security --ash-no-nudges",},}ApplyFileConfigToRuntime(cfg, fc)- if cfg.ChromeExtraFlags != "--disable-gpu --ash-no-nudges" {- t.Fatalf("ChromeExtraFlags = %q, want %q", cfg.ChromeExtraFlags, "--disable-gpu --ash-no-nudges")+ if cfg.BrowserExtraFlags != "--disable-gpu --ash-no-nudges" {+ t.Fatalf("BrowserExtraFlags = %q, want %q", cfg.BrowserExtraFlags, "--disable-gpu --ash-no-nudges")}}@@ -699,7 +699,7 @@ func TestApplyFileConfigToRuntime_CloakBrowserSettings(t *testing.T) {fc := &FileConfig{Browsers: BrowsersConfig{Default: BrowserCloak},Browser: BrowserConfig{- ChromeBinary: "/opt/cloakbrowser/chrome",+ BrowserBinary: "/opt/cloakbrowser/chrome",Cloak: CloakBrowserConfig{FingerprintSeed: "42069",Platform: "windows",@@ -718,8 +718,8 @@ func TestApplyFileConfigToRuntime_CloakBrowserSettings(t *testing.T) {if cfg.DefaultBrowser != BrowserCloak {t.Fatalf("DefaultBrowser = %q, want %q", cfg.DefaultBrowser, BrowserCloak)}- if cfg.ChromeBinary != "/opt/cloakbrowser/chrome" {- t.Fatalf("ChromeBinary = %q, want configured binary", cfg.ChromeBinary)+ if cfg.BrowserBinary != "/opt/cloakbrowser/chrome" {+ t.Fatalf("BrowserBinary = %q, want configured binary", cfg.BrowserBinary)}if cfg.Cloak.FingerprintSeed != "42069" ||cfg.Cloak.Platform != "windows" ||@@ -736,7 +736,7 @@ func TestApplyFileConfigToRuntime_CloakBrowserSettings(t *testing.T) {ApplyFileConfigToRuntime(defaultCfg, &FileConfig{Browsers: BrowsersConfig{Default: BrowserCloak},Browser: BrowserConfig{- ChromeBinary: "/opt/cloakbrowser/chrome",+ BrowserBinary: "/opt/cloakbrowser/chrome",},})if !defaultCfg.Cloak.DisableDefaultStealthArgs {@@ -865,7 +865,7 @@ func TestFileConfigFromRuntime_UsesDefaultBrowser(t *testing.T) {cfg := &RuntimeConfig{DefaultBrowser: "chrome",BrowsersAvailable: []string{"chrome"},- ChromeVersion: "100.0.0.0",+ BrowserVersion: "100.0.0.0",ExtensionPaths: []string{},}diff --git a/internal/config/config_types.go b/internal/config/config_types.goindex 9d4a0136..b4cf938b 100644--- a/internal/config/config_types.go+++ b/internal/config/config_types.go@@ -53,16 +53,16 @@ type RuntimeConfig struct {ProfileDir stringProfilesBaseDir stringDefaultProfile string- ChromeVersion string+ BrowserVersion stringTimezone stringBlockImages boolBlockMedia boolBlockAds boolMaxTabs intMaxParallelTabs int // 0 = auto-detect from runtime.NumCPU- ChromeBinary string- ChromeDebugPort int- ChromeExtraFlags string+ BrowserBinary string+ BrowserDebugPort int+ BrowserExtraFlags string// CDPAttachURL: when set, the bridge skips launching its own Chrome and// connects to an already-running Chrome whose browser-level CDP// WebSocket URL is provided here (e.g.@@ -306,13 +306,13 @@ type DashboardSessionFileConfig struct {type BrowserConfig struct {// Removed: presence triggers a validation error. Keep for JSON backward compat.- Provider string `json:"provider,omitempty"`- ChromeVersion string `json:"version,omitempty"`- ChromeBinary string `json:"binary,omitempty"`- ChromeDebugPort *int `json:"remoteDebuggingPort,omitempty"`- ChromeExtraFlags string `json:"extraFlags,omitempty"`- Cloak CloakBrowserConfig `json:"cloak,omitempty"`- ExtensionPaths []string `json:"extensionPaths,omitempty"`+ Provider string `json:"provider,omitempty"`+ BrowserVersion string `json:"version,omitempty"`+ BrowserBinary string `json:"binary,omitempty"`+ BrowserDebugPort *int `json:"remoteDebuggingPort,omitempty"`+ BrowserExtraFlags string `json:"extraFlags,omitempty"`+ Cloak CloakBrowserConfig `json:"cloak,omitempty"`+ ExtensionPaths []string `json:"extensionPaths,omitempty"`Proxy BrowserProxyConfig `json:"proxy,omitempty"`diff --git a/internal/config/editor_get.go b/internal/config/editor_get.goindex 5363dad4..64124665 100644--- a/internal/config/editor_get.go+++ b/internal/config/editor_get.go@@ -21,6 +21,8 @@ func GetConfigValue(fc *FileConfig, path string) (string, error) {return getServerField(&fc.Server, field)case "browser":return getBrowserField(&fc.Browser, field)+ case "browsers":+ return getBrowsersField(&fc.Browsers, field)case "instanceDefaults":return getInstanceDefaultsField(&fc.InstanceDefaults, field)case "security":@@ -36,7 +38,7 @@ func GetConfigValue(fc *FileConfig, path string) (string, error) {case "sessions":return getSessionsField(&fc.Sessions, field)default:- return "", fmt.Errorf("unknown section %q (valid: server, browser, instanceDefaults, security, profiles, multiInstance, timeouts, observability, sessions)", section)+ return "", fmt.Errorf("unknown section %q (valid: server, browser, browsers, instanceDefaults, security, profiles, multiInstance, timeouts, observability, sessions)", section)}}@@ -67,16 +69,27 @@ func getBrowserField(b *BrowserConfig, field string) (string, error) {case "provider":return "", fmt.Errorf("browser.provider is no longer supported; use browsers.default")case "version":- return b.ChromeVersion, nil+ return b.BrowserVersion, nilcase "binary":- return b.ChromeBinary, nil+ return b.BrowserBinary, nilcase "extraFlags":- return b.ChromeExtraFlags, nil+ return b.BrowserExtraFlags, nildefault:return "", fmt.Errorf("unknown field browser.%s", field)}}+func getBrowsersField(b *BrowsersConfig, field string) (string, error) {+ switch field {+ case "default":+ return b.Default, nil+ case "available":+ return strings.Join(b.Available, ","), nil+ default:+ return "", fmt.Errorf("unknown field browsers.%s", field)+ }+}+func getCloakBrowserField(c *CloakBrowserConfig, field string) (string, error) {switch field {case "fingerprintSeed":diff --git a/internal/config/editor_get_test.go b/internal/config/editor_get_test.goindex 497bc954..c0df0d69 100644--- a/internal/config/editor_get_test.go+++ b/internal/config/editor_get_test.go@@ -24,6 +24,8 @@ func TestGetConfigValue_RoundTrip(t *testing.T) {// browser.provider is no longer supported; tested separately below.{"browser.version", "120.0", "120.0"},{"browser.binary", "/usr/bin/chrome", "/usr/bin/chrome"},+ {"browsers.default", "cloak", "cloak"},+ {"browsers.available", "chrome,cloak,ghost-chrome", "chrome,cloak,ghost-chrome"},{"browser.cloak.fingerprintSeed", "42069", "42069"},{"browser.cloak.platform", "windows", "windows"},{"browser.cloak.locale", "en-GB", "en-GB"},diff --git a/internal/config/editor_set.go b/internal/config/editor_set.goindex 11de2cdf..6b49e3a2 100644--- a/internal/config/editor_set.go+++ b/internal/config/editor_set.go@@ -20,6 +20,8 @@ func SetConfigValue(fc *FileConfig, path string, value string) error {return setServerField(&fc.Server, field, value)case "browser":return setBrowserField(&fc.Browser, field, value)+ case "browsers":+ return setBrowsersField(&fc.Browsers, field, value)case "instanceDefaults":return setInstanceDefaultsField(&fc.InstanceDefaults, field, value)case "security":@@ -35,7 +37,7 @@ func SetConfigValue(fc *FileConfig, path string, value string) error {case "sessions":return setSessionsField(&fc.Sessions, field, value)default:- return fmt.Errorf("unknown section %q (valid: server, browser, instanceDefaults, security, profiles, multiInstance, timeouts, observability, sessions)", section)+ return fmt.Errorf("unknown section %q (valid: server, browser, browsers, instanceDefaults, security, profiles, multiInstance, timeouts, observability, sessions)", section)}}@@ -81,17 +83,29 @@ func setBrowserField(b *BrowserConfig, field, value string) error {case "provider":return fmt.Errorf("browser.provider is no longer supported; use browsers.default")case "version":- b.ChromeVersion = value+ b.BrowserVersion = valuecase "binary":- b.ChromeBinary = value+ b.BrowserBinary = valuecase "extraFlags":- b.ChromeExtraFlags = value+ b.BrowserExtraFlags = valuedefault:return fmt.Errorf("unknown field browser.%s", field)}return nil}+func setBrowsersField(b *BrowsersConfig, field, value string) error {+ switch field {+ case "default":+ b.Default = value+ case "available":+ b.Available = parseCSVList(value)+ default:+ return fmt.Errorf("unknown field browsers.%s", field)+ }+ return nil+}+func setCloakBrowserField(c *CloakBrowserConfig, field, value string) error {switch field {case "fingerprintSeed":diff --git a/internal/config/editor_set_test.go b/internal/config/editor_set_test.goindex 5fd9f816..a097f5c7 100644--- a/internal/config/editor_set_test.go+++ b/internal/config/editor_set_test.go@@ -52,8 +52,8 @@ func TestSetConfigValue_BrowserAndInstanceDefaultsFields(t *testing.T) {wantErr bool}{{"browser.provider", "cloak", nil, true},- {"browser.version", "144.0.7559.133", func(fc *FileConfig) bool { return fc.Browser.ChromeVersion == "144.0.7559.133" }, false},- {"browser.binary", "/tmp/chrome", func(fc *FileConfig) bool { return fc.Browser.ChromeBinary == "/tmp/chrome" }, false},+ {"browser.version", "144.0.7559.133", func(fc *FileConfig) bool { return fc.Browser.BrowserVersion == "144.0.7559.133" }, false},+ {"browser.binary", "/tmp/chrome", func(fc *FileConfig) bool { return fc.Browser.BrowserBinary == "/tmp/chrome" }, false},{"browser.cloak.fingerprintSeed", "42069", func(fc *FileConfig) bool { return fc.Browser.Cloak.FingerprintSeed == "42069" }, false},{"browser.cloak.storageQuotaMB", "2048", func(fc *FileConfig) bool { return *fc.Browser.Cloak.StorageQuotaMB == 2048 }, false},{"browser.cloak.disableDefaultStealthArgs", "false", func(fc *FileConfig) bool {@@ -87,6 +87,38 @@ func TestSetConfigValue_BrowserAndInstanceDefaultsFields(t *testing.T) {}}+func TestSetConfigValue_BrowsersFields(t *testing.T) {+ tests := []struct {+ path string+ value string+ check func(*FileConfig) bool+ wantErr bool+ }{+ {"browsers.default", "cloak", func(fc *FileConfig) bool { return fc.Browsers.Default == "cloak" }, false},+ {"browsers.available", "chrome, cloak, ghost-chrome", func(fc *FileConfig) bool {+ return len(fc.Browsers.Available) == 3 &&+ fc.Browsers.Available[0] == "chrome" &&+ fc.Browsers.Available[1] == "cloak" &&+ fc.Browsers.Available[2] == "ghost-chrome"+ }, false},+ {"browsers.unknown", "value", nil, true},+ }++ for _, tt := range tests {+ t.Run(tt.path+"="+tt.value, func(t *testing.T) {+ fc := &FileConfig{}+ err := SetConfigValue(fc, tt.path, tt.value)+ if (err != nil) != tt.wantErr {+ t.Errorf("SetConfigValue() error = %v, wantErr %v", err, tt.wantErr)+ return+ }+ if !tt.wantErr && !tt.check(fc) {+ t.Errorf("SetConfigValue() did not set value correctly")+ }+ })+ }+}+func TestSetConfigValue_SecurityFields(t *testing.T) {tests := []struct {path stringdiff --git a/internal/config/validate.go b/internal/config/validate.goindex bd143912..8402f515 100644--- a/internal/config/validate.go+++ b/internal/config/validate.go@@ -198,8 +198,8 @@ func ValidateFileConfig(fc *FileConfig) []error {}}- if fc.Browser.ChromeExtraFlags != "" {- errs = append(errs, validateChromeExtraFlags(fc.Browser.ChromeExtraFlags)...)+ if fc.Browser.BrowserExtraFlags != "" {+ errs = append(errs, validateBrowserExtraFlags(fc.Browser.BrowserExtraFlags)...)}// IDPI validationdiff --git a/internal/config/validate_test.go b/internal/config/validate_test.goindex c2184fd1..08b226c5 100644--- a/internal/config/validate_test.go+++ b/internal/config/validate_test.go@@ -421,7 +421,7 @@ func TestValidateFileConfig_MultipleErrors(t *testing.T) {}}-func TestValidateFileConfig_ChromeExtraFlags(t *testing.T) {+func TestValidateFileConfig_BrowserExtraFlags(t *testing.T) {tests := []struct {name stringflags string@@ -461,12 +461,12 @@ func TestValidateFileConfig_ChromeExtraFlags(t *testing.T) {for _, tt := range tests {t.Run(tt.name, func(t *testing.T) {fc := &FileConfig{- Browser: BrowserConfig{ChromeExtraFlags: tt.flags},+ Browser: BrowserConfig{BrowserExtraFlags: tt.flags},}errs := ValidateFileConfig(fc)hasErr := len(errs) > 0if hasErr != tt.wantErr {- t.Fatalf("ChromeExtraFlags=%q: got error=%v, want %v (errs: %v)", tt.flags, hasErr, tt.wantErr, errs)+ t.Fatalf("BrowserExtraFlags=%q: got error=%v, want %v (errs: %v)", tt.flags, hasErr, tt.wantErr, errs)}if tt.wantErr && !strings.Contains(errs[0].Error(), tt.wantMsg) {t.Fatalf("expected error containing %q, got %v", tt.wantMsg, errs[0])@@ -482,7 +482,7 @@ func TestValidateFileConfig_CloakBrowser(t *testing.T) {valid := &FileConfig{Browsers: BrowsersConfig{Default: BrowserCloak},Browser: BrowserConfig{- ChromeBinary: "/opt/cloakbrowser/chrome",+ BrowserBinary: "/opt/cloakbrowser/chrome",Cloak: CloakBrowserConfig{FingerprintSeed: "42069",Platform: "windows",@@ -521,56 +521,56 @@ func TestValidateFileConfig_CloakBrowser(t *testing.T) {{name: "invalid platform",fc: &FileConfig{Browser: BrowserConfig{- ChromeBinary: "/opt/cloakbrowser/chrome",- Cloak: CloakBrowserConfig{Platform: "ios"},+ BrowserBinary: "/opt/cloakbrowser/chrome",+ Cloak: CloakBrowserConfig{Platform: "ios"},}},want: "browser.cloak.platform",},{name: "negative storage quota",fc: &FileConfig{Browser: BrowserConfig{- ChromeBinary: "/opt/cloakbrowser/chrome",- Cloak: CloakBrowserConfig{StorageQuotaMB: &negativeQuota},+ BrowserBinary: "/opt/cloakbrowser/chrome",+ Cloak: CloakBrowserConfig{StorageQuotaMB: &negativeQuota},}},want: "browser.cloak.storageQuotaMB",},{name: "fingerprint seed whitespace",fc: &FileConfig{Browser: BrowserConfig{- ChromeBinary: "/opt/cloakbrowser/chrome",- Cloak: CloakBrowserConfig{FingerprintSeed: "42 069"},+ BrowserBinary: "/opt/cloakbrowser/chrome",+ Cloak: CloakBrowserConfig{FingerprintSeed: "42 069"},}},want: "browser.cloak.fingerprintSeed",},{name: "invalid timezone",fc: &FileConfig{Browser: BrowserConfig{- ChromeBinary: "/opt/cloakbrowser/chrome",- Cloak: CloakBrowserConfig{Timezone: "Not/AZone"},+ BrowserBinary: "/opt/cloakbrowser/chrome",+ Cloak: CloakBrowserConfig{Timezone: "Not/AZone"},}},want: "browser.cloak",},{name: "invalid locale",fc: &FileConfig{Browser: BrowserConfig{- ChromeBinary: "/opt/cloakbrowser/chrome",- Cloak: CloakBrowserConfig{Locale: "en-gb"},+ BrowserBinary: "/opt/cloakbrowser/chrome",+ Cloak: CloakBrowserConfig{Locale: "en-gb"},}},want: "browser.cloak",},{name: "invalid webrtc ip",fc: &FileConfig{Browser: BrowserConfig{- ChromeBinary: "/opt/cloakbrowser/chrome",- Cloak: CloakBrowserConfig{WebRTCIP: "not-an-ip"},+ BrowserBinary: "/opt/cloakbrowser/chrome",+ Cloak: CloakBrowserConfig{WebRTCIP: "not-an-ip"},}},want: "browser.cloak.webrtcIP",},{name: "fonts dir must exist",fc: &FileConfig{Browser: BrowserConfig{- ChromeBinary: "/opt/cloakbrowser/chrome",- Cloak: CloakBrowserConfig{FontsDir: "/definitely/not/a/real/fonts/dir"},+ BrowserBinary: "/opt/cloakbrowser/chrome",+ Cloak: CloakBrowserConfig{FontsDir: "/definitely/not/a/real/fonts/dir"},}},want: "browser.cloak.fontsDir",},diff --git a/internal/daemon/bootstrap_test.go b/internal/daemon/bootstrap_test.goindex 0f4a2476..5caa59c9 100644--- a/internal/daemon/bootstrap_test.go+++ b/internal/daemon/bootstrap_test.go@@ -78,8 +78,8 @@ func TestEnsureConfigRecoversExistingSecuritySettings(t *testing.T) {if cfg.Server.Port != "9999" {t.Fatalf("port = %q, want 9999", cfg.Server.Port)}- if cfg.Browser.ChromeBinary != "/custom/chrome" {- t.Fatalf("chrome binary = %q, want /custom/chrome", cfg.Browser.ChromeBinary)+ if cfg.Browser.BrowserBinary != "/custom/chrome" {+ t.Fatalf("chrome binary = %q, want /custom/chrome", cfg.Browser.BrowserBinary)}if cfg.Security.AllowEvaluate == nil || !*cfg.Security.AllowEvaluate {t.Fatal("expected allowEvaluate to be preserved as true")diff --git a/internal/doctor/checks_binary.go b/internal/doctor/checks_binary.goindex e7e5386e..a881326a 100644--- a/internal/doctor/checks_binary.go+++ b/internal/doctor/checks_binary.go@@ -15,7 +15,7 @@ func resolveBinary(cfg *config.RuntimeConfig) string {if cfg == nil {return ""}- return strings.TrimSpace(cfg.ChromeBinary)+ return strings.TrimSpace(cfg.BrowserBinary)}func checkBinaryExists(_ context.Context, cfg *config.RuntimeConfig) CheckResult {@@ -23,7 +23,7 @@ func checkBinaryExists(_ context.Context, cfg *config.RuntimeConfig) CheckResultif bin == "" {return CheckResult{Status: StatusSkip,- Detail: "browser.binary not set — relying on system-discovered chrome",+ Detail: "browser.binary not set; relying on provider discovery",}}info, err := os.Stat(bin)@@ -49,7 +49,7 @@ func checkBinaryExists(_ context.Context, cfg *config.RuntimeConfig) CheckResultfunc checkBinaryExecutable(_ context.Context, cfg *config.RuntimeConfig) CheckResult {bin := resolveBinary(cfg)if bin == "" {- return CheckResult{Status: StatusSkip, Detail: "browser.binary not set — relying on system-discovered chrome"}+ return CheckResult{Status: StatusSkip, Detail: "browser.binary not set; relying on provider discovery"}}info, err := os.Stat(bin)if err != nil {@@ -71,7 +71,7 @@ func checkBinaryExecutable(_ context.Context, cfg *config.RuntimeConfig) CheckRefunc checkBinaryStarts(ctx context.Context, cfg *config.RuntimeConfig) CheckResult {bin := resolveBinary(cfg)if bin == "" {- return CheckResult{Status: StatusSkip, Detail: "browser.binary not set — relying on system-discovered chrome"}+ return CheckResult{Status: StatusSkip, Detail: "browser.binary not set; relying on provider discovery"}}cctx, cancel := context.WithTimeout(ctx, 5*time.Second)defer cancel()diff --git a/internal/doctor/checks_system_test.go b/internal/doctor/checks_system_test.goindex 1b19097e..c71b107c 100644--- a/internal/doctor/checks_system_test.go+++ b/internal/doctor/checks_system_test.go@@ -8,7 +8,7 @@ import ("strings""testing"- _ "github.com/pinchtab/pinchtab/internal/browsers/all" // register browser providers for DiscoverChromeBinary+ _ "github.com/pinchtab/pinchtab/internal/browsers/all" // register browser providers for DiscoverBrowserBinary"github.com/pinchtab/pinchtab/internal/config")diff --git a/internal/doctor/runner.go b/internal/doctor/runner.goindex 5533be25..a7e7d6fb 100644--- a/internal/doctor/runner.go+++ b/internal/doctor/runner.go@@ -168,7 +168,7 @@ func buildDoctorEnv(cfg *config.RuntimeConfig) *browsers.DoctorEnv {return nil}return &browsers.DoctorEnv{- Binary: cfg.ChromeBinary,+ Binary: strings.TrimSpace(cfg.BrowserBinary),Cloak: browsers.CloakFingerprint{FingerprintSeed: cfg.Cloak.FingerprintSeed,Platform: cfg.Cloak.Platform,diff --git a/internal/doctor/runner_test.go b/internal/doctor/runner_test.goindex 5381acf9..41b2580b 100644--- a/internal/doctor/runner_test.go+++ b/internal/doctor/runner_test.go@@ -51,7 +51,7 @@ func TestExitCode(t *testing.T) {}func TestRun_RegistryOrdering_Chrome(t *testing.T) {- cfg := &config.RuntimeConfig{DefaultBrowser: config.BrowserChrome, ChromeBinary: "/does/not/exist"}+ cfg := &config.RuntimeConfig{DefaultBrowser: config.BrowserChrome, BrowserBinary: "/does/not/exist"}got := Run(context.Background(), cfg, "")wantOrder := []string{"config_file",@@ -72,7 +72,7 @@ func TestRun_RegistryOrdering_Chrome(t *testing.T) {}func TestRun_RegistryOrdering_Cloak(t *testing.T) {- cfg := &config.RuntimeConfig{DefaultBrowser: config.BrowserCloak, ChromeBinary: "/does/not/exist"}+ cfg := &config.RuntimeConfig{DefaultBrowser: config.BrowserCloak, BrowserBinary: "/does/not/exist"}got := Run(context.Background(), cfg, "")// The three cloak-specific checks now come from Browser.DoctorChecks(),// so they appear right after cloakbrowser_present (provider block) and@@ -99,7 +99,7 @@ func TestRun_RegistryOrdering_Cloak(t *testing.T) {}func TestRun_CheckFilter(t *testing.T) {- cfg := &config.RuntimeConfig{DefaultBrowser: config.BrowserChrome, ChromeBinary: "/does/not/exist"}+ cfg := &config.RuntimeConfig{DefaultBrowser: config.BrowserChrome, BrowserBinary: "/does/not/exist"}got := Run(context.Background(), cfg, "binary_exists")if len(got) != 1 {t.Fatalf("filter binary_exists: got %d results, want 1", len(got))@@ -127,7 +127,7 @@ func TestKnownCheck(t *testing.T) {}func TestBinaryExists_MissingFile(t *testing.T) {- cfg := &config.RuntimeConfig{ChromeBinary: filepath.Join(t.TempDir(), "nope")}+ cfg := &config.RuntimeConfig{BrowserBinary: filepath.Join(t.TempDir(), "nope")}r := checkBinaryExists(context.Background(), cfg)if r.Status != StatusFail {t.Fatalf("status = %v, want fail (err=%v)", r.Status, r.Err)@@ -140,7 +140,7 @@ func TestBinaryExists_FoundFile(t *testing.T) {if err := os.WriteFile(path, []byte("#!/bin/sh\necho hi\n"), 0o755); err != nil {t.Fatal(err)}- cfg := &config.RuntimeConfig{ChromeBinary: path}+ cfg := &config.RuntimeConfig{BrowserBinary: path}r := checkBinaryExists(context.Background(), cfg)if r.Status != StatusPass {t.Fatalf("status = %v, want pass; detail=%q err=%v", r.Status, r.Detail, r.Err)@@ -156,7 +156,7 @@ func TestBinaryExecutable_NotExecutable(t *testing.T) {if err := os.WriteFile(path, []byte("data"), 0o644); err != nil {t.Fatal(err)}- cfg := &config.RuntimeConfig{ChromeBinary: path}+ cfg := &config.RuntimeConfig{BrowserBinary: path}r := checkBinaryExecutable(context.Background(), cfg)if r.Status != StatusFail {t.Fatalf("status = %v, want fail", r.Status)@@ -169,7 +169,7 @@ func TestBinaryExecutable_Executable(t *testing.T) {if err := os.WriteFile(path, []byte("#!/bin/sh\n"), 0o755); err != nil {t.Fatal(err)}- cfg := &config.RuntimeConfig{ChromeBinary: path}+ cfg := &config.RuntimeConfig{BrowserBinary: path}r := checkBinaryExecutable(context.Background(), cfg)if r.Status != StatusPass {t.Fatalf("status = %v, want pass; detail=%q", r.Status, r.Detail)@@ -186,7 +186,7 @@ func TestBinaryStarts_FakeVersion(t *testing.T) {if err := os.WriteFile(path, []byte(script), 0o755); err != nil {t.Fatal(err)}- cfg := &config.RuntimeConfig{ChromeBinary: path}+ cfg := &config.RuntimeConfig{BrowserBinary: path}r := checkBinaryStarts(context.Background(), cfg)if r.Status != StatusPass {t.Fatalf("status = %v, want pass; detail=%q err=%v", r.Status, r.Detail, r.Err)@@ -205,7 +205,7 @@ func TestBinaryStarts_NonZeroExit(t *testing.T) {if err := os.WriteFile(path, []byte("#!/bin/sh\nexit 3\n"), 0o755); err != nil {t.Fatal(err)}- cfg := &config.RuntimeConfig{ChromeBinary: path}+ cfg := &config.RuntimeConfig{BrowserBinary: path}r := checkBinaryStarts(context.Background(), cfg)if r.Status != StatusFail {t.Fatalf("status = %v, want fail", r.Status)diff --git a/internal/handlers/actions_test.go b/internal/handlers/actions_test.goindex 3d5cbffc..4b7be142 100644--- a/internal/handlers/actions_test.go+++ b/internal/handlers/actions_test.go@@ -98,7 +98,7 @@ func (m *failMockBridge) ListTargets() ([]bridge.TabTarget, error) {return nil, fmt.Errorf("list targets failed")}-func (m *failMockBridge) EnsureChrome(cfg *config.RuntimeConfig) error {+func (m *failMockBridge) EnsureBrowser(cfg *config.RuntimeConfig) error {return nil}diff --git a/internal/handlers/attr.go b/internal/handlers/attr.goindex 85bf56a2..469f7b8c 100644--- a/internal/handlers/attr.go+++ b/internal/handlers/attr.go@@ -37,7 +37,7 @@ func (h *Handlers) HandleGetAttr(w http.ResponseWriter, r *http.Request) {if h.writeBridgeUnavailable(w, err) {return}- httpx.Error(w, 500, fmt.Errorf("chrome initialization: %w", err))+ httpx.Error(w, 500, fmt.Errorf("browser initialization: %w", err))return}diff --git a/internal/handlers/box.go b/internal/handlers/box.goindex 516dea6e..4b89e150 100644--- a/internal/handlers/box.go+++ b/internal/handlers/box.go@@ -41,7 +41,7 @@ func (h *Handlers) HandleGetBox(w http.ResponseWriter, r *http.Request) {if h.writeBridgeUnavailable(w, err) {return}- httpx.Error(w, 500, fmt.Errorf("chrome initialization: %w", err))+ httpx.Error(w, 500, fmt.Errorf("browser initialization: %w", err))return}diff --git a/internal/handlers/capture.go b/internal/handlers/capture.goindex b314d8cb..e11b4c1e 100644--- a/internal/handlers/capture.go+++ b/internal/handlers/capture.go@@ -13,7 +13,6 @@ import ("strings""time"- "github.com/chromedp/cdproto/page""github.com/pinchtab/pinchtab/internal/activity""github.com/pinchtab/pinchtab/internal/bridge""github.com/pinchtab/pinchtab/internal/browserops"@@ -102,7 +101,7 @@ func (h *Handlers) HandleCapture(w http.ResponseWriter, r *http.Request) {h.recordReadRequest(r, "capture", tabID)- captureRoute := browserops.SingleBrowserRoute("chrome")+ captureRoute := browserops.SingleBrowserRoute(browser)captureRoute.Attempts = append(captureRoute.Attempts, browserops.RouteAttempt{Browser: browser,Accepted: handleDecision.Decision == browsers.DecisionHandle,@@ -172,10 +171,10 @@ func (h *Handlers) HandleCapture(w http.ResponseWriter, r *http.Request) {}}- format := page.CaptureScreenshotFormatJpeg+ format := bridge.ScreenshotFormatJpegext := ".jpg"if q.Get("format") == "png" {- format = page.CaptureScreenshotFormatPng+ format = bridge.ScreenshotFormatPngext = ".png"}@@ -219,7 +218,7 @@ func (h *Handlers) HandleCapture(w http.ResponseWriter, r *http.Request) {return}opts.ScopeBackendNodeID = nodeID- clip, cErr := screenshotClipForNode(tCtx, nodeID)+ clip, cErr := bridge.ScreenshotClipForNode(tCtx, nodeID)if cErr != nil {httpx.Error(w, 500, fmt.Errorf("selector clip: %w", cErr))returndiff --git a/internal/handlers/checked.go b/internal/handlers/checked.goindex bd9d3008..f57df00b 100644--- a/internal/handlers/checked.go+++ b/internal/handlers/checked.go@@ -30,7 +30,7 @@ func (h *Handlers) HandleGetChecked(w http.ResponseWriter, r *http.Request) {if h.writeBridgeUnavailable(w, err) {return}- httpx.Error(w, 500, fmt.Errorf("chrome initialization: %w", err))+ httpx.Error(w, 500, fmt.Errorf("browser initialization: %w", err))return}diff --git a/internal/handlers/count.go b/internal/handlers/count.goindex e7ef4f46..527fcb00 100644--- a/internal/handlers/count.go+++ b/internal/handlers/count.go@@ -32,7 +32,7 @@ func (h *Handlers) HandleCount(w http.ResponseWriter, r *http.Request) {if h.writeBridgeUnavailable(w, err) {return}- httpx.Error(w, 500, fmt.Errorf("chrome initialization: %w", err))+ httpx.Error(w, 500, fmt.Errorf("browser initialization: %w", err))return}diff --git a/internal/handlers/current_tab_test.go b/internal/handlers/current_tab_test.goindex a150b084..3bfd743e 100644--- a/internal/handlers/current_tab_test.go+++ b/internal/handlers/current_tab_test.go@@ -69,7 +69,7 @@ func (b *scopedCurrentTabBridge) FocusTab(tabID string) error {return nil}-func (b *scopedCurrentTabBridge) EnsureChrome(*config.RuntimeConfig) error {+func (b *scopedCurrentTabBridge) EnsureBrowser(*config.RuntimeConfig) error {b.ensureCall++return nil}diff --git a/internal/handlers/enabled.go b/internal/handlers/enabled.goindex 08a87a63..911b39c2 100644--- a/internal/handlers/enabled.go+++ b/internal/handlers/enabled.go@@ -30,7 +30,7 @@ func (h *Handlers) HandleGetEnabled(w http.ResponseWriter, r *http.Request) {if h.writeBridgeUnavailable(w, err) {return}- httpx.Error(w, 500, fmt.Errorf("chrome initialization: %w", err))+ httpx.Error(w, 500, fmt.Errorf("browser initialization: %w", err))return}diff --git a/internal/handlers/find.go b/internal/handlers/find.goindex ee6f1443..4361be93 100644--- a/internal/handlers/find.go+++ b/internal/handlers/find.go@@ -58,7 +58,7 @@ func (h *Handlers) HandleFind(w http.ResponseWriter, r *http.Request) {if h.writeBridgeUnavailable(w, err) {return}- httpx.Error(w, 500, fmt.Errorf("chrome initialization: %w", err))+ httpx.Error(w, 500, fmt.Errorf("browser initialization: %w", err))return}diff --git a/internal/handlers/find_test.go b/internal/handlers/find_test.goindex 7b17f801..c63ee649 100644--- a/internal/handlers/find_test.go+++ b/internal/handlers/find_test.go@@ -24,7 +24,7 @@ type findMockBridge struct {refCache *bridge.RefCache}-func (m *findMockBridge) EnsureChrome(cfg *config.RuntimeConfig) error { return nil }+func (m *findMockBridge) EnsureBrowser(cfg *config.RuntimeConfig) error { return nil }func (m *findMockBridge) RestartBrowser(cfg *config.RuntimeConfig) error { return nil }func (m *findMockBridge) TabContext(tabID string) (*bridge.TabHandle, string, error) {diff --git a/internal/handlers/handler_browser_test.go b/internal/handlers/handler_browser_test.goindex 15fb5d58..6ca90dc4 100644--- a/internal/handlers/handler_browser_test.go+++ b/internal/handlers/handler_browser_test.go@@ -10,7 +10,7 @@ import (func TestResolveEffectiveConfig_WithTarget(t *testing.T) {cfg := &config.RuntimeConfig{DefaultBrowser: config.BrowserChrome,- ChromeBinary: "/usr/bin/chrome",+ BrowserBinary: "/usr/bin/chrome",ActionTimeout: 10 * time.Second,Targets: config.BrowserTargetsConfig{"cloak-us": {@@ -35,15 +35,15 @@ func TestResolveEffectiveConfig_WithTarget(t *testing.T) {if effective.DefaultBrowser != config.BrowserCloak {t.Errorf("expected DefaultBrowser=%q, got %q", config.BrowserCloak, effective.DefaultBrowser)}- if effective.ChromeBinary != "/opt/cloakbrowser/chrome" {- t.Errorf("expected ChromeBinary=%q, got %q", "/opt/cloakbrowser/chrome", effective.ChromeBinary)+ if effective.BrowserBinary != "/opt/cloakbrowser/chrome" {+ t.Errorf("expected BrowserBinary=%q, got %q", "/opt/cloakbrowser/chrome", effective.BrowserBinary)}}func TestResolveEffectiveConfig_NoTargets(t *testing.T) {cfg := &config.RuntimeConfig{DefaultBrowser: config.BrowserChrome,- ChromeBinary: "/usr/bin/chrome",+ BrowserBinary: "/usr/bin/chrome",}h := &Handlers{Config: cfg}diff --git a/internal/handlers/handlers.go b/internal/handlers/handlers.goindex d8df5f16..b83f1b75 100644--- a/internal/handlers/handlers.go+++ b/internal/handlers/handlers.go@@ -154,18 +154,11 @@ type restartStatusProvider interface {RestartStatus() (bool, time.Duration)}-type ensureBrowserProvider interface {- EnsureBrowser(cfg *config.RuntimeConfig) error-}-func (h *Handlers) ensureBrowser(cfg *config.RuntimeConfig) error {if cfg == nil {cfg = h.Config}- if provider, ok := h.Bridge.(ensureBrowserProvider); ok {- return provider.EnsureBrowser(cfg)- }- return h.Bridge.EnsureChrome(cfg)+ return h.Bridge.EnsureBrowser(cfg)}func (h *Handlers) ensureBrowserOrRespond(w http.ResponseWriter, cfg *config.RuntimeConfig) bool {@@ -244,7 +237,7 @@ func (h *Handlers) writeBridgeUnavailable(w http.ResponseWriter, err error) boolfunc (h *Handlers) RegisterRoutes(mux *http.ServeMux, doShutdown func()) {mux.HandleFunc("GET /health", h.HandleHealth)- mux.HandleFunc("POST /ensure-chrome", h.HandleEnsureChrome)+ mux.HandleFunc("POST /ensure-browser", h.HandleEnsureBrowser)mux.HandleFunc("POST /browser/restart", h.HandleBrowserRestart)mux.HandleFunc("GET /tabs", h.HandleTabs)mux.HandleFunc("POST /tabs/{id}/navigate", h.HandleTabNavigate)diff --git a/internal/handlers/handlers_test.go b/internal/handlers/handlers_test.goindex fa394212..eb320d2e 100644--- a/internal/handlers/handlers_test.go+++ b/internal/handlers/handlers_test.go@@ -25,9 +25,9 @@ type mockBridge struct {lastErrorLimit intfingerprintTabs map[string]boolframeScopes map[string]bridge.FrameScope- ensureChromeErr error- ensureChromeCall int- ensureChromeCfg *config.RuntimeConfig+ ensureBrowserErr error+ ensureBrowserCall int+ ensureBrowserCfg *config.RuntimeConfigdialogManager *bridge.DialogManagerexecuteActionErr errorautoCloseArmed []string@@ -90,10 +90,10 @@ func (m *mockBridge) CancelAutoClose(tabID string) {m.autoCloseCanceled = append(m.autoCloseCanceled, tabID)}-func (m *mockBridge) EnsureChrome(cfg *config.RuntimeConfig) error {- m.ensureChromeCall++- m.ensureChromeCfg = cfg- return m.ensureChromeErr+func (m *mockBridge) EnsureBrowser(cfg *config.RuntimeConfig) error {+ m.ensureBrowserCall+++ m.ensureBrowserCfg = cfg+ return m.ensureBrowserErr}func (m *mockBridge) RestartBrowser(cfg *config.RuntimeConfig) error {diff --git a/internal/handlers/health_tabs.go b/internal/handlers/health_tabs.goindex cde7c323..bc69b08b 100644--- a/internal/handlers/health_tabs.go+++ b/internal/handlers/health_tabs.go@@ -32,9 +32,9 @@ func (h *Handlers) HandleHealth(w http.ResponseWriter, r *http.Request) {if h.writeBridgeUnavailable(w, err) {return}- httpx.JSON(w, 503, map[string]any{"status": "error", "reason": fmt.Sprintf("chrome initialization failed: %v", err)})- return- }+ httpx.JSON(w, 503, map[string]any{"status": "error", "reason": fmt.Sprintf("browser initialization failed: %v", err)})+ return+ }targets, err := h.Bridge.ListTargets()if err != nil {@@ -57,15 +57,15 @@ func (h *Handlers) HandleHealth(w http.ResponseWriter, r *http.Request) {httpx.JSON(w, 200, resp)}-func (h *Handlers) HandleEnsureChrome(w http.ResponseWriter, r *http.Request) {+func (h *Handlers) HandleEnsureBrowser(w http.ResponseWriter, r *http.Request) {if err := h.ensureBrowser(h.Config); err != nil {if h.writeBridgeUnavailable(w, err) {return}- httpx.Error(w, 500, fmt.Errorf("chrome initialization failed: %w", err))+ httpx.Error(w, 500, fmt.Errorf("browser initialization failed: %w", err))return}- httpx.JSON(w, 200, map[string]string{"status": "chrome_ready"})+ httpx.JSON(w, 200, map[string]string{"status": "browser_ready"})}func (h *Handlers) HandleBrowserRestart(w http.ResponseWriter, r *http.Request) {diff --git a/internal/handlers/health_tabs_test.go b/internal/handlers/health_tabs_test.goindex 403fced7..6f127a9c 100644--- a/internal/handlers/health_tabs_test.go+++ b/internal/handlers/health_tabs_test.go@@ -214,12 +214,12 @@ func TestHandleTabs_CurrentTrackedTabIsReturnedFirst(t *testing.T) {}}-// TestHandleHealth_EnsureChromeFailure verifies /health returns 503 when Chrome initialization fails-func TestHandleHealth_EnsureChromeFailure(t *testing.T) {+// TestHandleHealth_EnsureBrowserFailure verifies /health returns 503 when browser initialization fails+func TestHandleHealth_EnsureBrowserFailure(t *testing.T) {mockBridge := &MockBridge{targets: []bridge.TabTarget{},- ensureChromeErr: "failed to start Chrome: connection refused",- ensureChromeCalled: false,+ ensureBrowserErr: "failed to start browser: connection refused",+ ensureBrowserCalled: false,}h := &Handlers{@@ -232,7 +232,7 @@ func TestHandleHealth_EnsureChromeFailure(t *testing.T) {h.HandleHealth(w, req)- // Should fail before calling ListTargets because ensureChrome fails first+ // Should fail before calling ListTargets because ensureBrowser fails firstif w.Code != http.StatusServiceUnavailable {t.Errorf("expected 503, got %d", w.Code)}@@ -246,26 +246,26 @@ func TestHandleHealth_EnsureChromeFailure(t *testing.T) {t.Errorf("expected status=error, got %v", status)}- // Verify ensureChrome was actually called- if !mockBridge.ensureChromeCalled {- t.Error("expected ensureChrome to be called before ListTargets")+ // Verify ensureBrowser was actually called+ if !mockBridge.ensureBrowserCalled {+ t.Error("expected ensureBrowser to be called before ListTargets")}- // Verify error message mentions chrome initialization+ // Verify error message mentions browser initializationreason, ok := resp["reason"].(string)- if !ok || !contains(reason, "chrome") {- t.Errorf("expected error reason mentioning chrome, got %v", reason)+ if !ok || !contains(reason, "browser") {+ t.Errorf("expected error reason mentioning browser, got %v", reason)}}-// TestHandleHealth_EnsureChromeSuccess verifies /health calls ensureChrome and then checks ListTargets-func TestHandleHealth_EnsureChromeSuccess(t *testing.T) {+// TestHandleHealth_EnsureBrowserSuccess verifies /health calls ensureBrowser and then checks ListTargets+func TestHandleHealth_EnsureBrowserSuccess(t *testing.T) {mockBridge := &MockBridge{targets: []bridge.TabTarget{{TargetID: "target1", URL: "https://pinchtab.com", Title: "Example"},},- ensureChromeCalled: false,- ensureChromeErr: "", // No error+ ensureBrowserCalled: false,+ ensureBrowserErr: "", // No error}h := &Handlers{@@ -282,9 +282,9 @@ func TestHandleHealth_EnsureChromeSuccess(t *testing.T) {t.Errorf("expected 200, got %d", w.Code)}- // Verify ensureChrome was called- if !mockBridge.ensureChromeCalled {- t.Error("expected ensureChrome to be called before ListTargets")+ // Verify ensureBrowser was called+ if !mockBridge.ensureBrowserCalled {+ t.Error("expected ensureBrowser to be called before ListTargets")}var resp map[string]any@@ -311,8 +311,8 @@ func contains(s, substr string) bool {type MockBridge struct {targets []bridge.TabTargetlistTargetsErr string- ensureChromeCalled bool- ensureChromeErr string+ ensureBrowserCalled bool+ ensureBrowserErr stringcurrentTabID stringdraining boolretryAfter time.Duration@@ -382,17 +382,17 @@ func (m *MockBridge) Unlock(tabID, owner string) error {return nil}-func (m *MockBridge) EnsureChrome(cfg *config.RuntimeConfig) error {- m.ensureChromeCalled = true- if m.ensureChromeErr != "" {- return fmt.Errorf("%s", m.ensureChromeErr)+func (m *MockBridge) EnsureBrowser(cfg *config.RuntimeConfig) error {+ m.ensureBrowserCalled = true+ if m.ensureBrowserErr != "" {+ return fmt.Errorf("%s", m.ensureBrowserErr)}return nil}func (m *MockBridge) RestartBrowser(cfg *config.RuntimeConfig) error {- if m.ensureChromeErr != "" {- return fmt.Errorf("%s", m.ensureChromeErr)+ if m.ensureBrowserErr != "" {+ return fmt.Errorf("%s", m.ensureBrowserErr)}return nil}diff --git a/internal/handlers/inspect.go b/internal/handlers/inspect.goindex 1f1c8ec5..bd31a4dd 100644--- a/internal/handlers/inspect.go+++ b/internal/handlers/inspect.go@@ -78,7 +78,7 @@ func (h *Handlers) handleInspect(w http.ResponseWriter, r *http.Request, kind inif h.writeBridgeUnavailable(w, err) {return}- httpx.Error(w, 500, fmt.Errorf("chrome initialization: %w", err))+ httpx.Error(w, 500, fmt.Errorf("browser initialization: %w", err))return}diff --git a/internal/handlers/middleware_session_grants.go b/internal/handlers/middleware_session_grants.goindex 64b4215a..4aed6f8c 100644--- a/internal/handlers/middleware_session_grants.go+++ b/internal/handlers/middleware_session_grants.go@@ -53,7 +53,7 @@ func sessionAdminRoute(method, path string) bool {return truecase method == http.MethodPost && path == "/shutdown":return true- case method == http.MethodPost && (path == "/browser/restart" || path == "/ensure-chrome"):+ case method == http.MethodPost && (path == "/browser/restart" || path == "/ensure-browser"):return truecase method == http.MethodPost && path == "/fingerprint/rotate":return truediff --git a/internal/handlers/navigation.go b/internal/handlers/navigation.goindex 0d409f5b..c56544c2 100644--- a/internal/handlers/navigation.go+++ b/internal/handlers/navigation.go@@ -180,7 +180,7 @@ func (h *Handlers) HandleNavigate(w http.ResponseWriter, r *http.Request) {trustedCIDRs := buildNavigateTrustedProxyCIDRs(effectiveCfg)h.recordNavigateRequest(r, req.TabID, req.URL)- navRoute := browserops.SingleBrowserRoute("chrome")+ navRoute := browserops.SingleBrowserRoute(resolvedBrowser)navRoute.Attempts = append(navRoute.Attempts, browserops.RouteAttempt{Browser: resolvedBrowser,Accepted: handleDecision.Decision == browsers.DecisionHandle,@@ -262,8 +262,8 @@ func (h *Handlers) HandleNavigate(w http.ResponseWriter, r *http.Request) {blockPatterns = bridge.CombineBlockPatterns(blockPatterns, bridge.ImageBlockPatterns)}- if req.NewTab {- h.navigateNewTabChrome(w, r, navigateChromeOptions{+ if req.NewTab {+ h.navigateNewTabBrowser(w, r, navigateBrowserOptions{URL: req.URL,WaitFor: req.WaitFor,WaitSelector: req.WaitSelector,@@ -281,8 +281,8 @@ func (h *Handlers) HandleNavigate(w http.ResponseWriter, r *http.Request) {ctx, resolvedTabID, err := h.tabContext(r, req.TabID)if err != nil {- if scopedCurrentForNavigate {- h.navigateNewTabChrome(w, r, navigateChromeOptions{+ if scopedCurrentForNavigate {+ h.navigateNewTabBrowser(w, r, navigateBrowserOptions{URL: req.URL,WaitFor: req.WaitFor,WaitSelector: req.WaitSelector,@@ -361,7 +361,7 @@ func (h *Handlers) HandleNavigate(w http.ResponseWriter, r *http.Request) {httpx.JSON(w, 200, map[string]any{"tabId": resolvedTabID, "url": navURL, "title": title, "route": navRoute})}-type navigateChromeOptions struct {+type navigateBrowserOptions struct {URL stringWaitFor stringWaitSelector string@@ -375,7 +375,7 @@ type navigateChromeOptions struct {MaxRedirects int}-func (h *Handlers) navigateNewTabChrome(w http.ResponseWriter, r *http.Request, opts navigateChromeOptions) {+func (h *Handlers) navigateNewTabBrowser(w http.ResponseWriter, r *http.Request, opts navigateBrowserOptions) {// Create a blank tab first so the requested URL becomes the first// real history entry.newTabID, newCtx, _, err := h.Bridge.CreateTab("")diff --git a/internal/handlers/navigation_browser_test.go b/internal/handlers/navigation_browser_test.goindex 2a2a4eaf..e88fe6cc 100644--- a/internal/handlers/navigation_browser_test.go+++ b/internal/handlers/navigation_browser_test.go@@ -48,7 +48,7 @@ func TestHandleNavigate_EnsuresResolvedBrowserTargetConfig(t *testing.T) {h := New(m, &config.RuntimeConfig{DefaultBrowser: config.BrowserChrome,BrowsersAvailable: []string{"chrome", "cloak"},- ChromeBinary: "/usr/bin/chrome",+ BrowserBinary: "/usr/bin/chrome",Targets: config.BrowserTargetsConfig{"cloak-local": {Provider: config.BrowserCloak,@@ -62,17 +62,17 @@ func TestHandleNavigate_EnsuresResolvedBrowserTargetConfig(t *testing.T) {w := httptest.NewRecorder()h.HandleNavigate(w, req)- if m.ensureChromeCall != 1 {- t.Fatalf("expected startup to be ensured once, got %d", m.ensureChromeCall)+ if m.ensureBrowserCall != 1 {+ t.Fatalf("expected startup to be ensured once, got %d", m.ensureBrowserCall)}- if m.ensureChromeCfg == nil {+ if m.ensureBrowserCfg == nil {t.Fatal("expected startup config to be recorded")}- if m.ensureChromeCfg.DefaultBrowser != config.BrowserCloak {- t.Fatalf("DefaultBrowser = %q, want %q", m.ensureChromeCfg.DefaultBrowser, config.BrowserCloak)+ if m.ensureBrowserCfg.DefaultBrowser != config.BrowserCloak {+ t.Fatalf("DefaultBrowser = %q, want %q", m.ensureBrowserCfg.DefaultBrowser, config.BrowserCloak)}- if m.ensureChromeCfg.ChromeBinary != "/opt/cloakbrowser/chrome" {- t.Fatalf("ChromeBinary = %q, want target binary", m.ensureChromeCfg.ChromeBinary)+ if m.ensureBrowserCfg.BrowserBinary != "/opt/cloakbrowser/chrome" {+ t.Fatalf("BrowserBinary = %q, want target binary", m.ensureBrowserCfg.BrowserBinary)}}diff --git a/internal/handlers/navigation_test.go b/internal/handlers/navigation_test.goindex 948a5dfe..a72d006d 100644--- a/internal/handlers/navigation_test.go+++ b/internal/handlers/navigation_test.go@@ -34,8 +34,8 @@ func TestHandleNavigate_InvalidJSON(t *testing.T) {}}-func TestHandleNavigate_EnsureChromeFailureStopsBeforeCreateTab(t *testing.T) {- m := &mockBridge{ensureChromeErr: fmt.Errorf("bridge init failed")}+func TestHandleNavigate_EnsureBrowserFailureStopsBeforeCreateTab(t *testing.T) {+ m := &mockBridge{ensureBrowserErr: fmt.Errorf("bridge init failed")}h := New(m, &config.RuntimeConfig{}, nil, nil, nil)req := httptest.NewRequest("POST", "/navigate", bytes.NewReader([]byte(`{"url":"about:blank"}`)))@@ -45,19 +45,19 @@ func TestHandleNavigate_EnsureChromeFailureStopsBeforeCreateTab(t *testing.T) {if w.Code != 500 {t.Fatalf("expected 500, got %d: %s", w.Code, w.Body.String())}- if m.ensureChromeCall != 1 {- t.Fatalf("expected EnsureChrome to be called once, got %d", m.ensureChromeCall)+ if m.ensureBrowserCall != 1 {+ t.Fatalf("expected EnsureBrowser to be called once, got %d", m.ensureBrowserCall)}if len(m.createTabURLs) != 0 {- t.Fatalf("CreateTab should not be called when EnsureChrome fails, got %v", m.createTabURLs)+ t.Fatalf("CreateTab should not be called when EnsureBrowser fails, got %v", m.createTabURLs)}if !strings.Contains(w.Body.String(), "browser initialization") {t.Fatalf("expected browser initialization error, got %s", w.Body.String())}}-func TestHandleTab_EnsureChromeFailureStopsBeforeCreateTab(t *testing.T) {- m := &mockBridge{ensureChromeErr: fmt.Errorf("bridge init failed")}+func TestHandleTab_EnsureBrowserFailureStopsBeforeCreateTab(t *testing.T) {+ m := &mockBridge{ensureBrowserErr: fmt.Errorf("bridge init failed")}h := New(m, &config.RuntimeConfig{}, nil, nil, nil)req := httptest.NewRequest("POST", "/tab", bytes.NewReader([]byte(`{"action":"new","url":"about:blank"}`)))@@ -67,11 +67,11 @@ func TestHandleTab_EnsureChromeFailureStopsBeforeCreateTab(t *testing.T) {if w.Code != 500 {t.Fatalf("expected 500, got %d: %s", w.Code, w.Body.String())}- if m.ensureChromeCall != 1 {- t.Fatalf("expected EnsureChrome to be called once, got %d", m.ensureChromeCall)+ if m.ensureBrowserCall != 1 {+ t.Fatalf("expected EnsureBrowser to be called once, got %d", m.ensureBrowserCall)}if len(m.createTabURLs) != 0 {- t.Fatalf("CreateTab should not be called when EnsureChrome fails, got %v", m.createTabURLs)+ t.Fatalf("CreateTab should not be called when EnsureBrowser fails, got %v", m.createTabURLs)}if !strings.Contains(w.Body.String(), "browser initialization") {t.Fatalf("expected browser initialization error, got %s", w.Body.String())diff --git a/internal/handlers/network.go b/internal/handlers/network.goindex 788922af..6cdbb876 100644--- a/internal/handlers/network.go+++ b/internal/handlers/network.go@@ -159,7 +159,7 @@ func (h *Handlers) HandleNetwork(w http.ResponseWriter, r *http.Request) {if h.writeBridgeUnavailable(w, err) {return}- httpx.Error(w, 500, fmt.Errorf("chrome initialization: %w", err))+ httpx.Error(w, 500, fmt.Errorf("browser initialization: %w", err))return}@@ -233,7 +233,7 @@ func (h *Handlers) HandleNetworkByID(w http.ResponseWriter, r *http.Request) {if h.writeBridgeUnavailable(w, err) {return}- httpx.Error(w, 500, fmt.Errorf("chrome initialization: %w", err))+ httpx.Error(w, 500, fmt.Errorf("browser initialization: %w", err))return}@@ -373,7 +373,7 @@ func (h *Handlers) HandleNetworkStream(w http.ResponseWriter, r *http.Request) {if h.writeBridgeUnavailable(w, err) {return}- httpx.Error(w, 500, fmt.Errorf("chrome initialization: %w", err))+ httpx.Error(w, 500, fmt.Errorf("browser initialization: %w", err))return}diff --git a/internal/handlers/network_export.go b/internal/handlers/network_export.goindex 1a077936..d06ea58a 100644--- a/internal/handlers/network_export.go+++ b/internal/handlers/network_export.go@@ -76,7 +76,7 @@ func (h *Handlers) HandleNetworkExport(w http.ResponseWriter, r *http.Request) {if h.writeBridgeUnavailable(w, err) {return}- httpx.Error(w, 500, fmt.Errorf("chrome initialization: %w", err))+ httpx.Error(w, 500, fmt.Errorf("browser initialization: %w", err))return}diff --git a/internal/handlers/network_export_stream.go b/internal/handlers/network_export_stream.goindex 4e5406d5..aeac3062 100644--- a/internal/handlers/network_export_stream.go+++ b/internal/handlers/network_export_stream.go@@ -34,7 +34,7 @@ func (h *Handlers) HandleNetworkExportStream(w http.ResponseWriter, r *http.Requif h.writeBridgeUnavailable(w, err) {return}- httpx.Error(w, 500, fmt.Errorf("chrome initialization: %w", err))+ httpx.Error(w, 500, fmt.Errorf("browser initialization: %w", err))return}diff --git a/internal/handlers/network_route.go b/internal/handlers/network_route.goindex 616ca422..dd026b91 100644--- a/internal/handlers/network_route.go+++ b/internal/handlers/network_route.go@@ -112,7 +112,7 @@ func (h *Handlers) requireRouteContext(w http.ResponseWriter, r *http.Request, tif h.writeBridgeUnavailable(w, err) {return nil, "", false}- httpx.Error(w, 500, fmt.Errorf("chrome initialization: %w", err))+ httpx.Error(w, 500, fmt.Errorf("browser initialization: %w", err))return nil, "", false}ctx, id, err := h.tabContext(r, tabID)diff --git a/internal/handlers/network_test.go b/internal/handlers/network_test.goindex 40425284..90cbc7a8 100644--- a/internal/handlers/network_test.go+++ b/internal/handlers/network_test.go@@ -649,7 +649,7 @@ func (m *networkFailTabBridge) TabContext(tabID string) (*bridge.TabHandle, strireturn nil, "", fmt.Errorf("tab not found")}-func (m *networkFailTabBridge) EnsureChrome(cfg *config.RuntimeConfig) error {+func (m *networkFailTabBridge) EnsureBrowser(cfg *config.RuntimeConfig) error {return nil}diff --git a/internal/handlers/pdf.go b/internal/handlers/pdf.goindex 35c2b529..4d0caf9e 100644--- a/internal/handlers/pdf.go+++ b/internal/handlers/pdf.go@@ -60,7 +60,7 @@ func (h *Handlers) HandlePDF(w http.ResponseWriter, r *http.Request) {if h.writeBridgeUnavailable(w, err) {return}- httpx.Error(w, 500, fmt.Errorf("chrome initialization: %w", err))+ httpx.Error(w, 500, fmt.Errorf("browser initialization: %w", err))return}diff --git a/internal/handlers/screenshot.go b/internal/handlers/screenshot.goindex 68ac7b95..70a642bd 100644--- a/internal/handlers/screenshot.go+++ b/internal/handlers/screenshot.go@@ -3,7 +3,6 @@ package handlersimport ("context""encoding/base64"- "encoding/json""fmt""log/slog""net/http"@@ -12,8 +11,6 @@ import ("strconv""time"- "github.com/chromedp/cdproto/page"- "github.com/chromedp/chromedp""github.com/pinchtab/pinchtab/internal/bridge""github.com/pinchtab/pinchtab/internal/httpx")@@ -26,7 +23,7 @@ func (h *Handlers) HandleScreenshot(w http.ResponseWriter, r *http.Request) {if h.writeBridgeUnavailable(w, err) {return}- httpx.Error(w, 500, fmt.Errorf("chrome initialization: %w", err))+ httpx.Error(w, 500, fmt.Errorf("browser initialization: %w", err))return}@@ -98,14 +95,14 @@ func (h *Handlers) HandleScreenshot(w http.ResponseWriter, r *http.Request) {return}- var clip *page.Viewport+ var clip *bridge.ScreenshotClipif selector != "" {nodeID, err := h.resolveSelectorNodeID(tCtx, resolvedTabID, selector)if err != nil {httpx.Error(w, 400, frameScopedSelectorError("selector", err))return}- clip, err = screenshotClipForNode(tCtx, nodeID)+ clip, err = bridge.ScreenshotClipForNode(tCtx, nodeID)if err != nil {httpx.Error(w, 500, fmt.Errorf("selector screenshot: %w", err))return@@ -137,9 +134,9 @@ func (h *Handlers) HandleScreenshot(w http.ResponseWriter, r *http.Request) {scale = bridge.ClampScale(sf)}}- cdpFormat := page.CaptureScreenshotFormatJpeg+ cdpFormat := bridge.ScreenshotFormatJpegif format == "png" {- cdpFormat = page.CaptureScreenshotFormatPng+ cdpFormat = bridge.ScreenshotFormatPng}// Route through the shared bridge.CaptureScreenshot engine: it carries the// scale/beyondViewport clip synthesis and the provider-runtime fixes@@ -216,99 +213,3 @@ func (h *Handlers) HandleTabScreenshot(w http.ResponseWriter, r *http.Request) {h.HandleScreenshot(w, req)}--func screenshotClipForNode(ctx context.Context, nodeID int64) (*page.Viewport, error) {- // Bring target element into view before computing clip coordinates.- if err := chromedp.Run(ctx, chromedp.ActionFunc(func(ctx context.Context) error {- return chromedp.FromContext(ctx).Target.Execute(ctx, "DOM.scrollIntoViewIfNeeded", map[string]any{- "backendNodeId": nodeID,- }, nil)- })); err != nil {- return nil, fmt.Errorf("scroll into view: %w", err)- }-- var resolveResult json.RawMessage- if err := chromedp.Run(ctx, chromedp.ActionFunc(func(ctx context.Context) error {- return chromedp.FromContext(ctx).Target.Execute(ctx, "DOM.resolveNode", map[string]any{- "backendNodeId": nodeID,- }, &resolveResult)- })); err != nil {- return nil, fmt.Errorf("resolve node: %w", err)- }-- var resolved struct {- Object struct {- ObjectID string `json:"objectId"`- } `json:"object"`- }- if err := json.Unmarshal(resolveResult, &resolved); err != nil {- return nil, fmt.Errorf("parse resolved node: %w", err)- }- if resolved.Object.ObjectID == "" {- return nil, fmt.Errorf("element not found in DOM (backendNodeId=%d)", nodeID)- }-- // Translate the element box into top-level page coordinates. captureScreenshot- // clip coordinates are page-relative, so viewport-relative rects need scroll- // offsets from the current document and each ancestor frame.- const boxFn = `function() {- const rect = this.getBoundingClientRect();- let x = rect.left + (window.scrollX || window.pageXOffset || 0);- let y = rect.top + (window.scrollY || window.pageYOffset || 0);- try {- let current = window;- while (current && current.parent && current !== current.parent) {- const frameEl = current.frameElement;- if (!frameEl) {- break;- }- const parent = current.parent;- const frameRect = frameEl.getBoundingClientRect();- x += frameRect.left + (parent.scrollX || parent.pageXOffset || 0);- y += frameRect.top + (parent.scrollY || parent.pageYOffset || 0);- current = parent;- }- } catch (e) {- // Cross-origin ancestors can block frame traversal. Keep the deepest- // reachable page coordinates in that case.- }- return { x, y, width: rect.width, height: rect.height };- }`-- var callResult json.RawMessage- if err := chromedp.Run(ctx, chromedp.ActionFunc(func(ctx context.Context) error {- return chromedp.FromContext(ctx).Target.Execute(ctx, "Runtime.callFunctionOn", map[string]any{- "functionDeclaration": boxFn,- "objectId": resolved.Object.ObjectID,- "returnByValue": true,- }, &callResult)- })); err != nil {- return nil, fmt.Errorf("read element box: %w", err)- }-- var boxCall struct {- Result struct {- Value struct {- X float64 `json:"x"`- Y float64 `json:"y"`- Width float64 `json:"width"`- Height float64 `json:"height"`- } `json:"value"`- } `json:"result"`- }- if err := json.Unmarshal(callResult, &boxCall); err != nil {- return nil, fmt.Errorf("parse element box: %w", err)- }-- box := boxCall.Result.Value- if box.Width <= 0 || box.Height <= 0 {- return nil, fmt.Errorf("element box is empty (width=%.2f height=%.2f)", box.Width, box.Height)- }- return &page.Viewport{- X: box.X,- Y: box.Y,- Width: box.Width,- Height: box.Height,- Scale: 1,- }, nil-}diff --git a/internal/handlers/snapshot.go b/internal/handlers/snapshot.goindex 3d0562b4..68b4a335 100644--- a/internal/handlers/snapshot.go+++ b/internal/handlers/snapshot.go@@ -115,7 +115,7 @@ func (h *Handlers) HandleSnapshot(w http.ResponseWriter, r *http.Request) {h.recordReadRequest(r, "snapshot", tabID)- snapChromeRoute := browserops.SingleBrowserRoute("chrome")+ snapChromeRoute := browserops.SingleBrowserRoute(browser)snapChromeRoute.Attempts = append(snapChromeRoute.Attempts, browserops.RouteAttempt{Browser: browser,Accepted: handleDecision.Decision == browsers.DecisionHandle,diff --git a/internal/handlers/stealth.go b/internal/handlers/stealth.goindex 210baece..380cfaed 100644--- a/internal/handlers/stealth.go+++ b/internal/handlers/stealth.go@@ -122,27 +122,27 @@ func (h *Handlers) generateFingerprint(req fingerprintRequest) fingerprint {fp := fingerprint{}// Match the launch-pinned UA: real Chrome (UA reduction, v100+) freezes- // navigator.userAgent to <major>.0.0.0. Using h.Config.ChromeVersion+ // navigator.userAgent to <major>.0.0.0. Using h.Config.BrowserVersion// verbatim here would emit Chrome/144.0.7559.133 while the launch path// pins Chrome/144.0.0.0 — a page/post-rotate version drift.- reducedChromeVersion := stealth.ReducedChromeVersion(h.Config.ChromeVersion)+ reducedBrowserVersion := stealth.ReducedBrowserVersion(h.Config.BrowserVersion)osConfigs := map[string]map[string]fingerprint{"windows": {"chrome": {- UserAgent: fmt.Sprintf("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/%s Safari/537.36", reducedChromeVersion),+ UserAgent: fmt.Sprintf("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/%s Safari/537.36", reducedBrowserVersion),Platform: "Win32",Vendor: "Google Inc.",},"edge": {- UserAgent: fmt.Sprintf("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/%s Safari/537.36 Edg/%s", reducedChromeVersion, reducedChromeVersion),+ UserAgent: fmt.Sprintf("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/%s Safari/537.36 Edg/%s", reducedBrowserVersion, reducedBrowserVersion),Platform: "Win32",Vendor: "Google Inc.",},},"mac": {"chrome": {- UserAgent: fmt.Sprintf("Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/%s Safari/537.36", reducedChromeVersion),+ UserAgent: fmt.Sprintf("Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/%s Safari/537.36", reducedBrowserVersion),Platform: "MacIntel",Vendor: "Google Inc.",},diff --git a/internal/handlers/stealth_test.go b/internal/handlers/stealth_test.goindex c585f950..d26f55af 100644--- a/internal/handlers/stealth_test.go+++ b/internal/handlers/stealth_test.go@@ -27,7 +27,7 @@ func TestHandleFingerprintRotate_InvalidJSON(t *testing.T) {}func TestGenerateFingerprint_Windows(t *testing.T) {- h := Handlers{Config: &config.RuntimeConfig{ChromeVersion: "120.0.0.0"}}+ h := Handlers{Config: &config.RuntimeConfig{BrowserVersion: "120.0.0.0"}}fp := h.generateFingerprint(fingerprintRequest{OS: "windows"})if fp.Platform != "Win32" {t.Errorf("expected Win32, got %q", fp.Platform)@@ -44,7 +44,7 @@ func TestGenerateFingerprint_Windows(t *testing.T) {}func TestGenerateFingerprint_Mac(t *testing.T) {- h := Handlers{Config: &config.RuntimeConfig{ChromeVersion: "120.0.0.0"}}+ h := Handlers{Config: &config.RuntimeConfig{BrowserVersion: "120.0.0.0"}}fp := h.generateFingerprint(fingerprintRequest{OS: "mac"})if fp.Platform != "MacIntel" {t.Errorf("expected MacIntel, got %q", fp.Platform)@@ -52,7 +52,7 @@ func TestGenerateFingerprint_Mac(t *testing.T) {}func TestGenerateFingerprint_Random(t *testing.T) {- h := Handlers{Config: &config.RuntimeConfig{ChromeVersion: "120.0.0.0"}}+ h := Handlers{Config: &config.RuntimeConfig{BrowserVersion: "120.0.0.0"}}fp := h.generateFingerprint(fingerprintRequest{OS: "random"})validPlatforms := map[string]bool{"Win32": true, "MacIntel": true}if !validPlatforms[fp.Platform] {@@ -61,7 +61,7 @@ func TestGenerateFingerprint_Random(t *testing.T) {}func TestGenerateFingerprint_WithBrowser(t *testing.T) {- h := Handlers{Config: &config.RuntimeConfig{ChromeVersion: "120.0.0.0"}}+ h := Handlers{Config: &config.RuntimeConfig{BrowserVersion: "120.0.0.0"}}fp := h.generateFingerprint(fingerprintRequest{OS: "windows", Browser: "chrome"})if fp.UserAgent == "" {t.Error("expected non-empty user agent")@@ -69,7 +69,7 @@ func TestGenerateFingerprint_WithBrowser(t *testing.T) {}func TestGenerateFingerprint_Config(t *testing.T) {- cfg := &config.RuntimeConfig{ChromeVersion: "120.0.0.0"}+ cfg := &config.RuntimeConfig{BrowserVersion: "120.0.0.0"}h := Handlers{Config: cfg}fp := h.generateFingerprint(fingerprintRequest{OS: "windows", Browser: "chrome"})@@ -84,7 +84,7 @@ func TestGenerateFingerprint_Config(t *testing.T) {// Chrome/144.0.0.0 followed by a rotated UA of Chrome/144.0.7559.133 trips// the "Chrome version preserved" E2E contract (system-basic.sh).func TestGenerateFingerprint_MatchesLaunchPinnedUAReduction(t *testing.T) {- cfg := &config.RuntimeConfig{ChromeVersion: "144.0.7559.133", Headless: true}+ cfg := &config.RuntimeConfig{BrowserVersion: "144.0.7559.133", Headless: true}bundle := stealth.NewBundle(cfg, 1)launchUA := bundle.LaunchUserAgent()if launchUA == "" {diff --git a/internal/handlers/text.go b/internal/handlers/text.goindex c27c2156..e973852a 100644--- a/internal/handlers/text.go+++ b/internal/handlers/text.go@@ -74,7 +74,7 @@ func (h *Handlers) HandleText(w http.ResponseWriter, r *http.Request) {h.recordReadRequest(r, "text", tabID)- textRoute := browserops.SingleBrowserRoute("chrome")+ textRoute := browserops.SingleBrowserRoute(browser)textRoute.Attempts = append(textRoute.Attempts, browserops.RouteAttempt{Browser: browser,Accepted: handleDecision.Decision == browsers.DecisionHandle,diff --git a/internal/handlers/value.go b/internal/handlers/value.goindex 7e8d427a..f73bf353 100644--- a/internal/handlers/value.go+++ b/internal/handlers/value.go@@ -30,7 +30,7 @@ func (h *Handlers) HandleGetValue(w http.ResponseWriter, r *http.Request) {if h.writeBridgeUnavailable(w, err) {return}- httpx.Error(w, 500, fmt.Errorf("chrome initialization: %w", err))+ httpx.Error(w, 500, fmt.Errorf("browser initialization: %w", err))return}diff --git a/internal/handlers/visible.go b/internal/handlers/visible.goindex 6fa13bd2..f818b9c4 100644--- a/internal/handlers/visible.go+++ b/internal/handlers/visible.go@@ -30,7 +30,7 @@ func (h *Handlers) HandleGetVisible(w http.ResponseWriter, r *http.Request) {if h.writeBridgeUnavailable(w, err) {return}- httpx.Error(w, 500, fmt.Errorf("chrome initialization: %w", err))+ httpx.Error(w, 500, fmt.Errorf("browser initialization: %w", err))return}diff --git a/internal/orchestrator/child_config.go b/internal/orchestrator/child_config.goindex 27a43dde..63246875 100644--- a/internal/orchestrator/child_config.go+++ b/internal/orchestrator/child_config.go@@ -43,7 +43,7 @@ func (o *Orchestrator) buildChildFileConfig(effectiveCfg *config.RuntimeConfig,fc.Server.StateDir = instanceStateDiractivityEnabled := falsefc.Observability.Activity.Enabled = &activityEnabled- fc.Browser.ChromeDebugPort = intPtr(cdpPort)+ fc.SetBrowserDebugPort(cdpPort)fc.Profiles.BaseDir = filepath.Dir(profilePath)fc.Profiles.DefaultProfile = filepath.Base(profilePath)if headless {@@ -173,13 +173,5 @@ func effectiveBinaryFromCfg(cfg *config.RuntimeConfig) string {if cfg == nil {return ""}- return cfg.ChromeBinary-}--func intPtr(v int) *int {- if v <= 0 {- return nil- }- n := v- return &n+ return strings.TrimSpace(cfg.BrowserBinary)}diff --git a/internal/orchestrator/handlers_instances.go b/internal/orchestrator/handlers_instances.goindex e19e0674..b3262738 100644--- a/internal/orchestrator/handlers_instances.go+++ b/internal/orchestrator/handlers_instances.go@@ -127,7 +127,7 @@ func (o *Orchestrator) handleStartByInstanceID(w http.ResponseWriter, r *http.Re}if active {- targetURL, targetErr := o.instancePathURL(inst, "/ensure-chrome", "")+ targetURL, targetErr := o.instancePathURL(inst, "/ensure-browser", "")if targetErr != nil {httpx.Error(w, 502, targetErr)returndiff --git a/internal/orchestrator/handlers_tabs.go b/internal/orchestrator/handlers_tabs.goindex 29f62131..1f4b8574 100644--- a/internal/orchestrator/handlers_tabs.go+++ b/internal/orchestrator/handlers_tabs.go@@ -66,7 +66,7 @@ func (o *Orchestrator) handleInstanceTabOpen(w http.ResponseWriter, r *http.Requreturn}if shouldRetryInstanceTabOpen(resp.StatusCode, body) {- ensureURL, ensureErr := o.instancePathURL(inst, "/ensure-chrome", "")+ ensureURL, ensureErr := o.instancePathURL(inst, "/ensure-browser", "")if ensureErr == nil {if err := o.ensureInstanceChrome(inst, ensureURL); err == nil {if retryResp, retryBody, retryErr := o.doInstanceRequest(r.Context(), proxyReq.Method, proxyReq.Header, payload, targetURL, inst); retryErr == nil {@@ -83,7 +83,7 @@ func (o *Orchestrator) handleInstanceTabOpen(w http.ResponseWriter, r *http.Requfunc (o *Orchestrator) ensureInstanceChrome(inst *InstanceInternal, targetURL *url.URL) error {if inst == nil || targetURL == nil {- return fmt.Errorf("instance ensure-chrome target missing")+ return fmt.Errorf("instance ensure-browser target missing")}req, err := http.NewRequest(http.MethodPost, targetURL.String(), nil)if err != nil {@@ -98,7 +98,7 @@ func (o *Orchestrator) ensureInstanceChrome(inst *InstanceInternal, targetURL *udefer func() { _ = resp.Body.Close() }()body, _ := io.ReadAll(resp.Body)if resp.StatusCode != http.StatusOK {- return fmt.Errorf("ensure-chrome HTTP %d: %s", resp.StatusCode, compactBody(body))+ return fmt.Errorf("ensure-browser HTTP %d: %s", resp.StatusCode, compactBody(body))}return nil}diff --git a/internal/orchestrator/instance_launch.go b/internal/orchestrator/instance_launch.goindex 99cefe22..43dbbd6a 100644--- a/internal/orchestrator/instance_launch.go+++ b/internal/orchestrator/instance_launch.go@@ -91,7 +91,7 @@ func (o *Orchestrator) LaunchWithOptions(name, port string, headless bool, optscdpPort, err := o.portAllocator.AllocatePort()if err != nil {- return nil, fmt.Errorf("failed to allocate chrome debug port: %w", err)+ return nil, fmt.Errorf("failed to allocate browser debug port: %w", err)}reservedPorts = append(reservedPorts, cdpPort)diff --git a/internal/orchestrator/instance_stop.go b/internal/orchestrator/instance_stop.goindex 73502bd3..bdcc9c11 100644--- a/internal/orchestrator/instance_stop.go+++ b/internal/orchestrator/instance_stop.go@@ -12,7 +12,8 @@ import ("sync""time"- "github.com/pinchtab/pinchtab/internal/bridge"+ "github.com/pinchtab/pinchtab/internal/browsers/providerhooks"+ "github.com/pinchtab/pinchtab/internal/config")func (o *Orchestrator) Stop(id string) error {@@ -129,6 +130,7 @@ func (o *Orchestrator) markStopped(id string) {}profileName := inst.ProfileName+ browser := inst.browserdelete(o.instances, id)o.mu.Unlock()@@ -136,7 +138,7 @@ func (o *Orchestrator) markStopped(id string) {o.removeInstanceFromManager(id)slog.Info("instance stopped and removed", "id", id, "profile", profileName)- o.cleanupStoppedProfile(profileName)+ o.cleanupStoppedProfile(profileName, browser)}func (o *Orchestrator) releaseInstancePorts(id string, inst *InstanceInternal) {@@ -150,7 +152,7 @@ func (o *Orchestrator) releaseInstancePorts(id string, inst *InstanceInternal) {}if inst.cdpPort > 0 {o.portAllocator.ReleasePort(inst.cdpPort)- slog.Debug("released chrome debug port", "id", id, "port", inst.cdpPort)+ slog.Debug("released browser debug port", "id", id, "port", inst.cdpPort)}}@@ -161,12 +163,12 @@ func (o *Orchestrator) removeInstanceFromManager(id string) {}}-func (o *Orchestrator) cleanupStoppedProfile(profileName string) {- // Kill any orphaned Chrome processes using this profile's directory.- // Chrome spawns helpers (GPU, renderer) in their own process groups,- // so killing the bridge process group doesn't reach them.+func (o *Orchestrator) cleanupStoppedProfile(profileName, browser string) {profilePath := filepath.Join(o.baseDir, profileName)- bridge.CleanupOrphanedChromeProcesses(profilePath)+ if browser == "" && o.runtimeCfg != nil {+ browser = config.NormalizeBrowser(o.runtimeCfg.DefaultBrowser)+ }+ providerhooks.CleanupProfile(browser, profilePath)if strings.HasPrefix(profileName, "instance-") {profilePath := filepath.Join(o.baseDir, profileName)diff --git a/internal/orchestrator/launch_target_config_test.go b/internal/orchestrator/launch_target_config_test.goindex 6014ad73..a8872f41 100644--- a/internal/orchestrator/launch_target_config_test.go+++ b/internal/orchestrator/launch_target_config_test.go@@ -16,10 +16,10 @@ func fakeOrch(cfg *config.RuntimeConfig) *Orchestrator {func runtimeCfgWithTargets() *config.RuntimeConfig {return &config.RuntimeConfig{- Port: "9867",- DefaultBrowser: config.BrowserChrome,- ChromeBinary: "/global/chrome",- ChromeExtraFlags: "--global-flag",+ Port: "9867",+ DefaultBrowser: config.BrowserChrome,+ BrowserBinary: "/global/chrome",+ BrowserExtraFlags: "--global-flag",Cloak: config.CloakBrowserRuntimeConfig{FingerprintSeed: "global-seed",Platform: "linux",@@ -57,11 +57,11 @@ func TestBuildChildFileConfig_TargetSelectedLaunchPromotesTargetBlock(t *testingif fc.Browsers.Default != config.BrowserCloak {t.Errorf("Browsers.Default = %q, want cloak", fc.Browsers.Default)}- if fc.Browser.ChromeBinary != "/opt/cloak/cloakbrowser" {- t.Errorf("Browser.ChromeBinary = %q, want /opt/cloak/cloakbrowser", fc.Browser.ChromeBinary)+ if fc.Browser.BrowserBinary != "/opt/cloak/cloakbrowser" {+ t.Errorf("Browser.BrowserBinary = %q, want /opt/cloak/cloakbrowser", fc.Browser.BrowserBinary)}- if fc.Browser.ChromeExtraFlags != "--target-flag" {- t.Errorf("Browser.ChromeExtraFlags = %q, want --target-flag", fc.Browser.ChromeExtraFlags)+ if fc.Browser.BrowserExtraFlags != "--target-flag" {+ t.Errorf("Browser.BrowserExtraFlags = %q, want --target-flag", fc.Browser.BrowserExtraFlags)}if fc.Browser.Cloak.FingerprintSeed != "target-seed" {t.Errorf("Cloak.FingerprintSeed = %q, want target-seed", fc.Browser.Cloak.FingerprintSeed)@@ -73,7 +73,7 @@ func TestBuildChildFileConfig_TargetSelectedLaunchPromotesTargetBlock(t *testingt.Errorf("Cloak.Platform = %q, want preserved linux", fc.Browser.Cloak.Platform)}if cfg.DefaultBrowser != config.BrowserChrome ||- cfg.ChromeBinary != "/global/chrome" {+ cfg.BrowserBinary != "/global/chrome" {t.Errorf("runtime cfg mutated by override: %+v", cfg)}}@@ -86,20 +86,20 @@ func TestBuildChildFileConfig_NoTargetSelected_UsesGlobalFields(t *testing.T) {if fc.Browsers.Default != config.BrowserChrome {t.Errorf("Browsers.Default = %q, want chrome (global)", fc.Browsers.Default)}- if fc.Browser.ChromeBinary != "/global/chrome" {- t.Errorf("Browser.ChromeBinary = %q, want /global/chrome", fc.Browser.ChromeBinary)+ if fc.Browser.BrowserBinary != "/global/chrome" {+ t.Errorf("Browser.BrowserBinary = %q, want /global/chrome", fc.Browser.BrowserBinary)}- if fc.Browser.ChromeExtraFlags != "--global-flag" {- t.Errorf("Browser.ChromeExtraFlags = %q, want --global-flag", fc.Browser.ChromeExtraFlags)+ if fc.Browser.BrowserExtraFlags != "--global-flag" {+ t.Errorf("Browser.BrowserExtraFlags = %q, want --global-flag", fc.Browser.BrowserExtraFlags)}}func TestBuildChildFileConfig_LegacyConfigByteStable(t *testing.T) {cfg := &config.RuntimeConfig{- Port: "9867",- DefaultBrowser: config.BrowserChrome,- ChromeBinary: "/usr/bin/chrome",- ChromeExtraFlags: "--flag",+ Port: "9867",+ DefaultBrowser: config.BrowserChrome,+ BrowserBinary: "/usr/bin/chrome",+ BrowserExtraFlags: "--flag",}o := fakeOrch(cfg)diff --git a/internal/orchestrator/launch_with_fallback.go b/internal/orchestrator/launch_with_fallback.goindex 802af134..a7d52d9f 100644--- a/internal/orchestrator/launch_with_fallback.go+++ b/internal/orchestrator/launch_with_fallback.go@@ -419,7 +419,7 @@ func (o *Orchestrator) cleanupDetachedFailedAttemptProfile(profileName string) {}}o.mu.RUnlock()- o.cleanupStoppedProfile(profileName)+ o.cleanupStoppedProfile(profileName, "")}// dedupCandidates trims whitespace, drops empty/duplicate entries, preserves order.diff --git a/internal/orchestrator/orchestrator.go b/internal/orchestrator/orchestrator.goindex 3404eb66..71d3c45e 100644--- a/internal/orchestrator/orchestrator.go+++ b/internal/orchestrator/orchestrator.go@@ -180,7 +180,7 @@ func NewOrchestratorWithRunner(baseDir string, runner HostRunner) *Orchestrator// 1. Instance /health handler to initialize the browser// 2. Tab operations to complete (navigate, snapshot, actions, etc.)// - Short timeout (<5s) would break first-request scenarios- // See: internal/orchestrator/health.go (monitor), internal/bridge/init.go (InitChrome)+ // See: internal/orchestrator/health.go (monitor), internal/bridge/init.go (InitBrowser)client: &http.Client{Timeout: 60 * time.Second},childAuthToken: "",allowEvaluate: false,diff --git a/internal/orchestrator/orchestrator_test.go b/internal/orchestrator/orchestrator_test.goindex c610b853..392135ed 100644--- a/internal/orchestrator/orchestrator_test.go+++ b/internal/orchestrator/orchestrator_test.go@@ -249,7 +249,7 @@ func TestOrchestrator_Launch_RejectsInvalidPort(t *testing.T) {}}-func TestOrchestrator_Launch_ReservesDistinctChromeDebugPort(t *testing.T) {+func TestOrchestrator_Launch_ReservesDistinctBrowserDebugPort(t *testing.T) {old := processAliveFuncprocessAliveFunc = func(pid int) bool { return pid > 0 }defer func() { processAliveFunc = old }()@@ -286,13 +286,13 @@ func TestOrchestrator_Launch_ReservesDistinctChromeDebugPort(t *testing.T) {if err := json.Unmarshal(data, &fc); err != nil {t.Fatalf("Unmarshal child config error = %v", err)}- if fc.Browser.ChromeDebugPort == nil {+ if fc.Browser.BrowserDebugPort == nil {t.Fatal("child config missing browser.remoteDebuggingPort")}- if *fc.Browser.ChromeDebugPort != 9901 {- t.Fatalf("chrome debug port = %d, want 9901", *fc.Browser.ChromeDebugPort)+ if *fc.Browser.BrowserDebugPort != 9901 {+ t.Fatalf("chrome debug port = %d, want 9901", *fc.Browser.BrowserDebugPort)}- if *fc.Browser.ChromeDebugPort == 9900 {+ if *fc.Browser.BrowserDebugPort == 9900 {t.Fatal("chrome debug port should differ from bridge port")}@@ -305,7 +305,7 @@ func TestOrchestrator_Launch_ReservesDistinctChromeDebugPort(t *testing.T) {}}-func TestOrchestrator_Launch_ExplicitPortAlsoReservesDistinctChromeDebugPort(t *testing.T) {+func TestOrchestrator_Launch_ExplicitPortAlsoReservesDistinctBrowserDebugPort(t *testing.T) {old := processAliveFuncprocessAliveFunc = func(pid int) bool { return pid > 0 }defer func() { processAliveFunc = old }()@@ -336,11 +336,11 @@ func TestOrchestrator_Launch_ExplicitPortAlsoReservesDistinctChromeDebugPort(t *if err := json.Unmarshal(data, &fc); err != nil {t.Fatalf("Unmarshal child config error = %v", err)}- if fc.Browser.ChromeDebugPort == nil {+ if fc.Browser.BrowserDebugPort == nil {t.Fatal("child config missing browser.remoteDebuggingPort")}- if *fc.Browser.ChromeDebugPort == 9911 {- t.Fatalf("chrome debug port = %d, must differ from bridge port", *fc.Browser.ChromeDebugPort)+ if *fc.Browser.BrowserDebugPort == 9911 {+ t.Fatalf("chrome debug port = %d, must differ from bridge port", *fc.Browser.BrowserDebugPort)}if !o.portAllocator.IsAllocated(9911) {t.Fatal("explicit bridge port should remain reserved in allocator while instance is active")@@ -397,7 +397,7 @@ func TestOrchestrator_Launch_DoesNotInjectSharedActivityStateDir(t *testing.T) {}}-func TestOrchestrator_Stop_ReleasesBridgeAndChromeDebugPorts(t *testing.T) {+func TestOrchestrator_Stop_ReleasesBridgeAndBrowserDebugPorts(t *testing.T) {old := processAliveFuncprocessAliveFunc = func(pid int) bool { return false }defer func() { processAliveFunc = old }()diff --git a/internal/server/bridge.go b/internal/server/bridge.goindex a64818ff..8d6cdc4c 100644--- a/internal/server/bridge.go+++ b/internal/server/bridge.go@@ -12,7 +12,8 @@ import ("github.com/pinchtab/pinchtab/internal/activity""github.com/pinchtab/pinchtab/internal/bridge"- "github.com/pinchtab/pinchtab/internal/browsers/ghostchrome/bridgekit"+ _ "github.com/pinchtab/pinchtab/internal/browsers/all"+ "github.com/pinchtab/pinchtab/internal/browsers/providerhooks""github.com/pinchtab/pinchtab/internal/cli""github.com/pinchtab/pinchtab/internal/config""github.com/pinchtab/pinchtab/internal/handlers"@@ -27,8 +28,7 @@ func RunBridgeServer(cfg *config.RuntimeConfig, version string) {ProfileDir: cfg.ProfileDir,})- // Clean up orphaned Chrome processes from previous crashed runs- bridge.CleanupOrphanedChromeProcesses(cfg.ProfileDir)+ providerhooks.CleanupProfile(config.NormalizeBrowser(cfg.DefaultBrowser), cfg.ProfileDir)bridgeInstance := bridge.New(context.Background(), nil, cfg)actStore, err := activity.NewRecorder(activity.Config{@@ -108,10 +108,10 @@ func RunBridgeServer(cfg *config.RuntimeConfig, version string) {}func configureBridgeRouter(h *handlers.Handlers, cfg *config.RuntimeConfig) {- if cfg.DefaultBrowser != config.BrowserGhostChrome {+ decorated := providerhooks.DecorateBridge(config.NormalizeBrowser(cfg.DefaultBrowser), h.Bridge, cfg)+ if decorated == h.Bridge {return}- adapter := bridgekit.NewBridgeAdapter(h.Bridge, cfg)- h.Bridge = adapter- slog.Info("ghost-chrome bridge proxy enabled", "browser", cfg.DefaultBrowser)+ h.Bridge = decorated+ slog.Info("browser bridge proxy enabled", "browser", config.NormalizeBrowser(cfg.DefaultBrowser))}diff --git a/internal/server/server.go b/internal/server/server.goindex 6f9d394e..24ceb9c4 100644--- a/internal/server/server.go+++ b/internal/server/server.go@@ -15,8 +15,8 @@ import ("github.com/pinchtab/pinchtab/internal/activity""github.com/pinchtab/pinchtab/internal/authn"- "github.com/pinchtab/pinchtab/internal/bridge"_ "github.com/pinchtab/pinchtab/internal/browsers/all"+ "github.com/pinchtab/pinchtab/internal/browsers/providerhooks""github.com/pinchtab/pinchtab/internal/browsersession""github.com/pinchtab/pinchtab/internal/cli""github.com/pinchtab/pinchtab/internal/config"@@ -40,8 +40,7 @@ func RunDashboard(cfg *config.RuntimeConfig, version string) {slog.SetDefault(slog.New(slog.NewTextHandler(io.Discard, nil)))}- // Clean up orphaned Chrome processes from previous crashed runs- bridge.CleanupOrphanedChromeProcesses(cfg.ProfileDir)+ providerhooks.CleanupProfile(config.NormalizeBrowser(cfg.DefaultBrowser), cfg.ProfileDir)dashPort := cfg.PortstartedAt := time.Now()@@ -341,7 +340,7 @@ func RunDashboard(cfg *config.RuntimeConfig, version string) {maintenanceCancel()dash.Shutdown()gracefulShutdownWithCap(orch, bridgeShutdownTotalCap)- bridge.KillAllPinchtabChrome()+ providerhooks.Shutdown(config.NormalizeBrowser(cfg.DefaultBrowser))ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)defer cancel()if err := srv.Shutdown(ctx); err != nil {diff --git a/internal/stealth/bundle.go b/internal/stealth/bundle.goindex 5b386102..c2cf4b2d 100644--- a/internal/stealth/bundle.go+++ b/internal/stealth/bundle.go@@ -84,7 +84,7 @@ func NewBundle(cfg *config.RuntimeConfig, seed int64) *Bundle {disablePinchTabStealth := config.PinchTabStealthDefaultsDisabled(cfg)personaJSON := "{}"if cfg != nil {- if encoded, err := json.Marshal(BuildPersona(cfg.UserAgent, cfg.ChromeVersion)); err == nil {+ if encoded, err := json.Marshal(BuildPersona(cfg.UserAgent, cfg.BrowserVersion)); err == nil {personaJSON = string(encoded)}}@@ -209,7 +209,7 @@ func statusFlags(bundle *Bundle, cfg *config.RuntimeConfig) map[string]bool {var extraFlags []stringheadless := falseif cfg != nil {- extraFlags = config.AllowedChromeExtraFlags(cfg.ChromeExtraFlags)+ extraFlags = config.AllowedBrowserExtraFlags(cfg.BrowserExtraFlags)headless = cfg.Headless}diff --git a/internal/stealth/bundle_test.go b/internal/stealth/bundle_test.goindex 41ff8028..d6f90850 100644--- a/internal/stealth/bundle_test.go+++ b/internal/stealth/bundle_test.go@@ -35,7 +35,7 @@ func TestNewBundleIncludesSeedLevelAndPopupGuard(t *testing.T) {}func TestScriptHashStableAcrossSeeds(t *testing.T) {- cfg := &config.RuntimeConfig{StealthLevel: "full", ChromeVersion: "144.0.7559.133"}+ cfg := &config.RuntimeConfig{StealthLevel: "full", BrowserVersion: "144.0.7559.133"}first := NewBundle(cfg, 111)second := NewBundle(cfg, 222)if first.ScriptHash != second.ScriptHash {@@ -128,7 +128,7 @@ func TestResolveUserAgent(t *testing.T) {}func TestBuildLaunchContractOwnsStealthLaunchFlags(t *testing.T) {- launch := BuildLaunchContract(&config.RuntimeConfig{ChromeVersion: "144.0.0.0"}, LevelLight)+ launch := BuildLaunchContract(&config.RuntimeConfig{BrowserVersion: "144.0.0.0"}, LevelLight)for _, want := range []string{"--enable-automation=false","--disable-blink-features=AutomationControlled",@@ -145,7 +145,7 @@ func TestBuildLaunchContractOwnsStealthLaunchFlags(t *testing.T) {t.Fatalf("did not expect a pinned user-agent without a custom UA, got %v", launch.Args)}// With an explicit custom UA, the launch contract owns --user-agent.- custom := BuildLaunchContract(&config.RuntimeConfig{ChromeVersion: "144.0.0.0", UserAgent: "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/144.0.0.0 Safari/537.36"}, LevelLight)+ custom := BuildLaunchContract(&config.RuntimeConfig{BrowserVersion: "144.0.0.0", UserAgent: "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/144.0.0.0 Safari/537.36"}, LevelLight)if !HasLaunchArgPrefix(custom.Args, "--user-agent=Mozilla/5.0") {t.Fatalf("expected an explicit custom UA to pin --user-agent, got %v", custom.Args)}diff --git a/internal/stealth/emulation.go b/internal/stealth/emulation.goindex e8bf9f29..e1b3c032 100644--- a/internal/stealth/emulation.go+++ b/internal/stealth/emulation.go@@ -70,7 +70,7 @@ func ApplyTargetEmulation(ctx context.Context, cfg *config.RuntimeConfig, userAgreturn fmt.Errorf("automation override: %w", err)}- if localeOverride := BuildLocaleOverride(userAgent, cfg.ChromeVersion); localeOverride != nil {+ if localeOverride := BuildLocaleOverride(userAgent, cfg.BrowserVersion); localeOverride != nil {if err := localeOverride.Do(ctx); err != nil {return fmt.Errorf("locale override: %w", err)}@@ -84,7 +84,7 @@ func ApplyTargetEmulation(ctx context.Context, cfg *config.RuntimeConfig, userAg// full_version field) an empty uaFullVersion — whereas the native hints are// correct and self-consistent.if strings.TrimSpace(userAgent) != "" {- if uaOverride := BuildUserAgentOverride(userAgent, cfg.ChromeVersion); uaOverride != nil {+ if uaOverride := BuildUserAgentOverride(userAgent, cfg.BrowserVersion); uaOverride != nil {if err := uaOverride.Do(ctx); err != nil {return fmt.Errorf("user agent override: %w", err)}diff --git a/internal/stealth/launch.go b/internal/stealth/launch.goindex b99d32aa..c5e3eedf 100644--- a/internal/stealth/launch.go+++ b/internal/stealth/launch.go@@ -25,7 +25,7 @@ func BuildLaunchContract(cfg *config.RuntimeConfig, level Level) LaunchContractcustomUA := ""headless := falseif cfg != nil {- persona = BuildPersona(cfg.UserAgent, cfg.ChromeVersion)+ persona = BuildPersona(cfg.UserAgent, cfg.BrowserVersion)customUA = strings.TrimSpace(cfg.UserAgent)headless = cfg.Headless}diff --git a/internal/stealth/ua.go b/internal/stealth/ua.goindex 76cbaad4..9d58d97c 100644--- a/internal/stealth/ua.go+++ b/internal/stealth/ua.go@@ -31,12 +31,12 @@ type BrowserPersona struct {UserAgentData UserAgentDataProfile `json:"userAgentData"`}-// ReducedChromeVersion returns the UA-reduced (v100+) "<major>.0.0.0" form+// ReducedBrowserVersion returns the UA-reduced (v100+) "<major>.0.0.0" form// of a Chrome version string. navigator.userAgent in real Chrome never carries// the full build — exposing it is a fingerprint tell. The full build still// lives in the high-entropy UA Client Hints. Falls back to the default major// when chromeVersion is empty so all callers agree on a single value.-func ReducedChromeVersion(chromeVersion string) string {+func ReducedBrowserVersion(chromeVersion string) string {major := chromeVersionif i := strings.Index(chromeVersion, "."); i > 0 {major = chromeVersion[:i]@@ -66,7 +66,7 @@ func ResolveUserAgent(userAgent, chromeVersion string) string {}func BuildPersona(userAgent, chromeVersion string) BrowserPersona {- reduced := ReducedChromeVersion(chromeVersion)+ reduced := ReducedBrowserVersion(chromeVersion)major := reducedif i := strings.Index(reduced, "."); i > 0 {major = reduced[:i]