The best way to control Claude Code, Codex and more from any computer or phone
Mirrored from https://github.com/Camo67/t3code.git
Synced Nov 22, 04:30 UTC
fix(server): orchestrator_capabilities no longer offers providers the project turned off (#29842)
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Alex Southwell committed
Nov 3, 2026 at 23:30 UTC
aeaf3633b53b0a6faab4e5f20d83a03483c04141
2 files changed
+44
-2
apps/server/src/mcp/OrchestratorMcpService.test.ts
+34
-1
@@ -1392,6 +1392,7 @@ describe("OrchestratorMcpService provider resolution", () => {
1392
Effect.gen(function* () {
1393
const disabledAntigravityInstanceId = ProviderInstanceId.make("antigravity-alt");
1394
const disabledWithoutAdapterInstanceId = ProviderInstanceId.make("codex-without-adapter");
1395
+ const projectDisabledInstanceId = ProviderInstanceId.make("codex-project-off");
1396
const forkOnlyInstanceId = ProviderInstanceId.make("forkOnly");
1397
const forkShadow = yield* buildUnavailableProviderSnapshot({
1398
driverKind: "forkOnly",
@@ -1437,6 +1438,11 @@ describe("OrchestratorMcpService provider resolution", () => {
1438
model: "gpt-5.4",
1439
enabled: false,
1440
}),
1441
+ providerSnapshot({
1442
+ instanceId: projectDisabledInstanceId,
1443
+ driver: ProviderDriverKind.make("codex"),
1444
+ model: "gpt-5.4",
1445
+ }),
1446
forkShadow,
1447
];
1448
const layerDependencies = Layer.mergeAll(
@@ -1445,12 +1451,34 @@ describe("OrchestratorMcpService provider resolution", () => {
1451
Layer.mock(ThreadManagementService.ThreadManagementService)({
1452
getThreadRecords: () => Effect.succeed(parentProjection([])),
1453
}),
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
+ }),
1476
Layer.mock(ProviderRegistry.ProviderRegistry)({
1477
getProviders: Effect.sync(() => providers),
1478
}),
1479
adapterRegistryLayer([
1480
codexInstanceId,
1481
+ projectDisabledInstanceId,
1482
ProviderInstanceId.make("claudeAgent"),
1483
ProviderInstanceId.make("pi"),
1484
ProviderInstanceId.make("acpRegistry"),
@@ -1521,6 +1549,11 @@ describe("OrchestratorMcpService provider resolution", () => {
1549
assert.isFalse(disabled!.canRunCrossProviderChildTask);
1550
assert.deepEqual(disabled!.constraints, ["Provider instance is disabled."]);
1551
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
+
1557
const disabledWithoutAdapter = byId.get(disabledWithoutAdapterInstanceId);
1558
assert.isDefined(disabledWithoutAdapter);
1559
assert.isFalse(disabledWithoutAdapter!.canRunChildTask);
apps/server/src/mcp/OrchestratorMcpService.ts
+10
-1
@@ -62,6 +62,7 @@ import {
62
type ServerProviderModel,
63
ThreadId,
64
isOrchestrationV2WorkActive,
65
+ resolveProjectProviderInstanceEnabled,
66
} from "@t3tools/contracts";
67
import { getProviderOptionCurrentValue } from "@t3tools/shared/model";
68
import { runRanAfter } from "@t3tools/shared/orchestrationV2ThreadError";
@@ -2275,8 +2276,16 @@ const make = Effect.gen(function* () {
2276
runtimeMode: limits.runtimeMode,
2277
interactionMode: limits.interactionMode,
2278
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
+ );
2287
const constraints = providerConstraints(
2279
- provider,
2288
+ enabledForCaller ? provider : { ...provider, enabled: false },
2289
orchestrationCapableInstanceIds.has(provider.instanceId),
2290
);
2291
const { listed, omitted } = listCapabilityModels({