Skip to content

Commit 9e5c444

Browse files
ozppupbgclaude
andcommitted
fix(server): treat provider runtime output as session activity
Change activity tracking to cover provider side, not only user actions. This keeps the provider session active while (sub)agents are running. Partially addresses #2980 & #2378. Co-authored-by: Claude Opus 4.7 <[email protected]>
1 parent f61fa94 commit 9e5c444

6 files changed

Lines changed: 78 additions & 1 deletion

File tree

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

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,12 @@ export type GetProviderSessionRuntimeInput = typeof GetProviderSessionRuntimeInp
5656
export const DeleteProviderSessionRuntimeInput = Schema.Struct({ threadId: ThreadId });
5757
export type DeleteProviderSessionRuntimeInput = typeof DeleteProviderSessionRuntimeInput.Type;
5858

59+
export const TouchProviderSessionRuntimeInput = Schema.Struct({
60+
threadId: ThreadId,
61+
lastSeenAt: IsoDateTime,
62+
});
63+
export type TouchProviderSessionRuntimeInput = typeof TouchProviderSessionRuntimeInput.Type;
64+
5965
/**
6066
* ProviderSessionRuntimeRepository - Service tag for provider runtime persistence.
6167
*/
@@ -97,6 +103,16 @@ export class ProviderSessionRuntimeRepository extends Context.Service<
97103
readonly deleteByThreadId: (
98104
input: DeleteProviderSessionRuntimeInput,
99105
) => Effect.Effect<void, ProviderSessionRuntimeRepositoryError>;
106+
107+
/**
108+
* Bump `last_seen_at` for an existing runtime row.
109+
*
110+
* No-op when no row matches. Cheaper than `upsert` for high-frequency
111+
* activity signals because it skips the SELECT and JSON re-encoding.
112+
*/
113+
readonly touchByThreadId: (
114+
input: TouchProviderSessionRuntimeInput,
115+
) => Effect.Effect<void, ProviderSessionRuntimeRepositoryError>;
100116
}
101117
>()("t3/persistence/ProviderSessionRuntime/ProviderSessionRuntimeRepository") {}
102118

