fix: V2 settings carry extensions over during model change (#1944)

This commit is contained in:
Alex Hancock
2025-03-31 15:05:04 -04:00
committed by GitHub
parent cd0e65177b
commit 41f3478893
6 changed files with 80 additions and 88 deletions
+39 -6
View File
@@ -4,6 +4,13 @@ import { GOOSE_PROVIDER, GOOSE_MODEL } from '../env_vars';
import { Model } from '../components/settings/models/ModelContext';
import { gooseModels } from '../components/settings/models/GooseModels';
import { initializeAgent } from '../agent';
import {
initializeBuiltInExtensions,
syncBuiltInExtensions,
addToAgentOnStartup,
} from '../components/settings_v2/extensions';
import { extractExtensionConfig } from '../components/settings_v2/extensions/utils';
import type { ExtensionConfig, FixedExtensionEntry } from '../components/ConfigContext';
export function getStoredProvider(config: any): string | null {
return config.GOOSE_PROVIDER || localStorage.getItem(GOOSE_PROVIDER);
@@ -65,7 +72,14 @@ You can also validate your output after you have generated it to ensure it meets
There may be (but not always) some tools mentioned in the instructions which you can check are available to this instance of goose (and try to help the user if they are not or find alternatives).
`;
export const initializeSystem = async (provider: string, model: string) => {
export const initializeSystem = async (
provider: string,
model: string,
options?: {
getExtensions?: (b: boolean) => Promise<FixedExtensionEntry[]>;
addExtension?: (name: string, config: ExtensionConfig, enabled: boolean) => Promise<void>;
}
) => {
try {
console.log('initializing agent with provider', provider, 'model', model);
await initializeAgent({ provider, model });
@@ -104,11 +118,30 @@ export const initializeSystem = async (provider: string, model: string) => {
}
}
// This will go away after the release of settings v2 as we now handle this via
//
// initializeBuiltInExtensions
// syncBuiltInExtensions
if (!process.env.ALPHA) {
if (process.env.ALPHA) {
if (!options?.getExtensions || !options?.addExtension) {
console.warn('Extension helpers not provided in alpha mode');
return;
}
// Initialize or sync built-in extensions into config.yaml
let refreshedExtensions = await options.getExtensions(false);
if (refreshedExtensions.length === 0) {
await initializeBuiltInExtensions(options.addExtension);
refreshedExtensions = await options.getExtensions(false);
} else {
await syncBuiltInExtensions(refreshedExtensions, options.addExtension);
}
// Add enabled extensions to agent
for (const extensionEntry of refreshedExtensions) {
if (extensionEntry.enabled) {
const extensionConfig = extractExtensionConfig(extensionEntry);
await addToAgentOnStartup({ addToConfig: options.addExtension, extensionConfig });
}
}
} else {
loadAndAddStoredExtensions().catch((error) => {
console.error('Failed to load and add stored extension configs:', error);
});