Commit f90e2f2bd26e22b77ccf781cccdf95afd3c3ac1c | the-knife

author	t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com> 2026-09-02 17:13:46-04:00
committer	GitHub <noreply@github.com> 2026-09-02 17:13:46-04:00
log	f90e2f2bd26e22b77ccf781cccdf95afd3c3ac1c
tree	99803041c48bb4368ca465f601e9b14737c12c34
parent	b57726ca842624b713572529109ac49b17c93fb3
signature	Signed by PGP key B5690EEEBB952194

fix(server): subscribe before provider settings watcher (#9271)

Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
Co-authored-by: maria <254055478+maria-rcks@users.noreply.github.com>

2 files changed, 19 insertions(+), 6 deletions(-)

apps
- server
  - src
    provider
    Layers
    ProviderInstanceRegistryHydration.ts
    ProviderRegistry.test.ts

apps/server/src/provider/Layers/ProviderInstanceRegistryHydration.ts+5-4

apps/server/src/provider/Layers/ProviderRegistry.test.ts+14-2

 @@ -1944,7 +1944,8 @@ it.layer(Layer.mergeAll(NodeServices.layer, ServerSettingsModule.layerTest(), Te
           const firstMissing = `t3code_codex_first_`;
           const secondMissing = `t3code_codex_second_`;
           const spawnedCommands: Array<string> = [];
-          const serverSettings = yield* makeMutableServerSettingsService(
+          const allowLazySettingsStream = yield* Deferred.make<void>();
+          const mutableServerSettings = yield* makeMutableServerSettingsService(
             decodeServerSettings(
               deepMerge(encodedDefaultServerSettings, {
                 providers: {
 @@ -1957,6 +1958,14 @@ it.layer(Layer.mergeAll(NodeServices.layer, ServerSettingsModule.layerTest(), Te
               }),
             ),
           );
+          const serverSettings = {
+            ...mutableServerSettings,
+            streamChanges: Stream.unwrap(
+              Deferred.await(allowLazySettingsStream).pipe(
+                Effect.as(mutableServerSettings.streamChanges),
+              ),
+            ),
+          } satisfies ServerSettingsModule.ServerSettingsService["Service"];
           const scope = yield* Scope.make();
           yield* Effect.addFinalizer(() => Scope.close(scope, Exit.void));
           const providerRegistryLayer = ProviderRegistryLive.pipe(
 @@ -2016,7 +2025,7 @@ it.layer(Layer.mergeAll(NodeServices.layer, ServerSettingsModule.layerTest(), Te
             assert.deepStrictEqual(spawnedCommands, [firstMissing]);
             // Drive a settings change. The Hydration layer's
-            // `SettingsWatcherLive` consumes this via `streamChanges`,
+            // `SettingsWatcherLive` consumes this via `subscribeChanges`,
             // calls `reconcile`, which rebuilds the codex instance (the
             // envelope changed because `binaryPath` differs → `entryEqual`
             // is false). The registry's `Stream.runForEach(
 @@ -2028,6 +2037,9 @@ it.layer(Layer.mergeAll(NodeServices.layer, ServerSettingsModule.layerTest(), Te
                 codex: { enabled: true, binaryPath: secondMissing },
               },
             });
+            // Start the lazy stream only after publishing. A watcher that did
+            // not subscribe before forking has already lost this update.
+            yield* Deferred.succeed(allowLazySettingsStream, undefined);
             // Poll until the injected process boundary observes the new
             // executable. This verifies the public settings-to-probe behavior

...	@@ -31,7 +31,7 @@	...	@@ -31,7 +31,7 @@
31	* 1. Read the current `ServerSettings` once and use it to seed the	31	* 1. Read the current `ServerSettings` once and use it to seed the
32	* registry's initial state via `ProviderInstanceRegistryMutableLayer`.	32	* registry's initial state via `ProviderInstanceRegistryMutableLayer`.
33	* 2. Fork a daemon fiber (lifetime tied to the layer's scope) that	33	* 2. Fork a daemon fiber (lifetime tied to the layer's scope) that
34	* subscribes to `ServerSettingsService.streamChanges` and calls	34	* acquires `ServerSettingsService.subscribeChanges` and calls
35	* `ProviderInstanceRegistryMutator.reconcile` on every emission.	35	* `ProviderInstanceRegistryMutator.reconcile` on every emission.
36	*	36	*
37	* Failures inside the watcher are logged and swallowed so a single bad	37	* Failures inside the watcher are logged and swallowed so a single bad
...	@@ -118,7 +118,8 @@ const SettingsWatcherLive = Layer.effectDiscard(	...	@@ -118,7 +118,8 @@ const SettingsWatcherLive = Layer.effectDiscard(
118	Effect.gen(function* () {	118	Effect.gen(function* () {
119	const mutator = yield* ProviderInstanceRegistryMutator;	119	const mutator = yield* ProviderInstanceRegistryMutator;
120	const serverSettings = yield* ServerSettingsService;	120	const serverSettings = yield* ServerSettingsService;
121	yield* serverSettings.streamChanges.pipe(	121	const settingsChanges = yield* serverSettings.subscribeChanges;
		122	yield* settingsChanges.pipe(
122	Stream.runForEach((next) =>	123	Stream.runForEach((next) =>
123	mutator	124	mutator
124	.reconcile(deriveProviderInstanceConfigMap(next))	125	.reconcile(deriveProviderInstanceConfigMap(next))
...	@@ -141,8 +142,8 @@ const SettingsWatcherLive = Layer.effectDiscard(	...	@@ -141,8 +142,8 @@ const SettingsWatcherLive = Layer.effectDiscard(
141	* - `ProviderInstanceRegistryMutableLayer` produces the registry +	142	* - `ProviderInstanceRegistryMutableLayer` produces the registry +
142	* mutator from the initial config map. Its scope owns every	143	* mutator from the initial config map. Its scope owns every
143	* per-instance child scope created during reconcile.	144	* per-instance child scope created during reconcile.
144	* - `SettingsWatcherLive` consumes the mutator and runs a daemon fiber	145	* - `SettingsWatcherLive` consumes the mutator, acquires its settings
145	* in the same scope.	146	* subscription before forking, and runs a daemon fiber in the same scope.
146	*	147	*
147	* Composing via `Layer.provideMerge` makes the watcher's deps available	148	* Composing via `Layer.provideMerge` makes the watcher's deps available
148	* from the mutable layer while still surfacing the registry as an output.	149	* from the mutable layer while still surfacing the registry as an output.