Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions apps/server/src/provider/Drivers/AntigravityDriver.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -705,4 +705,36 @@ it.layer(layerTest)("AntigravityDriver", (it) => {
expect(yield* fs.exists(legacyRoot)).toBe(false);
}),
);

it.effect.skipIf(windowsHost)(
"rechecks startup configuration after prepareSpawn before spawning ACP for text generation",
() =>
Effect.gen(function* () {
const path = yield* Path.Path;
const h = yield* makeHarness();
const pluginDirectory = path.join(h.profileDirectory, "config", "plugins", "late-hooks");
h.controls.beforeAcquire = h.fs
.makeDirectory(pluginDirectory, { recursive: true })
.pipe(
Effect.andThen(
h.fs.writeFileString(
path.join(pluginDirectory, "hooks.json"),
'{"default":{"SessionStart":[{"command":"echo hi"}]}}',
),
),
Effect.orDie,
);
const error = yield* h.instance.textGeneration
.generateThreadTitle({
cwd: h.profileDirectory,
message: "Name this thread",
modelSelection: { instanceId: h.instance.instanceId, model: "gemini-test-low" },
})
.pipe(Effect.flip);
expect(error._tag).toBe("TextGenerationError");
expect(error.detail).toContain("hooks or MCP configuration");
expect(h.launches.filter((launch) => launch.tempDirectory !== undefined)).toEqual([]);
yield* h.assertClosed;
}),
);
});
39 changes: 29 additions & 10 deletions apps/server/src/provider/Drivers/AntigravityDriver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import * as AcpErrors from "effect-acp/errors";

import * as ProviderHost from "@t3tools/provider-core/server/ProviderHost";
import {
ANTIGRAVITY_TEXT_GENERATION_UNAVAILABLE_MESSAGE,
isAntigravityTextGenerationAvailable,
makeAntigravityTextGeneration,
} from "../../textGeneration/AntigravityTextGeneration.ts";
Expand Down Expand Up @@ -292,21 +293,24 @@ export const AntigravityDriver: ProviderDriver<
});

