hookdeck
diff --git a/‎AGENTS.md‎
Lines changed: 57 additions & 8 deletions b/‎AGENTS.md‎
Lines changed: 57 additions & 8 deletions
diff --git a/‎CLAUDE.md‎
Lines changed: 1 addition & 3 deletions b/‎CLAUDE.md‎
Lines changed: 1 addition & 3 deletions
diff --git a/‎pkg/cmd/gateway.go‎
Lines changed: 25 additions & 8 deletions b/‎pkg/cmd/gateway.go‎
Lines changed: 25 additions & 8 deletions
diff --git a/‎pkg/cmd/gateway_test.go‎
Lines changed: 72 additions & 0 deletions b/‎pkg/cmd/gateway_test.go‎
Lines changed: 72 additions & 0 deletions
diff --git a/‎pkg/cmd/mcp.go‎
Lines changed: 7 additions & 2 deletions b/‎pkg/cmd/mcp.go‎
Lines changed: 7 additions & 2 deletions
@@ -228,12 +228,21 @@ pkg/hookdeck/
 
 ## 5. Development Workflow
 
+### Agent command execution (Cursor / AI)
+
+**Strong preference:** When a command needs more than the default sandbox (network, full filesystem, real module cache, TLS to external services, `gpg-agent`, etc.), **prompt the user for permission to run that command outside the sandbox** (e.g. approve **`required_permissions: ["all"]`**, **network**, or the product’s “run outside sandbox” control)—and **execute it yourself** after approval.
+
+- **Do not** default to “please run this in your terminal” or long copy-paste-only instructions when the environment can elevate the **same** command.
+- **Do** use copy-paste or “run locally” guidance only when elevation is **refused**, **unavailable**, or the user explicitly prefers it.
+
+This applies to **`go test`**, **`go mod download`**, **`git`**, **`gh`**, builds, and acceptance tests—not only network calls.
+
 ### Building and Testing
 ```bash
 # Build the CLI
 go build -o hookdeck cmd/hookdeck/main.go
 
-# Run tests
+# Run all unit tests (default packages; run from repo root)
 go test ./...
 
 # Run specific package tests
@@ -243,17 +252,55 @@ go test ./pkg/cmd/
 go test -race ./...
 ```
 
+### Running `go test` after code changes (required for agents)
+
+**Whenever you change Go code in this repo, run tests from the repository root** and treat the run as failed if compilation or any test fails.
+
+**Recommended command in Cursor (module cache + full permissions):**
+
+```bash
+cd /path/to/hookdeck-cli   # repo root containing go.mod
+GOMODCACHE="$(go env GOPATH)/pkg/mod" go test ./...
+```
+
+**Prompt the user** to approve running that command **outside the sandbox** with **`required_permissions: ["all"]`** and **`["network"]`** when the module cache may need to fetch (first run or new dependencies). Plain `go test ./...` is fine on a normal developer machine where `GOMODCACHE` is unset or already populated.
+
+**Cursor / agent environments — prompt for out-of-sandbox, fix module cache, do not skip tests**
+
+1. **Prompt the user** for permission, then run `go test ./...` with **`required_permissions: ["all"]`** (disable sandbox for that command). Do **not** use the default sandbox for `go test` here.
+
+2. **If you still see `no required module provides package github.com/...`**, the shell often has **`GOMODCACHE`** set to an **empty** Cursor temp directory (even with `all`). That is **not** a broken `go.mod`. **Re-run tests with an explicit cache path** (pick one):
+
+```bash
+GOMODCACHE="$(go env GOPATH)/pkg/mod" go mod download
+GOMODCACHE="$(go env GOPATH)/pkg/mod" go test ./...
+```
+
+Or unset the variable so Go uses its default (`$GOPATH/pkg/mod`):
+
+```bash
+env -u GOMODCACHE go mod download
+env -u GOMODCACHE go test ./...
+```
+
+Use **`go mod download`** with **`required_permissions: ["network"]` or `["all"]`** the first time the cache is cold (after **prompting** for that permission).
+
+- **`["network"]` alone is often not enough** for `go test` because compilation still needs a **readable** module cache.
+- **Prompt for out-of-sandbox / full permissions**, then re-run with **`["all"]`** and the **`GOMODCACHE`** / **`env -u`** fix above—**do not** skip tests or push the user to run commands manually unless they decline elevation.
+
+**Acceptance tests** live under `test/acceptance/` with **build tags** (they are **not** included in plain `go test ./...`). See **`test/acceptance/README.md`** for tags, env vars, and CI parity. When you change CLI-facing behavior, **prompt for out-of-sandbox permissions** and run them the same way, with **`required_permissions: ["all"]`** (and network) when using an agent shell.
+
 ### Sandbox and permissions
 
 Commands that need network (e.g. `git push`, `gh pr create`, `npm install`) or full system access often fail in the sandbox with **TLS/certificate errors** (e.g. `x509: OSStatus -26276`) or auth prompts. These are sandbox restrictions, not broken tooling.
 
