feat(0144c): launcher wiring + adapter al tool-use loop LLM
Schema DeviceMeshConfig en AgentConfig. Adapter ToolsForLLM convierte ToolSpec → tools.Tool transparente al LLM existente. URL via env var override. tools_allowed filter. agent-wsl-lucas blank import en launcher. LLM ve los tools como cualquier otra herramienta. Effects runner ya soporta ActionKindDeviceMesh como fallback. Build + tests verdes.
This commit is contained in:
@@ -9,6 +9,7 @@ import (
|
||||
|
||||
"github.com/enmanuel/agents/internal/config"
|
||||
"github.com/enmanuel/agents/pkg/memory"
|
||||
devicemeshtools "github.com/enmanuel/agents/pkg/tools/devicemesh"
|
||||
shellknowledge "github.com/enmanuel/agents/shell/knowledge"
|
||||
shellmcp "github.com/enmanuel/agents/shell/mcp"
|
||||
shellskills "github.com/enmanuel/agents/shell/skills"
|
||||
@@ -291,9 +292,112 @@ func buildToolRegistry(
|
||||
logger.Debug("registered skills tools")
|
||||
}
|
||||
|
||||
// Device-mesh tools — exposed when the agent's config has a populated
|
||||
// `device_mesh:` block with enabled=true. The builtin catalog (issue 0144
|
||||
// §2.1) is filtered by Mode and then narrowed by ToolsAllowed; each
|
||||
// surviving spec is adapted to a tools.Tool whose Exec routes through
|
||||
// the devicemesh.ToolRegistry (validate → ArgMapping → HTTP dispatch →
|
||||
// ResultMapping). See pkg/tools/devicemesh/adapter.go.
|
||||
if dmReg := buildDeviceMeshRegistry(cfg, logger); dmReg != nil {
|
||||
for _, t := range devicemeshtools.ToolsForLLM(dmReg) {
|
||||
reg.Register(t)
|
||||
}
|
||||
logger.Info("device_mesh tools registered",
|
||||
"host", cfg.DeviceMesh.ResolvedHost(),
|
||||
"mode", normalizeMeshMode(cfg.DeviceMesh.Mode),
|
||||
"count", dmReg.Len(),
|
||||
"names", dmReg.Names(),
|
||||
)
|
||||
}
|
||||
|
||||
return reg
|
||||
}
|
||||
|
||||
// buildDeviceMeshRegistry constructs the per-agent devicemesh.ToolRegistry
|
||||
// from cfg.DeviceMesh and returns it ready to be adapted. Returns nil when
|
||||
// the block is absent, disabled, or yields zero tools so the caller can
|
||||
// skip registration cleanly. Pure(-ish) — only side effect is os.Getenv
|
||||
// for the URL override; the rest is pure data shuffling.
|
||||
func buildDeviceMeshRegistry(cfg *config.AgentConfig, logger *slog.Logger) *devicemeshtools.ToolRegistry {
|
||||
if cfg == nil || cfg.DeviceMesh == nil || !cfg.DeviceMesh.Enabled {
|
||||
return nil
|
||||
}
|
||||
dm := cfg.DeviceMesh
|
||||
|
||||
// Resolve the device_agent URL: env override wins when present and
|
||||
// non-empty; otherwise fall back to the literal URL from YAML. This
|
||||
// keeps endpoints out of git while staying explicit.
|
||||
url := dm.DeviceAgentURL
|
||||
if dm.URLEnv != "" {
|
||||
if v := os.Getenv(dm.URLEnv); v != "" {
|
||||
url = v
|
||||
}
|
||||
}
|
||||
if url == "" {
|
||||
logger.Warn("device_mesh enabled but no URL resolved (neither device_agent_url nor URLEnv)",
|
||||
"url_env", dm.URLEnv,
|
||||
"host", dm.ResolvedHost(),
|
||||
)
|
||||
return nil
|
||||
}
|
||||
|
||||
client := devicemeshtools.NewClient(url)
|
||||
if t := dm.ResolvedTimeoutSeconds(); t > 0 {
|
||||
client.Timeout = time.Duration(t) * time.Second
|
||||
}
|
||||
|
||||
mode := normalizeMeshMode(dm.Mode)
|
||||
reg := devicemeshtools.NewToolRegistry(client)
|
||||
registered := devicemeshtools.RegisterBuiltins(reg, mode)
|
||||
logger.Debug("device_mesh builtins registered", "mode", mode, "count", len(registered), "names", registered)
|
||||
|
||||
// Narrow by tools_allowed if the config asks for it. The filter is a
|
||||
// pure transform — same Client, fewer specs.
|
||||
if len(dm.ToolsAllowed) > 0 {
|
||||
filtered := devicemeshtools.FilterByAllowed(reg, dm.ToolsAllowed)
|
||||
// Warn on names that the config asked for but the catalog does not
|
||||
// provide — typical drift between template and code after a new
|
||||
// builtin lands.
|
||||
present := make(map[string]bool, len(registered))
|
||||
for _, n := range registered {
|
||||
present[n] = true
|
||||
}
|
||||
for _, n := range dm.ToolsAllowed {
|
||||
if !present[n] {
|
||||
logger.Warn("device_mesh tools_allowed lists unknown tool",
|
||||
"name", n,
|
||||
"mode", mode,
|
||||
)
|
||||
}
|
||||
}
|
||||
reg = filtered
|
||||
}
|
||||
|
||||
if reg.Len() == 0 {
|
||||
logger.Warn("device_mesh registry empty after filter — skipping",
|
||||
"host", dm.ResolvedHost(),
|
||||
)
|
||||
return nil
|
||||
}
|
||||
return reg
|
||||
}
|
||||
|
||||
// normalizeMeshMode maps the YAML "mode" string to the RegistrationMode
|
||||
// enum, defaulting to ModeUser. Pure function — used by both the registry
|
||||
// builder and tests.
|
||||
func normalizeMeshMode(s string) devicemeshtools.RegistrationMode {
|
||||
switch s {
|
||||
case "sudo":
|
||||
return devicemeshtools.ModeSudo
|
||||
case "all":
|
||||
return devicemeshtools.ModeAll
|
||||
case "user", "":
|
||||
return devicemeshtools.ModeUser
|
||||
default:
|
||||
return devicemeshtools.ModeUser
|
||||
}
|
||||
}
|
||||
|
||||
// resolveDataBase returns the base directory for agent runtime data.
|
||||
// Priority: config storage.base_path > $AGENTS_DATA_DIR/<id> > <config-dir>/data
|
||||
func resolveDataBase(cfg *config.AgentConfig) string {
|
||||
|
||||
Reference in New Issue
Block a user