fix(grok): harden ACP resume and session lifecycle handling - #11
Open
justingray0 wants to merge 9 commits into
Open
fix(grok): harden ACP resume and session lifecycle handling#11justingray0 wants to merge 9 commits into
justingray0 wants to merge 9 commits into
Conversation
When Tailscale Serve is enabled it proxies the loopback-bound backend onto the tailnet, so the server is reachable from other devices even though `config.host` stays on 127.0.0.1. Previously the auth policy keyed solely off the bind host and selected a local-only policy in that case, skipping the one-time-token bootstrap required for remote access. Treat the server as remote-reachable whenever `tailscaleServeEnabled` is set, in addition to the existing wildcard / non-loopback host checks, so remote clients get the `remote-reachable` policy with one-time-token bootstrap. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Resuming a grok session against a different working directory than the one the cursor was recorded in produces a stale/invalid resume, so a thread that moves to a new worktree must start a fresh session instead of replaying the old cursor. - ProviderCommandReactor: when the preferred provider is grok and the cwd changed, pass an explicit `null` resume cursor (a "discard" sentinel, distinct from `undefined` which means "use the persisted cursor") when restarting the session, and log `shouldDiscardResumeCursorForCwdChange`. - ProviderService: honor the `null` sentinel by dropping the cursor, and independently refuse to reuse a persisted cursor when an explicit `cwd` differs from the persisted one. Persisted cwd lookup is hoisted so both the cursor-reuse guard and `effectiveCwd` share it. Adds reactor- and service-level regression tests covering the worktree/cwd-change paths. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
…ake stall The RpcClient and raw ext requests only ever mint numeric request ids, so a response whose id is not a base-10 number cannot match anything we sent. Some agents (notably grok) emit unsolicited JSON-RPC responses with symbolic ids such as "skills-reload" right after `initialize`. Forwarding those to the RpcClient made it fail while resolving the id, tearing down the response loop so that subsequent `authenticate` and `session/new` responses were never delivered and the handshake stalled until the caller timed out. Route untracked responses through a `forwardUntrackedResponse` guard that only forwards ids matching `^[0-9]+$` and otherwise drops them with a debug log. Applies to both the exit-encoded and success/defect response paths. Adds an in-memory regression test that floods the stream with `skills-reload` responses after `initialize` and asserts the initialize/authenticate/session handshake still completes. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
effect's default pinger writes a ping every 5s and tears the socket down on a single missed pong. Over lossy/reordering links (e.g. WireGuard/Tailscale) that churns the UI WebSocket and causes reconnect flapping. Patch `makePinger` to: - ping every 15s instead of 5s, and - only fail after 3 consecutive missed pongs (`MAX_MISSED_PONGS`) instead of 1, tracked via a `missedPongs` counter that resets on pong. The patch also threads optional `onPing`/`onPong` connection hooks through the pinger. Regenerated `patches/effect@4.0.0-beta.78.patch` and updated the `patch_hash` references in `pnpm-lock.yaml`. See pingdotgg#3054. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Rename every workflow file under .github/workflows/ to a `.yml.disabled` suffix so GitHub Actions no longer recognizes them. This stops all automatic runs on the fork — including the scheduled `Release` job (which runs every 3 hours and keeps queuing), CI on push/PR, deploy-relay, issue-labels, mobile EAS preview, and the pr-size / pr-vouch `pull_request_target` jobs. Pure renames with no content changes, so re-enabling is just renaming the files back to `.yml`. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Gate session/load replay before prompting, recover orphaned provider sessions on startup, sync active turn state from lifecycle events, and reset assistant segments in-place when item.started replays within the same turn. Co-authored-by: Cursor <cursoragent@cursor.com>
When Cursor reuses provider item ids across turns after restart, append assistant output to a new turn-scoped message at the end of the thread instead of mutating an earlier completed message. Co-authored-by: Cursor <cursoragent@cursor.com>
Improve Grok adapter resume semantics, xAI ACP extension replay behavior, and provider runtime turn tracking tests so resumed Grok sessions stay consistent across restarts. Co-authored-by: Cursor <cursoragent@cursor.com>
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 freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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
XAiAcpExtension,GrokAdapter, andGrokAcpSupport.activeTurnIdsync and JSON-RPC edge cases.Extracted from the earlier
wip/grok-resume-fixeswork on top of the merged Cursor resume fixes (#9, #10).Test plan
vp test apps/server/src/provider/acp/XAiAcpExtension.test.tsvp test apps/server/src/provider/acp/AcpJsonRpcConnection.test.tsvp test apps/server/src/provider/Layers/ProviderService.test.tsvp checkMade with Cursor