-**Prefer requesting elevated permissions** (e.g. `required_permissions: ["all"]` or `["network"]`) and asking the user to approve so the agent can retry the command. Do not default to prompting the user to run commands themselves when elevation is available. Only fall back to copy-pasteable commands when elevated permissions are not an option.
+**Prompt the user for permission to run outside the sandbox** (e.g. **`required_permissions: ["all"]`** or **`["network"]`**) and **re-run the same command** after they approve. See **Agent command execution** above. Only fall back to copy-pasteable “run this locally” instructions when elevation is refused or unavailable.
 
 ### Git commits (GPG)
 
 **Always use GPG-signed commits** (`git commit -S`, or `commit.gpgsign=true` in git config). **Do not** use `--no-gpg-sign` to bypass signing.
 
-In restricted environments, signing may fail with errors like “No agent running” or “Operation not permitted” on `~/.gnupg`. **Re-run the commit with full permissions** so `gpg-agent` is reachable, or sign from a normal local terminal. Unsigned commits should not be pushed as a shortcut.
+In restricted environments, signing may fail with errors like “No agent running” or “Operation not permitted” on `~/.gnupg`. **Prompt for permission to run the commit outside the sandbox** (full permissions) so `gpg-agent` is reachable; only if that still fails, suggest the user sign from a normal local terminal. Unsigned commits should not be pushed as a shortcut.
 
 ### Linting and Formatting
 ```bash
@@ -277,12 +324,13 @@ go run cmd/hookdeck/main.go login --help
 ```
 
 ### Sandbox and command execution
