Why: plan G2-2 requires plugin commands reachable via slash aliases through the same bus and audit envelope (EXT-10②), and a natural- language routing entry so '帮我写项目建议书' can reach the compile flow. The agent-command lib now carries a validated Slash field (lib PR #6, pin bumped to 4f583ca); the bus binds plugin-spec aliases into the same slash table; intents are declared via the extension registry and routed deterministically (normalized containment, longest phrase first) to commands through the bus — the system.intent builtin (/intent) is the chat-entrance dispatch point with a candidate list on miss. Evidence: TestPluginSlashAliasBindsAndDispatches — alias binds, case/ whitespace-normalized resolution, slash and button entrances hit the same command handler with committed receipts; TestIntentDeclareMatch Route — declare/validate, miss on unrelated text, normalized hit, bus-dispatch through the chat entrance, longest-phrase priority; server suite green with the dual-entry pair registered; full go test ./... 31/31 packages green. Impact: cmdbus plugin-spec slash binding + IntentStore; extension Registry.AddIntent + IntentSpec (SurfaceVersion 2.7.0-experimental); pluginRegistry.AddIntent wires plugin-declared intents; server builtin system.intent; command-pairs fixture extended. Refs: plan G2-2 (line 366); EXT-10②; lib PR #6 (4f583ca).
130 lines
3.5 KiB
Go
130 lines
3.5 KiB
Go
package app
|
||
|
||
import (
|
||
"context"
|
||
"encoding/json"
|
||
"errors"
|
||
"fmt"
|
||
"log"
|
||
"os"
|
||
"path/filepath"
|
||
|
||
agentcommand "agent-command"
|
||
"agent-system-backend/internal/cmdbus"
|
||
"agent-system-backend/pkg/extension"
|
||
core "agent-system-core"
|
||
)
|
||
|
||
type compiledRegistry struct {
|
||
skillsRoot string
|
||
bus *cmdbus.Bus
|
||
}
|
||
|
||
// pluginRegistry 携带插件身份与宿主能力,per-InProc 构造:
|
||
// AddCommandHandler 绑定的处理器在分发时按请求 Owner 构造 inprocHost(EXT-1)。
|
||
type pluginRegistry struct {
|
||
compiledRegistry
|
||
pluginID string
|
||
caps hostcaps
|
||
}
|
||
|
||
func (r pluginRegistry) AddCommandHandler(spec json.RawMessage, h extension.Handler) error {
|
||
if r.bus == nil {
|
||
return nil
|
||
}
|
||
if h == nil {
|
||
return fmt.Errorf("extension: %s: nil command handler", r.pluginID)
|
||
}
|
||
var s agentcommand.CommandSpec
|
||
if err := json.Unmarshal(spec, &s); err != nil {
|
||
return fmt.Errorf("extension: command spec: %w", err)
|
||
}
|
||
return r.bus.RegisterPluginCommand(s, func(ctx context.Context, req cmdbus.Request) (any, error) {
|
||
host := inprocHost{caps: r.caps, pluginID: r.pluginID, owner: req.Owner}
|
||
return h(ctx, host, extension.Request{
|
||
ID: req.ID, Params: req.Params, Entrance: req.Entrance,
|
||
Actor: req.Actor, Owner: req.Owner, ConversationID: req.ConversationID,
|
||
})
|
||
})
|
||
}
|
||
|
||
// AddIntent 意图声明(G2-2):汇入总线意图表;插件身份随声明归因。
|
||
func (r pluginRegistry) AddIntent(spec json.RawMessage) error {
|
||
if r.bus == nil {
|
||
return nil
|
||
}
|
||
var is extension.IntentSpec
|
||
if err := json.Unmarshal(spec, &is); err != nil {
|
||
return fmt.Errorf("extension: intent spec: %w", err)
|
||
}
|
||
return r.bus.Intents().Declare(cmdbus.Intent{
|
||
ID: is.ID, Phrases: is.Phrases, Command: is.Command,
|
||
Params: is.Params, Description: is.Description, Plugin: r.pluginID,
|
||
})
|
||
}
|
||
|
||
func (r compiledRegistry) AddSkill(name, markdown string) error {
|
||
if r.skillsRoot == "" || name == "" {
|
||
return nil
|
||
}
|
||
dest := filepath.Join(r.skillsRoot, "compiled", name)
|
||
if err := os.MkdirAll(dest, 0o755); err != nil {
|
||
return err
|
||
}
|
||
return os.WriteFile(filepath.Join(dest, "SKILL.md"), []byte(markdown), 0o644)
|
||
}
|
||
|
||
func (r compiledRegistry) AddCommand(spec json.RawMessage) error {
|
||
if r.bus == nil {
|
||
return nil
|
||
}
|
||
return r.bus.RegisterPluginCommands([]json.RawMessage{spec})
|
||
}
|
||
|
||
// RegisterResourceAuthorizer 声明式扩展无宿主进程内代码,不能提供回调(fail-closed)。
|
||
func (r compiledRegistry) RegisterResourceAuthorizer(extension.ResourceAuthorizer) error {
|
||
return errors.New("extension: declarative plugins cannot register resource authorizers")
|
||
}
|
||
|
||
func (r compiledRegistry) Note(kind, name string, payload json.RawMessage) error {
|
||
log.Printf("extension: note %s %s (%d bytes)", kind, name, len(payload))
|
||
return nil
|
||
}
|
||
|
||
func applyCompiled(skillsRoot string, bus *cmdbus.Bus, caps hostcaps) {
|
||
base := compiledRegistry{skillsRoot: skillsRoot, bus: bus}
|
||
for _, e := range extension.Compiled() {
|
||
if e.Register == nil {
|
||
continue
|
||
}
|
||
reg := pluginRegistry{compiledRegistry: base, pluginID: e.ID, caps: caps}
|
||
if err := e.Register(reg); err != nil {
|
||
log.Printf("extension: %s: %v", e.ID, err)
|
||
}
|
||
}
|
||
}
|
||
|
||
func mergeMCPServers(raw string, extra []core.PluginMCPServer) string {
|
||
var base []json.RawMessage
|
||
if raw != "" {
|
||
if err := json.Unmarshal([]byte(raw), &base); err != nil {
|
||
return raw
|
||
}
|
||
}
|
||
for _, s := range extra {
|
||
b, err := json.Marshal(s)
|
||
if err != nil {
|
||
continue
|
||
}
|
||
base = append(base, b)
|
||
}
|
||
if len(base) == 0 {
|
||
return ""
|
||
}
|
||
out, err := json.Marshal(base)
|
||
if err != nil {
|
||
return raw
|
||
}
|
||
return string(out)
|
||
}
|