diff --git a/packages/effect-acp/src/protocol.test.ts b/packages/effect-acp/src/protocol.test.ts index 2ee7347537fb6..e9a5f1187d32e 100644 --- a/packages/effect-acp/src/protocol.test.ts +++ b/packages/effect-acp/src/protocol.test.ts @@ -867,6 +867,36 @@ it.layer(NodeServices.layer)("effect-acp protocol", (it) => { }), ); + it.effect("fails pending and later requests when input ends before the process exits", () => + Effect.gen(function* () { + const { stdio, input, output } = yield* makeInMemoryStdio(); + const termination = yield* Deferred.make(); + const transport = yield* AcpProtocol.makeAcpPatchedProtocol({ + stdio, + terminationError: Effect.never, + serverRequestMethods: new Set(), + onTermination: (error) => Deferred.succeed(termination, error).pipe(Effect.asVoid), + }); + const pending = yield* transport + .request("x/test", { hello: "world" }) + .pipe(Effect.flip, Effect.orDie, Effect.forkScoped); + yield* Queue.take(output); + yield* Queue.end(input); + + const error = yield* Deferred.await(termination); + assert.instanceOf(error, AcpError.AcpInputStreamEndedError); + assert.strictEqual(yield* Fiber.join(pending), error); + assert.strictEqual( + yield* transport.request("x/test", { hello: "later" }).pipe(Effect.flip, Effect.orDie), + error, + ); + assert.strictEqual( + yield* transport.notify("session/cancel", { sessionId: "session-1" }).pipe(Effect.flip), + error, + ); + }), + ); + it.effect("propagates the real child exit code when the input stream ends", () => Effect.gen(function* () { const handle = yield* makeHandle({ ACP_MOCK_EXIT_IMMEDIATELY_CODE: "7" }); diff --git a/packages/effect-acp/src/protocol.ts b/packages/effect-acp/src/protocol.ts index 72b4e15643632..084e7752bda96 100644 --- a/packages/effect-acp/src/protocol.ts +++ b/packages/effect-acp/src/protocol.ts @@ -1,5 +1,6 @@ import type * as AcpCompat from "./compat.ts"; import * as Cause from "effect/Cause"; +import * as Clock from "effect/Clock"; import * as Effect from "effect/Effect"; import * as Deferred from "effect/Deferred"; import * as Exit from "effect/Exit"; @@ -756,10 +757,16 @@ export const makeAcpPatchedProtocol = Effect.fn("makeAcpPatchedProtocol")(functi return handleTermination(() => Effect.succeed(normalized)); }, onSuccess: () => - handleTermination( - () => - options.terminationError ?? Effect.succeed(new AcpError.AcpInputStreamEndedError({})), - ), + handleTermination(() => { + const ended = new AcpError.AcpInputStreamEndedError({}); + if (!options.terminationError) return Effect.succeed(ended); + // Stdout can close without process exit; use a live-clock diagnostic grace period. + return options.terminationError.pipe( + Effect.timeoutOption("250 millis"), + Effect.provideService(Clock.Clock, Clock.Clock.defaultValue()), + Effect.map(Option.getOrElse(() => ended)), + ); + }), }), Effect.forkScoped, );