fix: honor context in waitForPair and waitForHello

[SebTardif]

What Problem This Solves

clawgo run (and clawgo pair) already install signal.NotifyContext for SIGINT and SIGTERM. After a first-run connect, waitForPair (6 minutes) and waitForHello (30 seconds) selected only on the deadline, c.errs, and incoming frames.

Ctrl+C during pairing or hello therefore did nothing until that deadline fired. The inner reconnect loop already returns on ctx.Done(). These two waits did not.

This PR threads the process context into both waits and returns on ctx.Done(), matching the reconnect-loop pattern from #5. On cancel, run / pair close the client and exit 0, same as the rest of the run loop.

The wait functions were introduced in f601408 (2026-01-04) without a cancel case.

Evidence

Before (binary from upstream/main). Silent TCP acceptor, empty token, SIGINT during waitForPair. Process still running 2.027s later:

$ /tmp/clawgo-f002-old run -bridge 127.0.0.1:65434 -state /tmp/state.json -mdns=false -tts-engine none -chat-subscribe=false
connected to bridge 127.0.0.1:65434
no token found; requesting pairing
SIGINT pid=45295
still_running=yes elapsed_after_SIGINT=2.027s

After (this patch). Same silent acceptor and SIGINT. Process exits 0 in 0.017s:

$ /tmp/clawgo-f002 run -bridge 127.0.0.1:62813 -state /tmp/state.json -mdns=false -tts-engine none -chat-subscribe=false
connected to bridge 127.0.0.1:62813
no token found; requesting pairing
SIGINT pid=38544
clawgo exit rc=0 elapsed_after_SIGINT=0.017s

Canceled wait returns context.Canceled before the 6m/30s deadline. Without the ctx.Done() case the same command failed; with it, it passed:

$ go test ./cmd/clawgo -run 'TestWaitForPairCancelUnblocks|TestWaitForHelloCancelUnblocks' -count=1 -timeout 15s -v
=== RUN   TestWaitForPairCancelUnblocks
    wait_test.go:32: waitForPair did not return after cancel
--- FAIL: TestWaitForPairCancelUnblocks (2.00s)
=== RUN   TestWaitForHelloCancelUnblocks
    wait_test.go:52: waitForHello did not return after cancel
--- FAIL: TestWaitForHelloCancelUnblocks (2.00s)
FAIL

$ go test ./cmd/clawgo -run 'TestWaitForPairCancelUnblocks|TestWaitForHelloCancelUnblocks' -count=1 -timeout 15s -v
=== RUN   TestWaitForPairCancelUnblocks
--- PASS: TestWaitForPairCancelUnblocks (0.00s)
=== RUN   TestWaitForHelloCancelUnblocks
--- PASS: TestWaitForHelloCancelUnblocks (0.00s)
PASS
ok  	github.com/clawdbot/clawgo/cmd/clawgo	0.218s

Real behavior proof

• Behavior or issue addressed: SIGINT during first-run pairing or hello no longer waits out the 6 minute / 30 second deadline.

• Real environment tested: macOS 26.6.2 (Darwin 25.6.0 arm64), go1.27.0, clawgo built from this branch at /tmp/oc-pr-clawgo-F002. Compared against a binary built from upstream/main.

• Exact steps or command run after this patch: Started a silent TCP acceptor. Wrote a state file with no token. Ran clawgo run -bridge 127.0.0.1:$PORT -mdns=false -tts-engine none -chat-subscribe=false. After requesting pairing, sent SIGINT. Also ran go test ./cmd/clawgo -run TestWaitForPairCancelUnblocks|TestWaitForHelloCancelUnblocks -count=1 -timeout 15s -v before and after the ctx.Done() case.

• Evidence after fix: terminal output from the patched binary:

  connected to bridge 127.0.0.1:62813
  no token found; requesting pairing
  SIGINT pid=38544
  clawgo exit rc=0 elapsed_after_SIGINT=0.017s

  The unfixed binary stayed up:

  connected to bridge 127.0.0.1:65434
  no token found; requesting pairing
  SIGINT pid=45295
  still_running=yes elapsed_after_SIGINT=2.027s

• Observed result after fix: After SIGINT during pairing, clawgo run returned in 0.017s with exit 0. The unfixed binary was still in waitForPair 2.027s later.

• What was not tested: Live pairing against a real OpenClaw gateway, and a 30s hello wait against a gateway that accepts the pair but never sends hello-ok. Hello cancel uses the same select as pair and is covered by TestWaitForHelloCancelUnblocks.

