diff --git a/apps/server/src/provider/AntigravityInstallation.ts b/apps/server/src/provider/AntigravityInstallation.ts index f03a7874f879..a89f1ab25b50 100644 --- a/apps/server/src/provider/AntigravityInstallation.ts +++ b/apps/server/src/provider/AntigravityInstallation.ts @@ -378,6 +378,7 @@ export const makeAntigravityInstallation = Effect.fn("AntigravityInstallation.ma tempDirectory: profileDirectory, }); const runtime = yield* makeAntigravityAcpRuntime({ + runtimeVersion: expectedVersion, spawn: buildAntigravityAcpSpawnInput({ installation: executable, profile, diff --git a/apps/server/src/provider/acp/AntigravityAcpSupport.test.ts b/apps/server/src/provider/acp/AntigravityAcpSupport.test.ts index ea5efe230a23..3c3d90186066 100644 --- a/apps/server/src/provider/acp/AntigravityAcpSupport.test.ts +++ b/apps/server/src/provider/acp/AntigravityAcpSupport.test.ts @@ -16,6 +16,7 @@ import type * as EffectAcpSchema from "effect-acp/compat"; import { resolveAttachmentPath } from "../../attachmentStore.ts"; import { applyAntigravityAcpModelSelection, + antigravityClientInfo, antigravitySessionMeta, buildAntigravityPrompt, isQualifiedAntigravityRelease, @@ -59,17 +60,19 @@ function makeModelRuntime( describe("Antigravity release gates", () => { it.each([ - { version: "1.4.1", filter: false, native: false }, - { version: "1.4.2", filter: true, native: false }, - { version: "1.4.4", filter: true, native: false }, - { version: "1.4.5", filter: true, native: true }, - { version: "1.4.6", filter: false, native: false }, - { version: "1.3.0", filter: false, native: false }, - { version: undefined, filter: false, native: false }, - { version: "unknown", filter: false, native: false }, + { version: "1.4.1", filter: false, native: false, ownName: false }, + { version: "1.4.2", filter: true, native: false, ownName: false }, + { version: "1.4.4", filter: true, native: false, ownName: false }, + { version: "1.4.5", filter: true, native: true, ownName: false }, + { version: "1.4.6", filter: false, native: false, ownName: false }, + { version: "1.5.0", filter: false, native: false, ownName: false }, + { version: "1.5.1", filter: false, native: false, ownName: true }, + { version: "1.3.0", filter: false, native: false, ownName: false }, + { version: undefined, filter: false, native: false, ownName: false }, + { version: "unknown", filter: false, native: false, ownName: false }, ])( - "$version: workflow filter $filter, native reads and system prompt $native", - ({ version, filter, native }) => { + "$version: workflow filter $filter, native reads and system prompt $native, own client name $ownName", + ({ version, filter, native, ownName }) => { const initialize = { protocolVersion: 1, ...(version === undefined ? {} : { agentInfo: { name: "antigravity-acp", version } }), @@ -86,6 +89,7 @@ describe("Antigravity release gates", () => { filter || native ? { antigravity } : undefined, ); expect(isQualifiedAntigravityRelease(version)).toBe(native); + expect(antigravityClientInfo(version).name).toBe(ownName ? "t3-code" : "zed"); }, ); }); diff --git a/apps/server/src/provider/acp/AntigravityAcpSupport.ts b/apps/server/src/provider/acp/AntigravityAcpSupport.ts index 52fbd6c6070f..083457178589 100644 --- a/apps/server/src/provider/acp/AntigravityAcpSupport.ts +++ b/apps/server/src/provider/acp/AntigravityAcpSupport.ts @@ -23,6 +23,7 @@ import { makeAntigravityStdoutTransform, } from "../antigravityAuthSupport.ts"; import * as AcpSessionRuntime from "@t3tools/provider-acp/server/AcpSessionRuntime"; +import packageJson from "../../../package.json" with { type: "json" }; import { normalizeAntigravitySessionUpdate } from "./AntigravityProtocol.ts"; export interface AntigravityAcpRuntimeInput extends Omit< @@ -42,7 +43,7 @@ export interface AntigravityAcpRuntimeInput extends Omit< readonly onAuthorizationUrl?: (url: string) => Effect.Effect; /** Serve `fs/read_text_file` for runtimes whose native reader is not qualified. */ readonly clientFileReads?: boolean; - /** The installed version, known before `initialize`; it picks the file reader. */ + /** The installed version, known before `initialize`; it picks the file reader and client name. */ readonly runtimeVersion?: string | null; /** Conversational sessions only; helpers and probes leave the system prompt untouched. */ readonly sessionSystemPromptAppend?: string; @@ -83,6 +84,9 @@ export function isQualifiedAntigravityRelease(version: string | null | undefined return version?.trim() === "1.4.5"; } +// `agy acp` 1.5.1 offers every model to every ACP client; older runtimes allowlist editors. +const OPEN_MODEL_ACCESS_RELEASE = [1, 5, 1] as const; + /** * 1.4.5 appends `systemPrompt.append` to its system instructions on new, load and resume, and * keeps none of it between processes, so every activation sends it again. @@ -106,6 +110,14 @@ export function antigravitySessionMeta( return Object.keys(antigravity).length === 0 ? undefined : { antigravity }; } +/** Older releases offer non-Gemini models only to allowlisted clients such as Zed. */ +export function antigravityClientInfo(version: string | null | undefined) { + const parsed = parseAntigravityVersion(version); + return parsed !== undefined && compareVersions(parsed, OPEN_MODEL_ACCESS_RELEASE) >= 0 + ? { name: "t3-code", title: "T3 Code", version: packageJson.version } + : { name: "zed", version: "0.0.0" }; +} + export const makeAntigravityAcpRuntime = Effect.fn("makeAntigravityAcpRuntime")(function* ( input: AntigravityAcpRuntimeInput, ): Effect.fn.Return< @@ -120,8 +132,7 @@ export const makeAntigravityAcpRuntime = Effect.fn("makeAntigravityAcpRuntime")( authenticateEagerly: true, resumeMethod: "resume", cancelBehavior: "wait-for-prompt", - // The agent offers non-Gemini models only to allowlisted clients such as Zed. - clientInfo: { name: "zed", version: "0.0.0" }, + clientInfo: antigravityClientInfo(input.runtimeVersion), sessionMeta: (initializeResult) => antigravitySessionMeta(initializeResult, input.sessionSystemPromptAppend), clientCapabilities: { diff --git a/packages/provider-acp/src/server/AcpSessionRuntime.ts b/packages/provider-acp/src/server/AcpSessionRuntime.ts index ecbe61e34274..514ac9116415 100644 --- a/packages/provider-acp/src/server/AcpSessionRuntime.ts +++ b/packages/provider-acp/src/server/AcpSessionRuntime.ts @@ -118,6 +118,7 @@ export interface AcpSessionRuntimeOptions { readonly clientCapabilities?: EffectAcpSchema.InitializeRequest["clientCapabilities"]; readonly clientInfo: { readonly name: string; + readonly title?: string; readonly version: string; }; readonly authMethodId?: string;