Skip to content

Commit 57f0867

Browse files
authored
Revert "feat(providers): add context compaction across harnesses (#8808)"
This reverts commit 535557b.
1 parent fb93902 commit 57f0867

35 files changed

Lines changed: 114 additions & 646 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-
(command.name === "compact" ||
131-
(selectedProviderStatus?.driver === "codex" && command.name === "feedback"))
130+
selectedProviderStatus?.driver === "codex" &&
131+
command.name === "feedback"
132132
) {
133133
continue;
134134
}

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

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

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ function createProviderServiceHarness(
107107
const service: ProviderServiceShape = {
108108
startSession: () => unsupported(),
109109
sendTurn: () => unsupported(),
110-
compactThread: () => unsupported(),
111110
interruptTurn: () => unsupported(),
112111
respondToRequest: () => unsupported(),
113112
respondToUserInput: () => unsupported(),

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

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1275,21 +1275,6 @@ 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-
12931278
case "thread.session-set": {
12941279
const turnId = event.payload.session.activeTurnId;
12951280
if (turnId === null || event.payload.session.status !== "running") {

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

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,6 @@ describe("ProviderCommandReactor", () => {
254254
turnId: asTurnId("turn-1"),
255255
}),
256256
);
257-
const compactThread = vi.fn((_: ThreadId) => Effect.void);
258257
const interruptTurn = vi.fn((_: unknown) => input?.interruptTurnEffect?.() ?? Effect.void);
259258
const respondToRequest = vi.fn<ProviderServiceShape["respondToRequest"]>(() => Effect.void);
260259
const respondToUserInput = vi.fn<ProviderServiceShape["respondToUserInput"]>(() => Effect.void);
@@ -340,7 +339,6 @@ describe("ProviderCommandReactor", () => {
340339
const service: ProviderServiceShape = {
341340
startSession: startSession as ProviderServiceShape["startSession"],
342341
sendTurn: sendTurn as ProviderServiceShape["sendTurn"],
343-
compactThread,
344342
interruptTurn: interruptTurn as ProviderServiceShape["interruptTurn"],
345343
respondToRequest: respondToRequest as ProviderServiceShape["respondToRequest"],
346344
respondToUserInput: respondToUserInput as ProviderServiceShape["respondToUserInput"],
@@ -535,7 +533,6 @@ describe("ProviderCommandReactor", () => {
535533
readModel: () => Effect.runPromise(snapshotQuery.getSnapshot()),
536534
startSession,
537535
sendTurn,
538-
compactThread,
539536
interruptTurn,
540537
respondToRequest,
541538
respondToUserInput,
@@ -635,27 +632,6 @@ describe("ProviderCommandReactor", () => {
635632
}),
636633
);
637634

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-
);
659635
effectIt.effect("projects starting before a slow provider session finishes", () =>
660636
Effect.gen(function* () {
661637
const releaseStart = yield* Deferred.make<void>();

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

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

3131
import { resolveThreadWorkspaceCwd } from "../../checkpointing/Utils.ts";
3232
import { increment, orchestrationEventsProcessedTotal } from "../../observability/Metrics.ts";
33-
import {
34-
ProviderAdapterRequestError,
35-
ProviderAdapterValidationError,
36-
} from "../../provider/Errors.ts";
33+
import { ProviderAdapterRequestError } from "../../provider/Errors.ts";
3734
import type { ProviderServiceError } from "../../provider/Errors.ts";
3835
import { TextGeneration } from "../../textGeneration/TextGeneration.ts";
3936
import { ProviderService } from "../../provider/Services/ProviderService.ts";
@@ -53,7 +50,6 @@ import {
5350
import { VcsStatusBroadcaster } from "../../vcs/VcsStatusBroadcaster.ts";
5451
import { GitWorkflowService } from "../../git/GitWorkflowService.ts";
5552
const isProviderAdapterRequestError = Schema.is(ProviderAdapterRequestError);
56-
const isProviderAdapterValidationError = Schema.is(ProviderAdapterValidationError);
5753
const isProviderDriverKind = Schema.is(ProviderDriverKind);
5854

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

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

342334
const threadModelSelections = new Map<string, ModelSelection>();
343-
const compactingThreadIds = new Set<ThreadId>();
344335

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

385376
const formatFailureDetail = (cause: Cause.Cause<unknown>): string => {
386377
const failReason = cause.reasons.find(Cause.isFailReason);
387-
if (isProviderAdapterRequestError(failReason?.error)) {
388-
return failReason.error.detail;
389-
}
390-
if (isProviderAdapterValidationError(failReason?.error)) {
391-
return failReason.error.issue;
378+
const providerError = isProviderAdapterRequestError(failReason?.error)
379+
? failReason.error
380+
: undefined;
381+
if (providerError) {
382+
return providerError.detail;
392383
}
393384
return Cause.pretty(cause);
394385
};
@@ -1146,6 +1137,7 @@ const make = Effect.gen(function* () {
11461137
if (!thread) {
11471138
return;
11481139
}
1140+
11491141
const message = thread.messages.find((entry) => entry.id === event.payload.messageId);
11501142
if (!message || message.role !== "user") {
11511143
yield* appendProviderFailureActivity({
@@ -1155,28 +1147,15 @@ const make = Effect.gen(function* () {
11551147
detail: `User message '${event.payload.messageId}' was not found for turn start request.`,
11561148
turnId: null,
11571149
createdAt: event.payload.createdAt,
1158-
requestId: event.payload.messageId,
11591150
});
11601151
return;
11611152
}
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-
});
11721153

11731154
yield* ensureThreadWorktree(thread);
11741155

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) {
1156+
const isFirstUserMessageTurn =
1157+
thread.messages.filter((entry) => entry.role === "user").length === 1;
1158+
if (isFirstUserMessageTurn) {
11801159
const project = yield* resolveProject(thread.projectId);
11811160
const generationCwd =
11821161
resolveThreadWorkspaceCwd({
@@ -1215,7 +1194,16 @@ const make = Effect.gen(function* () {
12151194
detail,
12161195
createdAt: event.payload.createdAt,
12171196
}).pipe(
1218-
Effect.flatMap(() => appendTurnStartFailure("Provider turn start failed", detail)),
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+
),
12191207
Effect.asVoid,
12201208
);
12211209
};
@@ -1232,69 +1220,6 @@ const make = Effect.gen(function* () {
12321220
),
12331221
);
12341222

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-
}
12981223
const sendTurnRequest = yield* buildSendTurnRequestForThread({
12991224
threadId: event.payload.threadId,
13001225
messageText: message.text,
@@ -1315,7 +1240,7 @@ const make = Effect.gen(function* () {
13151240

13161241
yield* providerService
13171242
.sendTurn(sendTurnRequest.value)
1318-
.pipe(Effect.asVoid, Effect.catchCause(recoverTurnStartFailure), Effect.forkScoped);
1243+
.pipe(Effect.catchCause(recoverTurnStartFailure), Effect.forkScoped);
13191244
});
13201245

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

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ function createProviderServiceHarness() {
105105
const service: ProviderServiceShape = {
106106
startSession: () => unsupported(),
107107
sendTurn: () => unsupported(),
108-
compactThread: () => unsupported(),
109108
interruptTurn: () => unsupported(),
110109
respondToRequest: () => unsupported(),
111110
respondToUserInput: () => unsupported(),
@@ -3222,8 +3221,6 @@ describe("ProviderRuntimeIngestion", () => {
32223221
turnId: asTurnId("turn-1"),
32233222
payload: {
32243223
state: "compacted",
3225-
beforeTokens: 899_000,
3226-
afterTokens: 19_000,
32273224
detail: { source: "provider" },
32283225
},
32293226
});
@@ -3237,7 +3234,7 @@ describe("ProviderRuntimeIngestion", () => {
32373234
const activity = thread.activities.find(
32383235
(candidate: ProviderRuntimeTestActivity) => candidate.kind === "context-compaction",
32393236
);
3240-
expect(activity?.summary).toBe("Compacted context 899K → 19K tokens");
3237+
expect(activity?.summary).toBe("Context compacted");
32413238
expect(activity?.tone).toBe("info");
32423239
});
32433240

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ 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";
3231

3332
import { ProviderService } from "../../provider/Services/ProviderService.ts";
3433
import { ProjectionTurnRepository } from "../../persistence/Services/ProjectionTurns.ts";
@@ -754,23 +753,15 @@ export function runtimeEventToActivities(
754753
return [];
755754
}
756755

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";
763756
return [
764757
{
765758
id: event.eventId,
766759
createdAt: event.createdAt,
767760
tone: "info",
768761
kind: "context-compaction",
769-
summary,
762+
summary: "Context compacted",
770763
payload: {
771764
state: event.payload.state,
772-
...(beforeTokens !== undefined ? { beforeTokens } : {}),
773-
...(afterTokens !== undefined ? { afterTokens } : {}),
774765
...(event.payload.detail !== undefined ? { detail: event.payload.detail } : {}),
775766
},
776767
turnId: toTurnId(event.turnId) ?? null,

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

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

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

734739
const promptText = yield* Effect.promise(() =>
735740
readFirstPromptText(harness.getLastCreateQueryInput()),
@@ -2227,12 +2232,6 @@ describe("ClaudeAdapterLive", () => {
22272232
} as unknown as SDKMessage);
22282233

22292234
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);
22362235
const finalUsageEvent = runtimeEvents.findLast(
22372236
(event) => event.type === "thread.token-usage.updated",
22382237
);

0 commit comments

Comments
 (0)