@@ -233,6 +249,16 @@ export const make = Effect.gen(function* () {
233249
`,
234250
});
235251

252+
const touchRuntimeByThreadId = SqlSchema.void({
253+
Request: TouchProviderSessionRuntimeInput,
254+
execute: ({ threadId, lastSeenAt }) =>
255+
sql`
256+
UPDATE provider_session_runtime
257+
SET last_seen_at = ${lastSeenAt}
258+
WHERE thread_id = ${threadId}
259+
`,
260+
});
261+
236262
const upsert: ProviderSessionRuntimeRepository["Service"]["upsert"] = (runtime) =>
237263
upsertRuntimeRow(runtime).pipe(
238264
Effect.mapError(
@@ -308,11 +334,23 @@ export const make = Effect.gen(function* () {
308334
),
309335
);
310336

337+
const touchByThreadId: ProviderSessionRuntimeRepository["Service"]["touchByThreadId"] = (input) =>
338+
touchRuntimeByThreadId(input).pipe(
339+
Effect.mapError(
340+
toPersistenceSqlOrDecodeError(
341+
"ProviderSessionRuntimeRepository.touchByThreadId:query",
342+
"ProviderSessionRuntimeRepository.touchByThreadId:encodeRequest",
343+
{ threadId: input.threadId },
344+
),
345+
),
346+
);
347+
311348
return {
312349
upsert,
313350
getByThreadId,
314351
list,
315352
deleteByThreadId,
353+
touchByThreadId,
316354
} satisfies ProviderSessionRuntimeRepository["Service"];
317355
});
318356

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,7 @@ function makeScopedRuntimeFactory(options?: { readonly failConstruction?: boolea
213213

214214
const providerSessionDirectoryTestLayer = Layer.succeed(ProviderSessionDirectory, {
215215
upsert: () => Effect.void,
216+
touch: () => Effect.void,
216217
getProvider: () =>
217218
Effect.die(new Error("ProviderSessionDirectory.getProvider is not used in test")),
218219
getBinding: () => Effect.succeed(Option.none()),

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,7 @@ const OpenCodeRuntimeTestDouble: OpenCodeRuntimeShape = {
180180

181181
const providerSessionDirectoryTestLayer = Layer.succeed(ProviderSessionDirectory, {
182182
upsert: () => Effect.void,
183+
touch: () => Effect.void,
183184
getProvider: () =>
184185
Effect.die(new Error("ProviderSessionDirectory.getProvider is not used in test")),
185186
getBinding: () => Effect.succeed(Option.none()),

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

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,28 @@ const makeProviderService = Effect.fn("makeProviderService")(function* (
281281
});
282282
});
283283

284+
// Runtime event types that must NOT count as session activity.
285+
// `session.exited` means the provider process is gone — bumping `lastSeenAt`
286+
// would keep the directory binding alive past the runtime that backs it,
287+
// defeating the reaper. Extend this set if new event types turn out to fire
288+
// after a session is effectively dead.
289+
const SESSION_ACTIVITY_DENY_LIST: ReadonlySet<ProviderRuntimeEvent["type"]> = new Set([
290+
"session.exited",
291+
]);
292+
293+
const bumpSessionActivity = (event: ProviderRuntimeEvent): Effect.Effect<void> =>
294+
SESSION_ACTIVITY_DENY_LIST.has(event.type)
295+
? Effect.void
296+
: directory.touch(event.threadId).pipe(
297+
Effect.catchCause((cause) =>
298+
Effect.logDebug("provider.session.activity.touch-failed", {
299+
threadId: event.threadId,
300+
eventType: event.type,
301+
cause,
302+
}),
303+
),
304+
);
305+
284306
const processRuntimeEvent = (
285307
source: {
286308
readonly instanceId: ProviderInstanceId;
@@ -293,7 +315,10 @@ const makeProviderService = Effect.fn("makeProviderService")(function* (
293315
increment(providerRuntimeEventsTotal, {
294316
provider: canonicalEvent.provider,
295317
eventType: canonicalEvent.type,
296-
}).pipe(Effect.andThen(publishRuntimeEvent(canonicalEvent))),
318+
}).pipe(
319+
Effect.andThen(publishRuntimeEvent(canonicalEvent)),
320+
Effect.andThen(bumpSessionActivity(canonicalEvent)),
321+
),
297322
),
298323
);
299324

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,13 @@ const makeProviderSessionDirectory = Effect.gen(function* () {
148148
.pipe(Effect.mapError(toPersistenceError("ProviderSessionDirectory.upsert:upsert")));
149149
});
150150

151+
const touch: ProviderSessionDirectoryShape["touch"] = Effect.fn(function* (threadId) {
152+
const now = DateTime.formatIso(yield* DateTime.now);
153+
yield* repository
154+
.touchByThreadId({ threadId, lastSeenAt: now })
155+
.pipe(Effect.mapError(toPersistenceError("ProviderSessionDirectory.touch:touchByThreadId")));
156+
});
157+
151158
const getProvider: ProviderSessionDirectoryShape["getProvider"] = (threadId) =>
152159
getBinding(threadId).pipe(
153160
Effect.flatMap((binding) =>
@@ -184,6 +191,7 @@ const makeProviderSessionDirectory = Effect.gen(function* () {
184191

185192
return {
186193
upsert,
194+
touch,
187195
getProvider,
188196
getBinding,
189197
listThreadIds,

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@ export interface ProviderSessionDirectoryShape {
4545
binding: ProviderRuntimeBinding,
4646
) => Effect.Effect<void, ProviderSessionDirectoryWriteError>;
4747

48+
readonly touch: (
49+
threadId: ThreadId,
50+
) => Effect.Effect<void, ProviderSessionDirectoryPersistenceError>;
51+
4852
readonly getProvider: (
4953
threadId: ThreadId,
5054
) => Effect.Effect<ProviderDriverKind, ProviderSessionDirectoryReadError>;

0 commit comments

Comments
 (0)