const makeRuntime = Effect.fn("AntigravityDriver.makeRuntime")(function* (
input: AntigravityAdapterV2RuntimeInput,
input: AntigravityAdapterV2RuntimeInput & {
readonly beforeSpawn?: Effect.Effect<void, AcpErrors.AcpError | ProviderSetupError>;
},
): Effect.fn.Return<
AcpSessionRuntime.AcpSessionRuntime["Service"],
AcpErrors.AcpError | ProviderSetupError,
Scope.Scope
> {
// `buildAntigravityAcpSpawnInput` sets `extendEnv: false`, so thread variables only reach the
// agent's shell through `baseEnv`.
const { processEnvironment: threadEnvironment, ...runtimeInput } = input;
const { processEnvironment: threadEnvironment, beforeSpawn, ...runtimeInput } = input;
const { executable, spawn } = yield* prepareSpawn(
runtimeInput.cwd,
threadEnvironment === undefined
? processEnvironment
: { ...processEnvironment, ...threadEnvironment },
);
if (beforeSpawn) yield* beforeSpawn;
const runtime = yield* makeAntigravityAcpRuntime({
...runtimeInput,
runtimeVersion: executable.version,
Expand Down Expand Up @@ -565,21 +569,22 @@ export const AntigravityDriver: ProviderDriver<
Effect.provideService(Digest.Digest, digest),
Effect.provideService(HttpClient.HttpClient, httpClient),
);
const textGenerationAvailable = isAntigravityTextGenerationAvailable({
profileDirectory,
userHome,
}).pipe(
Effect.provideService(FileSystem.FileSystem, fileSystem),
Effect.provideService(Path.Path, path),
Effect.orElseSucceed(() => false),
);
const provider = yield* makeAntigravityProvider(settings, {
environment: processEnvironment,
stampIdentity: classifyModels,
probe,
probeUsage: usage.probe,
clearUsage: usage.clear,
auth: { type: auth.authMethod, label: antigravityAuthLabel(auth.authMethod) },
supportsTextGeneration: isAntigravityTextGenerationAvailable({
profileDirectory,
userHome,
}).pipe(
Effect.provideService(FileSystem.FileSystem, fileSystem),
Effect.provideService(Path.Path, path),
Effect.orElseSucceed(() => false),
),
supportsTextGeneration: textGenerationAvailable,
}).pipe(
Effect.mapError(
(cause) =>
Expand Down Expand Up @@ -631,6 +636,20 @@ export const AntigravityDriver: ProviderDriver<
makeRuntime({
cwd,
mcpServers: [],
// Recheck after prepareSpawn prepares the profile, before spawning ACP.
beforeSpawn: textGenerationAvailable.pipe(
Effect.flatMap((available) =>
available
? Effect.void
: Effect.fail(
new ProviderSetupError({
instanceId,
operation: "textGeneration",
detail: ANTIGRAVITY_TEXT_GENERATION_UNAVAILABLE_MESSAGE,
}),
),
),
),
}),
});

Expand Down
17 changes: 16 additions & 1 deletion apps/server/src/provider/Drivers/AntigravitySkills.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -169,13 +169,14 @@ it.layer(NodeServices.layer)("discoverAntigravitySkills", (it) => {
const config = path.join(input.userHome, ".gemini", "config");
const profileConfig = path.join(input.profileDirectory, "config");
for (const [plugin, manifest, text] of [
["on", "plugin.json"],
["on", "plugin.json", '{"skills":["./extra-skills"]}'],
["ag", ".antigravity-plugin/plugin.json"],
["gem", ".gemini-plugin/plugin.json"],
["off", "plugin.json"],
["bare", undefined],
["profile-off", "plugin.json"],
["shadowed", "plugin.json"],
["blocked-by-file", "plugin.json"],
["invalid", "plugin.json", "{"],
["string-flag", "plugin.json", '{"disabled":"yes"}'],
["null-flag", "plugin.json", '{"disabled":null}'],
Expand All @@ -192,6 +193,15 @@ it.layer(NodeServices.layer)("discoverAntigravitySkills", (it) => {
yield* fileSystem.writeFileString(path.join(directory, manifest), text ?? "{}");
}
}
yield* writeSkill(
path.join(config, "plugins", "on", "extra-skills", "extra"),
"---\nname: extra\n---\n",
);
// Root manifest disabled, but .antigravity-plugin/plugin.json takes precedence.
yield* fileSystem.writeFileString(
path.join(config, "plugins", "ag", "plugin.json"),
'{"disabled":true}',
);
yield* fileSystem.writeFileString(
path.join(config, "config.json"),
JSON.stringify({
Expand All @@ -206,6 +216,10 @@ it.layer(NodeServices.layer)("discoverAntigravitySkills", (it) => {
path.join(profileConfig, "plugins", "shadowed", "skills", "own"),
"---\nname: profile-shadowed\n---\n",
);
yield* fileSystem.writeFileString(
path.join(profileConfig, "plugins", "blocked-by-file"),
"not a directory",
);
yield* fileSystem.writeFileString(
path.join(profileConfig, "config.json"),
JSON.stringify({
Expand All @@ -222,6 +236,7 @@ it.layer(NodeServices.layer)("discoverAntigravitySkills", (it) => {
(yield* discoverAntigravitySkills(input)).map((skill) => [skill.name, skill.scope]),
[
["ag", "user"],
["extra", "user"],
["gem", "user"],
["null-flag", "user"],
["on", "user"],
Expand Down
154 changes: 105 additions & 49 deletions apps/server/src/provider/Drivers/AntigravitySkills.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,10 @@ const decodePluginPreferences = Schema.decodeUnknownOption(
const decodePluginManifest = Schema.decodeUnknownOption(
// agy decodes like Go's encoding/json, so null leaves the default and a string is invalid.
Schema.fromJsonString(
Schema.Struct({ disabled: Schema.optional(Schema.NullOr(Schema.Boolean)) }),
Schema.Struct({
disabled: Schema.optional(Schema.NullOr(Schema.Boolean)),
skills: Schema.optional(Schema.Unknown),
}),
),
);

Expand Down Expand Up @@ -141,13 +144,33 @@ const readAntigravityPluginPreferences = Effect.fn("readAntigravityPluginPrefere
);
});

/** agy skips a plugin folder without one of these manifests, or whose manifest is not valid JSON. */
/** agy skips a plugin folder without one of these manifests; provider-specific manifests win over root. */
const ANTIGRAVITY_PLUGIN_MANIFESTS = [
"plugin.json",
".antigravity-plugin/plugin.json",
".gemini-plugin/plugin.json",
"plugin.json",
] as const;

function extractManifestSkillPaths(raw: unknown): ReadonlyArray<string> {
if (typeof raw === "string") return [raw];
if (!Array.isArray(raw)) return [];
return raw.filter((entry): entry is string => typeof entry === "string");
}

function resolvePluginSkillDirectories(
path: Path.Path,
pluginDirectory: string,
extraSkills: ReadonlyArray<string> | undefined,
): ReadonlyArray<string> {
const directories = new Set([path.resolve(pluginDirectory, "skills")]);
for (const entry of extraSkills ?? []) {
const trimmed = entry.trim();
if (!trimmed) continue;
directories.add(path.resolve(pluginDirectory, trimmed));
}
return [...directories];
}

const readAntigravityPluginManifest = Effect.fn("readAntigravityPluginManifest")(function* (
pluginDirectory: string,
) {
Expand All @@ -156,7 +179,12 @@ const readAntigravityPluginManifest = Effect.fn("readAntigravityPluginManifest")
const text = yield* readAntigravityBoundedFile(path.join(pluginDirectory, manifest));
if (text === undefined) continue;
const decoded = decodePluginManifest(text);
return decoded._tag === "Some" ? { disabled: decoded.value.disabled === true } : undefined;
return decoded._tag === "Some"
? {
disabled: decoded.value.disabled === true,
skills: extractManifestSkillPaths(decoded.value.skills),
}
: undefined;
}
return undefined;
});
Expand All @@ -171,10 +199,14 @@ export const readAntigravityUserPlugins = Effect.fn("readAntigravityUserPlugins"
) {
const fileSystem = yield* FileSystem.FileSystem;
const path = yield* Path.Path;
const pluginsDirectory = path.join(userHome, ".gemini", "config", "plugins");
const pluginsDirectory = path.resolve(userHome, ".gemini", "config", "plugins");
const plugins = new Map<
string,
{ readonly directory: string; readonly disabledByDefault: boolean }
{
readonly directory: string;
readonly disabledByDefault: boolean;
readonly skillDirectories: ReadonlyArray<string>;
}
>();
const names = yield* readIfPresent(fileSystem.readDirectory(pluginsDirectory), pluginsDirectory);
for (const name of names?.toSorted() ?? []) {
Expand All @@ -183,11 +215,15 @@ export const readAntigravityUserPlugins = Effect.fn("readAntigravityUserPlugins"
if (info?.type !== "Directory") continue;
const manifest = yield* readAntigravityPluginManifest(directory);
if (manifest === undefined) continue;
plugins.set(name, { directory, disabledByDefault: manifest.disabled });
plugins.set(name, {
directory,
disabledByDefault: manifest.disabled,
skillDirectories: resolvePluginSkillDirectories(path, directory, manifest.skills),
});
}
if (plugins.size === 0) return plugins;
const preferences = yield* readAntigravityPluginPreferences(
path.join(userHome, ".gemini", "config", "config.json"),
path.resolve(userHome, ".gemini", "config", "config.json"),
);
for (const [name, plugin] of plugins) {
if (!isAntigravityPluginEnabled(plugin.disabledByDefault, preferences.get(name))) {
Expand All @@ -198,49 +234,67 @@ export const readAntigravityUserPlugins = Effect.fn("readAntigravityUserPlugins"
});

/** Plugins agy loads from the profile once its next launch relinks the enabled user plugins. */
const readAntigravityEffectivePlugins = Effect.fn("readAntigravityEffectivePlugins")(
function* (input: { readonly profileDirectory: string; readonly userHome: string }) {
const fileSystem = yield* FileSystem.FileSystem;
const path = yield* Path.Path;
const pluginsDirectory = path.resolve(input.profileDirectory, "config", "plugins");
const userPluginsDirectory = path.resolve(input.userHome, ".gemini", "config", "plugins");
// The profile linker carries a user's enabled override for a plugin that ships disabled.
const plugins = new Map(
[...(yield* readAntigravityUserPlugins(input.userHome))].map(([name, plugin]) => [
name,
{
directory: plugin.directory,
disabledByDefault: false,
skillDirectories: plugin.skillDirectories,
},
]),
);
const names = yield* readIfPresent(
fileSystem.readDirectory(pluginsDirectory),
pluginsDirectory,
);
for (const name of names ?? []) {
const pluginDirectory = path.join(pluginsDirectory, name);
const target = yield* fileSystem.readLink(pluginDirectory).pipe(
Effect.map((value) => path.resolve(pluginsDirectory, value)),
Effect.orElseSucceed(() => undefined),
);
// Profile preparation replaces its links into the user's plugins, so those come from above.
if (target !== undefined && path.dirname(target) === userPluginsDirectory) continue;
const info = yield* readIfPresent(fileSystem.stat(pluginDirectory), pluginDirectory);
if (info?.type !== "Directory") {
// A non-directory entry in profile plugins blocks linking the user plugin of the same name.
plugins.delete(name);
continue;
}
// Profile folders count without a manifest, as they did before user plugins were linked.
const manifest = yield* readAntigravityPluginManifest(pluginDirectory);
plugins.set(name, {
directory: pluginDirectory,
disabledByDefault: manifest?.disabled === true,
skillDirectories: resolvePluginSkillDirectories(path, pluginDirectory, manifest?.skills),
});
}
if (plugins.size === 0) return [];
const preferences = yield* readAntigravityPluginPreferences(
path.resolve(input.profileDirectory, "config", "config.json"),
);
return [...plugins]
.filter(([name, plugin]) =>
isAntigravityPluginEnabled(plugin.disabledByDefault, preferences.get(name)),
)
.sort(([left], [right]) => (left < right ? -1 : left > right ? 1 : 0))
.map(([, plugin]) => plugin);
},
);

export const readAntigravityPlugins = Effect.fn("readAntigravityPlugins")(function* (input: {
readonly profileDirectory: string;
readonly userHome: string;
}) {
const fileSystem = yield* FileSystem.FileSystem;
const path = yield* Path.Path;
const pluginsDirectory = path.join(input.profileDirectory, "config", "plugins");
const userPluginsDirectory = path.join(input.userHome, ".gemini", "config", "plugins");
// The profile linker carries a user's enabled override for a plugin that ships disabled.
const plugins = new Map(
[...(yield* readAntigravityUserPlugins(input.userHome))].map(([name, plugin]) => [
name,
{ directory: plugin.directory, disabledByDefault: false },
]),
);
const names = yield* readIfPresent(fileSystem.readDirectory(pluginsDirectory), pluginsDirectory);
for (const name of names ?? []) {
const pluginDirectory = path.join(pluginsDirectory, name);
const target = yield* fileSystem.readLink(pluginDirectory).pipe(
Effect.map((value) => path.resolve(pluginsDirectory, value)),
Effect.orElseSucceed(() => undefined),
);
// Profile preparation replaces its links into the user's plugins, so those come from above.
if (target !== undefined && path.dirname(target) === userPluginsDirectory) continue;
const info = yield* readIfPresent(fileSystem.stat(pluginDirectory), pluginDirectory);
if (info?.type !== "Directory") continue;
// Profile folders count without a manifest, as they did before user plugins were linked.
const manifest = yield* readAntigravityPluginManifest(pluginDirectory);
plugins.set(name, {
directory: pluginDirectory,
disabledByDefault: manifest?.disabled === true,
});
}
if (plugins.size === 0) return [];
const preferences = yield* readAntigravityPluginPreferences(
path.join(input.profileDirectory, "config", "config.json"),
);
return [...plugins]
.filter(([name, plugin]) =>
isAntigravityPluginEnabled(plugin.disabledByDefault, preferences.get(name)),
)
.sort(([left], [right]) => (left < right ? -1 : left > right ? 1 : 0))
.map(([, plugin]) => plugin.directory);
return (yield* readAntigravityEffectivePlugins(input)).map((plugin) => plugin.directory);
});

function parseSkillFrontmatter(contents: string, fileName: string) {
Expand Down Expand Up @@ -617,8 +671,10 @@ export const discoverAntigravitySkills = Effect.fn("discoverAntigravitySkills")(
);
}

for (const pluginDirectory of yield* readAntigravityPlugins(input)) {
yield* scanDirectory(path.join(pluginDirectory, "skills"), "user", true);
for (const plugin of yield* readAntigravityEffectivePlugins(input)) {
for (const skillDirectory of plugin.skillDirectories) {
yield* scanDirectory(skillDirectory, "user", true);
}
}
return [...skillsByName.values()].sort((left, right) => left.name.localeCompare(right.name));
});
Loading