High-performance browser automation bridge and multi-instance orchestrator with advanced stealth injection and real-time dashboard.
fix: gate detached start on the resolved address, not flag presence
Luigi Agosti39fe9a08cf1a
diff --git a/cmd/pinchtab/cmd_server.go b/cmd/pinchtab/cmd_server.goindex 08064d22..e8450154 100644--- a/cmd/pinchtab/cmd_server.go+++ b/cmd/pinchtab/cmd_server.go@@ -32,7 +32,7 @@ var serverCmd = &cobra.Command{bind, _ := cmd.Flags().GetString("bind")port, _ := cmd.Flags().GetString("port")- applyServerAddressFlags(cfg, bind, port)+ addressChanged := detachedAddressChanged(cfg, bind, port)yolo, _ := cmd.Flags().GetBool("yolo")if yolo {@@ -79,7 +79,7 @@ var serverCmd = &cobra.Command{Browser: browserName,Bind: bind,Port: port,- }); err != nil {+ }, addressChanged); err != nil {fmt.Fprintln(os.Stderr, cli.StyleStderr(cli.ErrorStyle, err.Error()))os.Exit(1)}@@ -101,6 +101,12 @@ func applyServerAddressFlags(cfg *config.RuntimeConfig, bind, port string) {}}+func detachedAddressChanged(cfg *config.RuntimeConfig, bind, port string) bool {+ daemonBind, daemonPort := cfg.Bind, cfg.Port+ applyServerAddressFlags(cfg, bind, port)+ return cfg.Bind != daemonBind || cfg.Port != daemonPort+}+// resolveLogLevel settles a run's threshold from the only inputs that carry it, in// precedence order: --log-level, then server.logLevel from the config file, then// -v, then the default. It is the one place that decides that precedence, and nodiff --git a/cmd/pinchtab/cmd_server_background.go b/cmd/pinchtab/cmd_server_background.goindex a0c72c06..d3d9553f 100644--- a/cmd/pinchtab/cmd_server_background.go+++ b/cmd/pinchtab/cmd_server_background.go@@ -82,12 +82,8 @@ func detachedDaemonOwnership() (bool, error) {return installed, nil}-func (o serverBackgroundOptions) addressOverridden() bool {- return strings.TrimSpace(o.Bind) != "" || strings.TrimSpace(o.Port) != ""-}--func requireDetachedServerOwnership(action string, addressOverridden bool) error {- if addressOverridden {+func requireDetachedServerOwnership(action string, addressChanged bool) error {+ if addressChanged {return nil}installed, err := detachedDaemonOwnership()@@ -95,7 +91,7 @@ func requireDetachedServerOwnership(action string, addressOverridden bool) errorreturn fmt.Errorf("cannot determine background-service ownership; refusing %s: %w", action, err)}if installed {- return fmt.Errorf("background service is installed; use `pinchtab daemon start` so one service manager owns the server, or pass --bind/--port to run a separate detached server")+ return fmt.Errorf("background service is installed; use `pinchtab daemon start` so one service manager owns the server, or pass --bind/--port with a different address to run a separate detached server")}return nil}@@ -115,7 +111,7 @@ func runServerRestart(cfg *config.RuntimeConfig) error {}}fmt.Println("Starting server...")- return runServerBackground(cfg, serverBackgroundOptions{})+ return runServerBackground(cfg, serverBackgroundOptions{}, false)}func stateDirForConfig(cfg *config.RuntimeConfig) string {@@ -167,8 +163,8 @@ func spawnDetachedChild(binary string, args []string, out *os.File) (int, error)return pid, nil}-func runServerBackground(cfg *config.RuntimeConfig, opts serverBackgroundOptions) error {- if err := requireDetachedServerOwnership("background start", opts.addressOverridden()); err != nil {+func runServerBackground(cfg *config.RuntimeConfig, opts serverBackgroundOptions, addressChanged bool) error {+ if err := requireDetachedServerOwnership("background start", addressChanged); err != nil {return err}diff --git a/cmd/pinchtab/cmd_server_background_test.go b/cmd/pinchtab/cmd_server_background_test.goindex b372fe45..7ceed38f 100644--- a/cmd/pinchtab/cmd_server_background_test.go+++ b/cmd/pinchtab/cmd_server_background_test.go@@ -39,37 +39,42 @@ func TestDetachedDaemonOwnershipTreatsUnsupportedOSAsNotInstalled(t *testing.T)}}-func TestServerBackgroundOptionsAddressOverridden(t *testing.T) {+func TestDetachedAddressChanged(t *testing.T) {cases := []struct {- name string- opts serverBackgroundOptions- want bool+ name string+ bind, port string+ flagBind string+ flagPort string+ want bool}{- {"default", serverBackgroundOptions{}, false},- {"port", serverBackgroundOptions{Port: "9880"}, true},- {"bind", serverBackgroundOptions{Bind: "0.0.0.0"}, true},- {"blank", serverBackgroundOptions{Bind: " ", Port: " "}, false},+ {"no flags", "127.0.0.1", "9867", "", "", false},+ {"port equals default", "127.0.0.1", "9867", "", "9867", false},+ {"bind equals default", "127.0.0.1", "9867", "127.0.0.1", "", false},+ {"blank flags", "127.0.0.1", "9867", " ", " ", false},+ {"port differs", "127.0.0.1", "9867", "", "5000", true},+ {"bind differs", "127.0.0.1", "9867", "0.0.0.0", "", true},}for _, tc := range cases {t.Run(tc.name, func(t *testing.T) {- if got := tc.opts.addressOverridden(); got != tc.want {- t.Fatalf("addressOverridden() = %v, want %v", got, tc.want)+ cfg := &config.RuntimeConfig{Bind: tc.bind, Port: tc.port}+ if got := detachedAddressChanged(cfg, tc.flagBind, tc.flagPort); got != tc.want {+ t.Fatalf("detachedAddressChanged() = %v, want %v", got, tc.want)}})}}-func TestRequireDetachedServerOwnershipAllowsAddressOverride(t *testing.T) {+func TestRequireDetachedServerOwnershipAllowsChangedAddress(t *testing.T) {original := daemonInstallationStatusdefer func() { daemonInstallationStatus = original }()daemonInstallationStatus = func() (bool, error) { return true, nil }if err := requireDetachedServerOwnership("background start", true); err != nil {- t.Fatalf("an explicit address override must bypass the ownership gate, got %v", err)+ t.Fatalf("a genuinely different address must bypass the ownership gate, got %v", err)}err := requireDetachedServerOwnership("background start", false)if err == nil || !strings.Contains(err.Error(), "pinchtab daemon start") {- t.Fatalf("default address must still defer to the installed daemon, got %v", err)+ t.Fatalf("the daemon-owned address must still defer to the installed daemon, got %v", err)}}@@ -98,7 +103,7 @@ func TestDetachedServerStartsRefuseInstalledOrUnknownServiceOwnership(t *testing}{{name: "background installed", installed: true,- start: func() error { return runServerBackground(&config.RuntimeConfig{}, serverBackgroundOptions{}) },+ start: func() error { return runServerBackground(&config.RuntimeConfig{}, serverBackgroundOptions{}, false) },want: "pinchtab daemon start",},{