hoomanjs 1.29.1 → 1.30.0

package/dist/core/agent/index.js

@@ -1,38 +1,34 @@
-import { Agent, BeforeInvocationEvent } from "@strands-agents/sdk";
+import { Agent, BeforeInvocationEvent, } from "@strands-agents/sdk";
 import { create as createContext } from "../context/index.js";
 import { modelProviders } from "../models/index.js";
-import { createMemoryTools } from "../memory/index.js";
-import { createWikiTools } from "../wiki/tools.js";
-import { skills as createSkillsPrompt } from "../prompts/index.js";
-import { createRunAgentsTools, loadBuiltInAgentDefinitions, } from "../agents/index.js";
+import { createRunSubagentTools, loadResearchSubagent, } from "../subagents/index.js";
 import { createByeTools, createTodoTools, createFetchTools, createFilesystemTools, createPlanTools, createSleepTools, createShellTools, createThinkingTools, createTimeTools, createWebSearchTools, } from "../tools/index.js";
-import { composeSystemPromptWithSessionMode, refreshAgentSystemPromptForSessionMode, registerAgentSystemPromptBaseBuilder, } from "../prompts/session-mode-appendix.js";
+import { createSessionModePromptPlugin } from "../prompts/session-mode-appendix.js";
+import { createAgentSkillsPlugin } from "../skills/index.js";
 import { ModeAwareToolRegistry } from "./mode-aware-tool-registry.js";
 import { applySessionMode } from "./sync-tool-registry-mode.js";
 import { clearTodoState } from "../state/todos.js";
-import { MODE_STATE_KEY, normalizeSessionMode, } from "../state/session-mode.js";
+import { MODE_STATE_KEY } from "../state/session-mode.js";
 import { YOLO_STATE_KEY } from "../state/yolo.js";
 const SECTION_BREAK = "\n\n---\n\n";
