The best way to control Claude Code, Codex and more from any computer or phone
fix(acp): wait for session/load to reply before prompting (#37139)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
shivam committed
Nov 15, 2026 at 15:46 UTC
834eb51301a447e6f4a8f5f517fb4eb75e00a783
4 files changed
+101
-8
apps/server/scripts/acp-mock-agent.ts
+18
@@ -70,6 +70,9 @@ const failLoadSession = process.env.T3_ACP_FAIL_LOAD_SESSION === "1";
70
const failLoadSessionAfterConfigReplay =
71
process.env.T3_ACP_FAIL_LOAD_SESSION_AFTER_CONFIG_REPLAY === "1";
72
const emitLoadReplay = process.env.T3_ACP_EMIT_LOAD_REPLAY === "1";
73
+const loadReplyDelayMs = Number(process.env.T3_ACP_LOAD_REPLY_DELAY_MS ?? "0");
74
+const loadNeverReplies = process.env.T3_ACP_LOAD_NEVER_REPLIES === "1";
75
+const rejectPromptUntilLoaded = process.env.T3_ACP_REJECT_PROMPT_UNTIL_LOADED === "1";
76
const failPrompt = process.env.T3_ACP_FAIL_PROMPT === "1";
77
// JSON for the `data` of an "Internal error" response to `session/new`, as
78
// Antigravity sends when its runtime cannot reach its local harness.
@@ -122,6 +125,7 @@ let currentAgent = "";
125
let authenticated = !requiresAuthentication;
126
let promptCount = 0;
127
const cancelledSessions = new Set<string>();
128
+const sessionsLoading = new Set<string>();
129
let configuredProvider: AcpSchema.ProviderCurrentConfig | null = null;
130
131
function promptIdFromRequestMeta(
@@ -687,6 +691,7 @@ const program = Effect.gen(function* () {
691
yield* agent.handleLoadSession((request) =>
692
Effect.gen(function* () {
693
const requestedSessionId = String(request.sessionId ?? sessionId);
694
+ sessionsLoading.add(requestedSessionId);
695
if (loadedCommandNames !== undefined) {
696
yield* agent.client.sessionUpdate({
697
sessionId: requestedSessionId,
@@ -729,6 +734,13 @@ const program = Effect.gen(function* () {
734
content: { type: "text", text: "replay" },
735
},
736
});
737
+ if (loadNeverReplies) {
738
+ return yield* Effect.never;
739
+ }
740
+ if (Number.isFinite(loadReplyDelayMs) && loadReplyDelayMs > 0) {
741
+ yield* Effect.sleep(`${loadReplyDelayMs} millis`);
742
+ }
743
+ sessionsLoading.delete(requestedSessionId);
744
return {
745
configOptions: configOptions(),
746
};
@@ -868,6 +880,12 @@ const program = Effect.gen(function* () {
880
yield* agent.handlePrompt((request) =>
881
Effect.gen(function* () {
882
const requestedSessionId = String(request.sessionId ?? sessionId);
883
+ if (rejectPromptUntilLoaded && sessionsLoading.has(requestedSessionId)) {
884
+ return yield* new AcpError.AcpRequestError({
885
+ code: -32002,
886
+ errorMessage: `Resource not found: ${requestedSessionId}`,
887
+ });
888
+ }
889
beginAcpMockPrompt(cancelledSessions, requestedSessionId);
890
promptCount += 1;
891
if (idleError === "grok-background" && promptCount === 1) {
apps/server/src/provider/acp/AcpJsonRpcConnection.test.ts
+66
@@ -1286,6 +1286,72 @@ describe("AcpSessionRuntime", () => {
1286
),
1287
);
1288
1289
+ // regression: #37106 prompt sent before session/load replied
1290
+ it.live("does not prompt before session/load replies after replay goes idle", () =>
1291
+ Effect.gen(function* () {
1292
+ const runtime = yield* AcpSessionRuntime.AcpSessionRuntime;
1293
+ yield* runtime.start();
1294
+
1295
+ const result = yield* runtime.prompt({
1296
+ prompt: [{ type: "text", text: "hi" }],
1297
+ });
1298
+ expect(result.stopReason).toBe("end_turn");
1299
+ }).pipe(
1300
+ Effect.provide(
1301
+ AcpSessionRuntime.layer({
1302
+ authMethodId: "test",
1303
+ spawn: {
1304
+ command: mockAgentCommand,
1305
+ args: mockAgentArgs,
1306
+ env: {
1307
+ T3_ACP_EMIT_LOAD_REPLAY: "1",
1308
+ T3_ACP_LOAD_REPLY_DELAY_MS: "500",
1309
+ T3_ACP_REJECT_PROMPT_UNTIL_LOADED: "1",
1310
+ },
1311
+ },
1312
+ cwd: process.cwd(),
1313
+ resumeSessionId: "mock-session-1",
1314
+ sessionLoadReplayIdleGap: "50 millis",
1315
+ clientInfo: { name: "t3-test", version: "0.0.0" },
1316
+ }),
1317
+ ),
1318
+ Effect.scoped,
1319
+ Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
1320
+ ),
1321
+ );
1322
+
1323
+ it.live("treats replay idle as loaded when the agent opts in", () =>
1324
+ Effect.gen(function* () {
1325
+ const runtime = yield* AcpSessionRuntime.AcpSessionRuntime;
1326
+ const started = yield* runtime.start();
1327
+
1328
+ expect(started.sessionSetupResult._meta).toMatchObject({
1329
+ t3SessionLoadReady: "replay_idle",
1330
+ });
1331
+ }).pipe(
1332
+ Effect.provide(
1333
+ AcpSessionRuntime.layer({
1334
+ authMethodId: "test",
1335
+ spawn: {
1336
+ command: mockAgentCommand,
1337
+ args: mockAgentArgs,
1338
+ env: {
1339
+ T3_ACP_EMIT_LOAD_REPLAY: "1",
1340
+ T3_ACP_LOAD_NEVER_REPLIES: "1",
1341
+ },
1342
+ },
1343
+ cwd: process.cwd(),
1344
+ resumeSessionId: "mock-session-1",
1345
+ sessionLoadReplayIdleGap: "50 millis",
1346
+ sessionLoadReplayIdleReadiness: true,
1347
+ clientInfo: { name: "t3-test", version: "0.0.0" },
1348
+ }),
1349
+ ),
1350
+ Effect.scoped,
1351
+ Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
1352
+ ),
1353
+ );
1354
+
1355
it.effect("rejects invalid config option values before sending session/set_config_option", () => {
1356
const tempDir = NodeFS.mkdtempSync(NodePath.join(NodeOS.tmpdir(), "acp-runtime-"));
1357
const requestLogPath = NodePath.join(tempDir, "requests.ndjson");
packages/provider-acp/src/server/AcpSessionRuntime.ts
+15
-8
@@ -101,6 +101,8 @@ export interface AcpSessionRuntimeOptions {
101
readonly resumeMethod?: "load" | "resume";
102
readonly sessionLoadTimeout?: Duration.Input;
103
readonly sessionLoadReplayIdleGap?: Duration.Input;
104
+ // Treat replay going quiet as loaded, for agents whose session/load may never reply.
105
+ readonly sessionLoadReplayIdleReadiness?: boolean;
106
readonly interruptPromptOnCancel?: boolean;
107
readonly cancelMeta?: EffectAcpSchema.CancelNotification["_meta"];
108
readonly initializeMeta?: EffectAcpSchema.InitializeRequest["_meta"];
@@ -1998,14 +2000,19 @@ export const make = Effect.fn("AcpSessionRuntime.make")(function* (
2000
status: "started",
2001
});
2002
2001
- const idleFiber = yield* waitForSessionLoadReplayIdle({
2002
- gateRef: sessionLoadGateRef,
2003
- }).pipe(Effect.forkIn(runtimeScope));
2004
- const loaded = yield* Effect.raceFirst(
2005
- acp.agent.loadSession(loadPayload),
2006
- Fiber.join(idleFiber),
2007
- ).pipe(
2008
- Effect.ensuring(Fiber.interrupt(idleFiber).pipe(Effect.ignore)),
2003
+ const loadOrReplayIdle =
2004
+ options.sessionLoadReplayIdleReadiness === true
2005
+ ? Effect.gen(function* () {
2006
+ const idleFiber = yield* waitForSessionLoadReplayIdle({
2007
+ gateRef: sessionLoadGateRef,
2008
+ }).pipe(Effect.forkIn(runtimeScope));
2009
+ return yield* Effect.raceFirst(
2010
+ acp.agent.loadSession(loadPayload),
2011
+ Fiber.join(idleFiber),
2012
+ ).pipe(Effect.ensuring(Fiber.interrupt(idleFiber).pipe(Effect.ignore)));
2013
+ })
2014
+ : acp.agent.loadSession(loadPayload);
2015
+ const loaded = yield* loadOrReplayIdle.pipe(
2016
Effect.timeoutOption(sessionLoadTimeout),
2017
Effect.flatMap((result) =>
2018
Effect.fromOption(
packages/provider-grok/src/server/acpSupport.ts
+2
@@ -141,6 +141,8 @@ export const makeGrokAcpRuntime = Effect.fn("GrokAcpSupport.makeGrokAcpRuntime")
141
authMethodId: resolveGrokAuthMethodId(input.environment),
142
cancelMeta: { ...input.cancelMeta, ...GROK_ACP_CANCEL_META },
143
initializeMeta: GROK_ACP_INITIALIZE_META,
144
+ // Grok's session/load can stay unanswered after replay finishes.
145
+ sessionLoadReplayIdleReadiness: true,
146
...grokAcpRuntimeProcessOwnership(processGroupPlatform),
147
}),
148
);