feat(chat): add @Skill/@MCP mentions with scoped agent runtime
Wire per-turn @mentions for skills, MCP services, tags, and files through QA handlers into agent config, runtime_context/must_use user blocks, and tool registration. Fix tag-only scopes dropping KB tools, refresh suggested questions on mention changes, and strengthen MCP must_use so @selected services are invoked before local KB search.
This commit is contained in:
+29
-28
@@ -38,6 +38,8 @@ type AgentEngine struct {
|
||||
eventBus *event.EventBus
|
||||
knowledgeBasesInfo []*KnowledgeBaseInfo // Detailed knowledge base information for prompt
|
||||
selectedDocs []*SelectedDocumentInfo // User-selected documents (via @ mention)
|
||||
pinnedMCPServices []*PinnedMCPServiceInfo // User @mentioned MCP services for this turn
|
||||
pinnedSkills []*PinnedSkillInfo // User @mentioned skills for this turn
|
||||
sessionID string // Session ID for logging and event emission
|
||||
systemPromptTemplate string // System prompt template (optional, uses default if empty)
|
||||
skillsManager *skills.Manager // Skills manager for Progressive Disclosure (optional)
|
||||
@@ -93,6 +95,32 @@ func NewAgentEngine(
|
||||
return engine
|
||||
}
|
||||
|
||||
// SetPinnedMentions sets per-turn @mention scope for MCP services and skills.
|
||||
func (e *AgentEngine) SetPinnedMentions(mcpServices []*PinnedMCPServiceInfo, skills []*PinnedSkillInfo) {
|
||||
e.pinnedMCPServices = mcpServices
|
||||
e.pinnedSkills = skills
|
||||
}
|
||||
|
||||
func (e *AgentEngine) systemPromptOptions(ctx context.Context) *BuildSystemPromptOptions {
|
||||
opts := &BuildSystemPromptOptions{
|
||||
Language: types.LanguageNameFromContext(ctx),
|
||||
Config: e.appConfig,
|
||||
}
|
||||
if e.skillsManager != nil && e.skillsManager.IsEnabled() {
|
||||
opts.SkillsMetadata = e.skillsManager.GetAllMetadata()
|
||||
}
|
||||
return opts
|
||||
}
|
||||
|
||||
func (e *AgentEngine) buildSystemPrompt(ctx context.Context) string {
|
||||
return BuildSystemPromptWithOptions(
|
||||
e.knowledgeBasesInfo,
|
||||
e.config.WebSearchEnabled,
|
||||
e.systemPromptOptions(ctx),
|
||||
e.systemPromptTemplate,
|
||||
)
|
||||
}
|
||||
|
||||
// NewAgentEngineWithSkills creates a new agent engine with skills support
|
||||
func NewAgentEngineWithSkills(
|
||||
config *types.AgentConfig,
|
||||
@@ -220,34 +248,7 @@ func (e *AgentEngine) Execute(
|
||||
|
||||
// Build system prompt using progressive RAG prompt
|
||||
// If skills are enabled, include skills metadata (Level 1 - Progressive Disclosure)
|
||||
// Extract user language from context for prompt placeholder
|
||||
language := types.LanguageNameFromContext(ctx)
|
||||
var systemPrompt string
|
||||
if e.skillsManager != nil && e.skillsManager.IsEnabled() {
|
||||
skillsMetadata := e.skillsManager.GetAllMetadata()
|
||||
systemPrompt = BuildSystemPromptWithOptions(
|
||||
e.knowledgeBasesInfo,
|
||||
e.config.WebSearchEnabled,
|
||||
e.selectedDocs,
|
||||
&BuildSystemPromptOptions{
|
||||
SkillsMetadata: skillsMetadata,
|
||||
Language: language,
|
||||
Config: e.appConfig,
|
||||
},
|
||||
e.systemPromptTemplate,
|
||||
)
|
||||
} else {
|
||||
systemPrompt = BuildSystemPromptWithOptions(
|
||||
e.knowledgeBasesInfo,
|
||||
e.config.WebSearchEnabled,
|
||||
e.selectedDocs,
|
||||
&BuildSystemPromptOptions{
|
||||
Language: language,
|
||||
Config: e.appConfig,
|
||||
},
|
||||
e.systemPromptTemplate,
|
||||
)
|
||||
}
|
||||
systemPrompt := e.buildSystemPrompt(ctx)
|
||||
logger.Debugf(ctx, "[Agent] SystemPrompt: %d chars", len(systemPrompt))
|
||||
|
||||
// Initialize messages with history
|
||||
|
||||
Reference in New Issue
Block a user