-export async function create(config, system, registry, mcp, print = false, meta) {
+export async function create(config, system, mcp, print = false, meta) {
     const sessionId = meta.sessionId;
     const userId = meta.userId ?? sessionId;
     const llm = await modelProviders[config.llm.provider]();
     const ctx = createContext(sessionId);
+    const { plugins: contextPlugins = [], ...agentContext } = ctx;
     const prefixed = await mcp.manager.listPrefixedTools();
+    const skillsPlugin = createAgentSkillsPlugin();
+    const sessionModePlugin = createSessionModePromptPlugin();
     async function buildBaseSystemPrompt() {
         await system.reload();
-        const skillsContent = (await createSkillsPrompt(registry)).content;
         const appendNext = await mcp.manager.listServerInstructions();
-        return [system.content, meta.systemPrompt, ...appendNext, skillsContent]
-            .filter((x) => !!x)
+        return [system.content, meta.systemPrompt, ...appendNext]
+            .filter(Boolean)
             .join(SECTION_BREAK);
     }
     const base = await buildBaseSystemPrompt();
-    const mode = normalizeSessionMode(meta.sessionMode);
-    const prompt = composeSystemPromptWithSessionMode(base, mode, {});
     const model = llm.create(config.llm.model, config.llm.params);
-    const memory = await createMemoryTools();
-    const wiki = config.tools.wiki.enabled ? await createWikiTools() : [];
     const tools = [
         ...createByeTools(),
         ...createTimeTools(),
@@ -42,27 +38,26 @@ export async function create(config, system, registry, mcp, print = false, meta)
         ...(config.tools.filesystem.enabled ? createFilesystemTools() : []),
         ...(config.tools.shell.enabled ? createShellTools() : []),
         ...(config.search.enabled ? createWebSearchTools(config) : []),
-        ...memory,
-        ...wiki,
         ...createThinkingTools(),
         ...createPlanTools(),
         ...prefixed,
     ];
     if (config.tools.agents.enabled) {
-        const definitions = loadBuiltInAgentDefinitions(config, {
+        const research = loadResearchSubagent(config, {
             knownTools: tools.map((entry) => entry.name),
+            baseSystemPrompt: base,
         });
-        tools.push(...createRunAgentsTools({
+        tools.push(...createRunSubagentTools({
             parent: config.name,
-            definitions,
+            research,
             tools,
             createModel: () => llm.create(config.llm.model, config.llm.params),
-            defaultConcurrency: config.tools.agents.concurrency,
+            concurrency: config.tools.agents.concurrency,
         }));
     }
     const agent = new Agent({
         name: config.name,
-        systemPrompt: prompt,
+        systemPrompt: base,
         model,
         appState: {
             ...(userId ? { userId } : {}),
@@ -70,15 +65,15 @@ export async function create(config, system, registry, mcp, print = false, meta)
             ...(meta.yolo ? { [YOLO_STATE_KEY]: true } : {}),
             ...(meta.sessionMode ? { [MODE_STATE_KEY]: meta.sessionMode } : {}),
         },
+        plugins: [skillsPlugin, sessionModePlugin, ...contextPlugins],
+        interventions: meta.interventions ?? [],
         tools,
         printer: print,
-        ...ctx,
+        ...agentContext,
     });
     agent.addHook(BeforeInvocationEvent, async (event) => {
         clearTodoState(event.agent);
-        refreshAgentSystemPromptForSessionMode(event.agent, await buildBaseSystemPrompt());
     });
-    registerAgentSystemPromptBaseBuilder(agent, buildBaseSystemPrompt);
     agent._toolRegistry =
         new ModeAwareToolRegistry(agent.toolRegistry.list());
     await agent.initialize();

package/dist/core/agent/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/agent/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/agent/index.ts"],"names":[],"mappings":"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"}

package/dist/core/agent/mode-aware-tool-registry.js

@@ -1,4 +1,5 @@
 import { ToolValidationError } from "@strands-agents/sdk";
+import { DEFAULT_SESSION_MODE } from "../modes/schema.js";
 import { isToolVisible } from "../state/tool-approvals.js";
 function toolVisibilityOptions(tool) {
     if ("mcpReadOnlyHint" in tool &&
@@ -14,7 +15,7 @@ function toolVisibilityOptions(tool) {
  */
 export class ModeAwareToolRegistry {
     _tools = new Map();
-    mode = "default";
+    mode = DEFAULT_SESSION_MODE;
     constructor(tools) {
         if (tools) {
             this.add(tools);

package/dist/core/agent/mode-aware-tool-registry.js.map

@@ -1 +1 @@
-{"version":3,"file":"mode-aware-tool-registry.js","sourceRoot":"","sources":["../../../src/core/agent/mode-aware-tool-registry.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mode-aware-tool-registry.js","sourceRoot":"","sources":["../../../src/core/agent/mode-aware-tool-registry.ts"],"names":[],"mappings":"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"}

package/dist/core/approvals/intervention.d.ts

@@ -0,0 +1,34 @@
+import { InterventionHandler, InterventionActions, type BeforeToolCallEvent, type JSONValue } from "@strands-agents/sdk";
+export type ToolApprovalDecision = "allow" | "always";
+export type ToolApprovalResult = ToolApprovalDecision | "reject" | {
+    decision: "reject";
+    reason?: string;
+};
+export type ToolApprovalRequest = {
+    toolName: string;
+    description?: string;
+    input: unknown;
+    inputPreview: string;
+    prompt: string;
+};
+type ToolApprovalCallbacks = {
+    onPromptStart?: (request: ToolApprovalRequest, event: BeforeToolCallEvent) => Promise<void> | void;
+    onApproved?: (request: ToolApprovalRequest, event: BeforeToolCallEvent, decision: ToolApprovalDecision | "auto") => Promise<void> | void;
+    onRejected?: (request: ToolApprovalRequest, event: BeforeToolCallEvent, reason: string) => Promise<void> | void;
+};
+export type ToolApprovalAsk = (request: ToolApprovalRequest, event: BeforeToolCallEvent) => Promise<ToolApprovalResult>;
+export type HoomanToolApprovalInterventionConfig = ToolApprovalCallbacks & {
+    ask: ToolApprovalAsk;
+};
+export declare class HoomanToolApprovalIntervention extends InterventionHandler {
+    readonly name = "hooman:tool-approval";
+    private readonly ask;
+    private readonly onPromptStart?;
+    private readonly onApproved?;
+    private readonly onRejected?;
+    constructor(config: HoomanToolApprovalInterventionConfig);
+    beforeToolCall(event: BeforeToolCallEvent): Promise<ReturnType<typeof InterventionActions.proceed> | ReturnType<typeof InterventionActions.deny>>;
+    private buildRequest;
+}
+export declare function normalizeApprovalResponse(response: JSONValue): ToolApprovalResult;
+export {};

package/dist/core/approvals/intervention.js

@@ -0,0 +1,94 @@
+import { InterventionHandler, InterventionActions, } from "@strands-agents/sdk";
+import { INTERNAL_ALWAYS_ALLOWED, allowToolForSession, isToolSessionAllowed, planModeWriteEditRejectionMessage, } from "../state/tool-approvals.js";
+import { isYoloEnabled } from "../state/yolo.js";
+const INPUT_PREVIEW_LIMIT = 1_024;
+function previewInput(input) {
+    try {
+        const text = JSON.stringify(input, null, 2) ?? "null";
+        return text.length > INPUT_PREVIEW_LIMIT
+            ? `${text.slice(0, INPUT_PREVIEW_LIMIT)}\n... (truncated)`
+            : text;
+    }
+    catch {
+        return String(input);
+    }
+}
+function toRejectReason(toolName, result) {
+    if (typeof result === "object" && result !== null && result.reason?.trim()) {
+        return result.reason.trim();
+    }
+    return `Tool "${toolName}" was rejected by the user.`;
+}
+export class HoomanToolApprovalIntervention extends InterventionHandler {
+    name = "hooman:tool-approval";
+    ask;
+    onPromptStart;
+    onApproved;
+    onRejected;
+    constructor(config) {
+        super();
+        this.ask = config.ask;
+        this.onPromptStart = config.onPromptStart;
+        this.onApproved = config.onApproved;
+        this.onRejected = config.onRejected;
+    }
+    async beforeToolCall(event) {
+        const toolName = event.toolUse.name;
+        const request = this.buildRequest(event);
+        const planReject = planModeWriteEditRejectionMessage(event.agent, toolName, event.toolUse.input);
+        if (planReject) {
+            await this.onRejected?.(request, event, planReject);
+            return InterventionActions.deny(planReject);
+        }
+        if (isYoloEnabled(event.agent) ||
+            INTERNAL_ALWAYS_ALLOWED.has(toolName) ||
+            isToolSessionAllowed(event.agent, toolName, event.toolUse.input)) {
+            await this.onApproved?.(request, event, "auto");
+            return InterventionActions.proceed();
+        }
+        await this.onPromptStart?.(request, event);
+        const result = await this.ask(request, event);
+        if (result === "allow") {
+            await this.onApproved?.(request, event, "allow");
+            return InterventionActions.proceed();
+        }
+        if (result === "always") {
+            allowToolForSession(event.agent, toolName);
+            await this.onApproved?.(request, event, "always");
+            return InterventionActions.proceed();
+        }
+        const reason = toRejectReason(toolName, result);
+        await this.onRejected?.(request, event, reason);
+        return InterventionActions.deny(reason);
+    }
+    buildRequest(event) {
+        const toolName = event.toolUse.name;
+        const description = event.tool?.description?.trim();
+        const inputPreview = previewInput(event.toolUse.input);
+        return {
+            toolName,
+            description,
+            input: event.toolUse.input,
+            inputPreview,
+            prompt: `Tool "${toolName}" requires human approval. Input: ${inputPreview}`,
+        };
+    }
+}
+export function normalizeApprovalResponse(response) {
+    if (response === true) {
+        return "allow";
+    }
+    if (typeof response === "string") {
+        const normalized = response.trim().toLowerCase();
+        if (normalized === "y" || normalized === "yes" || normalized === "allow") {
+            return "allow";
+        }
+        if (normalized === "t" ||
+            normalized === "trust" ||
+            normalized === "always") {
+            return "always";
+        }
+    }
+    return "reject";
+}
+//# sourceMappingURL=intervention.js.map

package/dist/core/approvals/intervention.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"intervention.js","sourceRoot":"","sources":["../../../src/core/approvals/intervention.ts"],"names":[],"mappings":"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"}

package/dist/core/config.d.ts

@@ -12,27 +12,44 @@ export declare enum LlmProvider {
     TensorZero = "tensorzero",
     Xai = "xai"
 }
-declare const LlmSchema: z.ZodObject<{
+declare const ResolvedLlmSchema: z.ZodObject<{
     provider: z.ZodEnum<typeof LlmProvider>;
     model: z.ZodString;
     params: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodAny>>;
 }, z.core.$strip>;
-declare const NamedLlmSchema: z.ZodObject<{
+declare const ProviderSchema: z.ZodObject<{
+    provider: z.ZodEnum<typeof LlmProvider>;
+    params: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodAny>>;
+}, z.core.$strip>;
+declare const NamedProviderSchema: z.ZodObject<{
     name: z.ZodString;
     options: z.ZodObject<{
         provider: z.ZodEnum<typeof LlmProvider>;
+        params: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodAny>>;
+    }, z.core.$strip>;
+}, z.core.$strip>;
+declare const NamedLlmSchema: z.ZodObject<{
+    name: z.ZodString;
+    options: z.ZodObject<{
+        provider: z.ZodString;
         model: z.ZodString;
         params: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodAny>>;
     }, z.core.$strip>;
     default: z.ZodDefault<z.ZodBoolean>;
 }, z.core.$strip>;
-export declare const DEFAULT_EMBED_MODEL = "hf:unsloth/embeddinggemma-300m-GGUF/embeddinggemma-300m-Q4_0.gguf";
 declare const ConfigSchema: z.ZodPipe<z.ZodObject<{
     name: z.ZodString;
-    llms: z.ZodArray<z.ZodObject<{
+    providers: z.ZodOptional<z.ZodNullable<z.ZodArray<z.ZodObject<{
         name: z.ZodString;
         options: z.ZodObject<{
             provider: z.ZodEnum<typeof LlmProvider>;
+            params: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodAny>>;
+        }, z.core.$strip>;
+    }, z.core.$strip>>>>;
+    llms: z.ZodArray<z.ZodObject<{
+        name: z.ZodString;
+        options: z.ZodObject<{
+            provider: z.ZodString;
             model: z.ZodString;
             params: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodAny>>;
         }, z.core.$strip>;
@@ -85,12 +102,6 @@ declare const ConfigSchema: z.ZodPipe<z.ZodObject<{
         sleep: z.ZodOptional<z.ZodObject<{
             enabled: z.ZodOptional<z.ZodBoolean>;
         }, z.core.$strip>>;
-        memory: z.ZodOptional<z.ZodObject<{
-            enabled: z.ZodOptional<z.ZodBoolean>;
-        }, z.core.$strip>>;
-        wiki: z.ZodOptional<z.ZodObject<{
-            enabled: z.ZodOptional<z.ZodBoolean>;
-        }, z.core.$strip>>;
         agents: z.ZodOptional<z.ZodObject<{
             enabled: z.ZodOptional<z.ZodBoolean>;
             concurrency: z.ZodOptional<z.ZodNumber>;
@@ -108,10 +119,17 @@ declare const ConfigSchema: z.ZodPipe<z.ZodObject<{
     } | null | undefined>>;
 }, z.core.$strip>, z.ZodTransform<{
     name: string;
-    llms: {
+    providers: {
         name: string;
         options: {
             provider: LlmProvider;
+            params: Record<string, any>;
+        };
+    }[];
+    llms: {
+        name: string;
+        options: {
+            provider: string;
             model: string;
             params: Record<string, any>;
         };
@@ -158,12 +176,6 @@ declare const ConfigSchema: z.ZodPipe<z.ZodObject<{
         sleep: {
             enabled: boolean;
         };
-        memory: {
-            enabled: boolean;
-        };
-        wiki: {
-            enabled: boolean;
-        };
         agents: {
             enabled: boolean;
             concurrency: number;
@@ -178,7 +190,7 @@ declare const ConfigSchema: z.ZodPipe<z.ZodObject<{
     llms: {
         name: string;
         options: {
-            provider: LlmProvider;
+            provider: string;
             model: string;
             params: Record<string, any>;
         };
@@ -188,6 +200,13 @@ declare const ConfigSchema: z.ZodPipe<z.ZodObject<{
         ratio: number;
         keep: number;
     };
+    providers?: {
+        name: string;
+        options: {
+            provider: LlmProvider;
+            params: Record<string, any>;
+        };
+    }[] | null | undefined;
     search?: {
         enabled?: boolean | undefined;
         provider?: "brave" | "exa" | "firecrawl" | "serper" | "tavily" | undefined;
@@ -229,12 +248,6 @@ declare const ConfigSchema: z.ZodPipe<z.ZodObject<{
         sleep?: {
             enabled?: boolean | undefined;
         } | undefined;
-        memory?: {
-            enabled?: boolean | undefined;
-        } | undefined;
-        wiki?: {
-            enabled?: boolean | undefined;
-        } | undefined;
         agents?: {
             enabled?: boolean | undefined;
             concurrency?: number | undefined;
@@ -242,12 +255,17 @@ declare const ConfigSchema: z.ZodPipe<z.ZodObject<{
     } | null | undefined;
 }>>;
 export type ConfigData = z.infer<typeof ConfigSchema>;
-export type LlmConfig = z.infer<typeof LlmSchema>;
+export type ProviderConfig = z.infer<typeof ProviderSchema>;
+export type NamedProviderConfig = z.infer<typeof NamedProviderSchema>;
+export type LlmConfig = z.infer<typeof ResolvedLlmSchema>;
 export type NamedLlmConfig = z.infer<typeof NamedLlmSchema>;
+export type ResolvedNamedLlmConfig = {
+    name: string;
+    options: LlmConfig;
+    default: boolean;
+};
 export type CompactionConfig = ConfigData["compaction"];
 export type PromptsConfig = ConfigData["prompts"];
-export type MemoryConfig = ConfigData["tools"]["memory"];
-export type WikiConfig = ConfigData["tools"]["wiki"];
 export type SearchConfig = ConfigData["search"];
 export type ToolsConfig = ConfigData["tools"];
 export declare class Config {
@@ -255,8 +273,12 @@ export declare class Config {
     private readonly path;
     constructor(path: string);
     get name(): string;
+    private resolveNamedLlm;
+    get providers(): NamedProviderConfig[];
     get llm(): LlmConfig;
     get llms(): NamedLlmConfig[];
+    get resolvedLlms(): ResolvedNamedLlmConfig[];
+    resolveLlm(name: string): ResolvedNamedLlmConfig | undefined;
     get search(): SearchConfig;
     get prompts(): PromptsConfig;
     get tools(): ToolsConfig;

package/dist/core/config.js

@@ -14,8 +14,21 @@ export var LlmProvider;
     LlmProvider["TensorZero"] = "tensorzero";
     LlmProvider["Xai"] = "xai";
 })(LlmProvider || (LlmProvider = {}));
-const LlmSchema = z.object({
+const ResolvedLlmSchema = z.object({
+    provider: z.nativeEnum(LlmProvider),
+    model: z.string().min(1),
+    params: z.record(z.string(), z.any()).default({}),
+});
+const ProviderSchema = z.object({
     provider: z.nativeEnum(LlmProvider),
+    params: z.record(z.string(), z.any()).default({}),
+});
+const NamedProviderSchema = z.object({
+    name: z.string().min(1),
+    options: ProviderSchema,
+});
+const LlmSchema = z.object({
+    provider: z.string().min(1),
     model: z.string().min(1),
     params: z.record(z.string(), z.any()).default({}),
 });
@@ -38,10 +51,6 @@ const DEFAULT_PROMPTS = {
     execution: true,
     guardrails: true,
 };
-export const DEFAULT_EMBED_MODEL = "hf:unsloth/embeddinggemma-300m-GGUF/embeddinggemma-300m-Q4_0.gguf";
-const MemoryPartialSchema = z.object({
-    enabled: z.boolean().optional(),
-});
 const ToolTogglePartialSchema = z.object({
     enabled: z.boolean().optional(),
 });
@@ -97,13 +106,12 @@ const ToolsPartialSchema = z.object({
     filesystem: ToolTogglePartialSchema.optional(),
     shell: ToolTogglePartialSchema.optional(),
     sleep: ToolTogglePartialSchema.optional(),
-    memory: MemoryPartialSchema.optional(),
-    wiki: ToolTogglePartialSchema.optional(),
     agents: AgentsPartialSchema.optional(),
 });
 const ConfigSchema = z
     .object({
     name: z.string().min(1),
+    providers: z.array(NamedProviderSchema).nullish(),
     llms: z.array(NamedLlmSchema).min(1),
     search: SearchPartialSchema.nullish(),
     prompts: PromptsPartialSchema.nullish(),
@@ -112,12 +120,35 @@ const ConfigSchema = z
         ratio: c?.ratio ?? DEFAULT_COMPACTION.ratio,
         keep: c?.keep ?? DEFAULT_COMPACTION.keep,
     })),
+})
+    .superRefine((input, ctx) => {
+    const seenProviders = new Set();
+    for (const provider of input.providers ?? []) {
+        if (seenProviders.has(provider.name)) {
+            ctx.addIssue({
+                code: z.ZodIssueCode.custom,
+                message: `Duplicate provider name: "${provider.name}".`,
+                path: ["providers"],
+            });
+            continue;
+        }
+        seenProviders.add(provider.name);
+    }
+    for (const llm of input.llms) {
+        const ref = llm.options.provider;
+        if (!seenProviders.has(ref)) {
+            ctx.addIssue({
+                code: z.ZodIssueCode.custom,
+                message: `LLM "${llm.name}" references unknown provider "${ref}".`,
+                path: ["llms"],
+            });
+        }
+    }
 })
     .transform((input) => {
-    const memory = input.tools?.memory;
-    const wiki = input.tools?.wiki;
     return {
         name: input.name,
+        providers: input.providers ?? [],
         llms: input.llms,
         search: {
             enabled: input.search?.enabled ?? false,
@@ -160,12 +191,6 @@ const ConfigSchema = z
             sleep: {
                 enabled: input.tools?.sleep?.enabled ?? true,
             },
-            memory: {
-                enabled: memory?.enabled ?? false,
-            },
-            wiki: {
-                enabled: wiki?.enabled ?? false,
-            },
             agents: {
                 enabled: input.tools?.agents?.enabled ?? true,
                 concurrency: input.tools?.agents?.concurrency ?? 3,
@@ -176,11 +201,20 @@ const ConfigSchema = z
 });
 const defaultConfigData = () => ({
     name: "Hooman",
+    providers: [
+        {
+            name: "ollama-local",
+            options: {
+                provider: LlmProvider.Ollama,
+                params: {},
+            },
+        },
+    ],
     llms: [
         {
             name: "Default",
             options: {
-                provider: LlmProvider.Ollama,
+                provider: "ollama-local",
                 model: "gemma4:e4b",
                 params: {},
             },
@@ -213,12 +247,6 @@ const defaultConfigData = () => ({
         sleep: {
             enabled: true,
         },
-        memory: {
-            enabled: false,
-        },
-        wiki: {
-            enabled: false,
-        },
         agents: {
             enabled: true,
             concurrency: 2,
@@ -239,13 +267,47 @@ export class Config {
     get name() {
         return this.data.name;
     }
+    resolveNamedLlm(entry) {
+        const matched = this.data.providers.find((p) => p.name === entry.options.provider);
+        if (!matched) {
+            throw new Error(`LLM "${entry.name}" references unknown provider "${entry.options.provider}".`);
+        }
+        return {
+            name: entry.name,
+            default: entry.default,
+            options: {
+                provider: matched.options.provider,
+                model: entry.options.model,
+                params: {
+                    ...matched.options.params,
+                    ...entry.options.params,
+                },
+            },
+        };
+    }
+    get providers() {
+        return this.data.providers.map((provider) => ({
+            ...provider,
+            options: {
+                ...provider.options,
+                params: { ...provider.options.params },
+            },
+        }));
+    }
     get llm() {
         const found = this.data.llms.find((m) => m.default) ?? this.data.llms[0];
-        return { ...found.options };
+        return { ...this.resolveNamedLlm(found).options };
     }
     get llms() {
         return this.data.llms.map((m) => ({ ...m, options: { ...m.options } }));
     }
+    get resolvedLlms() {
+        return this.data.llms.map((entry) => this.resolveNamedLlm(entry));
+    }
+    resolveLlm(name) {
+        const found = this.data.llms.find((entry) => entry.name === name);
+        return found ? this.resolveNamedLlm(found) : undefined;
+    }
     get search() {
         return {
             ...this.data.search,
@@ -267,8 +329,6 @@ export class Config {
             filesystem: { ...this.data.tools.filesystem },
             shell: { ...this.data.tools.shell },
             sleep: { ...this.data.tools.sleep },
-            memory: { ...this.data.tools.memory },
-            wiki: { ...this.data.tools.wiki },
             agents: { ...this.data.tools.agents },
         };
     }