feat: unify e2e tests, achieve full CLI/MCP feature parity

- Merge simulator tests into e2e/ directory with comprehensive coverage
  of all 116 tools against real Safari via iOS Simulator
- Remove separate integration tests (proxy lifecycle now covered by e2e)
- Add missing CLI commands: restart-iwdp, query-selector, get-outer-html,
  browser-extensions-enable, browser-extensions-disable
- Split CLI into per-domain files for maintainability
- Update mcp_test.go expectedTools to verify all 116 MCP tools
- Simplify CI to two jobs: unit+smoke (ubuntu) and e2e (macos+simulator)
- Bump version to 0.5.0

Author: nnemirovsky

.claude-plugin/marketplace.json

@@ -1,6 +1,6 @@
 {
   "name": "iwdp-mcp",
-  "version": "0.4.1",
+  "version": "0.5.0",
   "description": "iOS Safari debugging via ios-webkit-debug-proxy — MCP server with full WebKit Inspector Protocol support",
   "owner": {
     "name": "nnemirovsky"

.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "iwdp-mcp",
-  "version": "0.4.1",
+  "version": "0.5.0",
   "description": "iOS Safari debugging via ios-webkit-debug-proxy — MCP server with full WebKit Inspector Protocol support",
   "mcpServers": {
     "iwdp-mcp": {

.github/workflows/test.yml

@@ -35,46 +35,6 @@ jobs:
           done
 
   e2e:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-go@v5
-        with:
-          go-version-file: go.mod
-
-      - name: Run e2e tests
-        run: go test ./e2e/ -v -count=1 -timeout=120s
-
-  integration:
-    runs-on: macos-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-go@v5
-        with:
-          go-version-file: go.mod
-
-      - name: Install ios-webkit-debug-proxy
-        run: brew install ios-webkit-debug-proxy
-
-      - name: Run all tests with integration tag and coverage
-        run: go test -tags=integration ./... -v -count=1 -timeout=120s -coverprofile=coverage-integration.out
-
-      - name: Integration coverage summary
-        run: |
-          total=$(go tool cover -func=coverage-integration.out | tail -1 | awk '{print $NF}')
-          echo "## Integration Test Coverage (includes all tests)" >> "$GITHUB_STEP_SUMMARY"
-          echo "" >> "$GITHUB_STEP_SUMMARY"
-          echo "**Total: ${total}**" >> "$GITHUB_STEP_SUMMARY"
-          echo "" >> "$GITHUB_STEP_SUMMARY"
-          echo "| Package | Coverage |" >> "$GITHUB_STEP_SUMMARY"
-          echo "|---------|----------|" >> "$GITHUB_STEP_SUMMARY"
-          go tool cover -func=coverage-integration.out | grep -v "total:" | awk -F'\t+' '{print $1, $NF}' | sort -u -t' ' -k1,1 | while read -r pkg cov; do
-            echo "| \`${pkg}\` | ${cov} |" >> "$GITHUB_STEP_SUMMARY"
-          done
-
-  simulator:
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v4
@@ -110,21 +70,21 @@ jobs:
           eval "$(./scripts/sim-setup.sh)"
           echo "IWDP_SIM_WS_URL=$IWDP_SIM_WS_URL" >> "$GITHUB_ENV"
 
-      - name: Run simulator tests with coverage
-        run: go test -tags=simulator ./... -v -count=1 -timeout=300s -coverprofile=coverage-simulator.out
+      - name: Run e2e tests with coverage
+        run: go test -tags=simulator ./e2e/ -v -count=1 -timeout=300s -coverprofile=coverage-e2e.out
 
-      - name: Simulator coverage summary
+      - name: E2E coverage summary
         if: always()
         run: |
-          if [ -f coverage-simulator.out ]; then
-            total=$(go tool cover -func=coverage-simulator.out | tail -1 | awk '{print $NF}')
-            echo "## Simulator Test Coverage" >> "$GITHUB_STEP_SUMMARY"
+          if [ -f coverage-e2e.out ]; then
+            total=$(go tool cover -func=coverage-e2e.out | tail -1 | awk '{print $NF}')
+            echo "## E2E Test Coverage" >> "$GITHUB_STEP_SUMMARY"
             echo "" >> "$GITHUB_STEP_SUMMARY"
             echo "**Total: ${total}**" >> "$GITHUB_STEP_SUMMARY"
             echo "" >> "$GITHUB_STEP_SUMMARY"
             echo "| Package | Coverage |" >> "$GITHUB_STEP_SUMMARY"
             echo "|---------|----------|" >> "$GITHUB_STEP_SUMMARY"
-            go tool cover -func=coverage-simulator.out | grep -v "total:" | awk -F'\t+' '{print $1, $NF}' | sort -u -t' ' -k1,1 | while read -r pkg cov; do
+            go tool cover -func=coverage-e2e.out | grep -v "total:" | awk -F'\t+' '{print $1, $NF}' | sort -u -t' ' -k1,1 | while read -r pkg cov; do
               echo "| \`${pkg}\` | ${cov} |" >> "$GITHUB_STEP_SUMMARY"
             done
           fi

CLAUDE.md

@@ -8,11 +8,9 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co
 go build ./...                    # Compile (quick check)
 make build                        # Compile to bin/iwdp-mcp + bin/iwdp-cli
 make install                      # Install both binaries via go install
-make test                         # Run all tests (go test ./... -v -count=1)
-make test-e2e                     # Run e2e tests (builds binaries, tests CLI + MCP server)
+make test                         # Run unit + smoke tests (go test ./... -v -count=1)
+make test-e2e                     # Run e2e tests (boots iOS Sim + iwdp, tests ALL tools)
 make test-coverage                # Run tests with coverage → coverage.html
-make test-integration             # Run integration tests (requires iwdp binary installed)
-make test-simulator               # Run simulator tests (boots iOS Sim + iwdp, tests all tools)
 make sim-setup                    # Boot iOS Simulator + iwdp (prints IWDP_SIM_WS_URL)
 make sim-teardown                 # Shut down simulator + iwdp
 make fmt                          # gofumpt -w . (format all Go files)
@@ -89,15 +87,13 @@ Two binaries, one shared `internal/` package tree:
 - All WebKit protocol communication goes through `webkit.Client`
 - Tools return structured results; formatting is done by the caller (MCP or CLI)
 - Unit tests use mock WebSocket server from `internal/webkit/testutil/`
-- E2E tests in `e2e/` build actual binaries and test CLI help/error paths + MCP server JSON-RPC initialization
-- Integration tests (`-tags=integration`) use the real `ios_webkit_debug_proxy` binary
-- Simulator tests (`-tags=simulator`) boot iOS Simulator + iwdp and test all tools against real Safari
+- E2E tests in `e2e/` cover CLI binary smoke tests, MCP server JSON-RPC, and simulator-based tool tests (`-tags=simulator`) that test ALL tools against real Safari via iOS Simulator + iwdp
 - Error messages should be actionable (tell the user what to do)
 - Network/Console/Timeline use collector patterns: `Start()` registers event handlers, `Get*()` returns collected data
 - gorilla/websocket is not concurrent-write-safe — `Client.writeMu` mutex protects `conn.WriteMessage`
-- Simulator tests share a single WebSocket connection via `sync.Once` (`getSimClient`) — never create multiple connections to the same page
+- E2E simulator tests share a single WebSocket connection via `sync.Once` (`getSimClient` in `e2e/sim_helpers_test.go`) — never create multiple connections to the same page
 - Use `simOrigin()` helper to get the page's actual origin for storage tests — never hardcode origins
-- Use `t.Skipf` (not `t.Fatalf`) for features that may not be supported in all WebKit versions
+- Almost never use `t.Skipf`/`t.Skip`. Use `t.Fatalf`/`t.Fatal` instead. Only skip when a feature is specifically proven unsupported (e.g., `CSS.getAllStyleSheets` through iwdp Target routing). The env-var check in `getSimClient` is the only legitimate `t.Skip` in e2e tests.
 
 ## Git Conventions
 

Makefile

@@ -1,4 +1,4 @@
-.PHONY: build test test-e2e test-integration test-simulator test-coverage \
+.PHONY: build test test-e2e test-coverage \
        sim-setup sim-teardown lint fmt tidy install clean release release-snapshot
 
 # Build
@@ -25,26 +25,20 @@ test-coverage:
 	go test ./... -coverprofile=coverage.out
 	go tool cover -html=coverage.out -o coverage.html
 
-test-e2e:
-	go test ./e2e/ -v -count=1 -timeout=120s
-
-test-integration:
-	go test -tags=integration ./... -v -count=1 -timeout=120s
-
-# Simulator tests — boots iOS Simulator + iwdp, runs all tools against real Safari.
-# Usage: make test-simulator
-#   or:  make sim-setup && go test -tags=simulator ./... -v && make sim-teardown
+# E2E tests — boots iOS Simulator + iwdp, runs all tools against real Safari.
+# Usage: make test-e2e
+#   or:  make sim-setup && go test -tags=simulator ./e2e/ -v && make sim-teardown
 sim-setup:
 	@eval "$$(./scripts/sim-setup.sh)" && echo "IWDP_SIM_WS_URL=$$IWDP_SIM_WS_URL"
 
 sim-teardown:
 	@./scripts/sim-setup.sh --teardown
 
-test-simulator:
+test-e2e:
 	@echo "==> Setting up iOS Simulator..."
 	@eval "$$(./scripts/sim-setup.sh)" && \
-		echo "==> Running simulator tests..." && \
-		go test -tags=simulator ./... -v -count=1 -timeout=300s && \
+		echo "==> Running e2e tests..." && \
+		go test -tags=simulator ./e2e/ -v -count=1 -timeout=300s && \
 		echo "==> Tearing down..." && \
 		./scripts/sim-setup.sh --teardown
 	@./scripts/sim-setup.sh --teardown 2>/dev/null || true

README.md

@@ -18,7 +18,7 @@
 
 <video src="https://github.com/user-attachments/assets/dcc0dc05-3a1f-4454-88a8-51ee28da9fd2" poster="https://github.com/user-attachments/assets/3901f7ff-6531-4866-b49e-cf5d17304327" autoplay loop muted playsinline></video>
 
-100+ tools across all 27 WebKit Inspector Protocol domains — navigation, screenshots, DOM inspection, CSS, network interception, httpOnly cookies, JS debugging, heap snapshots, profiling, and more.
+100+ tools across all 27 WebKit Inspector Protocol domains — navigation, screenshots, DOM inspection, CSS, network interception, httpOnly cookies, JS debugging, heap snapshots, profiling, and more. Full feature parity between MCP server and CLI.
 
 ## Why?
 
@@ -374,46 +374,32 @@ Animation, Canvas, LayerTree, Workers, Audit, Security (TLS certificates), and e
 
 ```bash
 make build              # Build both binaries
-make test               # Run all tests
+make test               # Run unit + smoke tests
+make test-e2e           # E2E tests (boots iOS Simulator, tests all tools)
 make test-coverage      # Tests with coverage report
 make lint               # golangci-lint
 make fmt                # gofumpt formatting
 ```
 
 ### Testing
 
-Unit tests use a mock WebSocket server (`internal/webkit/testutil/`) that simulates the WebKit Inspector Protocol.
+Unit tests use a mock WebSocket server (`internal/webkit/testutil/`) that simulates the WebKit Inspector Protocol. E2E tests boot an iOS Simulator and run every tool against real Safari.
 
 ```bash
-# Unit tests (no device needed)
+# Unit + smoke tests (no device needed)
 make test
 
-# E2E tests (builds binaries, tests CLI + MCP server JSON-RPC)
+# E2E tests — boots iOS Simulator + iwdp, tests ALL tools against real Safari
 make test-e2e
 
-# Integration tests (requires iwdp binary installed)
-make test-integration
-
-# Simulator tests — boots iOS Simulator + iwdp, tests ALL tools against real Safari
-make test-simulator
-```
-
-#### iOS Simulator Tests
-
-Simulator tests (`-tags=simulator`) boot an iOS Simulator, start `ios_webkit_debug_proxy` with the simulator's web inspector socket, and run every tool against a real Safari page. No physical device needed.
-
-```bash
-# One-command: setup → test → teardown
-make test-simulator
-
 # Or manually for debugging:
 make sim-setup          # Prints IWDP_SIM_WS_URL
 export IWDP_SIM_WS_URL=ws://localhost:9222/devtools/page/1
-go test -tags=simulator ./... -v -run TestSim_Navigate
+go test -tags=simulator ./e2e/ -v -run TestSim_Navigate
 make sim-teardown
 ```
 
-> **Note:** Requires macOS with Xcode and `ios-webkit-debug-proxy` installed. GitHub Actions `macos-latest` runners have Xcode and iOS Simulator runtimes pre-installed.
+> **Note:** E2E tests require macOS with Xcode and `ios-webkit-debug-proxy` installed. GitHub Actions `macos-latest` runners have Xcode and iOS Simulator runtimes pre-installed.
 
 ### Project Structure