@ariaflowagents/config 0.4.0 → 0.4.3

package/dist/loader.js

@@ -9,7 +9,10 @@ import { parse as parseJsonc } from 'jsonc-parser';
 import { minimatch } from 'minimatch';
 import { tool as aiTool } from 'ai';
 import { z } from 'zod';
-import { createRuntime, } from '@ariaflowagents/core';
+import { createRuntime, getTemplate, } from '@ariaflowagents/core';
+import { PromptTemplateBuilder } from '@ariaflowagents/core';
+import { createStaticKnowledgeSource, createMarkdownChunker, createLLMRetriever } from '@ariaflowagents/rag';
+import { createCagTool, createCagAnswerTool } from '@ariaflowagents/tools';
 let _warnings = [];
 let _logger = null;
 let _silent = false;
@@ -212,6 +215,9 @@ async function loadMarkdownAgents(root, sources) {
         const name = typeof data.name === 'string' ? data.name : id;
         const modelId = typeof data.model === 'string' ? data.model : undefined;
         const tools = normalizeToolSelection(data.tools);
+        const autoRetrieve = typeof data.autoRetrieve === 'object' && data.autoRetrieve
+            ? data.autoRetrieve
+            : undefined;
         const mode = data.mode === 'hybrid'
             ? 'hybrid'
             : data.mode === 'strict'
@@ -230,10 +236,12 @@ async function loadMarkdownAgents(root, sources) {
             toolNames: tools,
             maxTurns: typeof data.maxTurns === 'number' ? data.maxTurns : undefined,
             maxSteps: typeof data.maxSteps === 'number' ? data.maxSteps : undefined,
+            autoRetrieve,
         };
         if (type === 'triage') {
             const routes = Array.isArray(data.routes) ? data.routes : [];
             const defaultAgent = typeof data.defaultAgent === 'string' ? data.defaultAgent : undefined;
+            const triageMode = data.triageMode === 'structured' ? 'structured' : data.triageMode === 'llm' ? 'llm' : undefined;
             const basePrompt = typeof data.systemPrompt === 'string' ? data.systemPrompt : prompt;
             baseAgent.systemPrompt = basePrompt;
             agents[id] = {
@@ -241,6 +249,7 @@ async function loadMarkdownAgents(root, sources) {
                 type: 'triage',
                 routes,
                 defaultAgent,
+                triageMode,
             };
         }
         else if (type === 'flow') {
@@ -307,6 +316,115 @@ async function resolvePrompt(value, baseDir) {
         }
         return readFile(resolvedPath, 'utf8');
     }
+    // Handle template references
+    if (typeof value === 'object' && value !== null && 'template' in value) {
+        const templateRef = value;
+        const template = getTemplate(templateRef.template);
+        if (!template) {
+            warn('missing_template', templateRef.template, `Template "${templateRef.template}" not found`);
+            return null;
+        }
+        // Create builder from template
+        const builder = new PromptTemplateBuilder({
+            id: template.id,
+            name: template.name,
+            description: template.description,
+        });
+        // Apply customizations
+        if (templateRef.customize) {
+            if (templateRef.customize.personality) {
+                builder.personality(templateRef.customize.personality);
+            }
+            if (templateRef.customize.goal) {
+                builder.goal(templateRef.customize.goal);
+            }
+            if (templateRef.customize.guardrails) {
+                builder.guardrails(templateRef.customize.guardrails);
+            }
+            if (templateRef.customize.tone) {
+                builder.tone(templateRef.customize.tone);
+            }
+            if (templateRef.customize.tools) {
+                builder.tools(templateRef.customize.tools);
+            }
+            if (templateRef.customize.errorHandling) {
+                builder.errorHandling(templateRef.customize.errorHandling);
+            }
+            if (templateRef.customize.characterNormalization) {
+                builder.characterNormalization(templateRef.customize.characterNormalization);
+            }
+            if (templateRef.customize.voiceRules) {
+                builder.voiceRules(templateRef.customize.voiceRules);
+            }
+            if (templateRef.customize.glossary) {
+                builder.glossary(templateRef.customize.glossary);
+            }
+            if (templateRef.customize.systemReminder) {
+                builder.custom('System Reminder', templateRef.customize.systemReminder);
+            }
+        }
+        // Add additional sections
+        if (templateRef.addSections) {
+            templateRef.addSections.forEach((section) => {
+                if (section.type === 'custom') {
+                    builder.custom(section.type, section.content, section.priority);
+                }
+                else {
+                    // Use the method name directly
+                    const methodName = section.type;
+                    if (typeof builder[methodName] === 'function') {
+                        builder[methodName](section.content);
+                    }
+                    else {
+                        builder.custom(section.type, section.content, section.priority);
+                    }
+                }
+            });
+        }
+        // Add glossary
+        if (templateRef.glossary) {
+            builder.glossary(templateRef.glossary.map((g) => ({
+                name: g.name,
+                description: g.description,
+                synonyms: g.synonyms,
+                category: g.category,
+            })));
+        }
+        // Add voice rules
+        if (templateRef.voiceRules) {
+            builder.voiceRules(templateRef.voiceRules);
+        }
+        // Set today date flag
+        if (templateRef.injectTodayDate !== undefined) {
+            builder.injectTodayDate(templateRef.injectTodayDate);
+        }
+        // Build and return
+        const finalTemplate = builder.build();
+        const promptBuilder = new (await import('@ariaflowagents/core')).PromptBuilder(finalTemplate);
+        return promptBuilder.build();
+    }
+    // Handle inline template definitions
+    if (typeof value === 'object' && value !== null && 'id' in value && 'sections' in value) {
+        const inlineTemplate = value;
+        const builder = new PromptTemplateBuilder({
+            id: inlineTemplate.id,
+            name: inlineTemplate.name,
+            description: inlineTemplate.description,
+        });
+        // Add sections
+        inlineTemplate.sections.forEach((section) => {
+            if (section.type === 'custom') {
+                builder.custom(section.type, section.content, section.priority);
+            }
+            else {
+                builder[section.type]?.(section.content);
+            }
+        });
+        // Build and return
+        const finalTemplate = builder.build();
+        const promptBuilder = new (await import('@ariaflowagents/core')).PromptBuilder(finalTemplate);
+        return promptBuilder.build();
+    }
     return null;
 }
 async function loadFlowFiles(root, sources) {
@@ -548,7 +666,7 @@ function hydrateFlowTools(flow, toolRegistry) {
         })),
     };
 }
