Skip to content

High-performance browser automation bridge and multi-instance orchestrator with advanced stealth injection and real-time dashboard.

refactor(cli): add --tab flag to all commands, remove tabs legacy router

Boscha55f91b6675c
diff --git a/cmd/pinchtab/cmd_cli.go b/cmd/pinchtab/cmd_cli.go
index 1dae251d..7f272996 100644
--- a/cmd/pinchtab/cmd_cli.go
+++ b/cmd/pinchtab/cmd_cli.go
@@ -66,11 +66,11 @@ var clickCmd = &cobra.Command{
var typeCmd = &cobra.Command{
Use: "type <ref> <text>",
Short: "Type into element",
- Args: cobra.ExactArgs(2),
+ Args: cobra.MinimumNArgs(2),
Run: func(cmd *cobra.Command, args []string) {
cfg := config.Load()
runCLIWith(cfg, func(client *http.Client, base, token string) {
- browseractions.Action(client, base, token, "type", args)
+ browseractions.ActionSimpleWithFlags(client, base, token, "type", args, cmd)
})
},
}
@@ -92,7 +92,7 @@ var tabsCmd = &cobra.Command{
Run: func(cmd *cobra.Command, args []string) {
cfg := config.Load()
runCLIWith(cfg, func(client *http.Client, base, token string) {
- browseractions.Tabs(client, base, token, args)
+ browseractions.Tabs(client, base, token, nil)
})
},
}
@@ -122,11 +122,11 @@ var healthCmd = &cobra.Command{
var pressCmd = &cobra.Command{
Use: "press <key>",
Short: "Press key (Enter, Tab, Escape...)",
- Args: cobra.ExactArgs(1),
+ Args: cobra.MinimumNArgs(1),
Run: func(cmd *cobra.Command, args []string) {
cfg := config.Load()
runCLIWith(cfg, func(client *http.Client, base, token string) {
- browseractions.Action(client, base, token, "press", args)
+ browseractions.ActionSimpleWithFlags(client, base, token, "press", args, cmd)
})
},
}
@@ -134,11 +134,11 @@ var pressCmd = &cobra.Command{
var fillCmd = &cobra.Command{
Use: "fill <ref|selector> <text>",
Short: "Fill input directly",
- Args: cobra.ExactArgs(2),
+ Args: cobra.MinimumNArgs(2),
Run: func(cmd *cobra.Command, args []string) {
cfg := config.Load()
runCLIWith(cfg, func(client *http.Client, base, token string) {
- browseractions.Action(client, base, token, "fill", args)
+ browseractions.ActionSimpleWithFlags(client, base, token, "fill", args, cmd)
})
},
}
@@ -162,11 +162,11 @@ var hoverCmd = &cobra.Command{
var scrollCmd = &cobra.Command{
Use: "scroll <ref|pixels>",
Short: "Scroll to element or by pixels",
- Args: cobra.ExactArgs(1),
+ Args: cobra.MinimumNArgs(1),
Run: func(cmd *cobra.Command, args []string) {
cfg := config.Load()
runCLIWith(cfg, func(client *http.Client, base, token string) {
- browseractions.Action(client, base, token, "scroll", args)
+ browseractions.ActionSimpleWithFlags(client, base, token, "scroll", args, cmd)
})
},
}
@@ -178,7 +178,7 @@ var evalCmd = &cobra.Command{
Run: func(cmd *cobra.Command, args []string) {
cfg := config.Load()
runCLIWith(cfg, func(client *http.Client, base, token string) {
- browseractions.Evaluate(client, base, token, args)
+ browseractions.EvaluateWithFlags(client, base, token, args, cmd)
})
},
}
@@ -262,11 +262,11 @@ var findCmd = &cobra.Command{
var selectCmd = &cobra.Command{
Use: "select <ref> <value>",
Short: "Select option in dropdown",
- Args: cobra.ExactArgs(2),
+ Args: cobra.MinimumNArgs(2),
Run: func(cmd *cobra.Command, args []string) {
cfg := config.Load()
runCLIWith(cfg, func(client *http.Client, base, token string) {
- browseractions.Action(client, base, token, "select", args)
+ browseractions.ActionSimpleWithFlags(client, base, token, "select", args, cmd)
})
},
}
@@ -385,6 +385,16 @@ func init() {
navCmd.Flags().Bool("new-tab", false, "Open in new tab")
navCmd.Flags().Bool("block-images", false, "Block image loading")
navCmd.Flags().Bool("block-ads", false, "Block ads")
+ navCmd.Flags().String("tab", "", "Tab ID")
+
+ clickCmd.Flags().String("tab", "", "Tab ID")
+ hoverCmd.Flags().String("tab", "", "Tab ID")
+ typeCmd.Flags().String("tab", "", "Tab ID")
+ pressCmd.Flags().String("tab", "", "Tab ID")
+ fillCmd.Flags().String("tab", "", "Tab ID")
+ scrollCmd.Flags().String("tab", "", "Tab ID")
+ selectCmd.Flags().String("tab", "", "Tab ID")
+ evalCmd.Flags().String("tab", "", "Tab ID")
rootCmd.AddCommand(quickCmd)
rootCmd.AddCommand(navCmd)
diff --git a/internal/cli/actions/actions_element.go b/internal/cli/actions/actions_element.go
index 66e8fb23..140d3265 100644
--- a/internal/cli/actions/actions_element.go
+++ b/internal/cli/actions/actions_element.go
@@ -1,6 +1,7 @@
package actions
import (
+ "fmt"
"github.com/pinchtab/pinchtab/internal/cli"
"github.com/pinchtab/pinchtab/internal/cli/apiclient"
"github.com/spf13/cobra"
@@ -27,7 +28,60 @@ func ActionWithFlags(client *http.Client, base, token, kind, refArg string, cmd
}
}
- apiclient.DoPost(client, base, token, "/action", body)
+ tabID, _ := cmd.Flags().GetString("tab")
+ path := "/action"
+ if tabID != "" {
+ path = fmt.Sprintf("/tabs/%s/action", tabID)
+ }
+ apiclient.DoPost(client, base, token, path, body)
+}
+
+func ActionSimpleWithFlags(client *http.Client, base, token, kind string, args []string, cmd *cobra.Command) {
+ body := map[string]any{"kind": kind}
+
+ switch kind {
+ case "type":
+ body["ref"] = args[0]
+ body["text"] = strings.Join(args[1:], " ")
+ case "fill":
+ if strings.HasPrefix(args[0], "e") {
+ body["ref"] = args[0]
+ } else {
+ body["selector"] = args[0]
+ }
+ body["text"] = strings.Join(args[1:], " ")
+ case "press":
+ body["key"] = args[0]
+ case "scroll":
+ if strings.HasPrefix(args[0], "e") {
+ body["ref"] = args[0]
+ } else if px, err := strconv.Atoi(args[0]); err == nil {
+ body["scrollY"] = px
+ } else {
+ switch strings.ToLower(args[0]) {
+ case "down":
+ body["scrollY"] = 800
+ case "up":
+ body["scrollY"] = -800
+ case "right":
+ body["scrollX"] = 800
+ case "left":
+ body["scrollX"] = -800
+ default:
+ cli.Fatal("Usage: pinchtab scroll <ref|pixels|direction> (e.g. e5, 800, or down)")
+ }
+ }
+ case "select":
+ body["ref"] = args[0]
+ body["value"] = args[1]
+ }
+
+ tabID, _ := cmd.Flags().GetString("tab")
+ path := "/action"
+ if tabID != "" {
+ path = fmt.Sprintf("/tabs/%s/action", tabID)
+ }
+ apiclient.DoPost(client, base, token, path, body)
}
func Action(client *http.Client, base, token, kind string, args []string) {
diff --git a/internal/cli/actions/actions_evaluate.go b/internal/cli/actions/actions_evaluate.go
index 387cff3e..b973074a 100644
--- a/internal/cli/actions/actions_evaluate.go
+++ b/internal/cli/actions/actions_evaluate.go
@@ -1,8 +1,10 @@
package actions
import (
+ "fmt"
"github.com/pinchtab/pinchtab/internal/cli"
"github.com/pinchtab/pinchtab/internal/cli/apiclient"
+ "github.com/spf13/cobra"
"net/http"
"strings"
)
@@ -16,3 +18,13 @@ func Evaluate(client *http.Client, base, token string, args []string) {
"expression": expr,
})
}
+
+func EvaluateWithFlags(client *http.Client, base, token string, args []string, cmd *cobra.Command) {
+ body := map[string]any{"expression": strings.Join(args, " ")}
+ tabID, _ := cmd.Flags().GetString("tab")
+ path := "/evaluate"
+ if tabID != "" {
+ path = fmt.Sprintf("/tabs/%s/evaluate", tabID)
+ }
+ apiclient.DoPost(client, base, token, path, body)
+}
diff --git a/internal/cli/actions/actions_navigate.go b/internal/cli/actions/actions_navigate.go
index 4b6fcd29..9f809fa6 100644
--- a/internal/cli/actions/actions_navigate.go
+++ b/internal/cli/actions/actions_navigate.go
@@ -1,6 +1,7 @@
package actions
import (
+ "fmt"
"github.com/pinchtab/pinchtab/internal/cli"
"github.com/pinchtab/pinchtab/internal/cli/apiclient"
"github.com/spf13/cobra"
@@ -37,6 +38,11 @@ func NavigateWithFlags(client *http.Client, base, token string, url string, cmd
if v, _ := cmd.Flags().GetBool("block-ads"); v {
body["blockAds"] = true
}
- result := apiclient.DoPost(client, base, token, "/navigate", body)
+ tabID, _ := cmd.Flags().GetString("tab")
+ path := "/navigate"
+ if tabID != "" {
+ path = fmt.Sprintf("/tabs/%s/navigate", tabID)
+ }
+ result := apiclient.DoPost(client, base, token, path, body)
apiclient.SuggestNextAction("navigate", result)
}