Skip to content

Commit 857ef05

Browse files
committed
fix(server): clear empty plans without losing fallback dates
1 parent 9167f93 commit 857ef05

2 files changed

Lines changed: 40 additions & 4 deletions

File tree

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

Lines changed: 38 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2239,7 +2239,7 @@ describe("ProviderRuntimeIngestion", () => {
22392239
type: "turn.proposed.delta",
22402240
eventId: asEventId("evt-plan-delta-1"),
22412241
provider: ProviderDriverKind.make("codex"),
2242-
createdAt: now,
2242+
createdAt: "",
22432243
threadId: asThreadId("thread-1"),
22442244
turnId: asTurnId("turn-plan-buffer"),
22452245
payload: {
@@ -2250,7 +2250,7 @@ describe("ProviderRuntimeIngestion", () => {
22502250
type: "turn.proposed.delta",
22512251
eventId: asEventId("evt-plan-delta-2"),
22522252
provider: ProviderDriverKind.make("codex"),
2253-
createdAt: now,
2253+
createdAt: "",
22542254
threadId: asThreadId("thread-1"),
22552255
turnId: asTurnId("turn-plan-buffer"),
22562256
payload: {
@@ -2280,6 +2280,42 @@ describe("ProviderRuntimeIngestion", () => {
22802280
entry.id === "plan:thread-1:turn:turn-plan-buffer",
22812281
);
22822282
expect(proposedPlan?.planMarkdown).toBe("## Buffered plan\n\n- first\n- second");
2283+
expect(proposedPlan?.createdAt).toBe(now);
2284+
});
2285+
2286+
it("releases a blank completed plan before a late replacement", async () => {
2287+
const harness = await createHarness();
2288+
const threadId = asThreadId("thread-1");
2289+
const turnId = asTurnId("blank-plan-turn");
2290+
const base = { provider: ProviderDriverKind.make("codex"), threadId, turnId };
2291+
const replacementTime = "2026-01-01T00:00:02.000Z";
2292+
await harness.emitAndDrain([
2293+
{
2294+
...base,
2295+
type: "turn.proposed.delta",
2296+
eventId: asEventId("blank-plan-delta"),
2297+
createdAt: "2026-01-01T00:00:00.000Z",
2298+
payload: { delta: " \n " },
2299+
},
2300+
{
2301+
...base,
2302+
type: "turn.completed",
2303+
eventId: asEventId("blank-plan-completed"),
2304+
createdAt: "2026-01-01T00:00:01.000Z",
2305+
payload: { state: "completed" },
2306+
},
2307+
{
2308+
...base,
2309+
type: "turn.proposed.completed",
2310+
eventId: asEventId("late-plan-completed"),
2311+
createdAt: replacementTime,
2312+
payload: { planMarkdown: "# Replacement plan" },
2313+
},
2314+
]);
2315+
const thread = (await harness.readModel()).threads.find((entry) => entry.id === threadId);
2316+
expect(thread?.proposedPlans).toEqual([
2317+
expect.objectContaining({ planMarkdown: "# Replacement plan", createdAt: replacementTime }),
2318+
]);
22832319
});
22842320

22852321
it("buffers assistant deltas with one lifecycle query per event until completion", async () => {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1314,7 +1314,7 @@ const make = Effect.gen(function* () {
13141314
const planMarkdown =
13151315
normalizeProposedPlanMarkdown(bufferedPlan?.text) ??
13161316
normalizeProposedPlanMarkdown(input.fallbackMarkdown);
1317-
if (!planMarkdown) return;
1317+
if (!planMarkdown) return yield* clearBufferedProposedPlan(input.planId);
13181318

13191319
const existingPlan = Option.getOrUndefined(
13201320
yield* projectionThreadProposedPlans.getByPlanId({
@@ -1332,7 +1332,7 @@ const make = Effect.gen(function* () {
13321332
planMarkdown,
13331333
implementedAt: existingPlan?.implementedAt ?? null,
13341334
implementationThreadId: existingPlan?.implementationThreadId ?? null,
1335-
createdAt: existingPlan?.createdAt ?? bufferedPlan?.createdAt ?? input.updatedAt,
1335+
createdAt: existingPlan?.createdAt ?? (bufferedPlan?.createdAt || input.updatedAt),
13361336
updatedAt: input.updatedAt,
13371337
},
13381338
createdAt: input.updatedAt,

0 commit comments

Comments
 (0)