-async function loadToolConfigEntries(toolsConfig, baseDir, registry, builtinTools, skills, permissions, sources) {
+async function loadToolConfigEntries(toolsConfig, baseDir, registry, builtinTools, skills, permissions, sources, knowledgePacks, aliasMap, modelRegistry, defaultModel) {
     if (!toolsConfig) {
         return;
     }
@@ -588,7 +706,137 @@ async function loadToolConfigEntries(toolsConfig, baseDir, registry, builtinTool
             registry[name] = createSkillTool(allowedSkills);
             continue;
         }
+        if (config.type === 'cag') {
+            const packName = config.pack;
+            if (!packName) {
+                throw new Error(`Tool "${name}" is missing pack name`);
+            }
+            const source = knowledgePacks[packName];
+            if (!source) {
+                throw new Error(`Tool "${name}" references unknown knowledge pack "${packName}"`);
+            }
+            const model = resolveModel(config.retrieverModel, aliasMap, modelRegistry, defaultModel);
+            if (!model) {
+                throw new Error(`Tool "${name}" is missing retrieverModel`);
+            }
+            const retriever = createLLMRetriever({
+                model: model,
+                topK: config.topK,
+                includeReasons: config.includeReasons,
+                candidateMaxChars: config.candidateMaxChars,
+            });
+            registry[name] = createCagTool({
+                sources: [source],
+                retriever,
+                topK: config.topK,
+            });
+            continue;
+        }
+        if (config.type === 'cag-answer') {
+            const model = resolveModel(config.generatorModel, aliasMap, modelRegistry, defaultModel);
+            if (!model) {
+                throw new Error(`Tool "${name}" is missing generatorModel`);
+            }
+            registry[name] = createCagAnswerTool({
+                generatorModel: model,
+                systemPrompt: config.systemPrompt,
+            });
+            continue;
+        }
+    }
+}
+function normalizeAutoRetrieveResult(result) {
+    if (!result)
+        return null;
+    if (typeof result === 'string') {
+        return { text: result };
+    }
+    if (typeof result !== 'object')
+        return null;
+    const record = result;
+    if (typeof record.text === 'string') {
+        return {
+            text: record.text,
+            chunks: Array.isArray(record.chunks) ? record.chunks : undefined,
+            metadata: typeof record.metadata === 'object' && record.metadata ? record.metadata : undefined,
+        };
+    }
+    if (Array.isArray(record.chunks)) {
+        const text = record.chunks
+            .map(chunk => {
+            if (!chunk || typeof chunk !== 'object')
+                return '';
+            const textValue = chunk.text;
+            return typeof textValue === 'string' ? textValue : '';
+        })
+            .filter(Boolean)
+            .join('\n\n');
+        if (text.trim().length > 0) {
+            return { text, chunks: record.chunks };
+        }
+    }
+    return null;
+}
+function buildAutoRetrieveProvider(autoRetrieve, toolRegistry) {
+    if (!autoRetrieve)
+        return undefined;
+    const tool = toolRegistry[autoRetrieve.tool];
+    if (!tool) {
+        throw new Error(`Auto-retrieve tool "${autoRetrieve.tool}" not found`);
+    }
+    return {
+        toolName: autoRetrieve.tool,
+        label: autoRetrieve.label,
+        message: autoRetrieve.message,
+        run: async ({ input }) => {
+            const args = { query: input };
+            if (autoRetrieve.topK !== undefined) {
+                args.topK = autoRetrieve.topK;
+            }
+            if (autoRetrieve.hint !== undefined) {
+                args.hint = autoRetrieve.hint;
+            }
+            const result = await tool.execute(args);
+            return normalizeAutoRetrieveResult(result);
+        },
+    };
+}
+async function loadKnowledgePacks(layers, inlineLayer) {
+    const packs = {};
+    const ingest = async (packId, input, baseDir) => {
+        const sourcePath = path.isAbsolute(input.source)
+            ? input.source
+            : path.resolve(baseDir, input.source);
+        const content = await readFile(sourcePath, 'utf8');
+        const chunker = createMarkdownChunker({
+            maxChars: input.chunk?.maxChars,
+            overlapChars: input.chunk?.overlapChars,
+        });
+        const source = createStaticKnowledgeSource({
+            id: packId,
+            name: input.name ?? packId,
+            description: input.description,
+            content,
+            chunker,
+            chunkOptions: {
+                maxChars: input.chunk?.maxChars,
+                overlapChars: input.chunk?.overlapChars,
+            },
+        });
+        packs[packId] = source;
+    };
+    for (const layer of layers) {
+        const configs = layer.config.knowledge?.packs ?? {};
+        for (const [packId, input] of Object.entries(configs)) {
+            await ingest(packId, input, layer.dir);
+        }
+    }
+    if (inlineLayer?.config.knowledge?.packs) {
+        for (const [packId, input] of Object.entries(inlineLayer.config.knowledge.packs)) {
+            await ingest(packId, input, inlineLayer.dir);
+        }
     }
+    return packs;
 }
 export async function loadAriaflowConfig(options = {}) {
     const startTime = Date.now();
@@ -633,6 +881,8 @@ export async function loadAriaflowConfig(options = {}) {
     if (inlineLayer) {
         mergedConfig = deepMerge(mergedConfig, inlineLayer.config);
     }
+    const aliasMap = mergedConfig.models ?? {};
+    const defaultModel = resolveModel(mergedConfig.runtime?.defaultModel, aliasMap, options.modelRegistry, options.defaultModel);
     const roots = [];
     for (const layer of baseLayers) {
         const root = path.join(layer.dir, '.ariaflow');
@@ -646,6 +896,7 @@ export async function loadAriaflowConfig(options = {}) {
             roots.push(dir);
         }
     }
+    const knowledgePacks = await loadKnowledgePacks(baseLayers, inlineLayer);
     const flows = {};
     const flowMeta = {};
     for (const layer of baseLayers) {
@@ -707,20 +958,19 @@ export async function loadAriaflowConfig(options = {}) {
     }
     const mergedPermissions = mergedConfig.permissions;
     for (const layer of baseLayers) {
-        await loadToolConfigEntries(layer.config.tools, layer.dir, toolsRegistry, options.builtinTools, skills, mergedPermissions, sources);
+        await loadToolConfigEntries(layer.config.tools, layer.dir, toolsRegistry, options.builtinTools, skills, mergedPermissions, sources, knowledgePacks, aliasMap, options.modelRegistry, defaultModel);
     }
     if (inlineLayer) {
-        await loadToolConfigEntries(inlineLayer.config.tools, inlineLayer.dir, toolsRegistry, options.builtinTools, skills, mergedPermissions, sources);
+        await loadToolConfigEntries(inlineLayer.config.tools, inlineLayer.dir, toolsRegistry, options.builtinTools, skills, mergedPermissions, sources, knowledgePacks, aliasMap, options.modelRegistry, defaultModel);
     }
     const agents = [];
-    const aliasMap = mergedConfig.models ?? {};
-    const defaultModel = resolveModel(mergedConfig.runtime?.defaultModel, aliasMap, options.modelRegistry, options.defaultModel);
     for (const agent of Object.values(agentDefs)) {
         const model = resolveModel(agent.modelId, aliasMap, options.modelRegistry, defaultModel);
         if (!model) {
             throw new Error(`Agent "${agent.id}" is missing a model (resolved from config)`);
         }
         const tools = buildToolSet(toolsRegistry, agent.toolNames);
+        const autoRetrieve = buildAutoRetrieveProvider(agent.autoRetrieve, toolsRegistry);
         if (agent.type === 'triage') {
             agents.push({
                 id: agent.id,
@@ -729,6 +979,7 @@ export async function loadAriaflowConfig(options = {}) {
                 systemPrompt: triagePromptTemplate(agent.systemPrompt, agent.routes, agent.defaultAgent),
                 model: model,
                 tools: tools,
+                autoRetrieve,
                 maxTurns: agent.maxTurns,
                 maxSteps: agent.maxSteps,
                 type: 'triage',
@@ -737,6 +988,7 @@ export async function loadAriaflowConfig(options = {}) {
                     description: route.description,
                 })),
                 defaultAgent: agent.defaultAgent,
+                triageMode: agent.triageMode,
             });
             continue;
         }
@@ -749,6 +1001,7 @@ export async function loadAriaflowConfig(options = {}) {
                 systemPrompt: agent.systemPrompt,
                 model: model,
                 tools: tools,
+                autoRetrieve,
                 maxTurns: agent.maxTurns,
                 maxSteps: agent.maxSteps,
                 type: 'flow',
@@ -765,6 +1018,7 @@ export async function loadAriaflowConfig(options = {}) {
             systemPrompt: agent.systemPrompt,
             model: model,
             tools: tools,
+            autoRetrieve,
             maxTurns: agent.maxTurns,
             maxSteps: agent.maxSteps,
             type: 'llm',
@@ -785,6 +1039,8 @@ export async function loadAriaflowConfig(options = {}) {
             maxSteps: runtimeConfig?.maxSteps,
             maxTurns: runtimeConfig?.maxTurns,
             maxHandoffs: runtimeConfig?.maxHandoffs,
+            alwaysRouteThroughTriage: runtimeConfig?.alwaysRouteThroughTriage,
+            triageAgentId: runtimeConfig?.triageAgent,
         },
         agents,
         flows,
@@ -835,6 +1091,8 @@ export async function loadAriaflowConfigWithResult(options = {}) {
     if (inlineLayer) {
         mergedConfig = deepMerge(mergedConfig, inlineLayer.config);
     }
+    const aliasMap = mergedConfig.models ?? {};
+    const defaultModel = resolveModel(mergedConfig.runtime?.defaultModel, aliasMap, options.modelRegistry, options.defaultModel);
     const roots = [];
     for (const layer of baseLayers) {
         const root = path.join(layer.dir, '.ariaflow');
@@ -848,6 +1106,7 @@ export async function loadAriaflowConfigWithResult(options = {}) {
             roots.push(dir);
         }
     }
+    const knowledgePacks = await loadKnowledgePacks(baseLayers, inlineLayer);
     const flows = {};
     const flowMeta = {};
     for (const layer of baseLayers) {
@@ -908,20 +1167,19 @@ export async function loadAriaflowConfigWithResult(options = {}) {
     }
     const mergedPermissions = mergedConfig.permissions;
     for (const layer of baseLayers) {
-        await loadToolConfigEntries(layer.config.tools, layer.dir, toolsRegistry, options.builtinTools, skills, mergedPermissions, sources);
+        await loadToolConfigEntries(layer.config.tools, layer.dir, toolsRegistry, options.builtinTools, skills, mergedPermissions, sources, knowledgePacks, aliasMap, options.modelRegistry, defaultModel);
     }
     if (inlineLayer) {
-        await loadToolConfigEntries(inlineLayer.config.tools, inlineLayer.dir, toolsRegistry, options.builtinTools, skills, mergedPermissions, sources);
+        await loadToolConfigEntries(inlineLayer.config.tools, inlineLayer.dir, toolsRegistry, options.builtinTools, skills, mergedPermissions, sources, knowledgePacks, aliasMap, options.modelRegistry, defaultModel);
     }
     const agents = [];
-    const aliasMap = mergedConfig.models ?? {};
-    const defaultModel = resolveModel(mergedConfig.runtime?.defaultModel, aliasMap, options.modelRegistry, options.defaultModel);
     for (const agent of Object.values(agentDefs)) {
         const model = resolveModel(agent.modelId, aliasMap, options.modelRegistry, defaultModel);
         if (!model) {
             throw new Error(`Agent "${agent.id}" is missing a model (resolved from config)`);
         }
         const tools = buildToolSet(toolsRegistry, agent.toolNames);
+        const autoRetrieve = buildAutoRetrieveProvider(agent.autoRetrieve, toolsRegistry);
         if (agent.type === 'triage') {
             agents.push({
                 id: agent.id,
@@ -930,6 +1188,7 @@ export async function loadAriaflowConfigWithResult(options = {}) {
                 systemPrompt: triagePromptTemplate(agent.systemPrompt, agent.routes, agent.defaultAgent),
                 model: model,
                 tools: tools,
+                autoRetrieve,
                 maxTurns: agent.maxTurns,
                 maxSteps: agent.maxSteps,
                 type: 'triage',
@@ -938,6 +1197,7 @@ export async function loadAriaflowConfigWithResult(options = {}) {
                     description: route.description,
                 })),
                 defaultAgent: agent.defaultAgent,
+                triageMode: agent.triageMode,
             });
             continue;
         }
@@ -950,6 +1210,7 @@ export async function loadAriaflowConfigWithResult(options = {}) {
                 systemPrompt: agent.systemPrompt,
                 model: model,
                 tools: tools,
+                autoRetrieve,
                 maxTurns: agent.maxTurns,
                 maxSteps: agent.maxSteps,
                 type: 'flow',
@@ -966,6 +1227,7 @@ export async function loadAriaflowConfigWithResult(options = {}) {
             systemPrompt: agent.systemPrompt,
             model: model,
             tools: tools,
+            autoRetrieve,
             maxTurns: agent.maxTurns,
             maxSteps: agent.maxSteps,
             type: 'llm',
@@ -993,6 +1255,8 @@ export async function loadAriaflowConfigWithResult(options = {}) {
                 maxSteps: runtimeConfig?.maxSteps,
                 maxTurns: runtimeConfig?.maxTurns,
                 maxHandoffs: runtimeConfig?.maxHandoffs,
+                alwaysRouteThroughTriage: runtimeConfig?.alwaysRouteThroughTriage,
+                triageAgentId: runtimeConfig?.triageAgent,
             },
             agents,
             flows,
@@ -1026,7 +1290,7 @@ export function printLoadSummary(summary) {
     }
     console.log(`   • ${summary.durationMs}ms`);
 }
-async function normalizeAgentInput(id, input, baseDir, flows, flowMeta) {
+async function normalizeAgentInput(id, input, baseDir, flows, flowMeta, toolRegistry) {
     const type = (input.type ?? 'llm');
     const name = input.name ?? id;
     const description = input.description;
@@ -1044,6 +1308,7 @@ async function normalizeAgentInput(id, input, baseDir, flows, flowMeta) {
         toolNames: normalizeToolSelection(input.tools),
         maxTurns: input.maxTurns,
         maxSteps: input.maxSteps,
+        autoRetrieve: input.autoRetrieve,
     };
     if (type === 'triage') {
         const triage = input;
@@ -1054,6 +1319,7 @@ async function normalizeAgentInput(id, input, baseDir, flows, flowMeta) {
             type: 'triage',
             routes,
             defaultAgent: triage.defaultAgent,
+            triageMode: triage.triageMode,
             systemPrompt: basePrompt ?? promptValue ?? `[Missing prompt for agent: ${id}]`,
         };
     }
@@ -1103,6 +1369,8 @@ export function createRuntimeFromConfig(config, overrides = {}) {
         defaultModel: config.runtime.defaultModel,
         maxSteps: config.runtime.maxSteps,
         maxHandoffs: config.runtime.maxHandoffs,
+        alwaysRouteThroughTriage: config.runtime.alwaysRouteThroughTriage,
+        triageAgentId: config.runtime.triageAgentId,
         ...overrides,
     });
 }