fix(mcp): review fixes for auth-aware gateway MCP#282
Merged
leggetter merged 3 commits intofix/mcp-not-logged-in-errorfrom Apr 1, 2026
Merged
fix(mcp): review fixes for auth-aware gateway MCP#282leggetter merged 3 commits intofix/mcp-not-logged-in-errorfrom
leggetter merged 3 commits intofix/mcp-not-logged-in-errorfrom
Conversation
- tool_projects_errors.go: match "status code: 4xx" instead of bare "401"/"403" to avoid false positives on IDs or timestamps - tool_login.go: remove `_ = ctx` suppression, add TODO for context propagation to polling goroutine, document happens-before on loginState.err via channel close - root.go: add maintenance comment linking flagNeedsNextArg to init() - helpers.go: revert unrelated Attempt struct alignment change https://claude.ai/code/session_01EpXZqTmgybtjgmSALukH8d
Thread the request context into the login polling goroutine so it stops promptly when the MCP transport closes, instead of running for up to ~4 minutes after the client disconnects. WaitForAPIKey blocks with time.Sleep and doesn't accept a context, so we run it in an inner goroutine and select on both its result channel and ctx.Done(). The inner goroutine is bounded by loginMaxAttempts. https://claude.ai/code/session_01EpXZqTmgybtjgmSALukH8d
The per-request ctx passed to MCP tool handlers is cancelled when the handler returns. The previous commit selected on that ctx in the login polling goroutine, which killed the poll immediately after returning the browser URL — breaking in-MCP authentication. Fix: add a sessionCtx field to Server, set it in Run() (called by RunStdio and tests), and select on that instead. The session context is only cancelled when the MCP transport closes (stdin EOF), which is the correct signal to abandon login polling. Also adds TestLoginTool_PollSurvivesAcrossToolCalls: a regression test that starts a login flow, lets the mock auth complete between tool calls, and verifies the client is authenticated on the second call. This would have caught the per-request ctx bug. https://claude.ai/code/session_01EpXZqTmgybtjgmSALukH8d
leggetter
force-pushed
the
claude/review-pr-280-my8PD
branch
from
325da3f to
0291f9e
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Review fixes for #280. Addresses bugs, adds missing tests, and improves code reuse.
*APIError: replaced manualfmt.Errorfstatus check withcheckAndPrintErrorso theerrors.Aspath inshouldSuggestReauthAfterListProjectsFailurematches directly — the string-matching fallback was never being reached for structured API errorssrv.sessionCtx(set inRun()) instead of the per-requestctx, which was cancelled when the handler returned — breaking in-MCP authentication"status code: 4xx"instead of bare"401"/"403"to avoid false positives on IDs or timestampsAttemptstruct alignment in helpers.goflagNeedsNextArglinking it toinit()loginState.errafter mutex removalTests added
TestLoginTool_PollSurvivesAcrossToolCalls— regression test: starts login, mock auth completes between tool calls, verifies client is authenticated on second call (catches the per-request ctx bug)TestShouldSuggestReauthAfterListProjectsFailure— unit tests for reauth hint covering*APIError401/403, plain error fallback, and false-positive resistance (proj_403_abc)TestArgvContainsGatewayMCP— additional cases for boolean flags before/between subcommandsTest plan
go test ./pkg/...)go test -tags mcp ./test/acceptance/...)hookdeck gateway mcpwithout prior auth →hookdeck_login→ browser auth → tools workhttps://claude.ai/code/session_01EpXZqTmgybtjgmSALukH8d