Skip to content

Commit e08dee6

Browse files
saphidclaude
authored andcommitted
fix(server): orchestrator_capabilities no longer offers providers the project turned off
Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 07846fc commit e08dee6

2 files changed

Lines changed: 44 additions & 2 deletions

File tree

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

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1392,6 +1392,7 @@ describe("OrchestratorMcpService provider resolution", () => {
13921392
Effect.gen(function* () {
13931393
const disabledAntigravityInstanceId = ProviderInstanceId.make("antigravity-alt");
13941394
const disabledWithoutAdapterInstanceId = ProviderInstanceId.make("codex-without-adapter");
1395+
const projectDisabledInstanceId = ProviderInstanceId.make("codex-project-off");
13951396
const forkOnlyInstanceId = ProviderInstanceId.make("forkOnly");
13961397
const forkShadow = yield* buildUnavailableProviderSnapshot({
13971398
driverKind: "forkOnly",
@@ -1437,6 +1438,11 @@ describe("OrchestratorMcpService provider resolution", () => {
14371438
model: "gpt-5.4",
14381439
enabled: false,
14391440
}),
1441+
providerSnapshot({
1442+
instanceId: projectDisabledInstanceId,
1443+
driver: ProviderDriverKind.make("codex"),
1444+
model: "gpt-5.4",
1445+
}),
14401446
forkShadow,
14411447
];
14421448
const layerDependencies = Layer.mergeAll(
@@ -1445,12 +1451,34 @@ describe("OrchestratorMcpService provider resolution", () => {
14451451
Layer.mock(ThreadManagementService.ThreadManagementService)({
14461452
getThreadRecords: () => Effect.succeed(parentProjection([])),
14471453
}),
1448-
ServerSettings.layerTest(),
1454+
ServerSettings.layerTest({
1455+
providerInstances: {
1456+
[ProviderInstanceId.make("pi")]: {
1457+
driver: ProviderDriverKind.make("pi"),
1458+
enabled: true,
1459+
},
1460+
[ProviderInstanceId.make("acpRegistry")]: {
1461+
driver: ProviderDriverKind.make("acpRegistry"),
1462+
enabled: true,
1463+
},
1464+
[antigravityInstanceId]: {
1465+
driver: ProviderDriverKind.make("antigravity"),
1466+
enabled: true,
1467+
},
1468+
[projectDisabledInstanceId]: { driver: ProviderDriverKind.make("codex") },
1469+
},
1470+
projectSettingsOverrides: {
1471+
[projectId]: {
1472+
providerInstances: { [projectDisabledInstanceId]: { enabled: false } },
1473+
},
1474+
},
1475+
}),
14491476
Layer.mock(ProviderRegistry.ProviderRegistry)({
14501477
getProviders: Effect.sync(() => providers),
14511478
}),
14521479
adapterRegistryLayer([
14531480
codexInstanceId,
1481+
projectDisabledInstanceId,
14541482
ProviderInstanceId.make("claudeAgent"),
14551483
ProviderInstanceId.make("pi"),
14561484
ProviderInstanceId.make("acpRegistry"),
@@ -1521,6 +1549,11 @@ describe("OrchestratorMcpService provider resolution", () => {
15211549
assert.isFalse(disabled!.canRunCrossProviderChildTask);
15221550
assert.deepEqual(disabled!.constraints, ["Provider instance is disabled."]);
15231551

1552+
const projectDisabled = byId.get(projectDisabledInstanceId);
1553+
assert.isDefined(projectDisabled);
1554+
assert.isFalse(projectDisabled!.canRunChildTask);
1555+
assert.deepEqual(projectDisabled!.constraints, ["Provider instance is disabled."]);
1556+
15241557
const disabledWithoutAdapter = byId.get(disabledWithoutAdapterInstanceId);
15251558
assert.isDefined(disabledWithoutAdapter);
15261559
assert.isFalse(disabledWithoutAdapter!.canRunChildTask);

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ import {
6262
type ServerProviderModel,
6363
ThreadId,
6464
isOrchestrationV2WorkActive,
65+
resolveProjectProviderInstanceEnabled,
6566
} from "@t3tools/contracts";
6667
import { getProviderOptionCurrentValue } from "@t3tools/shared/model";
6768
import { runRanAfter } from "@t3tools/shared/orchestrationV2ThreadError";
@@ -2275,8 +2276,16 @@ const make = Effect.gen(function* () {
22752276
runtimeMode: limits.runtimeMode,
22762277
interactionMode: limits.interactionMode,
22772278
providers: providers.map((provider) => {
2279+
// Snapshots list instances any project enables; delegate_task checks the caller's project.
2280+
const enabledForCaller =
2281+
parent === undefined ||
2282+
resolveProjectProviderInstanceEnabled(
2283+
settings,
2284+
parent.thread.projectId,
2285+
provider.instanceId,
2286+
);
22782287
const constraints = providerConstraints(
2279-
provider,
2288+
enabledForCaller ? provider : { ...provider, enabled: false },
22802289
orchestrationCapableInstanceIds.has(provider.instanceId),
22812290
);
22822291
const { listed, omitted } = listCapabilityModels({

0 commit comments

Comments
 (0)