Skip to content

Commit f5b7a12

Browse files
committed
test(opencode): pin compaction completion event
1 parent 7edb7f6 commit f5b7a12

7 files changed

Lines changed: 15 additions & 15 deletions

File tree

‎apps/server/src/orchestration/Layers/ProviderCommandReactor.test.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -656,7 +656,6 @@ describe("ProviderCommandReactor", () => {
656656
expect(harness.compactThread).not.toHaveBeenCalled();
657657
}),
658658
);
659-
660659
effectIt.effect("projects starting before a slow provider session finishes", () =>
661660
Effect.gen(function* () {
662661
const releaseStart = yield* Deferred.make<void>();

‎apps/server/src/orchestration/Layers/ProviderCommandReactor.ts‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ const isCompactCommandMessage = (message: ThreadTitleMessage): boolean =>
8080
message.role === "user" &&
8181
(message.attachments?.length ?? 0) === 0 &&
8282
message.text.trim().toLowerCase() === "/compact";
83-
8483
function mapProviderSessionStatusToOrchestrationStatus(
8584
status: "connecting" | "ready" | "running" | "error" | "closed",
8685
): OrchestrationSession["status"] {
@@ -1240,7 +1239,6 @@ const make = Effect.gen(function* () {
12401239
const detail = formatFailureDetail(cause);
12411240
return appendTurnStartFailure("Context compaction failed", detail).pipe(Effect.asVoid);
12421241
};
1243-
12441242
const recoverCompactionFailure = (cause: Cause.Cause<unknown>) =>
12451243
handleCompactionFailure(cause).pipe(
12461244
Effect.catchCause((recoveryCause) =>
@@ -1252,7 +1250,6 @@ const make = Effect.gen(function* () {
12521250
}),
12531251
),
12541252
);
1255-
12561253
if (isCompactCommand) {
12571254
if (nonCompactUserMessageCount === 0) {
12581255
return yield* appendTurnStartFailure(
@@ -1292,14 +1289,12 @@ const make = Effect.gen(function* () {
12921289
);
12931290
return;
12941291
}
1295-
12961292
if (compactingThreadIds.has(event.payload.threadId)) {
12971293
return yield* appendTurnStartFailure(
12981294
"Provider turn start failed",
12991295
"Wait for context compaction to finish before sending another message.",
13001296
);
13011297
}
1302-
13031298
const sendTurnRequest = yield* buildSendTurnRequestForThread({
13041299
threadId: event.payload.threadId,
13051300
messageText: message.text,

‎apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -760,7 +760,6 @@ export function runtimeEventToActivities(
760760
beforeTokens !== undefined && afterTokens !== undefined
761761
? `Compacted context ${formatTokens(beforeTokens)} → ${formatTokens(afterTokens)} tokens`
762762
: "Context compacted";
763-
764763
return [
765764
{
766765
id: event.eventId,

‎apps/server/src/provider/Layers/OpenCodeAdapter.test.ts‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -959,7 +959,16 @@ it.layer(OpenCodeAdapterTestLayer)("OpenCodeAdapterLive", (it) => {
959959
Effect.gen(function* () {
960960
const adapter = yield* OpenCodeAdapter;
961961
const threadId = asThreadId("thread-opencode-compact");
962-
962+
runtimeMock.state.subscribedEvents.push({
963+
type: "session.compacted",
964+
properties: { sessionID: "http://127.0.0.1:9999/session" },
965+
});
966+
const eventsFiber = yield* adapter.streamEvents.pipe(
967+
Stream.filter((event) => event.threadId === threadId),
968+
Stream.take(3),
969+
Stream.runCollect,
970+
Effect.forkChild,
971+
);
963972
yield* adapter.startSession({
964973
provider: ProviderDriverKind.make("opencode"),
965974
threadId,
@@ -971,10 +980,14 @@ it.layer(OpenCodeAdapterTestLayer)("OpenCodeAdapterLive", (it) => {
971980
);
972981
const summarizeCall = runtimeMock.state.summarizeCalls[0] as Record<string, unknown>;
973982
NodeAssert.equal(summarizeCall.modelID, "gpt-5");
983+
const events = Array.from(yield* Fiber.join(eventsFiber));
974984
yield* adapter.stopSession(threadId);
985+
const compacted = events.some(
986+
(event) => event.type === "thread.state.changed" && event.payload.state === "compacted",
987+
);
988+
NodeAssert.equal(compacted, true);
975989
}),
976990
);
977-
978991
it.effect("falls back to a fresh session when the persisted session is gone", () =>
979992
Effect.gen(function* () {
980993
const adapter = yield* OpenCodeAdapter;

‎apps/server/src/provider/Layers/OpenCodeAdapter.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2014,7 +2014,6 @@ export function makeOpenCodeAdapter(
20142014
}
20152015
break;
20162016
}
2017-
20182017
case "session.compacted": {
20192018
yield* emit({
20202019
...(yield* buildEventBase({
@@ -3025,7 +3024,6 @@ export function makeOpenCodeAdapter(
30253024
issue: "OpenCode compaction requires an active 'provider/model' selection.",
30263025
});
30273026
}
3028-
30293027
yield* context.promptSemaphore.withPermit(
30303028
Effect.gen(function* () {
30313029
if (sessions.get(threadId) !== context || (yield* Ref.get(context.stopped))) {
@@ -3066,7 +3064,6 @@ export function makeOpenCodeAdapter(
30663064
}),
30673065
);
30683066
});
3069-
30703067
const interruptTurn: OpenCodeAdapterShape["interruptTurn"] = Effect.fn("interruptTurn")(
30713068
function* (threadId, turnId) {
30723069
const context = yield* ensureSessionContext(sessions, threadId);

‎apps/server/src/provider/Layers/ProviderService.test.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,6 @@ function makeFakeCodexAdapter(provider: ProviderDriverKind = CODEX_DRIVER) {
184184
}),
185185
),
186186
);
187-
188187
const respondToRequest = vi.fn(
189188
(
190189
_threadId: ThreadId,

‎apps/server/src/provider/Layers/ProviderService.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,6 @@ const makeProviderService = Effect.fn("makeProviderService")(function* (
378378
yield* settleCompaction(canonicalEvent.threadId, "completed");
379379
return;
380380
}
381-
382381
const compactionTerminal =
383382
canonicalEvent.type === "turn.completed"
384383
? canonicalEvent.payload.state
@@ -397,7 +396,6 @@ const makeProviderService = Effect.fn("makeProviderService")(function* (
397396
) {
398397
return;
399398
}
400-
401399
const compactedEvent = {
402400
...canonicalEvent,
403401
eventId: EventId.make(`${canonicalEvent.eventId}:context-compaction`),

0 commit comments

Comments
 (0)