-- **Always run tests** when changing code: unit tests (`go test ./pkg/...`) and, for CLI-facing changes, acceptance tests (`go test ./test/acceptance/...`). Do not skip tests to avoid failures.
-- When running commands (build, test, acceptance tests), if you see **TLS/certificate errors** (e.g. `x509: certificate verify failed`, `tls: failed to verify certificate`), **permission errors** (e.g. `operation not permitted` when writing to the Go module cache), or similar failures that look environment-related, the command is likely running inside a **sandbox**. **Prompt the user** and **re-run the command with elevated permissions** (e.g. `required_permissions: ["network"]` for tests that need API access, or `["all"]` to disable the sandbox) so the operation can succeed. Do not treat a build or test as passed if stderr shows these errors, even when the process exit code is 0.
+- **Always run tests** when changing code: **`go test ./...`** from the repo root (see **Running `go test` after code changes** above), and for CLI-facing changes, acceptance tests with the appropriate **`-tags=...`** (see `test/acceptance/README.md`). Do not skip tests to avoid failures.
+- For **`go test`** in this repo, **prompt for out-of-sandbox execution** and use **`required_permissions: ["all"]`** (and **`["network"]`** when needed) so the Go module cache works (see **Running `go test` after code changes**). Same for acceptance tests that call the real API.
+- When you see **TLS/certificate errors**, **`no required module provides package`** during `go test`, **permission errors** on the module cache, or similar environment-related failures, **prompt for full/out-of-sandbox permissions** and **re-run** (with **`GOMODCACHE=...`** if needed)—**do not** treat the run as passed, and **do not** default to asking the user to run the command manually unless they declined elevation.
 
 ### GitHub CLI (`gh`)
 - Use the **[GitHub CLI](https://cli.github.com/) (`gh`)** to read GitHub data and perform actions from the shell: **workflow runs and job logs** (e.g. `gh run list`, `gh run view <run-id> --log-failed`, `gh run view <run-id> --job <job-id> --log`), **PRs and checks** (`gh pr view`, `gh pr checks`, `gh pr diff`), **API access** (`gh api`), and creating or updating PRs, issues, and releases.
-- Install and authenticate `gh` where needed (e.g. `gh auth login`). If `gh` fails with TLS, network, or permission errors, re-run with **network** or **all** permissions when the agent sandbox may be blocking access.
+- Install and authenticate `gh` where needed (e.g. `gh auth login`). If `gh` fails with TLS, network, or permission errors, **prompt for permission** to re-run with **network** or **all** permissions when the agent sandbox may be blocking access.
 
 ## 6. Documentation Standards
 
@@ -358,7 +406,7 @@ if apiErr, ok := err.(*hookdeck.APIError); ok {
 
 ## 9. Testing Guidelines
 
-- **Always run tests** when changing code. Run unit tests (`go test ./pkg/...`) and, for CLI-facing changes, acceptance tests (`go test ./test/acceptance/...`). If tests fail due to TLS/network/sandbox (e.g. `x509`, `operation not permitted`), prompt the user and re-run with elevated permissions (e.g. `required_permissions: ["all"]`) so tests can pass.
+- **Always run tests** when changing code. Run **`go test ./...`** from the repo root (see **§5 Running `go test` after code changes**). For CLI-facing changes, run acceptance tests with the correct **`-tags=...`** per `test/acceptance/README.md`. **Agents:** **prompt for out-of-sandbox / full permissions**, then run `go test` with **`required_permissions: ["all"]`** (and network if needed) so the module cache works—**do not** push the user to run tests manually unless elevation is refused.
 - **Create tests for new functionality.** Add unit tests for validation and business logic; add acceptance tests for flows that use the CLI as a user or agent would (success and failure paths). Acceptance tests must pass or fail—no skipping to avoid failures.
 
 ### Acceptance Test Setup
@@ -384,7 +432,8 @@ Acceptance tests in `test/acceptance/` are partitioned by **feature build tags**
 |---------|---------|
 | `go run cmd/hookdeck/main.go --help` | View CLI help |
 | `go build -o hookdeck cmd/hookdeck/main.go` | Build CLI binary |
-| `go test ./pkg/cmd/` | Test command implementations |
+| `go test ./...` | All unit tests (repo root; agents: run with `required_permissions: ["all"]`) |
+| `go test ./pkg/cmd/` | Test command implementations only |
 | `go generate ./...` | Run code generation (if used) |
 | `golangci-lint run` | Run comprehensive linting |
 
 
@@ -1,5 +1,3 @@
 # Hookdeck CLI — Claude / agent context
 
-Read **[AGENTS.md](AGENTS.md)** first for project structure, testing, and CLI conventions.
-
-Repo-specific agent workflows (e.g. releases) live under **[skills/](skills/)** — see `skills/hookdeck-cli-release/` for cutting GitHub releases and drafting release notes.
+Read **[AGENTS.md](AGENTS.md)** for all agent instructions (project structure, testing, sandbox permissions, CLI conventions, **`skills/`** workflows, and releases).
@@ -13,6 +13,26 @@ type gatewayCmd struct {
 	cmd *cobra.Command
 }
 
+// isGatewayMCPLeafCommand reports whether cmd is the gateway mcp subcommand.
+// MCP uses JSON-RPC on stdout; when there is no API key yet, requireGatewayProject
+// must not run so the server can start and expose hookdeck_login.
+func isGatewayMCPLeafCommand(cmd *cobra.Command) bool {
+	return cmd != nil && cmd.Name() == "mcp" && cmd.Parent() != nil && cmd.Parent().Name() == "gateway"
+}
+
+// gatewayPersistentPreRunE runs before gateway subcommands. MCP may start without credentials
+// (JSON-RPC on stdout; hookdeck_login supplies auth). Once logged in, gateway MCP uses the
+// same Gateway project rules as other gateway commands.
+func gatewayPersistentPreRunE(cmd *cobra.Command, args []string) error {
+	initTelemetry(cmd)
+	if isGatewayMCPLeafCommand(cmd) {
+		if err := Config.Profile.ValidateAPIKey(); err != nil {
+			return nil
+		}
+	}
+	return requireGatewayProject(nil)
+}
+
 // requireGatewayProject ensures the current project is a Gateway project (inbound or console).
 // It runs API key validation, resolves project type from config or API, and returns an error if not Gateway.
 // cfg is optional; when nil, the global Config is used (for production).
@@ -31,14 +51,14 @@ func requireGatewayProject(cfg *config.Config) error {
 		projectType = config.ModeToProjectType(cfg.Profile.ProjectMode)
 	}
 	if projectType == "" {
-		// Resolve from API
+		// Resolve team/project/mode/type from API (authoritative for the key). Do not clear
+		// guest_url here — gateway PreRun may run for users who still have a guest upgrade link.
 		response, err := cfg.GetAPIClient().ValidateAPIKey()
 		if err != nil {
 			return err
 		}
-		projectType = config.ModeToProjectType(response.ProjectMode)
-		cfg.Profile.ProjectType = projectType
-		cfg.Profile.ProjectMode = response.ProjectMode
+		cfg.Profile.ApplyValidateAPIKeyResponse(response, false)
+		projectType = cfg.Profile.ProjectType
 		_ = cfg.Profile.SaveProfile()
 	}
 	if !config.IsGatewayProject(projectType) {
@@ -69,10 +89,7 @@ The gateway command group provides full access to all Event Gateway resources.`,
 
   # Start the MCP server for AI agent access
   hookdeck gateway mcp`,
-		PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
-			initTelemetry(cmd)
-			return requireGatewayProject(nil)
-		},
+		PersistentPreRunE: gatewayPersistentPreRunE,
 	}
 
 	// Register resource subcommands (same factory as root backward-compat registration)
 
@@ -1,10 +1,16 @@
 package cmd
 
 import (
+	"encoding/json"
+	"net/http"
+	"net/http/httptest"
+	"os"
+	"path/filepath"
 	"strings"
 	"testing"
 
 	"github.com/hookdeck/hookdeck-cli/pkg/config"
+	"github.com/hookdeck/hookdeck-cli/pkg/hookdeck"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -86,3 +92,69 @@ func TestRequireGatewayProject(t *testing.T) {
 		assert.True(t, strings.Contains(err.Error(), "requires a Gateway project") || strings.Contains(err.Error(), "Outpost"))
 	})
 }