Command: go test ./cmd/clawgo -run 'TestWaitForPairCancelUnblocks|TestWaitForHelloCancelUnblocks' -count=1 -timeout 15s -v and live clawgo run plus SIGINT against a silent TCP acceptor.

Observed: red step failed at 2.00s (did not return after cancel). Green step passed at 0.00s. Live patched clawgo run exited 0 in 0.017s after SIGINT; unfixed binary still running at 2.027s.

Expected: cancel unblocks both waits with context.Canceled before the 6m/30s deadline; SIGINT during pairing exits the process promptly.

Time: 11:11:30 PDT

Date: 2026-08-29

Environment: macOS 26.6.2, Darwin 25.6.0 arm64, go1.27.0 darwin/arm64

[clawsweeper]

🦞👀
ClawSweeper picked this up.

Pull request received. I will update this pull request when review starts.

[clawsweeper]

Codex review: needs maintainer review before merge. Reviewed September 3, 2026, 4:57 AM ET / 08:57 UTC.

ClawSweeper review

What this changes

The PR threads process cancellation into bridge pairing and hello waits so interrupted clawgo run and clawgo pair commands exit promptly.

Merge readiness

✅ Ready for maintainer review

Keep open: current main still waits only on timeout, bridge errors, and frames during pairing and hello, so SIGINT/SIGTERM cannot end those waits promptly. This focused PR adds the missing cancellation path with direct regression coverage and credible real-process proof.

Priority: P2
Reviewed head: 77d0db30d05f8b88367f781131f9acab372507e9

Review scores

Measure	Result	What it means
Overall readiness	🦞 diamond lobster (5/6)	A focused repair with direct regression coverage and clear before/after process-level evidence.
Proof confidence	🦞 diamond lobster (5/6)	Sufficient (terminal): The changed production path is clawgo run entering bridge pairing; the supplied macOS terminal trace uses a silent TCP acceptor and shows SIGINT returning exit 0 in 0.017 seconds after the fix, versus a still-running baseline. Focused tests also cover both cancellation selects and successful pair/hello frames.
Patch quality	🦞 diamond lobster (5/6)	No actionable review findings were identified.

Verification

Check	Result	Evidence
Real behavior	Verified	Sufficient (terminal): The changed production path is clawgo run entering bridge pairing; the supplied macOS terminal trace uses a silent TCP acceptor and shows SIGINT returning exit 0 in 0.017 seconds after the fix, versus a still-running baseline. Focused tests also cover both cancellation selects and successful pair/hello frames.
Evidence reviewed	5 items	Current-main behavior remains affected: Current main's pairing and hello waits have no cancellation case, and their call sites do not convert an interrupted wait into a clean exit. Introduced PR fix: The PR adds context cancellation to both select loops and maps a canceled context to a successful CLI exit at each affected call site. Regression coverage: Added tests verify cancellation unblocks both waits and preserve successful pair-ok and hello-ok handling.
Findings	None	None.
Security	None	None.

How this fits together

Clawgo connects a headless node to the OpenClaw bridge, performs pairing when needed, and waits for the bridge hello before starting node services. Process signals should cancel these connection-stage waits and return control to the CLI.

flowchart LR
A[User starts clawgo] --> B[Bridge connection]
B --> C[Pairing or hello wait]
D[SIGINT or SIGTERM] --> C
C --> E[Start node services]
C --> F[Clean command exit]

Loading

Before merge

None.

Agent review details

Security

None.

Review metrics

Metric	Value	Why it matters
Production and regression coverage	production +21/-5, tests +81	The small runtime change is accompanied by focused coverage for cancellation and successful handshake paths.

Technical review

Best possible solution:

Land this narrow cancellation repair after ordinary maintainer review so bridge setup obeys the CLI's existing signal-handling expectation.

Do we have a high-confidence way to reproduce the issue?

Yes—current main's source provides a high-confidence path: connect to a silent bridge, begin pairing or hello, then send SIGINT/SIGTERM; the waits have no cancellation select. The contributor also supplied before/after terminal evidence for the pairing path.

Is this the best way to solve the issue?

Yes—the PR reuses the existing process context and applies it only to the two blocking waits, preserving successful handshake and timeout behavior.

AGENTS.md: not found in the target repository.

Codex review notes: model internal, reasoning high; reviewed against c6e46796a1c8.

Labels

Label justifications:

