Skip to content

Commit f04a9e1

Browse files
authored
fix(server): refresh stale model catalogs before refusing delegation (pingdotgg#33426)
1 parent c6969f8 commit f04a9e1

2 files changed

Lines changed: 91 additions & 1 deletion

File tree

‎apps/server/src/mcp/OrchestratorMcpService.test.ts‎

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1802,6 +1802,96 @@ describe("OrchestratorMcpService provider resolution", () => {
18021802
);
18031803
});
18041804

1805+
it.effect.each(["already advertised", "newly advertised", "still unavailable"] as const)(
1806+
"rechecks a delegated model that is %s",
1807+
(availability) =>
1808+
Effect.gen(function* () {
1809+
const museInstanceId = ProviderInstanceId.make("muse");
1810+
const model = "muse-wonder-1.0";
1811+
const provider = (advertisedModel: string) =>
1812+
providerSnapshot({
1813+
instanceId: museInstanceId,
1814+
driver: ProviderDriverKind.make("muse"),
1815+
model: advertisedModel,
1816+
});
1817+
const commands: Array<unknown> = [];
1818+
const refreshedInstances: Array<ProviderInstanceId> = [];
1819+
const task = {
1820+
id: taskId,
1821+
threadId: parentThreadId,
1822+
origin: "app_owned",
1823+
childThreadId,
1824+
providerInstanceId: museInstanceId,
1825+
model,
1826+
status: "running",
1827+
result: null,
1828+
};
1829+
const dependencies = Layer.mergeAll(
1830+
NodeServices.layer,
1831+
NodeCrypto.layer,
1832+
Layer.mock(ThreadManagementService.ThreadManagementService)({
1833+
hasReceipt: () => Effect.succeed(false),
1834+
getThreadRecords: (threadId) =>
1835+
Effect.succeed(
1836+
threadId === parentThreadId
1837+
? parentProjection(commands.length > 0 ? [task] : [])
1838+
: childProjection,
1839+
),
1840+
dispatch: (command) =>
1841+
Effect.sync(() => {
1842+
commands.push(command);
1843+
return {
1844+
sequence: 1,
1845+
storedEvents: [{ event: { type: "subagent.updated", payload: task } }],
1846+
} as never;
1847+
}),
1848+
}),
1849+
ServerSettings.layerTest(),
1850+
Layer.mock(ProviderRegistry.ProviderRegistry)({
1851+
getProviders: Effect.succeed([
1852+
provider(availability === "already advertised" ? model : "muse-spark-1.3"),
1853+
]),
1854+
refreshInstance: (instanceId) =>
1855+
Effect.sync(() => {
1856+
refreshedInstances.push(instanceId);
1857+
return [provider(availability === "still unavailable" ? "muse-spark-1.3" : model)];
1858+
}),
1859+
}),
1860+
adapterRegistryLayer([museInstanceId]),
1861+
Layer.mock(ProjectService.ProjectService)({}),
1862+
Layer.mock(SecretRequests.SecretRequests)({}),
1863+
Layer.mock(RemoteDelegation.RemoteDelegation)({}),
1864+
Layer.mock(ScheduledTaskService.ScheduledTaskService)({}),
1865+
);
1866+
yield* Effect.gen(function* () {
1867+
const service = yield* OrchestratorMcpService.OrchestratorMcpService;
1868+
const delegation = service.delegateTask(scope, {
1869+
task: "Review the change.",
1870+
target: { providerInstanceId: museInstanceId, model },
1871+
mode: "async",
1872+
clientRequestId: availability,
1873+
});
1874+
if (availability === "still unavailable") {
1875+
const error = yield* delegation.pipe(Effect.flip);
1876+
assert.equal(error.code, "model_unavailable");
1877+
assert.deepEqual(commands, []);
1878+
} else {
1879+
const result = yield* delegation;
1880+
assert.equal(result.model, model);
1881+
assert.equal(commands.length, 1);
1882+
assert.deepEqual((commands[0] as { modelSelection: unknown }).modelSelection, {
1883+
instanceId: museInstanceId,
1884+
model,
1885+
});
1886+
}
1887+
assert.deepEqual(
1888+
refreshedInstances,
1889+
availability === "already advertised" ? [] : [museInstanceId],
1890+
);
1891+
}).pipe(Effect.provide(layerOrchestratorService.pipe(Layer.provide(dependencies))));
1892+
}),
1893+
);
1894+
18051895
it.effect("rejects delegation to a provider without a registered adapter", () =>
18061896
Effect.gen(function* () {
18071897
const forkOnlyInstanceId = ProviderInstanceId.make("forkOnly");

‎apps/server/src/mcp/OrchestratorMcpService.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1301,7 +1301,7 @@ const make = Effect.gen(function* () {
13011301
if (instanceId === undefined) return resolved;
13021302
return resolved.pipe(
13031303
Effect.catchIf(
1304-
(error) => error.code === "provider_unavailable",
1304+
(error) => error.code === "provider_unavailable" || error.code === "model_unavailable",
13051305
() =>
13061306
providerRegistry
13071307
.refreshInstance(instanceId)

0 commit comments

Comments
 (0)