Skip to content

Commit ddafde5

Browse files
SunkenInTimeclaude
andauthored
fix(server): MCP thread reads skip the item scan they filter to nothing (pingdotgg#17038)
Co-authored-by: Claude Opus 5.5 (1M context) <[email protected]>
1 parent 21baef5 commit ddafde5

2 files changed

Lines changed: 61 additions & 3 deletions

File tree

‎apps/server/src/orchestration-v2/ProjectionStore.test.ts‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import * as Layer from "effect/Layer";
3030
import * as Schema from "effect/Schema";
3131
import * as Tracer from "effect/Tracer";
3232
import * as SqlClient from "effect/sql/SqlClient";
33+
import * as Statement from "effect/sql/Statement";
3334
import { projectThreadAwarenessV2 } from "@t3tools/shared/agentAwareness";
3435

3536
import * as SqlitePersistence from "../persistence/Sqlite.ts";
@@ -936,6 +937,53 @@ it.layer(layerTest)("ProjectionStoreV2", (it) => {
936937
assert.deepEqual(yield* store.getTurnStartHistory(threadId, [RunId.make("run:other")]), []);
937938
}),
938939
);
940+
it.effect("answers empty record filters without reading the filtered tables", () =>
941+
Effect.gen(function* () {
942+
const store = yield* ProjectionStore.ProjectionStoreV2;
943+
const threadId = yield* addRolledBackRecoveryCandidate("empty-record-filters");
944+
const runId = (yield* store.getThreadProjection(threadId)).runs[0]!.id;
945+
const queries: Array<string> = [];
946+
const recordQueries: Statement.Transformer = (statement) => {
947+
queries.push(statement.compile()[0]);
948+
return Effect.succeed(statement);
949+
};
950+
const read = (filter: ProjectionStore.ProjectionRecordFilter) =>
951+
store
952+
.getThreadRecords(threadId, ["runs", "messages", "turnItems"], filter)
953+
.pipe(Effect.provideService(Statement.CurrentTransformer, recordQueries));
954+
955+
const emptyFilters = [
956+
[{ turnItemTypes: [] }, "turnItems", "turn_items"],
957+
[{ turnItemStatuses: [] }, "turnItems", "turn_items"],
958+
[{ turnItemRunIds: [] }, "turnItems", "turn_items"],
959+
[{ runIds: [] }, "runs", "runs"],
960+
[{ messageIds: [] }, "messages", "messages"],
961+
[{ messageRoles: [] }, "messages", "messages"],
962+
[{ messageRunIds: [] }, "messages", "messages"],
963+
] as const;
964+
for (const [filter, field, table] of emptyFilters) {
965+
queries.length = 0;
966+
assert.isEmpty((yield* read(filter))[field]);
967+
assert.isFalse(
968+
queries.some((query) =>
969+
new RegExp(`FROM orchestration_v2_projection_${table}\\b`).test(query),
970+
),
971+
`${JSON.stringify(filter)} read ${table}`,
972+
);
973+
}
974+
975+
const selected = yield* read({ turnItemTypes: ["command_execution"], runIds: [runId] });
976+
assert.deepEqual(
977+
selected.turnItems.map((item) => item.type),
978+
["command_execution"],
979+
);
980+
assert.deepEqual(
981+
selected.runs.map((run) => run.id),
982+
[runId],
983+
);
984+
assert.isEmpty((yield* read({ turnItemTypes: ["user_message"] })).turnItems);
985+
}),
986+
);
939987
it.effect("preserves stored provider usage when a terminal update omits it", () =>
940988
Effect.gen(function* () {
941989
const projectionStore = yield* ProjectionStore.ProjectionStoreV2;

‎apps/server/src/orchestration-v2/ProjectionStore.ts‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1064,6 +1064,11 @@ const encodeTimelineSources = Schema.encodeEffect(
10641064
);
10651065
const encodeIdList = Schema.encodeSync(Schema.fromJsonString(Schema.Array(Schema.String)));
10661066

1067+
// An empty list filter selects no rows, but SQLite still walks every row of
1068+
// the thread to apply it. Callers pass `turnItemTypes: []` to skip items.
1069+
const matchesNothing = (...filters: ReadonlyArray<ReadonlyArray<unknown> | undefined>) =>
1070+
filters.some((values) => values?.length === 0);
1071+
10671072
const encodeThreadPayload = Schema.encodeEffect(
10681073
Schema.fromJsonString(OrchestrationV2AppThreadJsonSchema),
10691074
);
@@ -2750,7 +2755,9 @@ export const layer: Layer.Layer<ProjectionStoreV2, never, SqlClient.SqlClient> =
27502755
}
27512756

27522757
const boundedTurnItemRows =
2753-
fields !== undefined && !fields.includes("turnItems")
2758+
(fields !== undefined && !fields.includes("turnItems")) ||
2759+
(window === undefined &&
2760+
matchesNothing(filter?.turnItemTypes, filter?.turnItemStatuses, filter?.turnItemRunIds))
27542761
? []
27552762
: window === undefined
27562763
? yield* sql<PayloadRow>`
@@ -3023,7 +3030,8 @@ export const layer: Layer.Layer<ProjectionStoreV2, never, SqlClient.SqlClient> =
30233030
contextTransferRows,
30243031
] = yield* Effect.all([
30253032
decodeThreadPayload(threadRow.payload_json),
3026-
fields !== undefined && !fields.includes("runs")
3033+
(fields !== undefined && !fields.includes("runs")) ||
3034+
(window === undefined && matchesNothing(filter?.runIds))
30273035
? Effect.succeed([])
30283036
: window === undefined
30293037
? sql<PayloadRow>`
@@ -3194,7 +3202,9 @@ export const layer: Layer.Layer<ProjectionStoreV2, never, SqlClient.SqlClient> =
31943202
OR provider_turn_id IN (SELECT value FROM json_each(${cohortProviderTurnIds})))
31953203
ORDER BY created_at ASC, runtime_request_id ASC
31963204
`,
3197-
fields !== undefined && !fields.includes("messages")
3205+
(fields !== undefined && !fields.includes("messages")) ||
3206+
(window === undefined &&
3207+
matchesNothing(filter?.messageIds, filter?.messageRoles, filter?.messageRunIds))
31983208
? Effect.succeed([])
31993209
: window === undefined
32003210
? sql<PayloadRow>`

0 commit comments

Comments
 (0)