Skip to content

Commit 9c20cd5

Browse files
author
PR Batch Tester
committed
fix(server): refresh uncertain catalogs after provider thread errors
1 parent eae7129 commit 9c20cd5

2 files changed

Lines changed: 38 additions & 2 deletions

File tree

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

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3735,6 +3735,9 @@ it.effect(
37353735
() =>
37363736
Effect.gen(function* () {
37373737
const state = yield* Ref.make(emptyState);
3738+
const pendingWork = yield* Ref.make(false);
3739+
const settingsUnavailable = yield* Ref.make(false);
3740+
const settings = yield* makeTestSettings(settingsUnavailable);
37383741
const effect = Effect.gen(function* () {
37393742
const eventSink = yield* EventSink.EventSinkV2;
37403743
const idAllocator = yield* IdAllocator.IdAllocatorV2;
@@ -3845,9 +3848,37 @@ it.effect(
38453848
},
38463849
},
38473850
);
3851+
3852+
yield* settings.updateSettings({ linkedEnvironmentsEnabled: true });
3853+
yield* Ref.set(pendingWork, true);
3854+
yield* publish({
3855+
type: "provider_thread.updated",
3856+
driver: CODEX_DRIVER,
3857+
providerThread: { ...failed.providerThread, status: "error" },
3858+
});
3859+
assert.equal(yield* countRawResumes(failed), 1);
3860+
yield* settings.updateSettings({ linkedEnvironmentsEnabled: false });
3861+
yield* Ref.set(pendingWork, false);
3862+
assert.equal(yield* countRawResumes(failed), 1);
3863+
assert.equal(yield* countRawResumes(failed), 0);
3864+
assert.equal(yield* countRawResumes(sibling), 0);
3865+
assert.equal(yield* countRawResumes(healthy), 0);
3866+
assert.deepEqual((yield* Ref.get(state)).unloadedNativeThreadIds, [
3867+
"idle-failed-runtime",
3868+
"idle-failed-runtime",
3869+
]);
38483870
});
38493871

3850-
yield* effect.pipe(Effect.provide(layerTest({ state, idleTimeoutMs: 1000 })));
3872+
yield* effect.pipe(
3873+
Effect.provide(
3874+
layerTest({
3875+
state,
3876+
idleTimeoutMs: 1000,
3877+
hasPendingBackgroundWorkForThread: Ref.get(pendingWork),
3878+
serverSettingsLayer: Layer.succeed(ServerSettings.ServerSettingsService, settings),
3879+
}),
3880+
),
3881+
);
38513882
}),
38523883
);
38533884

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ export class ProviderSessionManagerV2 extends Context.Service<
218218
interface LiveSessionEntry {
219219
readonly attachedThreadIds: ReadonlySet<ThreadId>;
220220
readonly loadedProviderThreadKeyByThread: ReadonlyMap<ThreadId, string>;
221-
/** null retains a failed settings read; undefined means MCP refresh is not configured. */
221+
/** null marks an unknown catalog; undefined means MCP refresh is not configured. */
222222
readonly openedWithLinkedEnvironments: boolean | null | undefined;
223223
readonly linkedEnvironmentsByThread: ReadonlyMap<ThreadId, boolean | null>;
224224
/** Scope revocation to recorded credential ids so superseded sessions cannot revoke replacements opened before detach. */
@@ -2182,9 +2182,14 @@ export const layerWithOptions = (
21822182
latest.loadedProviderThreadKeyByThread,
21832183
);
21842184
loadedProviderThreadKeyByThread.delete(threadId);
2185+
const linkedEnvironmentsByThread = new Map(latest.linkedEnvironmentsByThread);
2186+
if (linkedEnvironmentsByThread.has(threadId)) {
2187+
linkedEnvironmentsByThread.set(threadId, null);
2188+
}
21852189
return new Map(sessions).set(key, {
21862190
...latest,
21872191
loadedProviderThreadKeyByThread,
2192+
linkedEnvironmentsByThread,
21882193
});
21892194
});
21902195
}

0 commit comments

Comments
 (0)