+
+func TestRequireGatewayProject_resolveFromValidate(t *testing.T) {
+	config.ResetAPIClientForTesting()
+	t.Cleanup(config.ResetAPIClientForTesting)
+
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if r.URL.Path != hookdeck.APIPathPrefix+"/cli-auth/validate" {
+			http.NotFound(w, r)
+			return
+		}
+		w.Header().Set("Content-Type", "application/json")
+		_ = json.NewEncoder(w).Encode(hookdeck.ValidateAPIKeyResponse{
+			ProjectID:   "team_from_validate",
+			ProjectMode: "inbound",
+		})
+	}))
+	t.Cleanup(server.Close)
+
+	dir := t.TempDir()
+	path := filepath.Join(dir, "config.toml")
+	toml := `profile = "default"
+
+[default]
+api_key = "sk_test_123456789012"
+project_id = "stale_team_should_be_replaced"
+guest_url = "https://guest.example/keep-me"
+`
+	require.NoError(t, os.WriteFile(path, []byte(toml), 0600))
+
+	cfg, err := config.LoadConfigFromFile(path)
+	require.NoError(t, err)
+	cfg.APIBaseURL = server.URL
+
+	err = requireGatewayProject(cfg)
+	require.NoError(t, err)
+	require.Equal(t, "team_from_validate", cfg.Profile.ProjectId)
+	require.Equal(t, config.ProjectTypeGateway, cfg.Profile.ProjectType)
+	require.Equal(t, "inbound", cfg.Profile.ProjectMode)
+	require.Equal(t, "https://guest.example/keep-me", cfg.Profile.GuestURL, "gateway validate path must not clear guest_url")
+}
+
+func TestGatewayPersistentPreRunE_MCP(t *testing.T) {
+	old := Config
+	t.Cleanup(func() { Config = old })
+
+	gw := newGatewayCmd().cmd
+	mcpLeaf, _, err := gw.Find([]string{"mcp"})
+	require.NoError(t, err)
+	require.True(t, isGatewayMCPLeafCommand(mcpLeaf))
+
+	t.Run("no API key skips requireGatewayProject", func(t *testing.T) {
+		Config = config.Config{}
+		Config.Profile.ProjectId = ""
+		err := gatewayPersistentPreRunE(mcpLeaf, nil)
+		assert.NoError(t, err)
+	})
+
+	t.Run("with API key and no project fails", func(t *testing.T) {
+		Config = config.Config{}
+		Config.Profile.APIKey = "sk_test_123456789012"
+		Config.Profile.ProjectId = ""
+		err := gatewayPersistentPreRunE(mcpLeaf, nil)
+		require.Error(t, err)
+		assert.Contains(t, err.Error(), "no project selected")
+	})
+}
@@ -25,8 +25,13 @@ destinations, events, requests, and more — as MCP tools that AI agents and
 LLM-based clients can invoke.
 
 If the CLI is already authenticated, all tools are available immediately.
-If not, a hookdeck_login tool is provided that initiates browser-based
-authentication so the user can log in without leaving the MCP session.`),
+If not, gateway MCP still starts: project selection is skipped until you
+authenticate, and hookdeck_login initiates browser-based sign-in. Protocol
+traffic uses stdout only (JSON-RPC); status and errors from the CLI before
+the server runs go to stderr.
+
+hookdeck_login stays registered after sign-in so you can call it with reauth: true
+to replace credentials (e.g. when project listing fails with a narrow API key).`),
 		Example: `  # Start the MCP server (stdio transport)
   hookdeck gateway mcp