Skip to content

Commit 0efb4d9

Browse files
nullStack65Grok 4.7
andauthored
fix(server): reject a model the provider instance does not serve (#129)
* fix(server): reject a model the provider instance does not serve A launch with claudeAgent and grok/grok-4.7 was accepted and ran on the Claude harness. Paths that start work now check that instance's catalog and name the models it serves. Model: grok-4.7 Task: CLO-946 refuse a model the provider instance does not serve Agent: magpie Lane: magpie Harness: t3/codex Model-family: Grok Model-generation: 4.7 Skills-SHA: 0540352af0d6f43bdeea39a8c4aad4660ab0ec55 Co-Authored-By: Grok 4.7 <noreply@x.ai> * fix(server): require the provider registry for the model guard A custom-only Codex catalog no longer refuses built-in models, and launch, send, and schedule paths fail the check when the registry is missing instead of skipping it. Model: grok-4.7 Task: CLO-946 refuse a model the provider instance does not serve Agent: magpie Lane: magpie Harness: t3/codex Model-family: Grok Model-generation: 4.7 Skills-SHA: 0540352af0d6f43bdeea39a8c4aad4660ab0ec55 Co-Authored-By: Grok 4.7 <noreply@x.ai> --------- Co-authored-by: Grok 4.7 <noreply@x.ai>
1 parent 42a974d commit 0efb4d9

33 files changed

Lines changed: 886 additions & 41 deletions

‎apps/server/src/mcp/McpToolAccess.race.test.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import * as McpHttpServer from "./McpHttpServer.ts";
2828
import * as McpInvocationContext from "./McpInvocationContext.ts";
2929
import * as McpToolAccess from "./McpToolAccess.ts";
3030
import type * as ProviderAdapter from "@t3tools/provider-core/server/ProviderAdapter";
31+
import * as ProviderRegistryMock from "../provider/testUtils/providerRegistryMock.ts";
3132

3233
const instanceId = ProviderInstanceId.make("codex");
3334
const adapter = {
@@ -182,6 +183,7 @@ it.layer(layerOrchestrator)("writesThreads against a mode raise", (it) => {
182183
}).pipe(
183184
Effect.provide(
184185
ThreadManagement.layer.pipe(
186+
Layer.provide(ProviderRegistryMock.layer()),
185187
Layer.provide(ServerSettings.layerTest()),
186188
Layer.provide(CommandReceiptStore.layer.pipe(Layer.provide(layerDatabase))),
187189
),

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

Lines changed: 123 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ import * as OrchestratorMcpService from "./OrchestratorMcpService.ts";
7878
import { resolveRuntimeMode } from "./delegatedTaskModes.ts";
7979
import type { ProjectionRecordFilter } from "../orchestration-v2/ProjectionStore.ts";
8080
import type * as ProviderAdapter from "@t3tools/provider-core/server/ProviderAdapter";
81+
import * as ProviderRegistryMock from "../provider/testUtils/providerRegistryMock.ts";
8182

8283
const decodeTarget = Schema.decodeUnknownEffect(OrchestratorMcpTarget);
8384

@@ -2573,6 +2574,126 @@ describe("OrchestratorMcpService provider resolution", () => {
25732574
}),
25742575
);
25752576

2577+
it.effect("refuses a Grok model on claudeAgent and accepts a model that instance serves", () =>
2578+
Effect.gen(function* () {
2579+
const claudeInstanceId = ProviderInstanceId.make("claudeAgent");
2580+
const claude = providerSnapshot({
2581+
instanceId: claudeInstanceId,
2582+
driver: ProviderDriverKind.make("claudeAgent"),
2583+
model: "claude-opus",
2584+
});
2585+
const dispatched = yield* Ref.make<
2586+
ReadonlyArray<{ modelSelection?: { instanceId: string; model: string } }>
2587+
>([]);
2588+
let delegated = false;
2589+
const task = {
2590+
id: taskId,
2591+
threadId: parentThreadId,
2592+
runId: parentRunId,
2593+
parentNodeId,
2594+
origin: "app_owned",
2595+
createdBy: "agent",
2596+
driver: ProviderDriverKind.make("claudeAgent"),
2597+
providerInstanceId: claudeInstanceId,
2598+
providerThreadId: null,
2599+
childThreadId,
2600+
nativeTaskRef: null,
2601+
prompt: "Summarize the diff.",
2602+
title: null,
2603+
model: "claude-opus",
2604+
status: "running",
2605+
result: null,
2606+
startedAt: null,
2607+
completedAt: null,
2608+
};
2609+
const layerDependencies = Layer.mergeAll(
2610+
NodeServices.layer,
2611+
NodeCrypto.layer,
2612+
Layer.mock(ThreadManagementService.ThreadManagementService)({
2613+
hasReceipt: () => Effect.succeed(false),
2614+
getThreadRecords: (threadId) =>
2615+
Effect.succeed(
2616+
threadId === parentThreadId
2617+
? parentProjection(delegated ? [task] : [])
2618+
: childProjection,
2619+
),
2620+
dispatch: (command) =>
2621+
Ref.update(dispatched, (commands) => [...commands, command as never]).pipe(
2622+
Effect.andThen(
2623+
Effect.sync(() => {
2624+
delegated = true;
2625+
}),
2626+
),
2627+
Effect.as({
2628+
sequence: 1,
2629+
storedEvents: [
2630+
{
2631+
sequence: 1,
2632+
commandId: null,
2633+
event: { type: "subagent.updated", payload: task },
2634+
},
2635+
],
2636+
} as never),
2637+
),
2638+
}),
2639+
ServerSettings.layerTest(),
2640+
providerRegistryLayer([
2641+
providerSnapshot({
2642+
instanceId: codexInstanceId,
2643+
driver: ProviderDriverKind.make("codex"),
2644+
model: "gpt-5.4",
2645+
}),
2646+
{
2647+
...claude,
2648+
models: [
2649+
{
2650+
slug: "claude-opus",
2651+
name: "Opus",
2652+
aliases: ["Opus"],
2653+
isCustom: false,
2654+
capabilities: null,
2655+
},
2656+
],
2657+
},
2658+
]),
2659+
adapterRegistryLayer([codexInstanceId, claudeInstanceId]),
2660+
Layer.mock(ProjectService.ProjectService)({}),
2661+
Layer.mock(SecretRequests.SecretRequests)({}),
2662+
Layer.mock(RemoteDelegation.RemoteDelegation)({}),
2663+
Layer.mock(ScheduledTaskService.ScheduledTaskService)({}),
2664+
);
2665+
2666+
yield* Effect.gen(function* () {
2667+
const service = yield* OrchestratorMcpService.OrchestratorMcpService;
2668+
const refused = yield* service
2669+
.delegateTask(scope, {
2670+
task: "Summarize the diff.",
2671+
target: { providerInstanceId: claudeInstanceId, model: "grok/grok-4.7" },
2672+
mode: "async",
2673+
clientRequestId: "delegate-grok-on-claude",
2674+
})
2675+
.pipe(Effect.flip);
2676+
assert.equal(refused.code, "model_unavailable");
2677+
assert.include(refused.message, "grok/grok-4.7");
2678+
assert.include(refused.message, "claudeAgent");
2679+
assert.include(refused.message, "claude-opus");
2680+
assert.equal((yield* Ref.get(dispatched)).length, 0);
2681+
2682+
const accepted = yield* service.delegateTask(scope, {
2683+
task: "Summarize the diff.",
2684+
target: { providerInstanceId: claudeInstanceId, model: "Opus" },
2685+
mode: "async",
2686+
clientRequestId: "delegate-opus-on-claude",
2687+
});
2688+
assert.equal(accepted.status, "running");
2689+
const commands = yield* Ref.get(dispatched);
2690+
assert.equal(commands.length, 1);
2691+
assert.equal(commands[0]?.modelSelection?.instanceId, claudeInstanceId);
2692+
assert.equal(commands[0]?.modelSelection?.model, "Opus");
2693+
}).pipe(Effect.provide(layerOrchestratorService.pipe(Layer.provide(layerDependencies))));
2694+
}),
2695+
);
2696+
25762697
it.effect("driver-only delegation skips an instance the project turned off", () =>
25772698
Effect.gen(function* () {
25782699
const altInstanceId = ProviderInstanceId.make("codex-alt");
@@ -2835,6 +2956,7 @@ describe("OrchestratorMcpService provider resolution", () => {
28352956
},
28362957
});
28372958
const layerThreads = ThreadManagementService.layer.pipe(
2959+
Layer.provide(ProviderRegistryMock.layer()),
28382960
Layer.provideMerge(layerOrchestrator),
28392961
Layer.provide(
28402962
LegacyV1ThreadImporter.layer.pipe(
@@ -3017,6 +3139,7 @@ describe("OrchestratorMcpService provider resolution", () => {
30173139
providerInstances: { [codexInstanceId]: { driver: "codex", enabled: true } },
30183140
});
30193141
const layerThreads = ThreadManagementService.layer.pipe(
3142+
Layer.provide(ProviderRegistryMock.layer()),
30203143
Layer.provideMerge(layerOrchestrator),
30213144
Layer.provide(
30223145
LegacyV1ThreadImporter.layer.pipe(

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

Lines changed: 15 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ import { isSnoozed } from "../orchestration-v2/ThreadSettlementService.ts";
124124
import { userFacingDispatchErrorMessage } from "../orchestration-v2/UserFacingErrors.ts";
125125
import * as ProjectService from "../project/ProjectService.ts";
126126
import * as ProviderRegistry from "../provider/ProviderRegistry.ts";
127+
import { findServedModel, unservedModelMessage } from "../provider/servedModel.ts";
127128
import * as ScheduledTaskService from "../scheduledTasks/ScheduledTaskService.ts";
128129
import * as ServerSettings from "../serverSettings.ts";
129130
import {
@@ -369,42 +370,8 @@ function listCapabilityModels(input: {
369370
return { listed, omitted: visible.length - listed.length };
370371
}
371372

372-
/** Names advertised slugs to retry with: same last `/` segment first, else a short list. */
373-
function advertisedModelsHint(models: ReadonlyArray<ServerProviderModel>, requested: string) {
374-
const lastSegment = (slug: string) => slug.slice(slug.lastIndexOf("/") + 1).toLowerCase();
375-
const wanted = lastSegment(requested);
376-
const close = models.filter((model) => lastSegment(model.slug) === wanted);
377-
if (close.length > 0) {
378-
return `Did you mean ${close
379-
.slice(0, LISTED_MODEL_LIMIT)
380-
.map((model) => model.slug)
381-
.join(", ")}?`;
382-
}
383-
const listed = models
384-
.toSorted((a, b) => Number(a.isLegacy ?? false) - Number(b.isLegacy ?? false))
385-
.slice(0, LISTED_MODEL_LIMIT);
386-
const omitted = models.length - listed.length;
387-
return `Advertised models: ${listed.map((model) => model.slug).join(", ")}${
388-
omitted > 0 ? ` and ${omitted} more; orchestrator_capabilities with search finds them` : ""
389-
}.`;
390-
}
391-
392-
/** Option ids and allowed values are all a delegating agent needs; labels are UI copy. */
393-
function capabilityModelOption(descriptor: ProviderOptionDescriptor): OrchestratorMcpModelOption {
394-
const defaultValue = getProviderOptionCurrentValue(descriptor);
395-
return {
396-
id: descriptor.id,
397-
values:
398-
descriptor.type === "boolean" ? [false, true] : descriptor.options.map((choice) => choice.id),
399-
...(defaultValue === undefined ? {} : { default: defaultValue }),
400-
};
401-
}
402-
403373
const advertisedModel = (provider: ServerProvider, model: string) =>
404-
provider.models.find((candidate) => candidate.slug === model) ??
405-
provider.models.find((candidate) =>
406-
candidate.aliases?.some((alias) => alias.toLowerCase() === model.toLowerCase()),
407-
);
374+
findServedModel(provider.models, model);
408375

409376
const withV = (version: string) => (version.startsWith("v") ? version : `v${version}`);
410377

@@ -421,12 +388,24 @@ export const requireAdvertisedModel = (provider: ServerProvider, model: string)
421388
failure(
422389
"model_unavailable",
423390
updateRequired === undefined
424-
? `Model ${model} is not advertised by provider ${provider.instanceId}. ${advertisedModelsHint(provider.models, model)}`
391+
? (unservedModelMessage(provider.instanceId, model, provider.models) ??
392+
`Model ${model} is not advertised by provider ${provider.instanceId}.`)
425393
: `Model ${model} needs provider ${provider.instanceId} at ${withV(updateRequired.minVersion)} or newer, but the detected CLI is ${detectedVersion === null ? "an unknown version" : withV(detectedVersion)}. Ask the user to update it or point the provider's binary path at a newer install.`,
426394
),
427395
);
428396
};
429397

398+
/** Option ids and allowed values are all a delegating agent needs; labels are UI copy. */
399+
function capabilityModelOption(descriptor: ProviderOptionDescriptor): OrchestratorMcpModelOption {
400+
const defaultValue = getProviderOptionCurrentValue(descriptor);
401+
return {
402+
id: descriptor.id,
403+
values:
404+
descriptor.type === "boolean" ? [false, true] : descriptor.options.map((choice) => choice.id),
405+
...(defaultValue === undefined ? {} : { default: defaultValue }),
406+
};
407+
}
408+
430409
function providerConstraints(
431410
provider: ServerProvider | undefined,
432411
supportsOrchestrationV2: boolean,

‎apps/server/src/mcp/OrchestratorMcpToolkit.integration.test.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,7 @@ describe("orchestrator MCP toolkit", () => {
241241
).pipe(
242242
Layer.provide(
243243
ThreadManagementService.layer.pipe(
244+
Layer.provide(ProviderRegistryMock.layer()),
244245
Layer.provide(layerOrchestrator),
245246
Layer.provide(ServerSettings.layerTest()),
246247
Layer.provide(

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ import * as PeerForwarding from "../peer/PeerForwarding.ts";
4848
import * as ThreadSearch from "../orchestration-v2/ThreadSearch.ts";
4949
import * as PeerLinkRequests from "../peer/PeerLinkRequests.ts";
5050
import * as PeerLinks from "../peer/PeerLinks.ts";
51+
import * as ProviderRegistryMock from "../provider/testUtils/providerRegistryMock.ts";
5152

5253
// A linked environment's session drives this one's real orchestrator through
5354
// its real T3 tools. What the link starts carries its origin, and the link
@@ -73,6 +74,7 @@ const layerOrchestrator = Layer.mergeAll(
7374
),
7475
);
7576
const layerOrchestration = ThreadManagement.layer.pipe(
77+
Layer.provide(ProviderRegistryMock.layer()),
7678
Layer.provide(CommandReceiptStore.layer.pipe(Layer.provide(layerDatabase))),
7779
Layer.provideMerge(Layer.merge(layerOrchestrator, ServerSettings.layerTest())),
7880
);

‎apps/server/src/mcp/toolkits/project/handlers.test.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -398,6 +398,7 @@ it.effect("a launch with a model its provider does not advertise creates no thre
398398

399399
for (const [instanceId, model] of [
400400
["claudeAgent", "claude-unadvertised"],
401+
["claudeAgent", "grok/grok-4.7"],
401402
["codex", "opus"],
402403
] as const) {
403404
expect(yield* launchWith(instanceId, model)).toMatchObject({

‎apps/server/src/mcp/toolkits/project/handlers.ts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -495,6 +495,12 @@ export const layer = McpToolAccess.toLayer(ProjectToolkit, {
495495
});
496496
}
497497
// The administrator's ceiling refuses the mode; say so rather than "unavailable".
498+
if (error._tag === "ThreadLaunchError" && error.operation === "reject-model") {
499+
return new OrchestratorMcpFailure({
500+
code: "model_unavailable",
501+
message: error.message,
502+
});
503+
}
498504
if (error._tag === "ThreadLaunchError" && isAboveCeilingError(error.cause)) {
499505
return new OrchestratorMcpFailure({
500506
code: "invalid_request",

0 commit comments

Comments
 (0)