High-performance browser automation bridge and multi-instance orchestrator with advanced stealth injection and real-time dashboard.
Merge pull request #274 from pinchtab/feat/navigation-history
luigiagent64111ef50bf9
diff --git a/cmd/pinchtab/cmd_cli.go b/cmd/pinchtab/cmd_cli.goindex d6d1996e..f9a1b8b4 100644--- a/cmd/pinchtab/cmd_cli.go+++ b/cmd/pinchtab/cmd_cli.go@@ -37,6 +37,39 @@ var navCmd = &cobra.Command{},}+var backCmd = &cobra.Command{+ Use: "back",+ Short: "Go back in browser history",+ Run: func(cmd *cobra.Command, args []string) {+ cfg := config.Load()+ runCLIWith(cfg, func(client *http.Client, base, token string) {+ browseractions.Back(client, base, token, cmd)+ })+ },+}++var forwardCmd = &cobra.Command{+ Use: "forward",+ Short: "Go forward in browser history",+ Run: func(cmd *cobra.Command, args []string) {+ cfg := config.Load()+ runCLIWith(cfg, func(client *http.Client, base, token string) {+ browseractions.Forward(client, base, token, cmd)+ })+ },+}++var reloadCmd = &cobra.Command{+ Use: "reload",+ Short: "Reload current page",+ Run: func(cmd *cobra.Command, args []string) {+ cfg := config.Load()+ runCLIWith(cfg, func(client *http.Client, base, token string) {+ browseractions.Reload(client, base, token, cmd)+ })+ },+}+var snapCmd = &cobra.Command{Use: "snap",Short: "Snapshot accessibility tree",@@ -281,6 +314,9 @@ var selectCmd = &cobra.Command{func init() {quickCmd.GroupID = "browser"navCmd.GroupID = "browser"+ backCmd.GroupID = "browser"+ forwardCmd.GroupID = "browser"+ reloadCmd.GroupID = "browser"snapCmd.GroupID = "browser"clickCmd.GroupID = "browser"typeCmd.GroupID = "browser"@@ -384,6 +420,9 @@ func init() {navCmd.Flags().Bool("block-images", false, "Block image loading")navCmd.Flags().Bool("block-ads", false, "Block ads")navCmd.Flags().String("tab", "", "Tab ID")+ backCmd.Flags().String("tab", "", "Tab ID")+ forwardCmd.Flags().String("tab", "", "Tab ID")+ reloadCmd.Flags().String("tab", "", "Tab ID")clickCmd.Flags().String("tab", "", "Tab ID")hoverCmd.Flags().String("tab", "", "Tab ID")@@ -396,6 +435,9 @@ func init() {rootCmd.AddCommand(quickCmd)rootCmd.AddCommand(navCmd)+ rootCmd.AddCommand(backCmd)+ rootCmd.AddCommand(forwardCmd)+ rootCmd.AddCommand(reloadCmd)rootCmd.AddCommand(snapCmd)rootCmd.AddCommand(clickCmd)rootCmd.AddCommand(typeCmd)diff --git a/docs/commands.md b/docs/commands.mdindex 25a18b39..3fea692b 100644--- a/docs/commands.md+++ b/docs/commands.md@@ -26,6 +26,15 @@ pinchtab nav <url> --block-ads # Navigate with ad blockingpinchtab quick <url> # Navigate + snapshot accessibility tree```+```+pinchtab back # Go back in browser history+pinchtab back --tab <id> # Go back in specific tab+pinchtab forward # Go forward in browser history+pinchtab forward --tab <id> # Go forward in specific tab+pinchtab reload # Reload current page+pinchtab reload --tab <id> # Reload specific tab+```+Hidden aliases: `goto`, `navigate`, `open`## Tab Managementdiff --git a/docs/endpoints.md b/docs/endpoints.mdindex bd74071d..e4930c1d 100644--- a/docs/endpoints.md+++ b/docs/endpoints.md@@ -18,12 +18,26 @@ GET /api/events # SSE event stream (dashboard)```POST /navigate # Navigate current tab to URLGET /navigate?url=<url> # Navigate (GET variant)-GET /nav?url=<url> # Navigate (short alias)+POST /tabs/{id}/navigate # Navigate a specific tab```Body: `{"url": "...", "timeout": 60, "blockImages": true, "newTab": true, "blockAds": true}`+## History & Reload++```+POST /back # Go back in current tab+POST /back?tabId=<id> # Go back in specific tab+POST /tabs/{id}/back # Go back (tab-scoped)+POST /forward # Go forward in current tab+POST /forward?tabId=<id> # Go forward in specific tab+POST /tabs/{id}/forward # Go forward (tab-scoped)+POST /reload # Reload current tab+POST /reload?tabId=<id> # Reload specific tab+POST /tabs/{id}/reload # Reload (tab-scoped)+```+## Tab Management```diff --git a/internal/cli/actions/actions_navigate.go b/internal/cli/actions/actions_navigate.goindex 43aa8109..1fd44cc8 100644--- a/internal/cli/actions/actions_navigate.go+++ b/internal/cli/actions/actions_navigate.go@@ -7,6 +7,36 @@ import ("net/http")+// Back navigates the current (or specified) tab back in history.+func Back(client *http.Client, base, token string, cmd *cobra.Command) {+ tabID, _ := cmd.Flags().GetString("tab")+ path := "/back"+ if tabID != "" {+ path = fmt.Sprintf("/tabs/%s/back", tabID)+ }+ apiclient.DoPost(client, base, token, path, nil)+}++// Forward navigates the current (or specified) tab forward in history.+func Forward(client *http.Client, base, token string, cmd *cobra.Command) {+ tabID, _ := cmd.Flags().GetString("tab")+ path := "/forward"+ if tabID != "" {+ path = fmt.Sprintf("/tabs/%s/forward", tabID)+ }+ apiclient.DoPost(client, base, token, path, nil)+}++// Reload reloads the current (or specified) tab.+func Reload(client *http.Client, base, token string, cmd *cobra.Command) {+ tabID, _ := cmd.Flags().GetString("tab")+ path := "/reload"+ if tabID != "" {+ path = fmt.Sprintf("/tabs/%s/reload", tabID)+ }+ apiclient.DoPost(client, base, token, path, nil)+}+func Navigate(client *http.Client, base, token string, url string, cmd *cobra.Command) {body := map[string]any{"url": url}if v, _ := cmd.Flags().GetBool("new-tab"); v {diff --git a/internal/handlers/handlers.go b/internal/handlers/handlers.goindex 3b58e2c6..11da37cd 100644--- a/internal/handlers/handlers.go+++ b/internal/handlers/handlers.go@@ -97,6 +97,9 @@ func (h *Handlers) RegisterRoutes(mux *http.ServeMux, doShutdown func()) {mux.HandleFunc("POST /ensure-chrome", h.HandleEnsureChrome)mux.HandleFunc("GET /tabs", h.HandleTabs)mux.HandleFunc("POST /tabs/{id}/navigate", h.HandleTabNavigate)+ mux.HandleFunc("POST /tabs/{id}/back", h.HandleTabBack)+ mux.HandleFunc("POST /tabs/{id}/forward", h.HandleTabForward)+ mux.HandleFunc("POST /tabs/{id}/reload", h.HandleTabReload)mux.HandleFunc("GET /tabs/{id}/snapshot", h.HandleTabSnapshot)mux.HandleFunc("GET /tabs/{id}/screenshot", h.HandleTabScreenshot)mux.HandleFunc("POST /tabs/{id}/action", h.HandleTabAction)@@ -115,7 +118,10 @@ func (h *Handlers) RegisterRoutes(mux *http.ServeMux, doShutdown func()) {mux.HandleFunc("GET /openapi.json", h.HandleOpenAPI)mux.HandleFunc("POST /navigate", h.HandleNavigate)mux.HandleFunc("GET /navigate", h.HandleNavigate)- mux.HandleFunc("GET /nav", h.HandleNavigate)++ mux.HandleFunc("POST /back", h.HandleBack)+ mux.HandleFunc("POST /forward", h.HandleForward)+ mux.HandleFunc("POST /reload", h.HandleReload)mux.HandleFunc("POST /action", h.HandleAction)mux.HandleFunc("GET /action", h.HandleAction)mux.HandleFunc("POST /actions", h.HandleActions)diff --git a/internal/handlers/navigation.go b/internal/handlers/navigation.goindex 36cf6431..42fd2cda 100644--- a/internal/handlers/navigation.go+++ b/internal/handlers/navigation.go@@ -13,6 +13,7 @@ import ("strings""time"+ "github.com/chromedp/cdproto/page""github.com/chromedp/chromedp""github.com/pinchtab/pinchtab/internal/bridge""github.com/pinchtab/pinchtab/internal/engine"@@ -426,3 +427,119 @@ func (h *Handlers) HandleTab(w http.ResponseWriter, r *http.Request) {web.Error(w, 400, fmt.Errorf("action must be 'new', 'close', or 'focus'"))}}++// HandleTabBack navigates a specific tab back in history.+func (h *Handlers) HandleTabBack(w http.ResponseWriter, r *http.Request) {+ q := r.URL.Query()+ q.Set("tabId", r.PathValue("id"))+ r.URL.RawQuery = q.Encode()+ h.HandleBack(w, r)+}++// HandleTabForward navigates a specific tab forward in history.+func (h *Handlers) HandleTabForward(w http.ResponseWriter, r *http.Request) {+ q := r.URL.Query()+ q.Set("tabId", r.PathValue("id"))+ r.URL.RawQuery = q.Encode()+ h.HandleForward(w, r)+}++// HandleTabReload reloads a specific tab.+func (h *Handlers) HandleTabReload(w http.ResponseWriter, r *http.Request) {+ q := r.URL.Query()+ q.Set("tabId", r.PathValue("id"))+ r.URL.RawQuery = q.Encode()+ h.HandleReload(w, r)+}++// HandleBack navigates the current (or specified) tab back in history.+func (h *Handlers) HandleBack(w http.ResponseWriter, r *http.Request) {+ tabID := r.URL.Query().Get("tabId")+ ctx, resolvedID, err := h.Bridge.TabContext(tabID)+ if err != nil {+ web.Error(w, 404, err)+ return+ }++ // Use CDP directly instead of chromedp.NavigateBack() which wraps in+ // responseAction() and waits for Page.loadEventFired — hangs indefinitely.+ var noHistory bool+ if err := chromedp.Run(ctx, chromedp.ActionFunc(func(ctx context.Context) error {+ cur, entries, err := page.GetNavigationHistory().Do(ctx)+ if err != nil {+ return fmt.Errorf("get history: %w", err)+ }+ if cur <= 0 || cur > int64(len(entries)-1) {+ noHistory = true+ return nil+ }+ return page.NavigateToHistoryEntry(entries[cur-1].ID).Do(ctx)+ })); err != nil {+ web.Error(w, 500, fmt.Errorf("back: %w", err))+ return+ }+ if !noHistory {+ time.Sleep(200 * time.Millisecond)+ }++ var curURL string+ _ = chromedp.Run(ctx, chromedp.Location(&curURL))+ web.JSON(w, 200, map[string]any{"tabId": resolvedID, "url": curURL})+}++// HandleForward navigates the current (or specified) tab forward in history.+func (h *Handlers) HandleForward(w http.ResponseWriter, r *http.Request) {+ tabID := r.URL.Query().Get("tabId")+ ctx, resolvedID, err := h.Bridge.TabContext(tabID)+ if err != nil {+ web.Error(w, 404, err)+ return+ }++ // Use CDP directly instead of chromedp.NavigateForward() which wraps in+ // responseAction() and waits for Page.loadEventFired — hangs indefinitely.+ var noHistory bool+ if err := chromedp.Run(ctx, chromedp.ActionFunc(func(ctx context.Context) error {+ cur, entries, err := page.GetNavigationHistory().Do(ctx)+ if err != nil {+ return fmt.Errorf("get history: %w", err)+ }+ if cur < 0 || cur >= int64(len(entries)-1) {+ noHistory = true+ return nil+ }+ return page.NavigateToHistoryEntry(entries[cur+1].ID).Do(ctx)+ })); err != nil {+ web.Error(w, 500, fmt.Errorf("forward: %w", err))+ return+ }+ if !noHistory {+ time.Sleep(200 * time.Millisecond)+ }++ var curURL string+ _ = chromedp.Run(ctx, chromedp.Location(&curURL))+ web.JSON(w, 200, map[string]any{"tabId": resolvedID, "url": curURL})+}++// HandleReload reloads the current (or specified) tab.+func (h *Handlers) HandleReload(w http.ResponseWriter, r *http.Request) {+ tabID := r.URL.Query().Get("tabId")+ ctx, resolvedID, err := h.Bridge.TabContext(tabID)+ if err != nil {+ web.Error(w, 404, err)+ return+ }++ if err := chromedp.Run(ctx, chromedp.ActionFunc(func(ctx context.Context) error {+ return page.Reload().Do(ctx)+ })); err != nil {+ web.Error(w, 500, fmt.Errorf("reload: %w", err))+ return+ }++ // Wait briefly for page to start loading+ var curURL string+ _ = chromedp.Run(ctx, chromedp.Location(&curURL))+ web.JSON(w, 200, map[string]any{"tabId": resolvedID, "url": curURL})+}diff --git a/internal/orchestrator/handlers.go b/internal/orchestrator/handlers.goindex 1bd0abd7..69c00678 100644--- a/internal/orchestrator/handlers.go+++ b/internal/orchestrator/handlers.go@@ -57,6 +57,9 @@ func (o *Orchestrator) RegisterHandlers(mux *http.ServeMux) {"POST /tabs/{id}/cookies","GET /tabs/{id}/metrics","POST /tabs/{id}/find",+ "POST /tabs/{id}/back",+ "POST /tabs/{id}/forward",+ "POST /tabs/{id}/reload",} {mux.HandleFunc(route, o.proxyTabRequest)}diff --git a/internal/strategy/autorestart/autorestart.go b/internal/strategy/autorestart/autorestart.goindex f0dfd54f..ecb8371a 100644--- a/internal/strategy/autorestart/autorestart.go+++ b/internal/strategy/autorestart/autorestart.go@@ -177,7 +177,8 @@ func (s *Strategy) RegisterRoutes(mux *http.ServeMux) {shorthandRoutes := []string{"GET /snapshot", "GET /screenshot", "GET /text", "GET /pdf", "POST /pdf",- "POST /navigate", "POST /action", "POST /actions",+ "POST /navigate", "POST /back", "POST /forward", "POST /reload",+ "POST /action", "POST /actions","POST /tab", "POST /tab/lock", "POST /tab/unlock","GET /cookies", "POST /cookies","GET /stealth/status", "POST /fingerprint/rotate",diff --git a/internal/strategy/explicit/explicit.go b/internal/strategy/explicit/explicit.goindex 1ecdc558..44b4d41c 100644--- a/internal/strategy/explicit/explicit.go+++ b/internal/strategy/explicit/explicit.go@@ -43,7 +43,8 @@ func (s *Strategy) RegisterRoutes(mux *http.ServeMux) {// Shorthand endpoints proxy to first running instance.shorthandRoutes := []string{"GET /snapshot", "GET /screenshot", "GET /text", "GET /pdf", "POST /pdf",- "POST /navigate", "POST /action", "POST /actions",+ "POST /navigate", "POST /back", "POST /forward", "POST /reload",+ "POST /action", "POST /actions","POST /tab", "POST /tab/lock", "POST /tab/unlock","GET /cookies", "POST /cookies","GET /stealth/status", "POST /fingerprint/rotate",diff --git a/internal/strategy/simple/simple.go b/internal/strategy/simple/simple.goindex e84e9e6f..f72574eb 100644--- a/internal/strategy/simple/simple.go+++ b/internal/strategy/simple/simple.go@@ -51,7 +51,8 @@ func (s *Strategy) RegisterRoutes(mux *http.ServeMux) {// Shorthand endpoints — all proxy to first running instance.shorthandRoutes := []string{"GET /snapshot", "GET /screenshot", "GET /text", "GET /pdf", "POST /pdf",- "POST /navigate", "POST /action", "POST /actions",+ "POST /navigate", "POST /back", "POST /forward", "POST /reload",+ "POST /action", "POST /actions","POST /tab", "POST /tab/lock", "POST /tab/unlock","GET /cookies", "POST /cookies","GET /stealth/status", "POST /fingerprint/rotate",diff --git a/tests/e2e/scenarios-cli/16-nav-history.sh b/tests/e2e/scenarios-cli/16-nav-history.shnew file mode 100755index 00000000..b81da89d--- /dev/null+++ b/tests/e2e/scenarios-cli/16-nav-history.sh@@ -0,0 +1,54 @@+#!/bin/bash+# 16-nav-history.sh — CLI navigation history commands (back, forward, reload)++source "$(dirname "$0")/common.sh"++# ─────────────────────────────────────────────────────────────────+start_test "pinchtab back (no history)"++pt_ok back+assert_output_json "back returns JSON"+assert_output_contains "tabId" "response contains tabId"+assert_output_contains "url" "response contains url"++end_test++# ─────────────────────────────────────────────────────────────────+start_test "pinchtab back (navigate two pages then back)"++# Navigate to page A+pt_ok nav "${FIXTURES_URL}/index.html"+TAB_ID=$(echo "$PT_OUT" | jq -r '.tabId')+URL_A=$(echo "$PT_OUT" | jq -r '.url')++# Navigate to page B+pt_ok nav "${FIXTURES_URL}/form.html" --tab "$TAB_ID"+URL_B=$(echo "$PT_OUT" | jq -r '.url')++# Go back to page A+pt_ok back --tab "$TAB_ID"+assert_output_json "back returns JSON"+assert_output_contains "index.html" "back returned to index.html"+assert_output_contains "$TAB_ID" "back response contains correct tabId"++end_test++# ─────────────────────────────────────────────────────────────────+start_test "pinchtab forward"++pt_ok forward --tab "$TAB_ID"+assert_output_json "forward returns JSON"+assert_output_contains "form.html" "forward returned to form.html"+assert_output_contains "$TAB_ID" "forward response contains correct tabId"++end_test++# ─────────────────────────────────────────────────────────────────+start_test "pinchtab reload"++pt_ok reload --tab "$TAB_ID"+assert_output_json "reload returns JSON"+assert_output_contains "form.html" "reload kept same page"+assert_output_contains "$TAB_ID" "reload response contains correct tabId"++end_testdiff --git a/tests/e2e/scenarios-recent/44-nav-history.sh b/tests/e2e/scenarios-recent/44-nav-history.shnew file mode 100755index 00000000..cad7629c--- /dev/null+++ b/tests/e2e/scenarios-recent/44-nav-history.sh@@ -0,0 +1,108 @@+#!/bin/bash+# Test: Navigation history (back, forward, reload)+# Tests for `POST /back`, `POST /forward`, `POST /reload` commands+source "$(dirname "$0")/common.sh"++# --- T1: Navigate back to previous page ---+start_test "Navigate back to previous page"++# Navigate to page A (index.html)+pt_post /navigate "{\"url\":\"${FIXTURES_URL}/index.html\"}"+assert_ok "navigate to index.html"+TAB_ID=$(echo "$RESULT" | jq -r '.tabId // empty')+assert_tab_id "get tab ID"+show_tab "TAB_ID" "$TAB_ID"+URL_A=$(echo "$RESULT" | jq -r '.url // empty')+echo -e " ${MUTED}URL_A: $URL_A${NC}"++# Navigate same tab to page B (form.html) — must pass tabId to reuse tab+pt_post /navigate "{\"url\":\"${FIXTURES_URL}/form.html\",\"tabId\":\"${TAB_ID}\"}"+assert_ok "navigate to form.html"+URL_B=$(echo "$RESULT" | jq -r '.url // empty')+echo -e " ${MUTED}URL_B: $URL_B${NC}"++# Go back — should return to page A+pt_post "/back?tabId=${TAB_ID}" ''+assert_ok "POST /back"+RESULT_URL=$(echo "$RESULT" | jq -r '.url // empty')+assert_json_contains "$RESULT" ".url" "index.html" "back returned to index.html"+assert_json_contains "$RESULT" ".tabId" "$TAB_ID" "back response contains tabId"++end_test++# --- T2: Navigate forward after back ---+start_test "Navigate forward after back"++# Go forward on same tab to page B+pt_post "/forward?tabId=${TAB_ID}" ''+assert_ok "POST /forward"+RESULT_URL=$(echo "$RESULT" | jq -r '.url // empty')+assert_json_contains "$RESULT" ".url" "form.html" "forward returned to form.html"+assert_json_contains "$RESULT" ".tabId" "$TAB_ID" "forward response contains tabId"++end_test++# --- T3: Reload page stays on same URL ---+start_test "Reload page stays on same URL"++# Reload the same tab (should still be on form.html from T2)+pt_post "/reload?tabId=${TAB_ID}" ''+assert_ok "POST /reload"+RESULT_URL=$(echo "$RESULT" | jq -r '.url // empty')+assert_json_contains "$RESULT" ".url" "form.html" "reload stayed on form.html"+assert_json_contains "$RESULT" ".tabId" "$TAB_ID" "reload response contains tabId"++end_test++# --- T4: Back with tabId parameter ---+start_test "Back with tabId parameter"++# Navigate tab to page A+pt_post /navigate "{\"url\":\"${FIXTURES_URL}/index.html\",\"tabId\":\"${TAB_ID}\"}"+assert_ok "navigate to index.html with tabId"++# Navigate to page B+pt_post /navigate "{\"url\":\"${FIXTURES_URL}/form.html\",\"tabId\":\"${TAB_ID}\"}"+assert_ok "navigate to form.html with tabId"++# Go back using tabId query parameter+pt_post "/back?tabId=${TAB_ID}" ''+assert_ok "POST /back?tabId=<id>"+assert_json_contains "$RESULT" ".url" "index.html" "back with tabId returned to index.html"+assert_json_contains "$RESULT" ".tabId" "$TAB_ID" "back with tabId response contains correct tabId"++end_test++# --- T5: Tab-scoped back using path parameter ---+start_test "Tab-scoped back using path parameter"++# Navigate to form.html+pt_post /navigate "{\"url\":\"${FIXTURES_URL}/form.html\",\"tabId\":\"${TAB_ID}\"}"+assert_ok "navigate to form.html"++# Go back using path-scoped endpoint /tabs/{id}/back+pt_post "/tabs/${TAB_ID}/back" ''+assert_ok "POST /tabs/{id}/back"+assert_json_contains "$RESULT" ".url" "index.html" "path-scoped back returned to index.html"+assert_json_contains "$RESULT" ".tabId" "$TAB_ID" "path-scoped back response contains correct tabId"++end_test++# --- T6: Back with no history stays on same page ---+start_test "Back with no history stays on same page"++# Create a new tab and navigate to one page only+pt_post /navigate "{\"url\":\"${FIXTURES_URL}/buttons.html\"}"+assert_ok "navigate to buttons.html"+NEW_TAB_ID=$(echo "$RESULT" | jq -r '.tabId // empty')+URL_SINGLE=$(echo "$RESULT" | jq -r '.url // empty')+show_tab "NEW_TAB_ID" "$NEW_TAB_ID"++# Try to go back with no history — should stay on same page+pt_post "/back?tabId=${NEW_TAB_ID}" ''+assert_ok "POST /back with no history (should stay on same page)"+RESULT_URL=$(echo "$RESULT" | jq -r '.url // empty')+assert_json_contains "$RESULT" ".url" "buttons.html" "back with no history stayed on same page"+assert_json_contains "$RESULT" ".tabId" "$NEW_TAB_ID" "back with no history response contains correct tabId"++end_test