From 7c481b7d3e6ab8e5d541cf560bf36bca84df1549 Mon Sep 17 00:00:00 2001 From: Simone <185146821+Lucenx9@users.noreply.github.com> Date: Thu, 19 Nov 2026 23:55:42 +0100 Subject: [PATCH 1/2] fix(server): accept Antigravity model IDs with thinking levels when delegating --- .../src/mcp/OrchestratorMcpService.test.ts | 80 ++++++++++++++++++- apps/server/src/mcp/OrchestratorMcpService.ts | 37 ++++++++- 2 files changed, 112 insertions(+), 5 deletions(-) diff --git a/apps/server/src/mcp/OrchestratorMcpService.test.ts b/apps/server/src/mcp/OrchestratorMcpService.test.ts index 0890d5de0340e..3eb1b1a2d4710 100644 --- a/apps/server/src/mcp/OrchestratorMcpService.test.ts +++ b/apps/server/src/mcp/OrchestratorMcpService.test.ts @@ -4361,6 +4361,7 @@ describe("OrchestratorMcpService provider resolution", () => { () => Effect.gen(function* () { const peerId = ProviderInstanceId.make("codex-subscription-2"); + const antigravityId = ProviderInstanceId.make("antigravity"); const driver = ProviderDriverKind.make("codex"); const inherited = { instanceId: codexInstanceId, @@ -4408,6 +4409,55 @@ describe("OrchestratorMcpService provider resolution", () => { target: { providerInstanceId: peerId, options: { reasoningEffort: "max" } }, expected: { instanceId: peerId, model: inherited.model, options: override }, }, + { + name: "Antigravity model and explicit thinking level", + target: { + providerInstanceId: antigravityId, + model: "gemini-4-neon", + options: { thought_level: "high" }, + }, + expected: { + instanceId: antigravityId, + model: "gemini-4-neon", + options: [{ id: "thought_level", value: "high" }], + }, + }, + { + name: "Antigravity model with a thinking suffix", + target: { providerInstanceId: antigravityId, model: "gemini-4-neon-high" }, + expected: { + instanceId: antigravityId, + model: "gemini-4-neon", + options: [{ id: "thought_level", value: "high" }], + }, + }, + ...([[], {}] as const).map((options, index) => ({ + name: `clear Antigravity suffix options with ${index === 0 ? "array" : "object"}`, + target: { providerInstanceId: antigravityId, model: "gemini-4-neon-high", options }, + expected: { instanceId: antigravityId, model: "gemini-4-neon", options: [] }, + })), + { + name: "Antigravity native thinking option", + target: { providerInstanceId: antigravityId, model: "gemini-4-argon-high" }, + expected: { + instanceId: antigravityId, + model: "gemini-4-argon", + options: [{ id: "thinking_level", value: "high" }], + }, + }, + { + name: "explicit Antigravity thinking overrides the suffix", + target: { + providerInstanceId: antigravityId, + model: "gemini-4-argon-high", + options: { thinking_level: "medium" }, + }, + expected: { + instanceId: antigravityId, + model: "gemini-4-argon", + options: [{ id: "thinking_level", value: "medium" }], + }, + }, { name: "old Ultracode effort level", target: { model: "ultracode-model", options: { effort: "ultracode" } }, @@ -4495,8 +4545,36 @@ describe("OrchestratorMcpService provider resolution", () => { ], }, providerSnapshot({ instanceId: peerId, driver, model: inherited.model }), + { + ...providerSnapshot({ + instanceId: antigravityId, + driver: ProviderDriverKind.make("antigravity"), + }), + models: [ + { slug: "gemini-4-neon", id: "thought_level" }, + { slug: "gemini-4-argon", id: "thinking_level", role: "reasoning" as const }, + ].map(({ slug, id, role }) => ({ + slug, + name: slug, + isCustom: false, + capabilities: { + optionDescriptors: [ + { + id, + ...(role === undefined ? {} : { role }), + label: "Thinking", + type: "select", + options: [ + { id: "medium", label: "Medium" }, + { id: "high", label: "High" }, + ], + }, + ], + }, + })), + }, ]), - adapterRegistryLayer([codexInstanceId, peerId]), + adapterRegistryLayer([codexInstanceId, peerId, antigravityId]), Layer.mock(ProjectService.ProjectService)({ getById: () => Effect.succeedNone }), Layer.mock(SecretRequests.SecretRequests)({}), Layer.mock(RemoteDelegation.RemoteDelegation)({}), diff --git a/apps/server/src/mcp/OrchestratorMcpService.ts b/apps/server/src/mcp/OrchestratorMcpService.ts index c9009d6597671..12e12e1636870 100644 --- a/apps/server/src/mcp/OrchestratorMcpService.ts +++ b/apps/server/src/mcp/OrchestratorMcpService.ts @@ -397,6 +397,25 @@ const advertisedModel = (provider: ServerProvider, model: string) => candidate.aliases?.some((alias) => alias.toLowerCase() === model.toLowerCase()), ); +// Antigravity settings can retain the native ID with the thinking level appended. +function antigravityDelegationTarget(provider: ServerProvider, model: string) { + if (provider.driver !== "antigravity" || advertisedModel(provider, model)) return; + const separator = model.lastIndexOf("-"); + if (separator === -1) return; + const family = model.slice(0, separator); + const value = model.slice(separator + 1); + const thinking = provider.models + .find((candidate) => candidate.slug === family) + ?.capabilities?.optionDescriptors?.find( + (descriptor) => + descriptor.type === "select" && + (descriptor.role === "reasoning" || descriptor.id === "thought_level"), + ); + if (thinking?.type === "select" && thinking.options.some((choice) => choice.id === value)) { + return { model: family, thinking: { id: thinking.id, value } }; + } +} + /** A folder's own provider config can add models that only its workspace snapshot lists. */ export const withWorkspaceModels = ( providers: ReadonlyArray, @@ -1611,6 +1630,7 @@ const make = Effect.gen(function* () { readonly parent: Pick; readonly target: OrchestratorMcpTarget | undefined; readonly providers: ReadonlyArray; + readonly allowAntigravityThinkingSuffix?: boolean; /** Receipt replays bypass current settings because they start no work. Dispatch must reuse the checked command ID. */ readonly skipProjectEnablementFilter?: boolean; }): Effect.fn.Return { @@ -1690,7 +1710,12 @@ const make = Effect.gen(function* () { const inheritedSelection = input.parent.thread.modelSelection; const requestedModel = input.target?.model; + const antigravityTarget = + input.allowAntigravityThinkingSuffix && requestedModel !== undefined + ? antigravityDelegationTarget(provider, requestedModel) + : undefined; const model = + antigravityTarget?.model ?? requestedModel ?? (instanceId === inheritedSelection.instanceId ? inheritedSelection.model @@ -1701,7 +1726,7 @@ const make = Effect.gen(function* () { `Provider ${instanceId} has no model available for inheritance.`, ); } - if (requestedModel !== undefined) yield* requireAdvertisedModel(provider, requestedModel); + if (requestedModel !== undefined) yield* requireAdvertisedModel(provider, model); const advertised = advertisedModel(provider, model); const descriptors = advertised?.capabilities?.optionDescriptors; const requestedOptions = withLegacyUltracodeEffort(descriptors, input.target?.options); @@ -1725,14 +1750,17 @@ const make = Effect.gen(function* () { descriptors, ) : undefined; - if (requestedOptions !== undefined) { + if (requestedOptions !== undefined || antigravityTarget !== undefined) { const selections = new Map( - (requestedOptions.length === 0 ? [] : (options ?? [])).map((selection) => [ + (requestedOptions?.length === 0 ? [] : (options ?? [])).map((selection) => [ selection.id, selection, ]), ); - for (const selection of requestedOptions) { + if (antigravityTarget !== undefined && requestedOptions?.length !== 0) { + selections.set(antigravityTarget.thinking.id, antigravityTarget.thinking); + } + for (const selection of requestedOptions ?? []) { selections.set(selection.id, selection); } options = [...selections.values()]; @@ -2802,6 +2830,7 @@ const make = Effect.gen(function* () { providers, cwd: yield* parentWorkspaceCwd(parent), skipProjectEnablementFilter: isRetryOfAcceptedDelegation, + allowAntigravityThinkingSuffix: true, }); const runtimeMode = yield* resolveRuntimeMode( parent.thread.runtimeMode, From 623bd5587f6f94cce16ec4c7773dfde886634da6 Mon Sep 17 00:00:00 2001 From: Julius Marminge Date: Thu, 19 Nov 2026 23:06:02 +0000 Subject: [PATCH 2/2] fix(server): map Antigravity suffixed IDs for every child target Apply the mapping in create_threads too, match only the reasoning-role descriptor that Antigravity's capabilities always set, and trim the tests to the regressions that matter. Co-Authored-By: Claude Opus 5.5 --- .../src/mcp/OrchestratorMcpService.test.ts | 79 +++++++------------ apps/server/src/mcp/OrchestratorMcpService.ts | 14 +--- 2 files changed, 32 insertions(+), 61 deletions(-) diff --git a/apps/server/src/mcp/OrchestratorMcpService.test.ts b/apps/server/src/mcp/OrchestratorMcpService.test.ts index 3eb1b1a2d4710..2afed50b27c6e 100644 --- a/apps/server/src/mcp/OrchestratorMcpService.test.ts +++ b/apps/server/src/mcp/OrchestratorMcpService.test.ts @@ -4409,19 +4409,6 @@ describe("OrchestratorMcpService provider resolution", () => { target: { providerInstanceId: peerId, options: { reasoningEffort: "max" } }, expected: { instanceId: peerId, model: inherited.model, options: override }, }, - { - name: "Antigravity model and explicit thinking level", - target: { - providerInstanceId: antigravityId, - model: "gemini-4-neon", - options: { thought_level: "high" }, - }, - expected: { - instanceId: antigravityId, - model: "gemini-4-neon", - options: [{ id: "thought_level", value: "high" }], - }, - }, { name: "Antigravity model with a thinking suffix", target: { providerInstanceId: antigravityId, model: "gemini-4-neon-high" }, @@ -4431,33 +4418,24 @@ describe("OrchestratorMcpService provider resolution", () => { options: [{ id: "thought_level", value: "high" }], }, }, - ...([[], {}] as const).map((options, index) => ({ - name: `clear Antigravity suffix options with ${index === 0 ? "array" : "object"}`, - target: { providerInstanceId: antigravityId, model: "gemini-4-neon-high", options }, - expected: { instanceId: antigravityId, model: "gemini-4-neon", options: [] }, - })), - { - name: "Antigravity native thinking option", - target: { providerInstanceId: antigravityId, model: "gemini-4-argon-high" }, - expected: { - instanceId: antigravityId, - model: "gemini-4-argon", - options: [{ id: "thinking_level", value: "high" }], - }, - }, { name: "explicit Antigravity thinking overrides the suffix", target: { providerInstanceId: antigravityId, - model: "gemini-4-argon-high", - options: { thinking_level: "medium" }, + model: "gemini-4-neon-high", + options: { thought_level: "medium" }, }, expected: { instanceId: antigravityId, - model: "gemini-4-argon", - options: [{ id: "thinking_level", value: "medium" }], + model: "gemini-4-neon", + options: [{ id: "thought_level", value: "medium" }], }, }, + { + name: "clear Antigravity suffix options", + target: { providerInstanceId: antigravityId, model: "gemini-4-neon-high", options: {} }, + expected: { instanceId: antigravityId, model: "gemini-4-neon", options: [] }, + }, { name: "old Ultracode effort level", target: { model: "ultracode-model", options: { effort: "ultracode" } }, @@ -4551,27 +4529,26 @@ describe("OrchestratorMcpService provider resolution", () => { driver: ProviderDriverKind.make("antigravity"), }), models: [ - { slug: "gemini-4-neon", id: "thought_level" }, - { slug: "gemini-4-argon", id: "thinking_level", role: "reasoning" as const }, - ].map(({ slug, id, role }) => ({ - slug, - name: slug, - isCustom: false, - capabilities: { - optionDescriptors: [ - { - id, - ...(role === undefined ? {} : { role }), - label: "Thinking", - type: "select", - options: [ - { id: "medium", label: "Medium" }, - { id: "high", label: "High" }, - ], - }, - ], + { + slug: "gemini-4-neon", + name: "Gemini 4 Neon", + isCustom: false, + capabilities: { + optionDescriptors: [ + { + id: "thought_level", + role: "reasoning", + label: "Thinking", + type: "select", + options: [ + { id: "medium", label: "Medium" }, + { id: "high", label: "High" }, + ], + }, + ], + }, }, - })), + ], }, ]), adapterRegistryLayer([codexInstanceId, peerId, antigravityId]), diff --git a/apps/server/src/mcp/OrchestratorMcpService.ts b/apps/server/src/mcp/OrchestratorMcpService.ts index 12e12e1636870..bd57bebb3fc35 100644 --- a/apps/server/src/mcp/OrchestratorMcpService.ts +++ b/apps/server/src/mcp/OrchestratorMcpService.ts @@ -397,8 +397,8 @@ const advertisedModel = (provider: ServerProvider, model: string) => candidate.aliases?.some((alias) => alias.toLowerCase() === model.toLowerCase()), ); -// Antigravity settings can retain the native ID with the thinking level appended. -function antigravityDelegationTarget(provider: ServerProvider, model: string) { +/** Antigravity 1.3 IDs append the thinking level (`gemini-3.8-flash-high`); the agent still accepts them. */ +function antigravitySuffixedModel(provider: ServerProvider, model: string) { if (provider.driver !== "antigravity" || advertisedModel(provider, model)) return; const separator = model.lastIndexOf("-"); if (separator === -1) return; @@ -407,9 +407,7 @@ function antigravityDelegationTarget(provider: ServerProvider, model: string) { const thinking = provider.models .find((candidate) => candidate.slug === family) ?.capabilities?.optionDescriptors?.find( - (descriptor) => - descriptor.type === "select" && - (descriptor.role === "reasoning" || descriptor.id === "thought_level"), + (descriptor) => descriptor.type === "select" && descriptor.role === "reasoning", ); if (thinking?.type === "select" && thinking.options.some((choice) => choice.id === value)) { return { model: family, thinking: { id: thinking.id, value } }; @@ -1630,7 +1628,6 @@ const make = Effect.gen(function* () { readonly parent: Pick; readonly target: OrchestratorMcpTarget | undefined; readonly providers: ReadonlyArray; - readonly allowAntigravityThinkingSuffix?: boolean; /** Receipt replays bypass current settings because they start no work. Dispatch must reuse the checked command ID. */ readonly skipProjectEnablementFilter?: boolean; }): Effect.fn.Return { @@ -1711,9 +1708,7 @@ const make = Effect.gen(function* () { const inheritedSelection = input.parent.thread.modelSelection; const requestedModel = input.target?.model; const antigravityTarget = - input.allowAntigravityThinkingSuffix && requestedModel !== undefined - ? antigravityDelegationTarget(provider, requestedModel) - : undefined; + requestedModel === undefined ? undefined : antigravitySuffixedModel(provider, requestedModel); const model = antigravityTarget?.model ?? requestedModel ?? @@ -2830,7 +2825,6 @@ const make = Effect.gen(function* () { providers, cwd: yield* parentWorkspaceCwd(parent), skipProjectEnablementFilter: isRetryOfAcceptedDelegation, - allowAntigravityThinkingSuffix: true, }); const runtimeMode = yield* resolveRuntimeMode( parent.thread.runtimeMode,