• P2: This is a bounded CLI cancellation defect that can delay user shutdown during bridge setup.
• rating: 🦞 diamond lobster: Overall readiness is 🦞 diamond lobster; proof is 🦞 diamond lobster and patch quality is 🦞 diamond lobster.
• status: 👀 ready for maintainer look: ClawSweeper has no concrete contributor-facing blocker left for this PR. Sufficient (terminal): The changed production path is clawgo run entering bridge pairing; the supplied macOS terminal trace uses a silent TCP acceptor and shows SIGINT returning exit 0 in 0.017 seconds after the fix, versus a still-running baseline. Focused tests also cover both cancellation selects and successful pair/hello frames.
• proof: sufficient: Contributor real behavior proof is sufficient. The changed production path is clawgo run entering bridge pairing; the supplied macOS terminal trace uses a silent TCP acceptor and shows SIGINT returning exit 0 in 0.017 seconds after the fix, versus a still-running baseline. Focused tests also cover both cancellation selects and successful pair/hello frames.

Evidence

What I checked:

• Current-main behavior remains affected: Current main's pairing and hello waits have no cancellation case, and their call sites do not convert an interrupted wait into a clean exit. (cmd/clawgo/main.go:626, c6e46796a1c8)
• Introduced PR fix: The PR adds context cancellation to both select loops and maps a canceled context to a successful CLI exit at each affected call site. (cmd/clawgo/main.go:638, 77d0db30d05f)
• Regression coverage: Added tests verify cancellation unblocks both waits and preserve successful pair-ok and hello-ok handling. (cmd/clawgo/wait_test.go:18, 77d0db30d05f)
• Feature history: The command-area history identifies f601408 as the earlier routing/plugin implementation commit; subsequent current-main history has not added cancellation to these waits. (cmd/clawgo/main.go:626, f60140892c55)
• Real behavior proof: The PR body records a patched clawgo run against a silent TCP acceptor exiting with status 0 in 0.017 seconds after SIGINT, while the baseline process remained running after 2.027 seconds. (77d0db30d05f)

Likely related people:

• Mariano Belinky: Suggested for follow-up; no historical authorship or introduction is verified. (role: unverified routing candidate; confidence: low)

Rating scale

Score	Internal tier	Crab rank	Meaning
6/6	S	🦀 challenger crab	Exceptional readiness
5/6	A	🦞 diamond lobster	Very strong readiness
4/6	B	🐚 platinum hermit	Good normal PR; ordinary maintainer review
3/6	C	🦐 gold shrimp	Useful, but confidence is limited
2/6	D	🦪 silver shellfish	Proof or implementation needs work
1/6	F	🧂 unranked krab	Not merge-ready
N/A	NA	🌊 off-meta tidepool	Rating does not apply

Overall follows the weaker of proof and patch quality.
Shiny media proof means a screenshot, video, or linked artifact directly shows the changed behavior. Runtime, network, CSP, and security claims still need visible diagnostics.

Workflow

• ClawSweeper keeps one durable marker-backed review comment per issue or PR.
• Re-runs edit this comment so the latest verdict, findings, and automation markers stay together instead of adding duplicate bot comments.
• A fresh review can be triggered by eligible @clawsweeper re-review comments, exact-item GitHub events, scheduled/background review runs, or manual workflow dispatch.
• PR/issue authors and users with repository write access can comment @clawsweeper re-review or @clawsweeper re-run on an open PR or issue to request a fresh review only.
• Maintainers can also comment @clawsweeper review to request a fresh review only.
• Fresh-review commands do not start repair, autofix, rebase, CI repair, or automerge.
• Maintainer-only repair and merge flows require explicit commands such as @clawsweeper autofix, @clawsweeper automerge, @clawsweeper fix ci, or @clawsweeper address review.
• Maintainers can comment @clawsweeper explain to ask for more context, or @clawsweeper stop to stop active automation.

History

Review history (12 earlier review cycles; latest 8 shown)

• reviewed 2026-08-30T16:02:13.644Z sha 77d0db3 :: needs maintainer review before merge. :: none
• reviewed 2026-08-30T20:14:18.751Z sha 77d0db3 :: needs maintainer review before merge. :: none
• reviewed 2026-08-30T23:59:02.984Z sha 77d0db3 :: needs maintainer review before merge. :: none
• reviewed 2026-08-31T11:05:48.511Z sha 77d0db3 :: needs maintainer review before merge. :: none
• reviewed 2026-09-01T04:56:38.330Z sha 77d0db3 :: needs maintainer review before merge. :: none
• reviewed 2026-09-01T10:10:31.415Z sha 77d0db3 :: needs maintainer review before merge. :: none
• reviewed 2026-09-02T11:54:35.767Z sha 77d0db3 :: needs maintainer review before merge. :: none
• reviewed 2026-09-03T01:17:22.135Z sha 77d0db3 :: needs maintainer review before merge. :: none