Skip to content

Commit 0bfb6df

Browse files
authored
perf(server): cut idle CPU use and stop provider event leaks (pingdotgg#8187)
1 parent a9ffb82 commit 0bfb6df

19 files changed

Lines changed: 913 additions & 98 deletions

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -973,6 +973,29 @@ describe("ProviderRuntimeIngestion", () => {
973973
);
974974
});
975975

976+
it("ignores provider content deltas that cannot change thread state", async () => {
977+
const harness = await createHarness();
978+
const initial = await harness.readModel();
979+
980+
for (const streamKind of ["reasoning_text", "command_output", "file_change_output"] as const) {
981+
harness.emit({
982+
type: "content.delta",
983+
eventId: asEventId(`evt-ignored-${streamKind}`),
984+
provider: ProviderDriverKind.make("codex"),
985+
createdAt: "2026-01-01T00:00:00.000Z",
986+
threadId: asThreadId("thread-1"),
987+
turnId: asTurnId("turn-ignored"),
988+
payload: {
989+
streamKind,
990+
delta: "ignored output",
991+
},
992+
});
993+
}
994+
995+
await harness.drain();
996+
expect(await harness.readModel()).toEqual(initial);
997+
});
998+
976999
it("maps canonical content delta/item completed into finalized assistant messages", async () => {
9771000
const harness = await createHarness();
9781001
const now = "2026-01-01T00:00:00.000Z";

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

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1499,6 +1499,10 @@ const make = Effect.gen(function* () {
14991499

15001500
const processRuntimeEvent = (event: ProviderRuntimeEvent) =>
15011501
Effect.gen(function* () {
1502+
if (event.type === "content.delta" && event.payload.streamKind !== "assistant_text") {
1503+
return;
1504+
}
1505+
15021506
const thread = yield* resolveThreadShell(event.threadId);
15031507
if (!thread) return;
15041508

@@ -1515,9 +1519,17 @@ const make = Effect.gen(function* () {
15151519
const now = event.createdAt;
15161520
const eventTurnId = toTurnId(event.turnId);
15171521
const activeTurnId = thread.session?.activeTurnId ?? null;
1518-
const pendingTurnStart = yield* projectionTurnRepository.getPendingTurnStartByThreadId({
1519-
threadId: thread.id,
1520-
});
1522+
const pendingTurnStart =
1523+
event.type === "session.started" ||
1524+
event.type === "session.state.changed" ||
1525+
event.type === "session.exited" ||
1526+
event.type === "thread.started" ||
1527+
event.type === "turn.started" ||
1528+
event.type === "turn.completed"
1529+
? yield* projectionTurnRepository.getPendingTurnStartByThreadId({
1530+
threadId: thread.id,
1531+
})
1532+
: Option.none();
15211533
const hasPendingTurnStart =
15221534
Option.isSome(pendingTurnStart) && thread.session?.status === "starting";
15231535

‎apps/server/src/project/RepositoryIdentityResolver.test.ts‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import * as Effect from "effect/Effect";
55
import * as FileSystem from "effect/FileSystem";
66
import * as Layer from "effect/Layer";
77
import * as Path from "effect/Path";
8+
import * as ChildProcessSpawner from "effect/unstable/process/ChildProcessSpawner";
89
import { TestClock } from "effect/testing";
910

1011
import * as ProcessRunner from "../processRunner.ts";
@@ -35,6 +36,89 @@ const makeRepositoryIdentityResolverTestLayer = (options: {
3536
).pipe(Layer.provide(ProcessRunner.layer));
3637

3738
it.layer(NodeServices.layer)("RepositoryIdentityResolverLive", (it) => {
39+
it.effect("reuses the cached Git root for repeated workspace lookups", () => {
40+
const calls: Array<ReadonlyArray<string>> = [];
41+
const processRunner = Layer.succeed(ProcessRunner.ProcessRunner, {
42+
run: (input) =>
43+
Effect.sync(() => {
44+
calls.push(input.args);
45+
return {
46+
stdout: input.args.includes("rev-parse")
47+
? "/repo\n"
48+
: "origin\[email protected]:T3Tools/t3code.git (fetch)\n",
49+
stderr: "",
50+
code: ChildProcessSpawner.ExitCode(0),
51+
timedOut: false,
52+
stdoutTruncated: false,
53+
stderrTruncated: false,
54+
stdoutInvalidUtf8: false,
55+
stderrInvalidUtf8: false,
56+
};
57+
}),
58+
});
59+
const resolverLayer = Layer.effect(
60+
RepositoryIdentityResolver.RepositoryIdentityResolver,
61+
RepositoryIdentityResolver.make(),
62+
).pipe(Layer.provide(processRunner));
63+
64+
return Effect.gen(function* () {
65+
const resolver = yield* RepositoryIdentityResolver.RepositoryIdentityResolver;
66+
const first = yield* resolver.resolve("/repo/packages/web");
67+
const second = yield* resolver.resolve("/repo/packages/web");
68+
69+
expect(first?.canonicalKey).toBe("github.com/t3tools/t3code");
70+
expect(second).toEqual(first);
71+
expect(calls).toEqual([
72+
["-C", "/repo/packages/web", "rev-parse", "--show-toplevel"],
73+
["-C", "/repo", "remote", "-v"],
74+
]);
75+
}).pipe(Effect.provide(resolverLayer));
76+
});
77+
78+
it.effect("retries Git root discovery after a failed lookup", () => {
79+
const calls: Array<ReadonlyArray<string>> = [];
80+
let rootAttempts = 0;
81+
const processRunner = Layer.succeed(ProcessRunner.ProcessRunner, {
82+
run: (input) =>
83+
Effect.sync(() => {
84+
calls.push(input.args);
85+
const rootLookup = input.args.includes("rev-parse");
86+
const failed = rootLookup && rootAttempts++ === 0;
87+
return {
88+
stdout: rootLookup
89+
? failed
90+
? ""
91+
: "/repo\n"
92+
: "origin\[email protected]:T3Tools/t3code.git (fetch)\n",
93+
stderr: failed ? "temporary Git failure" : "",
94+
code: ChildProcessSpawner.ExitCode(failed ? 1 : 0),
95+
timedOut: false,
96+
stdoutTruncated: false,
97+
stderrTruncated: false,
98+
stdoutInvalidUtf8: false,
99+
stderrInvalidUtf8: false,
100+
};
101+
}),
102+
});
103+
const resolverLayer = Layer.effect(
104+
RepositoryIdentityResolver.RepositoryIdentityResolver,
105+
RepositoryIdentityResolver.make(),
106+
).pipe(Layer.provide(processRunner));
107+
108+
return Effect.gen(function* () {
109+
const resolver = yield* RepositoryIdentityResolver.RepositoryIdentityResolver;
110+
expect(yield* resolver.resolve("/repo/packages/web")).toBeNull();
111+
112+
const recovered = yield* resolver.resolve("/repo/packages/web");
113+
expect(recovered?.rootPath).toBe("/repo");
114+
expect(calls).toEqual([
115+
["-C", "/repo/packages/web", "rev-parse", "--show-toplevel"],
116+
["-C", "/repo/packages/web", "rev-parse", "--show-toplevel"],
117+
["-C", "/repo", "remote", "-v"],
118+
]);
119+
}).pipe(Effect.provide(resolverLayer));
120+
});
121+
38122
it.effect("normalizes equivalent GitHub remotes into a stable repository identity", () =>
39123
Effect.gen(function* () {
40124
const fileSystem = yield* FileSystem.FileSystem;

‎apps/server/src/project/RepositoryIdentityResolver.ts‎

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ function buildRepositoryIdentity(input: {
9090
const resolveRepositoryIdentityCacheKey = Effect.fn("RepositoryIdentityResolver.resolveCacheKey")(
9191
function* (cwd: string) {
9292
const processRunner = yield* ProcessRunner.ProcessRunner;
93-
let cacheKey = cwd;
9493

9594
// git is a real executable on every platform — no cmd.exe shell mode, which
9695
// would split paths containing spaces during cmd's re-tokenization.
@@ -102,15 +101,11 @@ const resolveRepositoryIdentityCacheKey = Effect.fn("RepositoryIdentityResolver.
102101
})
103102
.pipe(Effect.option);
104103
if (topLevelResult._tag === "None" || topLevelResult.value.code !== 0) {
105-
return cacheKey;
104+
return null;
106105
}
107106

108107
const candidate = topLevelResult.value.stdout.trim();
109-
if (candidate.length > 0) {
110-
cacheKey = candidate;
111-
}
112-
113-
return cacheKey;
108+
return candidate.length > 0 ? candidate : null;
114109
},
115110
);
116111

@@ -139,14 +134,30 @@ export const make = Effect.fn("RepositoryIdentityResolver.make")(function* (
139134
options: RepositoryIdentityResolverOptions = {},
140135
) {
141136
const processRunner = yield* ProcessRunner.ProcessRunner;
137+
const cacheCapacity = options.cacheCapacity ?? DEFAULT_REPOSITORY_IDENTITY_CACHE_CAPACITY;
138+
139+
const repositoryRootCache = yield* Cache.makeWith<string, string | null>(
140+
(cwd) =>
141+
resolveRepositoryIdentityCacheKey(cwd).pipe(
142+
Effect.provideService(ProcessRunner.ProcessRunner, processRunner),
143+
),
144+
{
145+
capacity: cacheCapacity,
146+
timeToLive: Exit.match({
147+
onSuccess: (value) =>
148+
value === null ? Duration.zero : (options.positiveCacheTtl ?? DEFAULT_POSITIVE_CACHE_TTL),
149+
onFailure: () => Duration.zero,
150+
}),
151+
},
152+
);
142153

143154
const repositoryIdentityCache = yield* Cache.makeWith<string, RepositoryIdentity | null>(
144155
(cacheKey) =>
145156
resolveRepositoryIdentityFromCacheKey(cacheKey).pipe(
146157
Effect.provideService(ProcessRunner.ProcessRunner, processRunner),
147158
),
148159
{
149-
capacity: options.cacheCapacity ?? DEFAULT_REPOSITORY_IDENTITY_CACHE_CAPACITY,
160+
capacity: cacheCapacity,
150161
timeToLive: Exit.match({
151162
onSuccess: (value) =>
152163
value === null
@@ -160,9 +171,8 @@ export const make = Effect.fn("RepositoryIdentityResolver.make")(function* (
160171
const resolve: RepositoryIdentityResolver["Service"]["resolve"] = Effect.fn(
161172
"RepositoryIdentityResolver.resolve",
162173
)(function* (cwd) {
163-
const cacheKey = yield* resolveRepositoryIdentityCacheKey(cwd).pipe(
164-
Effect.provideService(ProcessRunner.ProcessRunner, processRunner),
165-
);
174+
const cacheKey = yield* Cache.get(repositoryRootCache, cwd);
175+
if (cacheKey === null) return null;
166176
return yield* Cache.get(repositoryIdentityCache, cacheKey);
167177
});
168178

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

Lines changed: 42 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ describe("EventNdjsonLogger", () => {
286286
}),
287287
);
288288

289-
it.effect("drops transient canonical events before serialization", () =>
289+
it.effect("drops transient provider events before serialization", () =>
290290
Effect.gen(function* () {
291291
const tempDir = NodeFS.mkdtempSync(NodePath.join(NodeOS.tmpdir(), "t3-provider-log-"));
292292
const basePath = NodePath.join(tempDir, "events.log");
@@ -302,6 +302,46 @@ describe("EventNdjsonLogger", () => {
302302
yield* canonical.write(circularDelta, threadId);
303303
yield* canonical.write({ type: "item.completed", id: "final" }, threadId);
304304
yield* native.write({ type: "content.delta", id: "native-delta" }, threadId);
305+
yield* native.write(
306+
{ method: "item/agentMessage/delta", payload: circularDelta },
307+
threadId,
308+
);
309+
yield* native.write(
310+
{ method: "thread/realtime/outputAudio/delta", payload: circularDelta },
311+
threadId,
312+
);
313+
yield* native.write(
314+
{ method: "thread/realtime/transcript/delta", payload: circularDelta },
315+
threadId,
316+
);
317+
yield* native.write(
318+
{
319+
event: {
320+
method: "claude/stream_event/content_block_delta/text_delta",
321+
payload: circularDelta,
322+
},
323+
},
324+
threadId,
325+
);
326+
yield* native.write(
327+
{
328+
event: {
329+
method: "session/update",
330+
payload: { update: { sessionUpdate: "agent_message_chunk" } },
331+
},
332+
},
333+
threadId,
334+
);
335+
yield* native.write(
336+
{
337+
event: {
338+
type: "message.part.updated",
339+
payload: { properties: { part: { type: "text" } } },
340+
},
341+
},
342+
threadId,
343+
);
344+
yield* native.write({ type: "turn.completed", id: "native-final" }, threadId);
305345
yield* store.close();
306346

307347
const lines = NodeFS.readFileSync(ownedLogPath(basePath, "thread-filtered"), "utf8")
@@ -313,7 +353,7 @@ describe("EventNdjsonLogger", () => {
313353
lines.map(({ stream, payload }) => ({ stream, payload })),
314354
[
315355
{ stream: "CANON", payload: '{"type":"item.completed","id":"final"}' },
316-
{ stream: "NTIVE", payload: '{"type":"content.delta","id":"native-delta"}' },
356+
{ stream: "NTIVE", payload: '{"type":"turn.completed","id":"native-final"}' },
317357
],
318358
);
319359
} finally {

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

Lines changed: 54 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,17 @@ const transientCanonicalEventTypes = new Set([
4545
"tool.progress",
4646
"turn.proposed.delta",
4747
]);
48+
const transientNativeMethods = new Set([
49+
"item/agentMessage/delta",
50+
"item/commandExecution/outputDelta",
51+
"item/fileChange/outputDelta",
52+
"item/plan/delta",
53+
"item/reasoning/summaryTextDelta",
54+
"item/reasoning/textDelta",
55+
"thread/realtime/outputAudio/delta",
56+
"thread/realtime/transcript/delta",
57+
]);
58+
const transientAcpUpdates = new Set(["agent_message_chunk", "agent_thought_chunk"]);
4859

4960
export type EventNdjsonStream = "native" | "canonical" | "orchestration";
5061

@@ -126,7 +137,7 @@ export interface PendingRecord {
126137
}
127138

128139
interface StoreState {
129-
readonly pending: ReadonlyArray<PendingRecord>;
140+
readonly pending: Array<PendingRecord>;
130141
readonly pendingBytes: number;
131142
readonly sinks: ReadonlyMap<string, RotatingFileSink>;
132143
readonly flushScheduled: boolean;
@@ -178,12 +189,50 @@ function providerLogPath(directory: string, prefix: string, threadSegment: strin
178189
}
179190

180191
function shouldPersist(stream: EventNdjsonStream, event: unknown): boolean {
181-
if (stream !== "canonical" || typeof event !== "object" || event === null) {
192+
if (stream === "orchestration" || typeof event !== "object" || event === null) {
182193
return true;
183194
}
184195
try {
185196
const type = Reflect.get(event, "type");
186-
return typeof type !== "string" || !transientCanonicalEventTypes.has(type);
197+
if (typeof type === "string" && transientCanonicalEventTypes.has(type)) {
198+
return false;
199+
}
200+
if (stream !== "native") return true;
201+
202+
const nested = Reflect.get(event, "event");
203+
const nativeEvent = typeof nested === "object" && nested !== null ? nested : event;
204+
const method = Reflect.get(nativeEvent, "method");
205+
if (
206+
typeof method === "string" &&
207+
(transientNativeMethods.has(method) ||
208+
method.startsWith("claude/stream_event/content_block_delta/"))
209+
) {
210+
return false;
211+
}
212+
213+
const nativeType = Reflect.get(nativeEvent, "type");
214+
if (nativeType === "message.part.delta") return false;
215+
216+
const payload = Reflect.get(nativeEvent, "payload");
217+
if (typeof payload !== "object" || payload === null) return true;
218+
219+
if (method === "session/update") {
220+
const update = Reflect.get(payload, "update");
221+
if (typeof update !== "object" || update === null) return true;
222+
const updateType = Reflect.get(update, "sessionUpdate");
223+
return typeof updateType !== "string" || !transientAcpUpdates.has(updateType);
224+
}
225+
226+
if (nativeType === "message.part.updated") {
227+
const properties = Reflect.get(payload, "properties");
228+
if (typeof properties !== "object" || properties === null) return true;
229+
const part = Reflect.get(properties, "part");
230+
if (typeof part !== "object" || part === null) return true;
231+
const partType = Reflect.get(part, "type");
232+
return partType !== "text" && partType !== "reasoning";
233+
}
234+
235+
return true;
187236
} catch {
188237
return true;
189238
}
@@ -566,10 +615,8 @@ export const makeEventNdjsonLogStore = Effect.fnUntraced(function* (
566615
if (state.closed) {
567616
return Effect.succeed([{ flush: false }, state] as const);
568617
}
569-
const pending = [
570-
...state.pending,
571-
{ stream, threadSegment: resolveThreadSegment(threadId), line, bytes },
572-
];
618+
const pending = state.pending;
619+
pending.push({ stream, threadSegment: resolveThreadSegment(threadId), line, bytes });
573620
const pendingBytes = state.pendingBytes + bytes;
574621
const flush =
575622
resolved.batchWindowMs === 0 ||

0 commit comments

Comments
 (0)