TypeScript
fix(server): orchestrator_capabilities no longer offers providers the project turned off (#29842)
Alex Southwellaeaf3633b53b
diff --git a/apps/server/src/mcp/OrchestratorMcpService.test.ts b/apps/server/src/mcp/OrchestratorMcpService.test.tsindex 3bd9439d308..0faf43acb9d 100644--- a/apps/server/src/mcp/OrchestratorMcpService.test.ts+++ b/apps/server/src/mcp/OrchestratorMcpService.test.ts@@ -1392,6 +1392,7 @@ describe("OrchestratorMcpService provider resolution", () => {Effect.gen(function* () {const disabledAntigravityInstanceId = ProviderInstanceId.make("antigravity-alt");const disabledWithoutAdapterInstanceId = ProviderInstanceId.make("codex-without-adapter");+ const projectDisabledInstanceId = ProviderInstanceId.make("codex-project-off");const forkOnlyInstanceId = ProviderInstanceId.make("forkOnly");const forkShadow = yield* buildUnavailableProviderSnapshot({driverKind: "forkOnly",@@ -1437,6 +1438,11 @@ describe("OrchestratorMcpService provider resolution", () => {model: "gpt-5.4",enabled: false,}),+ providerSnapshot({+ instanceId: projectDisabledInstanceId,+ driver: ProviderDriverKind.make("codex"),+ model: "gpt-5.4",+ }),forkShadow,];const layerDependencies = Layer.mergeAll(@@ -1445,12 +1451,34 @@ describe("OrchestratorMcpService provider resolution", () => {Layer.mock(ThreadManagementService.ThreadManagementService)({getThreadRecords: () => Effect.succeed(parentProjection([])),}),- ServerSettings.layerTest(),+ ServerSettings.layerTest({+ providerInstances: {+ [ProviderInstanceId.make("pi")]: {+ driver: ProviderDriverKind.make("pi"),+ enabled: true,+ },+ [ProviderInstanceId.make("acpRegistry")]: {+ driver: ProviderDriverKind.make("acpRegistry"),+ enabled: true,+ },+ [antigravityInstanceId]: {+ driver: ProviderDriverKind.make("antigravity"),+ enabled: true,+ },+ [projectDisabledInstanceId]: { driver: ProviderDriverKind.make("codex") },+ },+ projectSettingsOverrides: {+ [projectId]: {+ providerInstances: { [projectDisabledInstanceId]: { enabled: false } },+ },+ },+ }),Layer.mock(ProviderRegistry.ProviderRegistry)({getProviders: Effect.sync(() => providers),}),adapterRegistryLayer([codexInstanceId,+ projectDisabledInstanceId,ProviderInstanceId.make("claudeAgent"),ProviderInstanceId.make("pi"),ProviderInstanceId.make("acpRegistry"),@@ -1521,6 +1549,11 @@ describe("OrchestratorMcpService provider resolution", () => {assert.isFalse(disabled!.canRunCrossProviderChildTask);assert.deepEqual(disabled!.constraints, ["Provider instance is disabled."]);+ const projectDisabled = byId.get(projectDisabledInstanceId);+ assert.isDefined(projectDisabled);+ assert.isFalse(projectDisabled!.canRunChildTask);+ assert.deepEqual(projectDisabled!.constraints, ["Provider instance is disabled."]);+const disabledWithoutAdapter = byId.get(disabledWithoutAdapterInstanceId);assert.isDefined(disabledWithoutAdapter);assert.isFalse(disabledWithoutAdapter!.canRunChildTask);diff --git a/apps/server/src/mcp/OrchestratorMcpService.ts b/apps/server/src/mcp/OrchestratorMcpService.tsindex b937453f39b..e84212cab00 100644--- a/apps/server/src/mcp/OrchestratorMcpService.ts+++ b/apps/server/src/mcp/OrchestratorMcpService.ts@@ -62,6 +62,7 @@ import {type ServerProviderModel,ThreadId,isOrchestrationV2WorkActive,+ resolveProjectProviderInstanceEnabled,} from "@t3tools/contracts";import { getProviderOptionCurrentValue } from "@t3tools/shared/model";import { runRanAfter } from "@t3tools/shared/orchestrationV2ThreadError";@@ -2275,8 +2276,16 @@ const make = Effect.gen(function* () {runtimeMode: limits.runtimeMode,interactionMode: limits.interactionMode,providers: providers.map((provider) => {+ // Snapshots list instances any project enables; delegate_task checks the caller's project.+ const enabledForCaller =+ parent === undefined ||+ resolveProjectProviderInstanceEnabled(+ settings,+ parent.thread.projectId,+ provider.instanceId,+ );const constraints = providerConstraints(- provider,+ enabledForCaller ? provider : { ...provider, enabled: false },orchestrationCapableInstanceIds.has(provider.instanceId),);const { listed, omitted } = listCapabilityModels({