diff --git a/apps/server/src/provider/Drivers/AntigravitySkills.test.ts b/apps/server/src/provider/Drivers/AntigravitySkills.test.ts index 79f9bc438447c..e24ead71e9c7b 100644 --- a/apps/server/src/provider/Drivers/AntigravitySkills.test.ts +++ b/apps/server/src/provider/Drivers/AntigravitySkills.test.ts @@ -112,11 +112,22 @@ it.layer(NodeServices.layer)("discoverAntigravitySkills", (it) => { JSON.stringify({ plugins: { off: { enabled: false } } }), ); yield* fileSystem.writeFileString(path.join(plugins, ".DS_Store"), "x"); + // `agy plugin install` writes to ~/.gemini/config/plugins, outside the instance profile. + const globalPlugins = path.join(workspace.userHome, ".gemini", "config", "plugins"); + yield* writeSkill( + path.join(globalPlugins, "global", "skills", "g"), + "---\nname: global-skill\ndescription: From an agy-installed plugin.\n---\n", + ); + // The profile disables `off`, so its global copy stays hidden too. + yield* writeSkill( + path.join(globalPlugins, "off", "skills", "o"), + "---\nname: off-global-skill\ndescription: Disabled in the profile.\n---\n", + ); const input = { ...workspace, profileDirectory }; assert.deepEqual( (yield* discoverAntigravitySkills(input)).map((skill) => skill.name), - ["demo-skill"], + ["demo-skill", "global-skill"], ); }), ); diff --git a/apps/server/src/provider/Drivers/AntigravitySkills.ts b/apps/server/src/provider/Drivers/AntigravitySkills.ts index ddea4239745e8..723a7848e62a2 100644 --- a/apps/server/src/provider/Drivers/AntigravitySkills.ts +++ b/apps/server/src/provider/Drivers/AntigravitySkills.ts @@ -23,14 +23,15 @@ export function resolveAntigravityUserHome( return environment.HOME || home; } -/** Link private GEMINI_HOME skills to ~/.gemini; ~/.agents/skills is ignored because .agents/skills is project-only. */ +/** Link private GEMINI_HOME skills and plugins to ~/.gemini; ~/.agents/skills is project-only. */ export function antigravityUserSkillDirectories( path: Path.Path, geminiHome: string, -): readonly [configSkills: string, cliSkills: string] { +): readonly [configSkills: string, cliSkills: string, configPlugins: string] { return [ path.join(geminiHome, "config", "skills"), path.join(geminiHome, "antigravity-cli", "skills"), + path.join(geminiHome, "config", "plugins"), ]; } @@ -247,17 +248,16 @@ export const discoverAntigravitySkills = Effect.fn("discoverAntigravitySkills")( } }); - for (const root of roots) { - yield* scanDirectory(root.directory, root.scope, true); - } - - const pluginsDirectory = path.join(input.profileDirectory, "config", "plugins"); - const plugins = yield* readIfPresent( - fileSystem.readDirectory(pluginsDirectory), - pluginsDirectory, - ); - if (plugins !== undefined && plugins.length > 0) { - const configPath = path.join(input.profileDirectory, "config", "config.json"); + // The profile's plugins and their enabled state win; ~/.gemini only adds plugins it lacks. + const seenPlugins = new Set(); + const scanPlugins = Effect.fn("scanAntigravityPlugins")(function* (geminiHome: string) { + const pluginsDirectory = path.join(geminiHome, "config", "plugins"); + const plugins = yield* readIfPresent( + fileSystem.readDirectory(pluginsDirectory), + pluginsDirectory, + ); + if (plugins === undefined || plugins.length === 0) return; + const configPath = path.join(geminiHome, "config", "config.json"); const configInfo = yield* readIfPresent(fileSystem.stat(configPath), configPath); if (configInfo?.type === "File" && configInfo.size > BigInt(MAX_SKILL_BYTES)) { return yield* new AntigravitySkillsProbeError({ @@ -276,12 +276,22 @@ export const discoverAntigravitySkills = Effect.fn("discoverAntigravitySkills")( ).flatMap(([name, plugin]) => (plugin.enabled === false ? [name] : [])), ); for (const plugin of plugins.toSorted()) { + if (seenPlugins.has(plugin)) continue; + seenPlugins.add(plugin); if (disabled.has(plugin)) continue; const pluginDirectory = path.join(pluginsDirectory, plugin); const info = yield* readIfPresent(fileSystem.stat(pluginDirectory), pluginDirectory); if (info?.type !== "Directory") continue; yield* scanDirectory(path.join(pluginDirectory, "skills"), "user", true); } + }); + + for (const root of roots) { + yield* scanDirectory(root.directory, root.scope, true); + } + // `agy plugin install` writes to ~/.gemini, which the profile links in at launch. + for (const geminiHome of [input.profileDirectory, path.join(input.userHome, ".gemini")]) { + yield* scanPlugins(geminiHome); } return [...skillsByName.values()].sort((left, right) => left.name.localeCompare(right.name)); }); diff --git a/apps/server/src/provider/antigravityAuthSupport.test.ts b/apps/server/src/provider/antigravityAuthSupport.test.ts index 4476ccd3a2d1c..cccb681d7a39e 100644 --- a/apps/server/src/provider/antigravityAuthSupport.test.ts +++ b/apps/server/src/provider/antigravityAuthSupport.test.ts @@ -658,9 +658,14 @@ it.layer(NodeServices.layer)("Antigravity profile preparation", (it) => { Effect.as(true), Effect.catchReason("PlatformError", "NotFound", () => Effect.succeed(false)), ); + const configPlugins = path.join(userHome, ".gemini", "config", "plugins"); yield* fs.makeDirectory(path.join(configSkills, "review"), { recursive: true }); + yield* fs.makeDirectory(path.join(configPlugins, "demo"), { recursive: true }); yield* prepareAntigravityProfile({ profileDirectory, userHome }); + expect(yield* fs.readLink(path.join(profileDirectory, "config", "plugins"))).toBe( + configPlugins, + ); const configLink = path.join(profileDirectory, "config", "skills"); const cliLink = path.join(profileDirectory, "antigravity-cli", "skills"); expect(yield* fs.readLink(configLink)).toBe(configSkills); diff --git a/apps/server/src/provider/antigravityAuthSupport.ts b/apps/server/src/provider/antigravityAuthSupport.ts index 47be6bf31ccae..ec88997ab4688 100644 --- a/apps/server/src/provider/antigravityAuthSupport.ts +++ b/apps/server/src/provider/antigravityAuthSupport.ts @@ -246,7 +246,7 @@ class AntigravitySkillLinkError extends Schema.TaggedError