fix(grok): Harden ACP resume with replay-idle load readiness (#3156) by aaditagrawal · Pull Request #129 · aaditagrawal/t3code

aaditagrawal · 2026-06-26T09:00:48Z

What Changed

Why

UI Changes

Checklist

This PR is small and focused
I explained what changed and why
I included before/after screenshots for any UI changes
I included a video for animation/interaction changes

Co-authored-by: Julius Marminge <julius@mac.lan>

Co-authored-by: codex <codex@users.noreply.github.com>

…gg#3156) Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: codex <codex@users.noreply.github.com>

coderabbitai · 2026-06-26T09:00:56Z

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro

Run ID: 3a900a06-8925-4449-a8f3-87c87a56b2a0

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

Create PR with unit tests
Commit unit tests in branch sync/upstream-20260626-grok-acp-resume

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

_{Comment @coderabbitai help to get the list of available commands.}

aaditagrawal · 2026-06-26T09:01:01Z

This stack of pull requests is managed by Graphite. Learn more about stacking.

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 44d905a6dd

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

chatgpt-codex-connector · 2026-06-26T12:23:30Z

+  const runningTurnId = thread.session?.status === "running" ? thread.session.activeTurnId : null;
+  return {
+    threadId: thread.id,
+    ...(runningTurnId !== null ? { turnId: runningTurnId } : {}),


Forward the scoped turn id past the client command

On the normal ChatView path this turnId never reaches the provider: interruptThreadTurn dispatches thread.turn.interrupt, but ProviderCommandReactor.processTurnInterruptRequested still calls providerService.interruptTurn({ threadId }) and drops event.payload.turnId. In the scenario this change is trying to guard—Stop for turn A being processed after turn B has become active—the Grok adapter receives an unscoped interrupt and can cancel B anyway, so please forward the payload turn id through that reactor.

Useful? React with 👍 / 👎.

chatgpt-codex-connector · 2026-06-26T12:23:30Z

+            yield* acp.agent
+              .cancel({ sessionId: started.sessionId })
+              .pipe(Effect.ignore, Effect.forkIn(runtimeScope));


Await cancel before releasing the next prompt

Here cancel interrupts the local prompt fiber and then forks/ignores session/cancel, so the effect can complete before the cancel notification is written. When a user stops a hung prompt and immediately sends a follow-up, the next session/prompt can be enqueued before the delayed cancel; ACP cancellation is session-scoped, so that late cancel can hit the follow-up or leave the original provider run alive. Please await or serialize the cancel send before allowing another prompt.

Useful? React with 👍 / 👎.

chatgpt-codex-connector · 2026-06-26T12:23:30Z

      prompt: (payload) =>
-        getStartedState.pipe(
-          Effect.flatMap((started) => {
+        promptSerializationSemaphore.withPermit(


Preserve concurrent Grok steering prompts

This semaphore serializes every ACP session/prompt, but GrokAdapter still treats a second sendTurn while ctx.promptsInFlight > 0 as a steer that should be folded into the active Grok run. With a long-running or hung first prompt, the follow-up steer now waits for that first prompt to finish instead of being delivered during the run, so users cannot steer an active Grok turn and the request can hang indefinitely until Stop is used.

Useful? React with 👍 / 👎.

chatgpt-codex-connector · 2026-06-26T12:23:30Z

+        if (Option.isSome(gate) && gate.value.active) {
+          const lastActivityAtMillis = yield* Clock.currentTimeMillis;


Scope replay-idle readiness to the loaded session

While session/load is gated, this branch treats any session/update as replay progress before checking notification.sessionId below. If Grok emits an update for a child/foreign session while the requested resume session is still pending, the idle timer can synthesize a successful load for the wrong/stale session and also drops that foreign update; the gate should only advance for updates belonging to the session being loaded.

Useful? React with 👍 / 👎.

Co-authored-by: Julius Marminge <julius@mac.lan>

Co-authored-by: codex <codex@users.noreply.github.com>

…gg#3156) Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: codex <codex@users.noreply.github.com>

# Conflicts: # apps/server/src/provider/Layers/CursorAdapter.test.ts # apps/server/src/provider/Layers/CursorAdapter.ts # apps/server/src/provider/acp/AcpRuntimeModel.ts # apps/server/src/provider/acp/AcpSessionRuntime.ts # pnpm-lock.yaml # pnpm-workspace.yaml

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 41db910c6a

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

chatgpt-codex-connector · 2026-06-26T13:24:04Z

+          const loaded = yield* Effect.raceFirst(
+            acp.agent.loadSession(loadPayload),
+            Fiber.join(idleFiber),


Fall back when stale ACP loads fail

When a stored resumeSessionId is stale and session/load returns an error, the failure from this race now bubbles out of start() and prevents Grok from opening the thread at all. The previous path recovered by creating a new session after a failed load, so users whose agent cache was pruned or whose resume cursor is invalid now have a bricked thread until the cursor is cleared; please keep the session/new fallback for load errors while still using replay-idle for hung loads.

Useful? React with 👍 / 👎.

chatgpt-codex-connector · 2026-06-26T13:24:04Z

+              return;
+            }
+            const activeTurnId = ctx.activeTurnId ?? ctx.session.activeTurnId;
+            if (turnId !== undefined && activeTurnId !== undefined && activeTurnId !== turnId) {


Ignore scoped stops when no turn is active

When a delayed Stop carries a turnId for an already-completed turn, activeTurnId is undefined, so this guard falls through and the code below still sends a session-scoped ctx.acp.cancel. That cancel is no longer tied to the requested turn; if the user immediately submits a follow-up after turn A completes, the stale Stop for A can be delivered while turn B is starting and cancel the follow-up. Treat a scoped interrupt with no matching active turn as stale rather than sending session/cancel.

Useful? React with 👍 / 👎.

chatgpt-codex-connector · 2026-06-26T13:24:04Z

+              for (let yieldAttempt = 0; yieldAttempt < 8; yieldAttempt += 1) {
+                yield* Effect.yieldNow;
+              }
+              yield* prepared.acp.drainEvents;


Synchronize xAI completion with trailing updates

When Grok sends _x.ai/session/prompt_complete before the final session/update chunks, the prompt fallback can resume here before those later notifications have been parsed and queued. drainEvents only waits for events already in eventQueue, so the fixed eight yields are not a real ordering guarantee; under load a trailing chunk can be enqueued after the barrier, then the turn is marked ready and that chunk is dropped because there is no active turn. Please drain based on protocol/batch ordering or another explicit notification barrier rather than a fixed yield count.

Useful? React with 👍 / 👎.

chatgpt-codex-connector · 2026-06-26T13:24:04Z

+        const index =
+          notification.promptId !== undefined
+            ? pending.findIndex(
+                (entry) =>
+                  entry.sessionId === notification.sessionId &&
+                  entry.promptId === notification.promptId,
+              )
+            : pending.findIndex((entry) => entry.sessionId === notification.sessionId);


Avoid resolving ambiguous xAI completions by session only

Because promptId is optional in XAiPromptCompleteNotification, this fallback resolves the first pending prompt for the session when Grok omits it. With Grok steering there can be multiple pending prompts on the same ACP session; an out-of-order or stale prompt-complete notification without a prompt id can unblock the wrong deferred and leave the prompt that actually completed hung forever. Please only use the session-only fallback when it is unambiguous, or ignore no-id completions while more than one prompt can match.

Useful? React with 👍 / 👎.

aaditagrawal · 2026-06-26T15:03:58Z

Merge activity

Jun 26, 3:03 PM UTC: A user started a stack merge that includes this pull request via Graphite.
Jun 26, 3:12 PM UTC: Graphite couldn't merge this PR because it had merge conflicts.

juliusmarminge and others added 5 commits June 25, 2026 17:07

Restore right panel inset when maximized (pingdotgg#3555)

c2776c2

Fix Electron dev and packaged renderer startup (pingdotgg#3557)

31dfe35

Co-authored-by: Julius Marminge <julius@mac.lan>

Route preview automation through live owner streams (pingdotgg#3548)

ffae541

Co-authored-by: codex <codex@users.noreply.github.com>

[codex] Fix preview automation edge cases (pingdotgg#3561)

e9ed70c

Co-authored-by: codex <codex@users.noreply.github.com>

fix(grok): Harden ACP resume with replay-idle load readiness (pingdot…

52b04b9

…gg#3156) Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: codex <codex@users.noreply.github.com>

aaditagrawal mentioned this pull request Jun 26, 2026

[codex] Upgrade Legend List chat scrolling (#3545) #124

Merged

4 tasks

github-actions Bot added the vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. label Jun 26, 2026

aaditagrawal changed the title ~~Route preview automation through live owner streams (#3548)~~ fix(grok): Harden ACP resume with replay-idle load readiness (#3156) Jun 26, 2026

github-actions Bot added the size:XXL 1,000+ effective changed lines (test files excluded in mixed PRs). label Jun 26, 2026

aaditagrawal marked this pull request as ready for review June 26, 2026 12:11

chatgpt-codex-connector Bot reviewed Jun 26, 2026

View reviewed changes

juliusmarminge and others added 7 commits June 26, 2026 18:21

Restore right panel inset when maximized (pingdotgg#3555)

57be962

Fix Electron dev and packaged renderer startup (pingdotgg#3557)

d7ec665

Co-authored-by: Julius Marminge <julius@mac.lan>

Route preview automation through live owner streams (pingdotgg#3548)

cd4e5d8

Co-authored-by: codex <codex@users.noreply.github.com>

[codex] Fix preview automation edge cases (pingdotgg#3561)

ddcd138

Co-authored-by: codex <codex@users.noreply.github.com>

fix(grok): Harden ACP resume with replay-idle load readiness (pingdot…

0b4bb3b

…gg#3156) Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: codex <codex@users.noreply.github.com>

fix(grok): Harden ACP resume with replay-idle load readiness (pingdot…

d72eaf0

…gg#3156) Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: codex <codex@users.noreply.github.com>

aaditagrawal force-pushed the sync/upstream-20260626-preview-edge-cases branch from d2d615f to ddcd138 Compare June 26, 2026 13:11

aaditagrawal force-pushed the sync/upstream-20260626-grok-acp-resume branch from 44d905a to 41db910 Compare June 26, 2026 13:11

chatgpt-codex-connector Bot reviewed Jun 26, 2026

View reviewed changes

aaditagrawal changed the base branch from sync/upstream-20260626-preview-edge-cases to graphite-base/129 June 26, 2026 15:10

aaditagrawal changed the base branch from graphite-base/129 to main June 26, 2026 15:11

aaditagrawal merged commit bc98817 into main Jun 26, 2026
21 of 23 checks passed

aaditagrawal deleted the sync/upstream-20260626-grok-acp-resume branch June 26, 2026 15:17

		if (Option.isSome(gate) && gate.value.active) {
		const lastActivityAtMillis = yield* Clock.currentTimeMillis;

Conversation

aaditagrawal commented Jun 26, 2026

What Changed

Why

UI Changes

Checklist

Uh oh!

coderabbitai Bot commented Jun 26, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Review skipped

Uh oh!

aaditagrawal commented Jun 26, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot Jun 26, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector Bot Jun 26, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector Bot Jun 26, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector Bot Jun 26, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot Jun 26, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector Bot Jun 26, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector Bot Jun 26, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector Bot Jun 26, 2026

Choose a reason for hiding this comment

Uh oh!

aaditagrawal commented Jun 26, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Merge activity

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

coderabbitai Bot commented Jun 26, 2026 •

edited

Loading

aaditagrawal commented Jun 26, 2026 •

edited

Loading

aaditagrawal commented Jun 26, 2026 •

edited

Loading