Skip to content

Commit 535557b

Browse files
authored
feat(providers): add context compaction across harnesses (#8808)
Co-authored-by: maria-rcks <[email protected]>
1 parent 1eb36b4 commit 535557b

35 files changed

Lines changed: 646 additions & 114 deletions

‎apps/mobile/src/features/threads/use-composer-command-menu.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,8 @@ export function useComposerCommandMenu({
127127
// Codex feedback uploads an existing thread's session and logs.
128128
if (
129129
!hasThread &&
130-
selectedProviderStatus?.driver === "codex" &&
131-
command.name === "feedback"
130+
(command.name === "compact" ||
131+
(selectedProviderStatus?.driver === "codex" && command.name === "feedback"))
132132
) {
133133
continue;
134134
}

‎apps/server/integration/orphanedProviderSessionStartup.integration.test.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ const startupDependencies = Layer.mergeAll(
110110
Layer.succeed(ProviderService.ProviderService, {
111111
startSession: () => Effect.die("unused"),
112112
sendTurn: () => Effect.die("unused"),
113+
compactThread: () => Effect.die("unused"),
113114
interruptTurn: () => Effect.die("unused"),
114115
respondToRequest: () => Effect.die("unused"),
115116
respondToUserInput: () => Effect.die("unused"),

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ function createProviderServiceHarness(
107107
const service: ProviderServiceShape = {
108108
startSession: () => unsupported(),
109109
sendTurn: () => unsupported(),
110+
compactThread: () => unsupported(),
110111
interruptTurn: () => unsupported(),
111112
respondToRequest: () => unsupported(),
112113
respondToUserInput: () => unsupported(),

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1275,6 +1275,21 @@ const makeOrchestrationProjectionPipeline = Effect.fn("makeOrchestrationProjecti
12751275
return;
12761276
}
12771277

1278+
case "thread.activity-appended":
1279+
if (event.payload.activity.kind !== "provider.turn.start.failed") return;
1280+
const pendingTurnStart = yield* projectionTurnRepository.getPendingTurnStartByThreadId(
1281+
event.payload,
1282+
);
1283+
if (
1284+
Option.isNone(pendingTurnStart) ||
1285+
String(pendingTurnStart.value.messageId) !==
1286+
extractActivityRequestId(event.payload.activity.payload)
1287+
) {
1288+
return;
1289+
}
1290+
yield* projectionTurnRepository.deletePendingTurnStartByThreadId(event.payload);
1291+
return;
1292+
12781293
case "thread.session-set": {
12791294
const turnId = event.payload.session.activeTurnId;
12801295
if (turnId === null || event.payload.session.status !== "running") {

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,7 @@ describe("ProviderCommandReactor", () => {
254254
turnId: asTurnId("turn-1"),
255255
}),
256256
);
257+
const compactThread = vi.fn((_: ThreadId) => Effect.void);
257258
const interruptTurn = vi.fn((_: unknown) => input?.interruptTurnEffect?.() ?? Effect.void);
258259
const respondToRequest = vi.fn<ProviderServiceShape["respondToRequest"]>(() => Effect.void);
259260
const respondToUserInput = vi.fn<ProviderServiceShape["respondToUserInput"]>(() => Effect.void);
@@ -339,6 +340,7 @@ describe("ProviderCommandReactor", () => {
339340
const service: ProviderServiceShape = {
340341
startSession: startSession as ProviderServiceShape["startSession"],
341342
sendTurn: sendTurn as ProviderServiceShape["sendTurn"],
343+
compactThread,
342344
interruptTurn: interruptTurn as ProviderServiceShape["interruptTurn"],
343345
respondToRequest: respondToRequest as ProviderServiceShape["respondToRequest"],
344346
respondToUserInput: respondToUserInput as ProviderServiceShape["respondToUserInput"],
@@ -533,6 +535,7 @@ describe("ProviderCommandReactor", () => {
533535
readModel: () => Effect.runPromise(snapshotQuery.getSnapshot()),
534536
startSession,
535537
sendTurn,
538+
compactThread,
536539
interruptTurn,
537540
respondToRequest,
538541
respondToUserInput,
@@ -632,6 +635,27 @@ describe("ProviderCommandReactor", () => {
632635
}),
633636
);
634637

638+
effectIt.effect("rejects /compact without conversation context", () =>
639+
Effect.gen(function* () {
640+
const harness = yield* Effect.promise(() => createHarness());
641+
yield* harness.engine.dispatch({
642+
type: "thread.turn.start",
643+
commandId: CommandId.make("cmd-empty-compact"),
644+
threadId: ThreadId.make("thread-1"),
645+
message: {
646+
messageId: asMessageId("user-message-empty-compact"),
647+
role: "user",
648+
text: "/compact",
649+
attachments: [],
650+
},
651+
interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE,
652+
runtimeMode: "approval-required",
653+
createdAt: "2026-01-01T00:00:00.000Z",
654+
});
655+
yield* Effect.promise(() => harness.drain());
656+
expect(harness.compactThread).not.toHaveBeenCalled();
657+
}),
658+
);
635659
effectIt.effect("projects starting before a slow provider session finishes", () =>
636660
Effect.gen(function* () {
637661
const releaseStart = yield* Deferred.make<void>();

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

Lines changed: 96 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@ import { makeDrainableWorker } from "@t3tools/shared/DrainableWorker";
3030

3131
import { resolveThreadWorkspaceCwd } from "../../checkpointing/Utils.ts";
3232
import { increment, orchestrationEventsProcessedTotal } from "../../observability/Metrics.ts";
33-
import { ProviderAdapterRequestError } from "../../provider/Errors.ts";
33+
import {
34+
ProviderAdapterRequestError,
35+
ProviderAdapterValidationError,
36+
} from "../../provider/Errors.ts";
3437
import type { ProviderServiceError } from "../../provider/Errors.ts";
3538
import { TextGeneration } from "../../textGeneration/TextGeneration.ts";
3639
import { ProviderService } from "../../provider/Services/ProviderService.ts";
@@ -50,6 +53,7 @@ import {
5053
import { VcsStatusBroadcaster } from "../../vcs/VcsStatusBroadcaster.ts";
5154
import { GitWorkflowService } from "../../git/GitWorkflowService.ts";
5255
const isProviderAdapterRequestError = Schema.is(ProviderAdapterRequestError);
56+
const isProviderAdapterValidationError = Schema.is(ProviderAdapterValidationError);
5357
const isProviderDriverKind = Schema.is(ProviderDriverKind);
5458

5559
type ProviderIntentEvent = Extract<
@@ -72,6 +76,10 @@ function toNonEmptyProviderInput(value: string | undefined): string | undefined
7276
return normalized && normalized.length > 0 ? normalized : undefined;
7377
}
7478

79+
const isCompactCommandMessage = (message: ThreadTitleMessage): boolean =>
80+
message.role === "user" &&
81+
(message.attachments?.length ?? 0) === 0 &&
82+
message.text.trim().toLowerCase() === "/compact";
7583
function mapProviderSessionStatusToOrchestrationStatus(
7684
status: "connecting" | "ready" | "running" | "error" | "closed",
7785
): OrchestrationSession["status"] {
@@ -332,6 +340,7 @@ const make = Effect.gen(function* () {
332340
);
333341

334342
const threadModelSelections = new Map<string, ModelSelection>();
343+
const compactingThreadIds = new Set<ThreadId>();
335344

336345
const appendProviderFailureActivity = (input: {
337346
readonly threadId: ThreadId;
@@ -375,11 +384,11 @@ const make = Effect.gen(function* () {
375384

376385
const formatFailureDetail = (cause: Cause.Cause<unknown>): string => {
377386
const failReason = cause.reasons.find(Cause.isFailReason);
378-
const providerError = isProviderAdapterRequestError(failReason?.error)
379-
? failReason.error
380-
: undefined;
381-
if (providerError) {
382-
return providerError.detail;
387+
if (isProviderAdapterRequestError(failReason?.error)) {
388+
return failReason.error.detail;
389+
}
390+
if (isProviderAdapterValidationError(failReason?.error)) {
391+
return failReason.error.issue;
383392
}
384393
return Cause.pretty(cause);
385394
};
@@ -1137,7 +1146,6 @@ const make = Effect.gen(function* () {
11371146
if (!thread) {
11381147
return;
11391148
}
1140-
11411149
const message = thread.messages.find((entry) => entry.id === event.payload.messageId);
11421150
if (!message || message.role !== "user") {
11431151
yield* appendProviderFailureActivity({
@@ -1147,15 +1155,28 @@ const make = Effect.gen(function* () {
11471155
detail: `User message '${event.payload.messageId}' was not found for turn start request.`,
11481156
turnId: null,
11491157
createdAt: event.payload.createdAt,
1158+
requestId: event.payload.messageId,
11501159
});
11511160
return;
11521161
}
1162+
const appendTurnStartFailure = (summary: string, detail: string) =>
1163+
appendProviderFailureActivity({
1164+
threadId: event.payload.threadId,
1165+
kind: "provider.turn.start.failed",
1166+
summary,
1167+
detail,
1168+
turnId: null,
1169+
createdAt: event.payload.createdAt,
1170+
requestId: event.payload.messageId,
1171+
});
11531172

11541173
yield* ensureThreadWorktree(thread);
11551174

1156-
const isFirstUserMessageTurn =
1157-
thread.messages.filter((entry) => entry.role === "user").length === 1;
1158-
if (isFirstUserMessageTurn) {
1175+
const isCompactCommand = isCompactCommandMessage(message);
1176+
const nonCompactUserMessageCount = thread.messages.filter(
1177+
(entry) => entry.role === "user" && !isCompactCommandMessage(entry),
1178+
).length;
1179+
if (nonCompactUserMessageCount === 1 && !isCompactCommand) {
11591180
const project = yield* resolveProject(thread.projectId);
11601181
const generationCwd =
11611182
resolveThreadWorkspaceCwd({
@@ -1194,16 +1215,7 @@ const make = Effect.gen(function* () {
11941215
detail,
11951216
createdAt: event.payload.createdAt,
11961217
}).pipe(
1197-
Effect.flatMap(() =>
1198-
appendProviderFailureActivity({
1199-
threadId: event.payload.threadId,
1200-
kind: "provider.turn.start.failed",
1201-
summary: "Provider turn start failed",
1202-
detail,
1203-
turnId: null,
1204-
createdAt: event.payload.createdAt,
1205-
}),
1206-
),
1218+
Effect.flatMap(() => appendTurnStartFailure("Provider turn start failed", detail)),
12071219
Effect.asVoid,
12081220
);
12091221
};
@@ -1220,6 +1232,69 @@ const make = Effect.gen(function* () {
12201232
),
12211233
);
12221234

1235+
const handleCompactionFailure = (cause: Cause.Cause<unknown>) => {
1236+
if (Cause.hasInterruptsOnly(cause)) {
1237+
return Effect.void;
1238+
}
1239+
const detail = formatFailureDetail(cause);
1240+
return appendTurnStartFailure("Context compaction failed", detail).pipe(Effect.asVoid);
1241+
};
1242+
const recoverCompactionFailure = (cause: Cause.Cause<unknown>) =>
1243+
handleCompactionFailure(cause).pipe(
1244+
Effect.catchCause((recoveryCause) =>
1245+
Effect.logWarning("provider command reactor failed to recover compaction failure", {
1246+
eventType: event.type,
1247+
threadId: event.payload.threadId,
1248+
cause: Cause.pretty(recoveryCause),
1249+
originalCause: Cause.pretty(cause),
1250+
}),
1251+
),
1252+
);
1253+
if (isCompactCommand) {
1254+
if (nonCompactUserMessageCount === 0) {
1255+
return yield* appendTurnStartFailure(
1256+
"Context compaction failed",
1257+
"Context compaction requires an existing conversation.",
1258+
);
1259+
}
1260+
const latestThread = yield* resolveThread(event.payload.threadId);
1261+
if (
1262+
compactingThreadIds.has(event.payload.threadId) ||
1263+
latestThread?.session?.status === "starting" ||
1264+
latestThread?.session?.status === "running"
1265+
) {
1266+
yield* appendTurnStartFailure(
1267+
"Context compaction failed",
1268+
"Context compaction is unavailable while a provider turn is running.",
1269+
);
1270+
return;
1271+
}
1272+
compactingThreadIds.add(event.payload.threadId);
1273+
yield* Effect.gen(function* () {
1274+
yield* ensureSessionForThread(
1275+
event.payload.threadId,
1276+
event.payload.createdAt,
1277+
event.payload.modelSelection !== undefined
1278+
? { modelSelection: event.payload.modelSelection }
1279+
: undefined,
1280+
);
1281+
if (event.payload.modelSelection !== undefined) {
1282+
threadModelSelections.set(event.payload.threadId, event.payload.modelSelection);
1283+
}
1284+
yield* providerService.compactThread(event.payload.threadId, event.payload.modelSelection);
1285+
}).pipe(
1286+
Effect.catchCause(recoverCompactionFailure),
1287+
Effect.ensuring(Effect.sync(() => void compactingThreadIds.delete(event.payload.threadId))),
1288+
Effect.forkScoped,
1289+
);
1290+
return;
1291+
}
1292+
if (compactingThreadIds.has(event.payload.threadId)) {
1293+
return yield* appendTurnStartFailure(
1294+
"Provider turn start failed",
1295+
"Wait for context compaction to finish before sending another message.",
1296+
);
1297+
}
12231298
const sendTurnRequest = yield* buildSendTurnRequestForThread({
12241299
threadId: event.payload.threadId,
12251300
messageText: message.text,
@@ -1240,7 +1315,7 @@ const make = Effect.gen(function* () {
12401315

12411316
yield* providerService
12421317
.sendTurn(sendTurnRequest.value)
1243-
.pipe(Effect.catchCause(recoverTurnStartFailure), Effect.forkScoped);
1318+
.pipe(Effect.asVoid, Effect.catchCause(recoverTurnStartFailure), Effect.forkScoped);
12441319
});
12451320

12461321
const processTurnInterruptRequested = Effect.fn("processTurnInterruptRequested")(function* (

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ function createProviderServiceHarness() {
105105
const service: ProviderServiceShape = {
106106
startSession: () => unsupported(),
107107
sendTurn: () => unsupported(),
108+
compactThread: () => unsupported(),
108109
interruptTurn: () => unsupported(),
109110
respondToRequest: () => unsupported(),
110111
respondToUserInput: () => unsupported(),
@@ -3221,6 +3222,8 @@ describe("ProviderRuntimeIngestion", () => {
32213222
turnId: asTurnId("turn-1"),
32223223
payload: {
32233224
state: "compacted",
3225+
beforeTokens: 899_000,
3226+
afterTokens: 19_000,
32243227
detail: { source: "provider" },
32253228
},
32263229
});
@@ -3234,7 +3237,7 @@ describe("ProviderRuntimeIngestion", () => {
32343237
const activity = thread.activities.find(
32353238
(candidate: ProviderRuntimeTestActivity) => candidate.kind === "context-compaction",
32363239
);
3237-
expect(activity?.summary).toBe("Context compacted");
3240+
expect(activity?.summary).toBe("Compacted context 899K → 19K tokens");
32383241
expect(activity?.tone).toBe("info");
32393242
});
32403243

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import * as Layer from "effect/Layer";
2828
import * as Option from "effect/Option";
2929
import * as Stream from "effect/Stream";
3030
import { makeDrainableWorker } from "@t3tools/shared/DrainableWorker";
31+
import { formatTokens } from "@t3tools/shared/usageFormat";
3132

3233
import { ProviderService } from "../../provider/Services/ProviderService.ts";
3334
import { ProjectionTurnRepository } from "../../persistence/Services/ProjectionTurns.ts";
@@ -753,15 +754,23 @@ export function runtimeEventToActivities(
753754
return [];
754755
}
755756

757+
const beforeTokens = event.payload.beforeTokens;
758+
const afterTokens = event.payload.afterTokens;
759+
const summary =
760+
beforeTokens !== undefined && afterTokens !== undefined
761+
? `Compacted context ${formatTokens(beforeTokens)} → ${formatTokens(afterTokens)} tokens`
762+
: "Context compacted";
756763
return [
757764
{
758765
id: event.eventId,
759766
createdAt: event.createdAt,
760767
tone: "info",
761768
kind: "context-compaction",
762-
summary: "Context compacted",
769+
summary,
763770
payload: {
764771
state: event.payload.state,
772+
...(beforeTokens !== undefined ? { beforeTokens } : {}),
773+
...(afterTokens !== undefined ? { afterTokens } : {}),
765774
...(event.payload.detail !== undefined ? { detail: event.payload.detail } : {}),
766775
},
767776
turnId: toTurnId(event.turnId) ?? null,

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -729,12 +729,7 @@ describe("ClaudeAdapterLive", () => {
729729
runtimeMode: "full-access",
730730
});
731731

732-
yield* adapter.sendTurn({
733-
threadId: session.threadId,
734-
input: "/compact",
735-
attachments: [],
736-
modelSelection,
737-
});
732+
yield* adapter.compactThread!(session.threadId, modelSelection);
738733

739734
const promptText = yield* Effect.promise(() =>
740735
readFirstPromptText(harness.getLastCreateQueryInput()),
@@ -2232,6 +2227,12 @@ describe("ClaudeAdapterLive", () => {
22322227
} as unknown as SDKMessage);
22332228

22342229
const runtimeEvents = Array.from(yield* Fiber.join(runtimeEventsFiber));
2230+
const compactionEvent = runtimeEvents.find(
2231+
(event) => event.type === "thread.state.changed" && event.payload.state === "compacted",
2232+
);
2233+
assert.ok(compactionEvent?.type === "thread.state.changed");
2234+
assert.equal(compactionEvent.payload.beforeTokens, 200);
2235+
assert.equal(compactionEvent.payload.afterTokens, 40);
22352236
const finalUsageEvent = runtimeEvents.findLast(
22362237
(event) => event.type === "thread.token-usage.updated",
22372238
);

0 commit comments

Comments
 (0)