P3: meta + primitive tool group (think/now/cite + classify/extract/summarize)
Grow executus/tools into a real generic tool library: - Register(reg): the always-available, zero-config tools — think, now (UTC unless a CurrentTimeProvider is wired), cite (inert unless a CitationStorage is wired). All nil-safe; a light host calls Register and is useful. - RegisterMeta(reg, MetaDeps): the LLM-backed meta tools — classify, extract_entities, summarize — over the llmmeta helper. Budget defaults to the shipped in-memory per-run cap; Files optional; caps default. - Seams moved (interface/type-only, no host coupling): research_providers.go (CurrentTimeProvider/CitationStorage/SearchBudget/PageExtractor/PDFFetcher/…) and file_storage.go (FileStorage + FileDomainMeta). Plus the in-memory budget default (research_defaults.go) and scope_validate.go. calculate deferred (drags github.com/Krognol/go-wolfram + a module-path replace — not worth it in the lean core for one tool). Core go.sum still free of gorm/redis/discordgo/sqlite/wolfram. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
+71
-12
@@ -3,28 +3,87 @@
|
||||
// A host registers the tools it wants against a tool.Registry, then runs an
|
||||
// agent whose RunnableAgent.LowLevelTools name them. Tools split two ways:
|
||||
//
|
||||
// - Always-available, zero-dependency tools (think, ...) need no host backend
|
||||
// and register via Register. A light host (gadfly) can call Register and be
|
||||
// - Always-available, zero-configuration tools register via Register (think,
|
||||
// now, cite) — all nil-safe, so a light host (gadfly) calls Register and is
|
||||
// immediately useful.
|
||||
// - Backed tools (web search, file/kv storage, summarize, ...) take a nil-safe
|
||||
// Deps describing their host backend; they register via grouped registrars
|
||||
// (RegisterWeb, RegisterStore, ...) as those land.
|
||||
// - Backed tools take a nil-safe Deps describing their host backend and
|
||||
// register via grouped registrars (RegisterMeta, and RegisterWeb/Store/…
|
||||
// as they land). Each Deps ships sensible defaults so "some setup" is small.
|
||||
//
|
||||
// Every tool ships with the same three-stage permission model as mort's, and a
|
||||
// host adds its own domain tools against the SAME registry.
|
||||
// A host adds its own domain tools against the SAME registry.
|
||||
package tools
|
||||
|
||||
import "gitea.stevedudenhoeffer.com/steve/executus/tool"
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
|
||||
// Register adds the always-available, zero-dependency generic tools to reg
|
||||
// (currently: think). Returns the first registration error, if any.
|
||||
"gitea.stevedudenhoeffer.com/steve/executus/llmmeta"
|
||||
"gitea.stevedudenhoeffer.com/steve/executus/tool"
|
||||
)
|
||||
|
||||
// Register adds the always-available, zero-configuration generic tools:
|
||||
//
|
||||
// - think — record a thought to the run trace (no external effect)
|
||||
// - now — current time (UTC unless a CurrentTimeProvider is wired)
|
||||
// - cite — record a source citation (inert unless a CitationStorage is wired)
|
||||
//
|
||||
// All are nil-safe. Returns the first registration error.
|
||||
func Register(reg tool.Registry) error {
|
||||
for _, t := range []tool.Tool{
|
||||
return registerAll(reg,
|
||||
NewThink(),
|
||||
} {
|
||||
NewNow(nil),
|
||||
NewCite(nil),
|
||||
)
|
||||
}
|
||||
|
||||
// MetaDeps wires the LLM-backed meta tools (classify, extract_entities,
|
||||
// summarize). Helper is required. Budget defaults to an in-memory per-run cap;
|
||||
// Files is optional (summarize's file_id input is inert without it); MaxPerRun
|
||||
// and MaxWords default when non-positive.
|
||||
type MetaDeps struct {
|
||||
Helper *llmmeta.Helper
|
||||
Budget SearchBudget
|
||||
Files FileStorage
|
||||
MaxPerRun int // per-run cap for each meta tool; default 10
|
||||
MaxWords int // summarize length cap; default 200
|
||||
}
|
||||
|
||||
// RegisterMeta adds classify, extract_entities, and summarize. It requires a
|
||||
// configured llmmeta.Helper (the fast-tier meta-LLM caller); everything else
|
||||
// defaults.
|
||||
func RegisterMeta(reg tool.Registry, d MetaDeps) error {
|
||||
if d.Helper == nil {
|
||||
return errors.New("tools: MetaDeps.Helper is required for the meta tools")
|
||||
}
|
||||
if d.Budget == nil {
|
||||
d.Budget = NewInMemorySearchBudget(nil)
|
||||
}
|
||||
if d.MaxPerRun <= 0 {
|
||||
d.MaxPerRun = 10
|
||||
}
|
||||
if d.MaxWords <= 0 {
|
||||
d.MaxWords = 200
|
||||
}
|
||||
cfg := fixedMetaConfig{maxPerRun: d.MaxPerRun, maxWords: d.MaxWords}
|
||||
return registerAll(reg,
|
||||
NewClassify(d.Helper, cfg, d.Budget),
|
||||
NewExtractEntities(d.Helper, cfg, d.Budget),
|
||||
NewSummarize(d.Helper, cfg, d.Budget, d.Files),
|
||||
)
|
||||
}
|
||||
|
||||
func registerAll(reg tool.Registry, ts ...tool.Tool) error {
|
||||
for _, t := range ts {
|
||||
if err := reg.Register(t); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// fixedMetaConfig satisfies ClassifyConfig / ExtractEntitiesConfig /
|
||||
// SummarizeConfig with static caps read from MetaDeps.
|
||||
type fixedMetaConfig struct{ maxPerRun, maxWords int }
|
||||
|
||||
func (c fixedMetaConfig) MaxPerRun(context.Context) int { return c.maxPerRun }
|
||||
func (c fixedMetaConfig) MaxWords(context.Context) int { return c.maxWords }
|
||||
|
||||
Reference in New Issue
Block a user