Skip to content

Commit 28d2fef

Browse files
committed
fix(provider): reject stale resume cursor updates
1 parent 562947c commit 28d2fef

8 files changed

Lines changed: 133 additions & 9 deletions

‎apps/server/src/persistence/ProviderSessionRuntime.ts‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,15 @@ export type GetProviderSessionRuntimeInput = typeof GetProviderSessionRuntimeInp
5858
export const DeleteProviderSessionRuntimeInput = Schema.Struct({ threadId: ThreadId });
5959
export type DeleteProviderSessionRuntimeInput = typeof DeleteProviderSessionRuntimeInput.Type;
6060

61+
export const UpdateProviderSessionRuntimeResumeCursorInput = Schema.Struct({
62+
threadId: ThreadId,
63+
providerInstanceId: ProviderInstanceId,
64+
lastSeenAt: IsoDateTime,
65+
resumeCursor: Schema.Unknown,
66+
});
67+
export type UpdateProviderSessionRuntimeResumeCursorInput =
68+
typeof UpdateProviderSessionRuntimeResumeCursorInput.Type;
69+
6170
/**
6271
* ProviderSessionRuntimeRepository - Service tag for provider runtime persistence.
6372
*/
@@ -83,6 +92,15 @@ export class ProviderSessionRuntimeRepository extends Context.Service<
8392
ProviderSessionRuntimeRepositoryError
8493
>;
8594

