Skip to content

Commit 20fcc6c

Browse files
shivamhwpPR Batch Testerclaudemaria-rcks
authored
fix(server): refresh linking tools in existing agent sessions (#26737)
Co-authored-by: PR Batch Tester <[email protected]> Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: maria-rcks <[email protected]>
1 parent 3cd97a1 commit 20fcc6c

4 files changed

Lines changed: 273 additions & 16 deletions

File tree

‎apps/server/src/orchestration-v2/ProviderSessionManager.test.ts‎

Lines changed: 44 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3631,6 +3631,9 @@ it.effect(
36313631
() =>
36323632
Effect.gen(function* () {
36333633
const state = yield* Ref.make(emptyState);
3634+
const settings = yield* ServerSettings.ServerSettingsService.pipe(
3635+
Effect.provide(ServerSettings.layerTest()),
3636+
);
36343637
const effect = Effect.gen(function* () {
36353638
const eventSink = yield* EventSink.EventSinkV2;
36363639
const idAllocator = yield* IdAllocator.IdAllocatorV2;
@@ -3737,6 +3740,11 @@ it.effect(
37373740
assert.equal((yield* Ref.get(state)).resumeCount, 2);
37383741
yield* resumeSecondThread;
37393742
assert.equal((yield* Ref.get(state)).resumeCount, 3);
3743+
// regression: #26722 a Linked environments change reloads only the idle thread's tools.
3744+
yield* settings.updateSettings({ linkedEnvironmentsEnabled: true });
3745+
yield* resumeSecondThread;
3746+
assert.equal((yield* Ref.get(state)).resumeCount, 4);
3747+
assert.deepEqual((yield* Ref.get(state)).unloadedNativeThreadIds, ["native-thread"]);
37403748
const subscribe = firstRuntime.subscribeEvents;
37413749
assert.isDefined(subscribe);
37423750
if (subscribe === undefined) return;
@@ -3768,23 +3776,34 @@ it.effect(
37683776
runtimePolicy,
37693777
});
37703778
yield* resumeSecondThread;
3771-
assert.equal((yield* Ref.get(state)).resumeCount, 4);
3779+
assert.equal((yield* Ref.get(state)).resumeCount, 5);
37723780

3773-
assert.deepEqual((yield* Ref.get(state)).unloadedNativeThreadIds, []);
3781+
assert.deepEqual((yield* Ref.get(state)).unloadedNativeThreadIds, ["native-thread"]);
37743782

37753783
yield* manager.detach({ providerSessionId, threadId: firstThreadId });
37763784
assert.isTrue(Option.isSome(yield* manager.get(providerSessionId)));
37773785
assert.equal((yield* Ref.get(state)).closeCount, 0);
37783786
assert.equal((yield* Ref.get(state)).interruptCount, 1);
3779-
assert.deepEqual((yield* Ref.get(state)).unloadedNativeThreadIds, ["native-thread"]);
3787+
assert.deepEqual((yield* Ref.get(state)).unloadedNativeThreadIds, [
3788+
"native-thread",
3789+
"native-thread",
3790+
]);
37803791

37813792
yield* manager.detach({ providerSessionId, threadId: secondThreadId });
37823793
yield* TestClock.adjust("1 second");
37833794
yield* Effect.yieldNow;
37843795
assert.equal((yield* Ref.get(state)).closeCount, 1);
37853796
});
37863797

3787-
yield* effect.pipe(Effect.provide(layerTest({ state, idleTimeoutMs: 1000 })));
3798+
yield* effect.pipe(
3799+
Effect.provide(
3800+
layerTest({
3801+
state,
3802+
idleTimeoutMs: 1000,
3803+
serverSettingsLayer: Layer.succeed(ServerSettings.ServerSettingsService, settings),
3804+
}),
3805+
),
3806+
);
37883807
}),
37893808
);
37903809

@@ -4187,10 +4206,13 @@ it.effect(
41874206
);
41884207

41894208
it.effect(
4190-
"ProviderSessionManagerV2 rejects a second thread when the provider runtime is exclusive",
4209+
"ProviderSessionManagerV2 rejects a second thread when the provider runtime is exclusive, and reopens it when Linked environments changes",
41914210
() =>
41924211
Effect.gen(function* () {
41934212
const state = yield* Ref.make(emptyState);
4213+
const settings = yield* ServerSettings.ServerSettingsService.pipe(
4214+
Effect.provide(ServerSettings.layerTest()),
4215+
);
41944216
const effect = Effect.gen(function* () {
41954217
const eventSink = yield* EventSink.EventSinkV2;
41964218
const idAllocator = yield* IdAllocator.IdAllocatorV2;
@@ -4235,11 +4257,27 @@ it.effect(
42354257

42364258
assert.equal(error._tag, "ProviderSessionOpenError");
42374259
assert.equal((yield* Ref.get(state)).openCount, 1);
4260+
4261+
// regression: #26722 an exclusive runtime configures MCP at open, so it reopens.
4262+
yield* settings.updateSettings({ linkedEnvironmentsEnabled: true });
4263+
yield* manager.open({
4264+
threadId: firstThreadId,
4265+
providerSessionId,
4266+
modelSelection,
4267+
runtimePolicy,
4268+
});
4269+
assert.equal((yield* Ref.get(state)).openCount, 2);
4270+
assert.equal((yield* Ref.get(state)).closeCount, 1);
42384271
});
42394272

42404273
yield* effect.pipe(
42414274
Effect.provide(
4242-
layerTest({ state, idleTimeoutMs: 1000, capabilities: ExclusiveCapabilities }),
4275+
layerTest({
4276+
state,
4277+
idleTimeoutMs: 1000,
4278+
capabilities: ExclusiveCapabilities,
4279+
serverSettingsLayer: Layer.succeed(ServerSettings.ServerSettingsService, settings),
4280+
}),
42434281
),
42444282
);
42454283
}),

0 commit comments

Comments
 (0)