Skip to content

Commit dadbbfc

Browse files
rileyjshawclaude
andcommitted
fix(server): report session exits when a provider instance is torn down
Removing or replacing a provider instance (any `providerInstances` settings edit) closed the instance scope while threads were mid-turn, and the orchestrator never heard about it: those threads stayed "running" forever. - CodexSessionRuntime.close emitted `session/closed` and then immediately `Queue.shutdown` the events queue, which clears buffered messages, so the exit was dropped before the adapter forwarder took it. End the queue instead so the consumer drains it. - CodexAdapter.stopSessionInternal closed the session scope (interrupting the forwarder) right after `close`; wait for the forwarder to drain first. Both adapters now end their runtime event queue on release instead of shutting it down, so already-emitted exits stay readable. - ProviderInstanceRegistry.reconcile now calls `adapter.stopAll()` before closing a removed/replaced instance's scope. Adapter finalizers stop sessions silently on purpose (server shutdown keeps threads resumable); a settings edit is not a shutdown. Co-Authored-By: Claude Fable 5.1 <[email protected]>
1 parent 9ea9c3d commit dadbbfc

8 files changed

Lines changed: 14412 additions & 14247 deletions

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

Lines changed: 5065 additions & 5064 deletions
Large diffs are not rendered by default.

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

Lines changed: 2970 additions & 2916 deletions
Large diffs are not rendered by default.

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

Lines changed: 2452 additions & 2446 deletions
Large diffs are not rendered by default.

‎apps/server/src/provider/Layers/CodexCollabRuntime.integration.test.ts‎

Lines changed: 734 additions & 705 deletions
Large diffs are not rendered by default.

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

Lines changed: 2290 additions & 2284 deletions
Large diffs are not rendered by default.

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

Lines changed: 595 additions & 539 deletions
Large diffs are not rendered by default.

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

Lines changed: 288 additions & 276 deletions
Large diffs are not rendered by default.

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

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@
1212
* The mutator exposes a single entry point, `reconcile(configMap)`, which:
1313
*
1414
* 1. Diffs the incoming map against the live one keyed by instance id.
15-
* 2. Closes the per-instance `Scope` of every removed or replaced entry
16-
* (tearing down adapter processes, refresh fibres, temp files) BEFORE
17-
* creating the replacement — `reconcile` guarantees "at most one live
18-
* instance per id" at all times.
15+
* 2. Stops every live session of each removed or replaced entry (so the
16+
* orchestrator sees `session.exited` for threads mid-turn), then closes
17+
* its per-instance `Scope` (tearing down adapter processes, refresh
18+
* fibres, temp files) BEFORE creating the replacement — `reconcile`
19+
* guarantees "at most one live instance per id" at all times.
1920
* 3. Opens a fresh child `Scope` for every added or replaced entry, runs
2021
* the driver's `create`, and stores the resulting `ProviderInstance`
2122
* plus its scope.
@@ -33,20 +34,20 @@ import * as Context from "effect/Context";
3334
import type * as Effect from "effect/Effect";
3435

3536
export interface ProviderInstanceRegistryMutatorShape {
36-
/**
37-
* Bring the live registry in line with the supplied config map. See
38-
* module docs for the add / remove / replace semantics.
39-
*
40-
* The effect never fails: individual driver `create` failures are
41-
* captured as "unavailable" shadow snapshots inside the registry, the
42-
* same way boot-time failures are handled by
43-
* `makeProviderInstanceRegistry`. This keeps settings-watcher loops from
44-
* erroring out on a single bad entry.
45-
*/
46-
readonly reconcile: (configMap: ProviderInstanceConfigMap) => Effect.Effect<void>;
37+
/**
38+
* Bring the live registry in line with the supplied config map. See
39+
* module docs for the add / remove / replace semantics.
40+
*
41+
* The effect never fails: individual driver `create` failures are
42+
* captured as "unavailable" shadow snapshots inside the registry, the
43+
* same way boot-time failures are handled by
44+
* `makeProviderInstanceRegistry`. This keeps settings-watcher loops from
45+
* erroring out on a single bad entry.
46+
*/
47+
readonly reconcile: (configMap: ProviderInstanceConfigMap) => Effect.Effect<void>;
4748
}
4849

4950
export class ProviderInstanceRegistryMutator extends Context.Service<
50-
ProviderInstanceRegistryMutator,
51-
ProviderInstanceRegistryMutatorShape
51+
ProviderInstanceRegistryMutator,
52+
ProviderInstanceRegistryMutatorShape
5253
>()("t3/provider/Services/ProviderInstanceRegistryMutator") {}

0 commit comments

Comments
 (0)