95+
/**
96+
* Update a cursor only while the named provider instance still owns the row.
97+
*
98+
* Returns false when the session was removed or rebound before the update.
99+
*/
100+
readonly updateResumeCursorIfCurrentInstance: (
101+
input: UpdateProviderSessionRuntimeResumeCursorInput,
102+
) => Effect.Effect<boolean, ProviderSessionRuntimeRepositoryError>;
103+
86104
/**
87105
* List all provider runtime rows.
88106
*
@@ -129,6 +147,12 @@ const GetRuntimeRequestSchema = Schema.Struct({
129147

130148
const DeleteRuntimeRequestSchema = GetRuntimeRequestSchema;
131149

150+
const UpdateRuntimeResumeCursorDbInput = UpdateProviderSessionRuntimeResumeCursorInput.mapFields(
151+
Struct.assign({
152+
resumeCursor: Schema.fromJsonString(Schema.Unknown),
153+
}),
154+
);
155+
132156
function toPersistenceSqlOrDecodeError(
133157
sqlOperation: string,
134158
decodeOperation: string,
@@ -206,6 +230,21 @@ export const make = Effect.gen(function* () {
206230
`,
207231
});
208232

233+
const updateRuntimeResumeCursorIfCurrentInstance = SqlSchema.findOneOption({
234+
Request: UpdateRuntimeResumeCursorDbInput,
235+
Result: Schema.Struct({ threadId: ThreadId }),
236+
execute: ({ threadId, providerInstanceId, lastSeenAt, resumeCursor }) =>
237+
sql`
238+
UPDATE provider_session_runtime
239+
SET
240+
last_seen_at = ${lastSeenAt},
241+
resume_cursor_json = ${resumeCursor}
242+
WHERE thread_id = ${threadId}
243+
AND provider_instance_id = ${providerInstanceId}
244+
RETURNING thread_id AS "threadId"
245+
`,
246+
});
247+
209248
const listRuntimeRows = SqlSchema.findAll({
210249
Request: Schema.Void,
211250
Result: ProviderSessionRuntimeRawDbRowSchema,
@@ -273,6 +312,19 @@ export const make = Effect.gen(function* () {
273312
),
274313
);
275314

315+
const updateResumeCursorIfCurrentInstance: ProviderSessionRuntimeRepository["Service"]["updateResumeCursorIfCurrentInstance"] =
316+
(input) =>
317+
updateRuntimeResumeCursorIfCurrentInstance(input).pipe(
318+
Effect.map(Option.isSome),
319+
Effect.mapError(
320+
toPersistenceSqlOrDecodeError(
321+
"ProviderSessionRuntimeRepository.updateResumeCursorIfCurrentInstance:query",
322+
"ProviderSessionRuntimeRepository.updateResumeCursorIfCurrentInstance:decodeRow",
323+
{ threadId: input.threadId },
324+
),
325+
),
326+
);
327+
276328
const list: ProviderSessionRuntimeRepository["Service"]["list"] = () =>
277329
listRuntimeRows(undefined).pipe(
278330
Effect.mapError(
@@ -325,6 +377,7 @@ export const make = Effect.gen(function* () {
325377
return {
326378
upsert,
327379
getByThreadId,
380+
updateResumeCursorIfCurrentInstance,
328381
list,
329382
deleteByThreadId,
330383
} satisfies ProviderSessionRuntimeRepository["Service"];

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,7 @@ const providerSessionDirectoryTestLayer = Layer.succeed(ProviderSessionDirectory
223223
getProvider: () =>
224224
Effect.die(new Error("ProviderSessionDirectory.getProvider is not used in test")),
225225
getBinding: () => Effect.succeed(Option.none()),
226+
updateResumeCursorIfCurrentInstance: () => Effect.succeed(true),
226227
listThreadIds: () => Effect.succeed([]),
227228
listBindings: () => Effect.succeed([]),
228229
});

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -424,6 +424,7 @@ const providerSessionDirectoryTestLayer = Layer.succeed(ProviderSessionDirectory
424424
getProvider: () =>
425425
Effect.die(new Error("ProviderSessionDirectory.getProvider is not used in test")),
426426
getBinding: () => Effect.succeed(Option.none()),
427+
updateResumeCursorIfCurrentInstance: () => Effect.succeed(true),
427428
listThreadIds: () => Effect.succeed([]),
428429
listBindings: () => Effect.succeed([]),
429430
});

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

Lines changed: 39 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1736,7 +1736,7 @@ routing.layer("ProviderServiceLive routing", (it) => {
17361736
}),
17371737
);
17381738

1739-
it.effect("persists resume cursor updates emitted after sendTurn returns", () =>
1739+
it.effect("persists current-instance cursors and ignores stale adapter updates", () =>
17401740
Effect.gen(function* () {
17411741
const provider = yield* ProviderService.ProviderService;
17421742
const runtimeRepository = yield* ProviderSessionRuntime.ProviderSessionRuntimeRepository;
@@ -1773,14 +1773,48 @@ routing.layer("ProviderServiceLive routing", (it) => {
17731773
assert.equal(Option.isSome(persisted), true);
17741774
if (Option.isSome(persisted)) {
17751775
assert.deepEqual(persisted.value.resumeCursor, updatedResumeCursor);
1776+
assert.equal(persisted.value.providerInstanceId, claudeAgentInstanceId);
17761777
assert.deepEqual(persisted.value.runtimePayload, {
17771778
cwd: session.cwd,
17781779
model: null,
17791780
activeTurnId: `turn-${String(threadId)}`,
17801781
lastError: null,
1781-
lastRuntimeEvent: "session.resume-cursor.updated",
1782-
lastRuntimeEventAt: "2026-09-01T00:00:00.000Z",
1782+
lastRuntimeEvent: "provider.sendTurn",
1783+
lastRuntimeEventAt: "1970-01-01T00:00:00.000Z",
17831784
});
1785+
1786+
const replacementResumeCursor = { opaque: "new-owner-resume" };
1787+
yield* runtimeRepository.upsert({
1788+
...persisted.value,
1789+
providerName: "codex",
1790+
providerInstanceId: codexInstanceId,
1791+
adapterKey: "codex",
1792+
resumeCursor: replacementResumeCursor,
1793+
lastSeenAt: "2026-09-01T00:01:00.000Z",
1794+
});
1795+
const staleEventConsumer = yield* Stream.runHead(provider.streamEvents).pipe(
1796+
Effect.forkChild,
1797+
);
1798+
yield* advanceTestClock(50);
1799+
routing.claude.emit({
1800+
type: "session.configured",
1801+
eventId: asEventId("event-stale-resume-cursor"),
1802+
provider: ProviderDriverKind.make("claudeAgent"),
1803+
threadId,
1804+
createdAt: "2026-09-01T00:02:00.000Z",
1805+
payload: {
1806+
config: {},
1807+
resumeCursor: { opaque: "stale-owner-resume" },
1808+
},
1809+
});
1810+
yield* Fiber.join(staleEventConsumer);
1811+
1812+
const afterStaleEvent = yield* runtimeRepository.getByThreadId({ threadId });
1813+
assert.equal(Option.isSome(afterStaleEvent), true);
1814+
if (Option.isSome(afterStaleEvent)) {
1815+
assert.equal(afterStaleEvent.value.providerInstanceId, codexInstanceId);
1816+
assert.deepEqual(afterStaleEvent.value.resumeCursor, replacementResumeCursor);
1817+
}
17841818
}
17851819
}),
17861820
);
@@ -2637,6 +2671,8 @@ const boundedListing = makeProviderServiceLayer({
26372671
upsert: () => Effect.void,
26382672
getProvider: () => Effect.die("ProviderService.listSessions does not use getProvider"),
26392673
getBinding,
2674+
updateResumeCursorIfCurrentInstance: () =>
2675+
Effect.die("ProviderService.listSessions does not update resume cursors"),
26402676
listThreadIds,
26412677
listBindings: () => Effect.die("ProviderService.listSessions does not use listBindings"),
26422678
},

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

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -355,17 +355,21 @@ const makeProviderService = Effect.fn("makeProviderService")(function* (
355355
resumeCursor === undefined
356356
? Effect.void
357357
: directory
358-
.upsert({
358+
.updateResumeCursorIfCurrentInstance({
359359
threadId: canonicalEvent.threadId,
360-
provider: canonicalEvent.provider,
361360
providerInstanceId: source.instanceId,
362361
resumeCursor,
363-
runtimePayload: {
364-
lastRuntimeEvent: "session.resume-cursor.updated",
365-
lastRuntimeEventAt: canonicalEvent.createdAt,
366-
},
367362
})
368363
.pipe(
364+
Effect.tap((updated) =>
365+
updated
366+
? Effect.void
367+
: Effect.logDebug("provider.session.resume-cursor-update-stale", {
368+
threadId: canonicalEvent.threadId,
369+
provider: canonicalEvent.provider,
370+
providerInstanceId: source.instanceId,
371+
}),
372+
),
369373
Effect.catchCause((cause) =>
370374
Effect.logWarning("provider.session.resume-cursor-persist-failed", {
371375
threadId: canonicalEvent.threadId,

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,20 @@ const makeProviderSessionDirectory = Effect.gen(function* () {
164164
),
165165
);
166166

167+
const updateResumeCursorIfCurrentInstance: ProviderSessionDirectoryShape["updateResumeCursorIfCurrentInstance"] =
168+
Effect.fn(function* (input) {
169+
const lastSeenAt = DateTime.formatIso(yield* DateTime.now);
170+
return yield* repository
171+
.updateResumeCursorIfCurrentInstance({ ...input, lastSeenAt })
172+
.pipe(
173+
Effect.mapError(
174+
toPersistenceError(
175+
"ProviderSessionDirectory.updateResumeCursorIfCurrentInstance:update",
176+
),
177+
),
178+
);
179+
});
180+
167181
const listThreadIds: ProviderSessionDirectoryShape["listThreadIds"] = () =>
168182
repository.list().pipe(
169183
Effect.mapError(toPersistenceError("ProviderSessionDirectory.listThreadIds:list")),
@@ -186,6 +200,7 @@ const makeProviderSessionDirectory = Effect.gen(function* () {
186200
upsert,
187201
getProvider,
188202
getBinding,
203+
updateResumeCursorIfCurrentInstance,
189204
listThreadIds,
190205
listBindings,
191206
} satisfies ProviderSessionDirectoryShape;

‎apps/server/src/provider/Services/ProviderSessionDirectory.ts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,12 @@ export interface ProviderSessionDirectoryShape {
5353
threadId: ThreadId,
5454
) => Effect.Effect<Option.Option<ProviderRuntimeBinding>, ProviderSessionDirectoryReadError>;
5555

56+
readonly updateResumeCursorIfCurrentInstance: (input: {
57+
readonly threadId: ThreadId;
58+
readonly providerInstanceId: ProviderInstanceId;
59+
readonly resumeCursor: unknown;
60+
}) => Effect.Effect<boolean, ProviderSessionDirectoryWriteError>;
61+
5662
readonly listThreadIds: () => Effect.Effect<
5763
ReadonlyArray<ThreadId>,
5864
ProviderSessionDirectoryPersistenceError

‎apps/server/src/serverRuntimeStartup.reconcile.test.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ it.effect("marks active running sessions that have persisted resume state", () =
132132
),
133133
),
134134
upsert: (binding) => Effect.sync(() => upserts.push(binding)),
135+
updateResumeCursorIfCurrentInstance: () => Effect.die("unused"),
135136
getProvider: () => Effect.die("unused"),
136137
listThreadIds: () => Effect.die("unused"),
137138
listBindings: () => Effect.die("unused"),
@@ -232,6 +233,7 @@ it.effect("continues marked sessions after activation with provider-specific inp
232233
firstMarkerCleared ? Deferred.succeed(continuationCleared, undefined) : Effect.void,
233234
),
234235
),
236+
updateResumeCursorIfCurrentInstance: () => Effect.die("unused"),
235237
getProvider: () => Effect.die("unused"),
236238
listThreadIds: () => Effect.die("unused"),
237239
listBindings: () => Effect.die("unused"),
@@ -355,6 +357,7 @@ it.effect("does not continue archived or deleted marked sessions", () => {
355357
);
356358
},
357359
upsert: () => Effect.void,
360+
updateResumeCursorIfCurrentInstance: () => Effect.die("unused"),
358361
getProvider: () => Effect.die("unused"),
359362
listThreadIds: () => Effect.die("unused"),
360363
listBindings: () => Effect.die("unused"),
@@ -410,6 +413,7 @@ it.effect("retries continuation preparation before settling a persistent failure
410413
}),
411414
),
412415
upsert: () => Effect.void,
416+
updateResumeCursorIfCurrentInstance: () => Effect.die("unused"),
413417
getProvider: () => Effect.die("unused"),
414418
listThreadIds: () => Effect.die("unused"),
415419
listBindings: () => Effect.die("unused"),
@@ -481,6 +485,7 @@ it.effect("reconciles multiple active and archived orphans but skips live sessio
481485
),
482486
),
483487
upsert: (binding) => Effect.sync(() => upserts.push(binding)),
488+
updateResumeCursorIfCurrentInstance: () => Effect.succeed(true),
484489
getProvider: () => Effect.die("unused"),
485490
listThreadIds: () => Effect.die("unused"),
486491
listBindings: () => Effect.die("unused"),
@@ -559,6 +564,7 @@ it.effect(
559564
}),
560565
),
561566
upsert: () => Effect.fail(writeFailure),
567+
updateResumeCursorIfCurrentInstance: () => Effect.succeed(true),
562568
getProvider: () => Effect.die("unused"),
563569
listThreadIds: () => Effect.die("unused"),
564570
listBindings: () => Effect.die("unused"),
@@ -596,6 +602,7 @@ it.effect("retries failed projections and continues after a persistent failure",
596602
directory: {
597603
getBinding: () => Effect.succeed(Option.none()),
598604
upsert: () => Effect.void,
605+
updateResumeCursorIfCurrentInstance: () => Effect.succeed(true),
599606
getProvider: () => Effect.die("unused"),
600607
listThreadIds: () => Effect.die("unused"),
601608
listBindings: () => Effect.die("unused"),
@@ -644,6 +651,7 @@ it.effect("does not fail startup when the live provider session inventory cannot
644651
Effect.provideService(ProviderSessionDirectory.ProviderSessionDirectory, {
645652
getBinding: () => Effect.die("unused"),
646653
upsert: () => Effect.die("unused"),
654+
updateResumeCursorIfCurrentInstance: () => Effect.die("unused"),
647655
getProvider: () => Effect.die("unused"),
648656
listThreadIds: () => Effect.die("unused"),
649657
listBindings: () => Effect.die("unused"),

0 commit comments

Comments
 (0)