Skip to content

Commit db03ae5

Browse files
committed
test(server): ACP adapter tests wait for prompt settle instead of guessing
Ten AcpAdapterV2 tests waited for the raw `stopReason` line on the wire, yielded twice, and assumed the adapter had marked the prompt settled. The adapter only does that several async hops later, in the prompt completion callback. When Stop won that race the interrupt took the cancel-and-wait path, and the test's `TestClock.adjust("10 seconds")` fired the interrupt timeout immediately. Wait on the existing `afterPromptSettledWithBackgroundWork` test hook instead, as three other tests in the file already do.
1 parent cc1e634 commit db03ae5

1 file changed

Lines changed: 66 additions & 122 deletions

File tree

‎apps/server/src/orchestration-v2/Adapters/AcpAdapterV2.test.ts‎

Lines changed: 66 additions & 122 deletions
Original file line numberDiff line numberDiff line change
@@ -4927,7 +4927,12 @@ describe("AcpAdapterV2", () => {
49274927
);
49284928
const protocolEvents = yield* Queue.bounded<EffectAcpProtocol.AcpProtocolLogEvent>(256);
49294929
const instanceId = ProviderInstanceId.make("acp-test");
4930+
const promptSettled = yield* Deferred.make<void>();
49304931
const adapter = makeAcpAdapterV2({
4932+
testHooks: {
4933+
afterPromptSettledWithBackgroundWork: () =>
4934+
Deferred.succeed(promptSettled, undefined).pipe(Effect.asVoid),
4935+
},
49314936
crypto: yield* Crypto.Crypto,
49324937
instanceId,
49334938
flavor: {
@@ -4986,18 +4991,7 @@ describe("AcpAdapterV2", () => {
49864991
makeTurnInput({ threadId, providerThread, instanceId, runtimePolicy, now }),
49874992
);
49884993
// The still-running subagent defers finalize after session/prompt returns.
4989-
yield* Stream.fromQueue(protocolEvents).pipe(
4990-
Stream.filter(
4991-
(event) =>
4992-
event.direction === "incoming" &&
4993-
event.stage === "raw" &&
4994-
typeof event.payload === "string" &&
4995-
event.payload.includes('"stopReason"'),
4996-
),
4997-
Stream.runHead,
4998-
);
4999-
yield* Effect.yieldNow;
5000-
yield* Effect.yieldNow;
4994+
yield* Deferred.await(promptSettled);
50014995

50024996
const providerTurnId = idAllocator.derive.providerTurn({
50034997
driver: ACP_TEST_DRIVER,
@@ -5036,7 +5030,12 @@ describe("AcpAdapterV2", () => {
50365030
const protocolEvents = yield* Queue.bounded<EffectAcpProtocol.AcpProtocolLogEvent>(256);
50375031
const instanceId = ProviderInstanceId.make("acp-test");
50385032
let subagentPhase: "spawn" | "complete" = "spawn";
5033+
const promptSettled = yield* Deferred.make<void>();
50395034
const adapter = makeAcpAdapterV2({
5035+
testHooks: {
5036+
afterPromptSettledWithBackgroundWork: () =>
5037+
Deferred.succeed(promptSettled, undefined).pipe(Effect.asVoid),
5038+
},
50405039
crypto: yield* Crypto.Crypto,
50415040
instanceId,
50425041
flavor: {
@@ -5107,18 +5106,7 @@ describe("AcpAdapterV2", () => {
51075106
yield* runtime.startTurn(
51085107
makeTurnInput({ threadId, providerThread, instanceId, runtimePolicy, now }),
51095108
);
5110-
yield* Stream.fromQueue(protocolEvents).pipe(
5111-
Stream.filter(
5112-
(event) =>
5113-
event.direction === "incoming" &&
5114-
event.stage === "raw" &&
5115-
typeof event.payload === "string" &&
5116-
event.payload.includes('"stopReason"'),
5117-
),
5118-
Stream.runHead,
5119-
);
5120-
yield* Effect.yieldNow;
5121-
yield* Effect.yieldNow;
5109+
yield* Deferred.await(promptSettled);
51225110

51235111
const firstProviderTurnId = idAllocator.derive.providerTurn({
51245112
driver: ACP_TEST_DRIVER,
@@ -5196,7 +5184,12 @@ describe("AcpAdapterV2", () => {
51965184
const protocolEvents = yield* Queue.bounded<EffectAcpProtocol.AcpProtocolLogEvent>(256);
51975185
const instanceId = ProviderInstanceId.make("acp-test");
51985186
let subagentPhase: "spawn" | "complete" = "spawn";
5187+
const promptSettled = yield* Deferred.make<void>();
51995188
const adapter = makeAcpAdapterV2({
5189+
testHooks: {
5190+
afterPromptSettledWithBackgroundWork: () =>
5191+
Deferred.succeed(promptSettled, undefined).pipe(Effect.asVoid),
5192+
},
52005193
crypto: yield* Crypto.Crypto,
52015194
instanceId,
52025195
flavor: {
@@ -5272,18 +5265,7 @@ describe("AcpAdapterV2", () => {
52725265
yield* runtime.startTurn(
52735266
makeTurnInput({ threadId, providerThread, instanceId, runtimePolicy, now }),
52745267
);
5275-
yield* Stream.fromQueue(protocolEvents).pipe(
5276-
Stream.filter(
5277-
(event) =>
5278-
event.direction === "incoming" &&
5279-
event.stage === "raw" &&
5280-
typeof event.payload === "string" &&
5281-
event.payload.includes('"stopReason"'),
5282-
),
5283-
Stream.runHead,
5284-
);
5285-
yield* Effect.yieldNow;
5286-
yield* Effect.yieldNow;
5268+
yield* Deferred.await(promptSettled);
52875269

52885270
const firstProviderTurnId = idAllocator.derive.providerTurn({
52895271
driver: ACP_TEST_DRIVER,
@@ -5361,7 +5343,12 @@ describe("AcpAdapterV2", () => {
53615343
let subagentPhase: "spawn" | "complete" = "spawn";
53625344
type RuntimeService = AcpSessionRuntime.AcpSessionRuntime["Service"];
53635345
let sessionUpdateHandler: Parameters<RuntimeService["handleSessionUpdate"]>[0] | undefined;
5346+
const promptSettled = yield* Deferred.make<void>();
53645347
const adapter = makeAcpAdapterV2({
5348+
testHooks: {
5349+
afterPromptSettledWithBackgroundWork: () =>
5350+
Deferred.succeed(promptSettled, undefined).pipe(Effect.asVoid),
5351+
},
53655352
crypto: yield* Crypto.Crypto,
53665353
instanceId,
53675354
flavor: {
@@ -5456,18 +5443,7 @@ describe("AcpAdapterV2", () => {
54565443
yield* runtime.startTurn(
54575444
makeTurnInput({ threadId, providerThread, instanceId, runtimePolicy, now }),
54585445
);
5459-
yield* Stream.fromQueue(protocolEvents).pipe(
5460-
Stream.filter(
5461-
(event) =>
5462-
event.direction === "incoming" &&
5463-
event.stage === "raw" &&
5464-
typeof event.payload === "string" &&
5465-
event.payload.includes('"stopReason"'),
5466-
),
5467-
Stream.runHead,
5468-
);
5469-
yield* Effect.yieldNow;
5470-
yield* Effect.yieldNow;
5446+
yield* Deferred.await(promptSettled);
54715447

54725448
const firstProviderTurnId = idAllocator.derive.providerTurn({
54735449
driver: ACP_TEST_DRIVER,
@@ -5629,7 +5605,12 @@ describe("AcpAdapterV2", () => {
56295605
let sessionUpdateHandler:
56305606
| Parameters<RuntimeService["handleSessionUpdate"]>[0]
56315607
| undefined;
5608+
const promptSettled = yield* Deferred.make<void>();
56325609
const adapter = makeAcpAdapterV2({
5610+
testHooks: {
5611+
afterPromptSettledWithBackgroundWork: () =>
5612+
Deferred.succeed(promptSettled, undefined).pipe(Effect.asVoid),
5613+
},
56335614
crypto: yield* Crypto.Crypto,
56345615
instanceId,
56355616
flavor: {
@@ -5719,18 +5700,7 @@ describe("AcpAdapterV2", () => {
57195700
yield* runtime.startTurn(
57205701
makeTurnInput({ threadId, providerThread, instanceId, runtimePolicy, now }),
57215702
);
5722-
yield* Stream.fromQueue(protocolEvents).pipe(
5723-
Stream.filter(
5724-
(event) =>
5725-
event.direction === "incoming" &&
5726-
event.stage === "raw" &&
5727-
typeof event.payload === "string" &&
5728-
event.payload.includes('"stopReason"'),
5729-
),
5730-
Stream.runHead,
5731-
);
5732-
yield* Effect.yieldNow;
5733-
yield* Effect.yieldNow;
5703+
yield* Deferred.await(promptSettled);
57345704
yield* TestClock.adjust("1 second");
57355705
assert.isDefined(sessionUpdateHandler, "session update handler must be wired");
57365706

@@ -6458,7 +6428,12 @@ describe("AcpAdapterV2", () => {
64586428
let subagentPhase: "spawn" | "complete" = "spawn";
64596429
type RuntimeService = AcpSessionRuntime.AcpSessionRuntime["Service"];
64606430
let sessionUpdateHandler: Parameters<RuntimeService["handleSessionUpdate"]>[0] | undefined;
6431+
const promptSettled = yield* Deferred.make<void>();
64616432
const adapter = makeAcpAdapterV2({
6433+
testHooks: {
6434+
afterPromptSettledWithBackgroundWork: () =>
6435+
Deferred.succeed(promptSettled, undefined).pipe(Effect.asVoid),
6436+
},
64626437
crypto: yield* Crypto.Crypto,
64636438
instanceId,
64646439
flavor: {
@@ -6548,18 +6523,7 @@ describe("AcpAdapterV2", () => {
65486523
yield* runtime.startTurn(
65496524
makeTurnInput({ threadId, providerThread, instanceId, runtimePolicy, now }),
65506525
);
6551-
yield* Stream.fromQueue(protocolEvents).pipe(
6552-
Stream.filter(
6553-
(event) =>
6554-
event.direction === "incoming" &&
6555-
event.stage === "raw" &&
6556-
typeof event.payload === "string" &&
6557-
event.payload.includes('"stopReason"'),
6558-
),
6559-
Stream.runHead,
6560-
);
6561-
yield* Effect.yieldNow;
6562-
yield* Effect.yieldNow;
6526+
yield* Deferred.await(promptSettled);
65636527

65646528
const firstProviderTurnId = idAllocator.derive.providerTurn({
65656529
driver: ACP_TEST_DRIVER,
@@ -6759,7 +6723,12 @@ describe("AcpAdapterV2", () => {
67596723
let subagentPhase: "spawn" | "complete" = "spawn";
67606724
type RuntimeService = AcpSessionRuntime.AcpSessionRuntime["Service"];
67616725
let sessionUpdateHandler: Parameters<RuntimeService["handleSessionUpdate"]>[0] | undefined;
6726+
const promptSettled = yield* Deferred.make<void>();
67626727
const adapter = makeAcpAdapterV2({
6728+
testHooks: {
6729+
afterPromptSettledWithBackgroundWork: () =>
6730+
Deferred.succeed(promptSettled, undefined).pipe(Effect.asVoid),
6731+
},
67636732
crypto: yield* Crypto.Crypto,
67646733
instanceId,
67656734
flavor: {
@@ -6875,8 +6844,7 @@ describe("AcpAdapterV2", () => {
68756844
},
68766845
});
68776846
yield* Deferred.succeed(releasePromptCompletion, undefined);
6878-
yield* Effect.yieldNow;
6879-
yield* Effect.yieldNow;
6847+
yield* Deferred.await(promptSettled);
68806848

68816849
const firstProviderTurnId = idAllocator.derive.providerTurn({
68826850
driver: ACP_TEST_DRIVER,
@@ -7231,7 +7199,12 @@ describe("AcpAdapterV2", () => {
72317199
let subagentPhase: "spawn" | "complete" = "spawn";
72327200
type RuntimeService = AcpSessionRuntime.AcpSessionRuntime["Service"];
72337201
let sessionUpdateHandler: Parameters<RuntimeService["handleSessionUpdate"]>[0] | undefined;
7202+
const promptSettled = yield* Deferred.make<void>();
72347203
const adapter = makeAcpAdapterV2({
7204+
testHooks: {
7205+
afterPromptSettledWithBackgroundWork: () =>
7206+
Deferred.succeed(promptSettled, undefined).pipe(Effect.asVoid),
7207+
},
72357208
crypto: yield* Crypto.Crypto,
72367209
instanceId,
72377210
flavor: {
@@ -7321,18 +7294,7 @@ describe("AcpAdapterV2", () => {
73217294
yield* runtime.startTurn(
73227295
makeTurnInput({ threadId, providerThread, instanceId, runtimePolicy, now }),
73237296
);
7324-
yield* Stream.fromQueue(protocolEvents).pipe(
7325-
Stream.filter(
7326-
(event) =>
7327-
event.direction === "incoming" &&
7328-
event.stage === "raw" &&
7329-
typeof event.payload === "string" &&
7330-
event.payload.includes('"stopReason"'),
7331-
),
7332-
Stream.runHead,
7333-
);
7334-
yield* Effect.yieldNow;
7335-
yield* Effect.yieldNow;
7297+
yield* Deferred.await(promptSettled);
73367298

73377299
const firstProviderTurnId = idAllocator.derive.providerTurn({
73387300
driver: ACP_TEST_DRIVER,
@@ -7513,7 +7475,12 @@ describe("AcpAdapterV2", () => {
75137475
let subagentPhase: "spawn" | "complete" = "spawn";
75147476
type RuntimeService = AcpSessionRuntime.AcpSessionRuntime["Service"];
75157477
let sessionUpdateHandler: Parameters<RuntimeService["handleSessionUpdate"]>[0] | undefined;
7478+
const promptSettled = yield* Deferred.make<void>();
75167479
const adapter = makeAcpAdapterV2({
7480+
testHooks: {
7481+
afterPromptSettledWithBackgroundWork: () =>
7482+
Deferred.succeed(promptSettled, undefined).pipe(Effect.asVoid),
7483+
},
75177484
crypto: yield* Crypto.Crypto,
75187485
instanceId,
75197486
flavor: {
@@ -7603,18 +7570,7 @@ describe("AcpAdapterV2", () => {
76037570
yield* runtime.startTurn(
76047571
makeTurnInput({ threadId, providerThread, instanceId, runtimePolicy, now }),
76057572
);
7606-
yield* Stream.fromQueue(protocolEvents).pipe(
7607-
Stream.filter(
7608-
(event) =>
7609-
event.direction === "incoming" &&
7610-
event.stage === "raw" &&
7611-
typeof event.payload === "string" &&
7612-
event.payload.includes('"stopReason"'),
7613-
),
7614-
Stream.runHead,
7615-
);
7616-
yield* Effect.yieldNow;
7617-
yield* Effect.yieldNow;
7573+
yield* Deferred.await(promptSettled);
76187574

76197575
const firstProviderTurnId = idAllocator.derive.providerTurn({
76207576
driver: ACP_TEST_DRIVER,
@@ -7765,7 +7721,12 @@ describe("AcpAdapterV2", () => {
77657721
let subagentPhase: "spawn" | "complete" = "spawn";
77667722
let cancelCalled = false;
77677723
let runtimeOrdinalSeen = 0;
7724+
const promptSettled = yield* Deferred.make<void>();
77687725
const adapter = makeAcpAdapterV2({
7726+
testHooks: {
7727+
afterPromptSettledWithBackgroundWork: () =>
7728+
Deferred.succeed(promptSettled, undefined).pipe(Effect.asVoid),
7729+
},
77697730
crypto: yield* Crypto.Crypto,
77707731
instanceId,
77717732
flavor: {
@@ -7853,18 +7814,7 @@ describe("AcpAdapterV2", () => {
78537814
);
78547815
// The still-running subagent defers finalize after session/prompt returns,
78557816
// so the interrupt below hits a settled turn held open for background work.
7856-
yield* Stream.fromQueue(protocolEvents).pipe(
7857-
Stream.filter(
7858-
(event) =>
7859-
event.direction === "incoming" &&
7860-
event.stage === "raw" &&
7861-
typeof event.payload === "string" &&
7862-
event.payload.includes('"stopReason"'),
7863-
),
7864-
Stream.runHead,
7865-
);
7866-
yield* Effect.yieldNow;
7867-
yield* Effect.yieldNow;
7817+
yield* Deferred.await(promptSettled);
78687818

78697819
const firstProviderTurnId = idAllocator.derive.providerTurn({
78707820
driver: ACP_TEST_DRIVER,
@@ -13728,7 +13678,12 @@ describe("AcpAdapterV2", () => {
1372813678
const protocolEvents = yield* Queue.bounded<EffectAcpProtocol.AcpProtocolLogEvent>(256);
1372913679
const instanceId = ProviderInstanceId.make("acp-test");
1373013680
let subagentPhase: "spawn" | "complete" = "spawn";
13681+
const promptSettled = yield* Deferred.make<void>();
1373113682
const adapter = makeAcpAdapterV2({
13683+
testHooks: {
13684+
afterPromptSettledWithBackgroundWork: () =>
13685+
Deferred.succeed(promptSettled, undefined).pipe(Effect.asVoid),
13686+
},
1373213687
crypto: yield* Crypto.Crypto,
1373313688
instanceId,
1373413689
flavor: {
@@ -13799,18 +13754,7 @@ describe("AcpAdapterV2", () => {
1379913754
yield* runtime.startTurn(
1380013755
makeTurnInput({ threadId, providerThread, instanceId, runtimePolicy, now }),
1380113756
);
13802-
yield* Stream.fromQueue(protocolEvents).pipe(
13803-
Stream.filter(
13804-
(event) =>
13805-
event.direction === "incoming" &&
13806-
event.stage === "raw" &&
13807-
typeof event.payload === "string" &&
13808-
event.payload.includes('"stopReason"'),
13809-
),
13810-
Stream.runHead,
13811-
);
13812-
yield* Effect.yieldNow;
13813-
yield* Effect.yieldNow;
13757+
yield* Deferred.await(promptSettled);
1381413758

1381513759
const firstProviderTurnId = idAllocator.derive.providerTurn({
1381613760
driver: ACP_TEST_DRIVER,

0 commit comments

Comments
 (0)