mirror of
https://github.com/zadam/trilium.git
synced 2025-12-05 15:04:24 +01:00
feat(llm): try to improve tool and tool calling, part 2
This commit is contained in:
perf3ct
parent
dccd6477d2
commit
87fd6afec6
@ -490,43 +490,9 @@ export class ToolCallingStage extends BasePipelineStage<ToolExecutionInput, { re
|
||||
let directiveMessage = '';
|
||||
|
||||
if (hasEmptyResults) {
|
||||
// Empty results - be very directive about trying alternatives
|
||||
const emptyToolNames = toolResultMessages
|
||||
.filter(msg => this.isEmptyToolResult(msg.content, msg.name || ''))
|
||||
.map(msg => msg.name);
|
||||
|
||||
directiveMessage = `CRITICAL INSTRUCTION: YOU MUST NOT STOP AFTER EMPTY RESULTS!\n\n`;
|
||||
directiveMessage += `REQUIRED ACTIONS:\n`;
|
||||
|
||||
if (emptyToolNames.includes('search_notes')) {
|
||||
directiveMessage += `1. IMMEDIATELY use keyword_search_notes with specific terms\n`;
|
||||
directiveMessage += `2. Try attribute_search if content might be tagged/categorized\n`;
|
||||
directiveMessage += `3. Use discover_tools to find alternative approaches\n`;
|
||||
}
|
||||
|
||||
if (emptyToolNames.includes('keyword_search_notes')) {
|
||||
directiveMessage += `1. IMMEDIATELY use search_notes for semantic matching\n`;
|
||||
directiveMessage += `2. Try broader or alternative keyword terms\n`;
|
||||
directiveMessage += `3. Use workflow_helper for guidance on next steps\n`;
|
||||
}
|
||||
|
||||
if (emptyToolNames.includes('attribute_search')) {
|
||||
directiveMessage += `1. Use search_notes to find content about the attribute topic\n`;
|
||||
directiveMessage += `2. Try different attribute names or types\n`;
|
||||
directiveMessage += `3. Use search_suggestion to see available attributes\n`;
|
||||
}
|
||||
|
||||
directiveMessage += `\nFORBIDDEN: Do NOT ask user for clarification or offer general information!\n`;
|
||||
directiveMessage += `REQUIRED: CONTINUE with alternative tools and approaches immediately!`;
|
||||
directiveMessage = `No results found. Try alternative search approaches: use different search tools, broader terms, or alternative keywords. Continue searching - don't ask the user for guidance.`;
|
||||
} else {
|
||||
// Has results - encourage follow-up actions
|
||||
directiveMessage = `EXCELLENT! You found results. Now CONTINUE the workflow:\n\n`;
|
||||
directiveMessage += `NEXT REQUIRED ACTIONS:\n`;
|
||||
directiveMessage += `1. Use read_note to examine the most relevant results\n`;
|
||||
directiveMessage += `2. Use workflow_helper to plan next steps based on your findings\n`;
|
||||
directiveMessage += `3. Consider using related tools for deeper analysis\n\n`;
|
||||
directiveMessage += `GOAL: Provide comprehensive information by using multiple tools in sequence.\n`;
|
||||
directiveMessage += `CONTINUE with tool usage - don't stop at just search results!`;
|
||||
directiveMessage = `You found results! Use read_note with the noteId values to get full content and continue your analysis.`;
|
||||
}
|
||||
|
||||
updatedMessages.push({
|
||||
@ -638,14 +604,8 @@ export class ToolCallingStage extends BasePipelineStage<ToolExecutionInput, { re
|
||||
guidance += "RECOMMENDATION: If specific searches fail, try the 'search_notes' tool which performs semantic searches.\n";
|
||||
}
|
||||
|
||||
// Always suggest helper tools for guidance
|
||||
guidance += "HELPER TOOLS AVAILABLE:\n";
|
||||
guidance += "• Use 'discover_tools' to find the right tool for your task\n";
|
||||
guidance += "• Use 'workflow_helper' to get guidance on next steps\n";
|
||||
guidance += "• Use 'search_suggestion' for search syntax help\n";
|
||||
|
||||
// Encourage continued tool usage
|
||||
guidance += "\nIMPORTANT: Don't stop after one failed tool - try alternatives immediately!";
|
||||
guidance += "\nTry alternative tools immediately. Use discover_tools if unsure which tool to use next.";
|
||||
|
||||
return guidance;
|
||||
}
|
||||
|
||||
@ -19,61 +19,26 @@ export const attributeSearchToolDefinition: Tool = {
|
||||
type: 'function',
|
||||
function: {
|
||||
name: 'attribute_search',
|
||||
description: `ATTRIBUTE-BASED search for notes. Find notes by their labels or relations (metadata/tags).
|
||||
|
||||
BEST FOR: Finding notes by categories, tags, status, relationships, or other metadata
|
||||
USE WHEN: You need notes with specific labels, relations, or organizational attributes
|
||||
DIFFERENT FROM: search_notes (content) and keyword_search_notes (text)
|
||||
|
||||
CRITICAL: attributeType MUST be exactly "label" or "relation" (lowercase only!)
|
||||
|
||||
COMMON ATTRIBUTES:
|
||||
• Labels: #important, #todo, #project, #status, #priority
|
||||
• Relations: ~relatedTo, ~childOf, ~contains, ~references
|
||||
|
||||
NEXT STEPS: Use read_note with returned noteId values for full content`,
|
||||
description: 'Search notes by attributes (labels/relations). attributeType must be exactly "label" or "relation" (lowercase).',
|
||||
parameters: {
|
||||
type: 'object',
|
||||
properties: {
|
||||
attributeType: {
|
||||
type: 'string',
|
||||
description: `MUST be exactly "label" or "relation" (lowercase only!)
|
||||
|
||||
CORRECT: "label", "relation"
|
||||
WRONG: "Label", "LABEL", "labels", "relations"
|
||||
|
||||
• "label" = tags/categories like #important, #todo
|
||||
• "relation" = connections like ~relatedTo, ~childOf`,
|
||||
description: 'Must be exactly "label" or "relation" (lowercase only).',
|
||||
enum: ['label', 'relation']
|
||||
},
|
||||
attributeName: {
|
||||
type: 'string',
|
||||
description: `Name of the attribute to search for.
|
||||
|
||||
LABEL EXAMPLES:
|
||||
- "important" (finds notes with #important)
|
||||
- "status" (finds notes with #status label)
|
||||
- "project" (finds notes tagged #project)
|
||||
|
||||
RELATION EXAMPLES:
|
||||
- "relatedTo" (finds notes with ~relatedTo relation)
|
||||
- "childOf" (finds notes with ~childOf relation)
|
||||
- "contains" (finds notes with ~contains relation)`
|
||||
description: 'Name of the attribute (e.g., "important", "todo", "relatedTo").'
|
||||
},
|
||||
attributeValue: {
|
||||
type: 'string',
|
||||
description: `OPTIONAL: Specific value of the attribute.
|
||||
|
||||
• Leave empty to find ALL notes with this attribute
|
||||
• Specify value to find notes where attribute = specific value
|
||||
|
||||
EXAMPLES:
|
||||
- attributeName: "status", attributeValue: "completed"
|
||||
- attributeName: "priority", attributeValue: "high"`
|
||||
description: 'Optional value to match. Leave empty to find all notes with this attribute name.'
|
||||
},
|
||||
maxResults: {
|
||||
type: 'number',
|
||||
description: 'Number of results (1-50, default: 20). Use higher values for comprehensive searches.'
|
||||
description: 'Maximum number of results (default: 20).'
|
||||
}
|
||||
},
|
||||
required: ['attributeType', 'attributeName']
|
||||
@ -112,15 +77,7 @@ export class AttributeSearchTool implements ToolHandler {
|
||||
suggestions.push('CORRECT: Use "relation" for connections and relationships');
|
||||
}
|
||||
|
||||
const errorMessage = `Invalid attributeType: "${attributeType}"
|
||||
|
||||
REQUIRED: Must be exactly "label" or "relation" (lowercase only!)
|
||||
|
||||
${suggestions.length > 0 ? suggestions.join('\n') : ''}
|
||||
|
||||
EXAMPLES:
|
||||
• Find notes with #important tag: { "attributeType": "label", "attributeName": "important" }
|
||||
• Find notes with ~relatedTo relation: { "attributeType": "relation", "attributeName": "relatedTo" }`;
|
||||
const errorMessage = `Invalid attributeType: "${attributeType}". Must be exactly "label" or "relation" (lowercase). Example: {"attributeType": "label", "attributeName": "important"}`;
|
||||
|
||||
return errorMessage;
|
||||
}
|
||||
|
||||
@ -17,41 +17,13 @@ export const keywordSearchToolDefinition: Tool = {
|
||||
type: 'function',
|
||||
function: {
|
||||
name: 'keyword_search_notes',
|
||||
description: `EXACT KEYWORD search for notes. Finds notes containing specific words, phrases, or attribute filters.
|
||||
|
||||
BEST FOR: Finding notes with specific words/phrases you know exist
|
||||
USE WHEN: You need exact text matches, specific terms, or attribute-based filtering
|
||||
DIFFERENT FROM: search_notes (which finds conceptual/semantic matches)
|
||||
|
||||
SEARCH TYPES:
|
||||
• Simple: "machine learning" (finds notes containing both words)
|
||||
• Phrase: "\"exact phrase\"" (finds this exact phrase)
|
||||
• Attributes: "#label" or "~relation" (notes with specific labels/relations)
|
||||
• Complex: "AI #project ~relatedTo" (combines keywords with attributes)
|
||||
|
||||
NEXT STEPS: Use read_note with returned noteId values for full content`,
|
||||
description: 'Keyword search for exact text matches. Supports phrases in quotes, #labels, ~relations, and search operators like OR.',
|
||||
parameters: {
|
||||
type: 'object',
|
||||
properties: {
|
||||
query: {
|
||||
type: 'string',
|
||||
description: `Keyword search query using Trilium search syntax.
|
||||
|
||||
SIMPLE EXAMPLES:
|
||||
- "machine learning" (both words anywhere)
|
||||
- "\"project management\"" (exact phrase)
|
||||
- "python OR javascript" (either word)
|
||||
|
||||
ATTRIBUTE EXAMPLES:
|
||||
- "#important" (notes with 'important' label)
|
||||
- "~project" (notes with 'project' relation)
|
||||
- "#status = completed" (specific label value)
|
||||
|
||||
COMBINED EXAMPLES:
|
||||
- "AI #project #status = active" (AI content with project label and active status)
|
||||
- "note.title *= \"weekly\"" (titles containing 'weekly')
|
||||
|
||||
AVOID: Conceptual queries better suited for search_notes`
|
||||
description: 'Search query. Examples: "machine learning", "#important", "python OR javascript", "note.title *= weekly"'
|
||||
},
|
||||
maxResults: {
|
||||
type: 'number',
|
||||
@ -59,7 +31,7 @@ export const keywordSearchToolDefinition: Tool = {
|
||||
},
|
||||
includeArchived: {
|
||||
type: 'boolean',
|
||||
description: 'INCLUDE ARCHIVED: Search archived notes too (default: false). Use true for complete historical search.'
|
||||
description: 'Include archived notes in search (default: false).'
|
||||
}
|
||||
},
|
||||
required: ['query']
|
||||
@ -130,21 +102,7 @@ export class KeywordSearchTool implements ToolHandler {
|
||||
count: 0,
|
||||
results: [],
|
||||
query: query,
|
||||
searchType: 'keyword',
|
||||
message: 'No exact keyword matches found.',
|
||||
nextSteps: {
|
||||
immediate: [
|
||||
`Try search_notes for semantic/conceptual search: "${this.convertToSemanticQuery(query)}"`,
|
||||
`Use attribute_search if looking for specific labels or relations`,
|
||||
`Try simpler keywords or check spelling`
|
||||
],
|
||||
queryHelp: [
|
||||
'Remove quotes for broader matching',
|
||||
'Try individual words instead of phrases',
|
||||
'Use OR operator: "word1 OR word2"',
|
||||
'Check if content might be in archived notes (set includeArchived: true)'
|
||||
]
|
||||
}
|
||||
message: `No keyword matches. Try: search_notes with "${this.convertToSemanticQuery(query)}" or check spelling/try simpler terms.`
|
||||
};
|
||||
}
|
||||
|
||||
@ -153,12 +111,7 @@ export class KeywordSearchTool implements ToolHandler {
|
||||
totalFound: searchResults.length,
|
||||
query: query,
|
||||
searchType: 'keyword',
|
||||
message: 'Found exact keyword matches. Use noteId values with other tools.',
|
||||
nextSteps: {
|
||||
examine: `Use read_note with any noteId (e.g., "${limitedResults[0].noteId}") to get full content`,
|
||||
refine: limitedResults.length < searchResults.length ? `Found ${searchResults.length} total matches (showing ${limitedResults.length}). Increase maxResults for more.` : null,
|
||||
related: 'Use search_notes for conceptually related content beyond exact keywords'
|
||||
},
|
||||
message: `Found ${limitedResults.length} keyword matches. Use read_note with noteId for full content.`,
|
||||
results: limitedResults.map(note => {
|
||||
// Get a preview of the note content with highlighted search terms
|
||||
let contentPreview = '';
|
||||
|
||||
@ -34,37 +34,17 @@ export const readNoteToolDefinition: Tool = {
|
||||
type: 'function',
|
||||
function: {
|
||||
name: 'read_note',
|
||||
description: `READ FULL CONTENT of a specific note by its ID. Get complete note content and metadata.
|
||||
|
||||
BEST FOR: Getting complete content after finding notes through search tools
|
||||
USE WHEN: You have a noteId from search results and need the full content
|
||||
IMPORTANT: Must use noteId (like "abc123def456") from search results - NOT note titles
|
||||
|
||||
TIP: This is typically used after search_notes, keyword_search_notes, or attribute_search
|
||||
|
||||
NEXT STEPS: Use note_update or attribute_manager tools to modify the note if needed`,
|
||||
description: 'Read the full content of a note by its ID. Use noteId from search results, not note titles.',
|
||||
parameters: {
|
||||
type: 'object',
|
||||
properties: {
|
||||
noteId: {
|
||||
type: 'string',
|
||||
description: `SYSTEM ID of the note to read.
|
||||
|
||||
CRITICAL: Must be a noteId (like "abc123def456") - NOT a note title!
|
||||
|
||||
CORRECT: "abc123def456" (from search results)
|
||||
WRONG: "My Note Title" (this will fail)
|
||||
|
||||
WHERE TO GET: From noteId field in search tool results`
|
||||
description: 'The noteId of the note to read (e.g., "abc123def456"). Get this from search results, not note titles.'
|
||||
},
|
||||
includeAttributes: {
|
||||
type: 'boolean',
|
||||
description: `INCLUDE METADATA: Get note attributes (labels, relations) in response.
|
||||
|
||||
• true = Get full note with all attributes/metadata
|
||||
• false = Get just note content (default)
|
||||
|
||||
Use true when you need to see tags, labels, relations, or other metadata`
|
||||
description: 'Include note attributes/metadata in response (default: false).'
|
||||
}
|
||||
},
|
||||
required: ['noteId']
|
||||
|
||||
@ -17,50 +17,25 @@ export const searchNotesToolDefinition: Tool = {
|
||||
type: 'function',
|
||||
function: {
|
||||
name: 'search_notes',
|
||||
description: `SEMANTIC/CONCEPTUAL search for notes. Finds notes related to concepts, topics, or themes even without exact keyword matches.
|
||||
|
||||
BEST FOR: Finding notes about ideas, concepts, or topics described in various ways
|
||||
USE WHEN: Looking for conceptual relationships, thematic content, or related ideas
|
||||
DIFFERENT FROM: keyword_search (which finds exact text matches)
|
||||
|
||||
TIPS:
|
||||
- Use descriptive phrases like "project management methodologies" rather than single words
|
||||
- Think conceptually: "machine learning classification" vs just "ML"
|
||||
- Results include noteId values - ALWAYS use these IDs (not titles) with other tools
|
||||
|
||||
NEXT STEPS: Use read_note with returned noteId values to get full content`,
|
||||
description: 'Semantic search for notes. Finds conceptually related content. Use descriptive phrases, not single words. Returns noteId values to use with other tools.',
|
||||
parameters: {
|
||||
type: 'object',
|
||||
properties: {
|
||||
query: {
|
||||
type: 'string',
|
||||
description: `Descriptive search query for semantic matching.
|
||||
|
||||
GOOD EXAMPLES:
|
||||
- "machine learning algorithms for classification"
|
||||
- "personal productivity and time management techniques"
|
||||
- "software development best practices"
|
||||
|
||||
AVOID:
|
||||
- Single words: "ML", "productivity"
|
||||
- Overly broad: "work", "notes"
|
||||
- Overly specific: exact phrases that might not exist`
|
||||
description: 'Search query for finding conceptually related notes. Use descriptive phrases like "machine learning classification" rather than single words.'
|
||||
},
|
||||
parentNoteId: {
|
||||
type: 'string',
|
||||
description: `SCOPE LIMITER: Search only within children of this note.
|
||||
|
||||
IMPORTANT: Must be a noteId (like "abc123def456") from previous search results - NOT a note title.
|
||||
|
||||
USE FOR: Searching within specific projects, categories, or sections.`
|
||||
description: 'Optional noteId to limit search to children of this note. Must be a noteId from search results, not a title.'
|
||||
},
|
||||
maxResults: {
|
||||
type: 'number',
|
||||
description: 'Number of results (1-20, default: 5). Use 10-15 for comprehensive exploration, 3-5 for quick lookup.'
|
||||
description: 'Maximum number of results to return (default: 5, max: 20).'
|
||||
},
|
||||
summarize: {
|
||||
type: 'boolean',
|
||||
description: 'AI SUMMARIES: Get intelligent summaries instead of truncated text (default: false). Use true for cleaner result overview.'
|
||||
description: 'Get AI-generated summaries instead of truncated previews (default: false).'
|
||||
}
|
||||
},
|
||||
required: ['query']
|
||||
@ -324,33 +299,14 @@ export class SearchNotesTool implements ToolHandler {
|
||||
count: 0,
|
||||
results: [],
|
||||
query: query,
|
||||
searchType: 'semantic',
|
||||
message: 'No semantic matches found for your query.',
|
||||
nextSteps: {
|
||||
immediate: [
|
||||
`Try keyword_search with specific terms: "${this.extractKeywords(query)}"`,
|
||||
`Use attribute_search if looking for labeled/categorized notes`,
|
||||
`Try broader search terms like "${this.suggestBroaderTerms(query)}"`
|
||||
],
|
||||
tips: [
|
||||
'Semantic search finds conceptual matches - try describing the topic differently',
|
||||
'If you know specific words that appear in the notes, use keyword_search instead',
|
||||
'Check if the content might be tagged with labels using attribute_search'
|
||||
]
|
||||
}
|
||||
message: `No results found. Try: keyword_search_notes with "${this.extractKeywords(query)}" or attribute_search for tagged notes.`
|
||||
};
|
||||
} else {
|
||||
return {
|
||||
count: enhancedResults.length,
|
||||
results: enhancedResults,
|
||||
query: query,
|
||||
searchType: 'semantic',
|
||||
message: 'Found semantic matches. Use noteId values with other tools.',
|
||||
nextSteps: {
|
||||
examine: `Use read_note with any noteId (e.g., "${enhancedResults[0].noteId}") to get full content`,
|
||||
refine: parentNoteId ? 'Remove parentNoteId to search all notes' : `Add parentNoteId: "${enhancedResults[0].noteId}" to search within the first result's children`,
|
||||
related: 'Search for related concepts or use different descriptive terms'
|
||||
}
|
||||
message: `Found ${enhancedResults.length} matches. Use read_note with noteId to get full content.`
|
||||
};
|
||||
}
|
||||
} catch (error: unknown) {
|
||||
|
||||
@ -16,37 +16,21 @@ export const toolDiscoveryHelperDefinition: Tool = {
|
||||
type: 'function',
|
||||
function: {
|
||||
name: 'discover_tools',
|
||||
description: `DISCOVER AVAILABLE TOOLS and get guidance on which tools to use for your task.
|
||||
|
||||
BEST FOR: Understanding what tools are available and getting usage recommendations
|
||||
USE WHEN: You're unsure which tool to use, want to see all options, or need workflow guidance
|
||||
HELPS WITH: Tool selection, parameter guidance, workflow planning
|
||||
|
||||
TIP: Use this when you have a task but aren't sure which tools can help accomplish it
|
||||
|
||||
NEXT STEPS: Use the recommended tools based on the guidance provided`,
|
||||
description: 'Get recommendations for which tools to use for your task. Helps when you\'re unsure which tool is best.',
|
||||
parameters: {
|
||||
type: 'object',
|
||||
properties: {
|
||||
taskDescription: {
|
||||
type: 'string',
|
||||
description: `📝 DESCRIBE YOUR TASK: What are you trying to accomplish?
|
||||
|
||||
✅ GOOD EXAMPLES:
|
||||
- "Find notes about machine learning"
|
||||
- "Create a new project planning note"
|
||||
- "Find all notes tagged as important"
|
||||
- "Read the content of a specific note"
|
||||
|
||||
💡 Be specific about your goal for better tool recommendations`
|
||||
description: 'Describe what you want to accomplish (e.g., "find notes about machine learning", "read a specific note").'
|
||||
},
|
||||
includeExamples: {
|
||||
type: 'boolean',
|
||||
description: 'INCLUDE EXAMPLES: Get specific usage examples for recommended tools (default: true)'
|
||||
description: 'Include usage examples for recommended tools (default: true).'
|
||||
},
|
||||
showAllTools: {
|
||||
type: 'boolean',
|
||||
description: 'SHOW ALL TOOLS: List all available tools, not just recommended ones (default: false)'
|
||||
description: 'Show all available tools instead of just recommendations (default: false).'
|
||||
}
|
||||
},
|
||||
required: ['taskDescription']
|
||||
|
||||
@ -18,7 +18,6 @@ import { AttributeManagerTool } from './attribute_manager_tool.js';
|
||||
import { CalendarIntegrationTool } from './calendar_integration_tool.js';
|
||||
import { NoteSummarizationTool } from './note_summarization_tool.js';
|
||||
import { ToolDiscoveryHelper } from './tool_discovery_helper.js';
|
||||
import { WorkflowHelper } from './workflow_helper.js';
|
||||
import log from '../../log.js';
|
||||
|
||||
// Error type guard
|
||||
@ -54,9 +53,8 @@ export async function initializeTools(): Promise<void> {
|
||||
toolRegistry.registerTool(new ContentExtractionTool()); // Extract info from note content
|
||||
toolRegistry.registerTool(new CalendarIntegrationTool()); // Calendar-related operations
|
||||
|
||||
// Register helper and guidance tools
|
||||
// Register helper tools (simplified)
|
||||
toolRegistry.registerTool(new ToolDiscoveryHelper()); // Tool discovery and usage guidance
|
||||
toolRegistry.registerTool(new WorkflowHelper()); // Multi-step workflow guidance
|
||||
|
||||
// Log registered tools
|
||||
const toolCount = toolRegistry.getAllTools().length;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user