tools: move builtins to tools/builtin/
Prepares tools/ as the umbrella for all tool implementations: - tools/builtin/ — in-process handlers (shell, reasoning, tool/skill registry) - tools/lsp/ — (next) Go LSP tools with shared client library Package rename: ollie/tools → ollie/tools/builtin
This commit is contained in:
parent
ba8db09143
commit
1015536f2c
|
|
@ -10,7 +10,7 @@ import (
|
|||
"ollie/backend"
|
||||
coresession "ollie/session"
|
||||
"ollie/toolsrv"
|
||||
"ollie/tools"
|
||||
"ollie/tools/builtin"
|
||||
"ollie/paths"
|
||||
"ollie/prompts"
|
||||
)
|
||||
|
|
@ -128,7 +128,7 @@ func Create(rs *rootState, args []string) (string, error) {
|
|||
}
|
||||
if rs.cfg.SkillsRegistry != nil {
|
||||
execOpts = append(execOpts, toolsrv.WithSkillsRegistry(rs.cfg.SkillsRegistry))
|
||||
execOpts = append(execOpts, toolsrv.WithBuiltins(tools.Builtins()))
|
||||
execOpts = append(execOpts, toolsrv.WithBuiltins(builtin.Builtins()))
|
||||
}
|
||||
var newToolServer func() toolsrv.Runner
|
||||
var remoteEnv []string
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ import (
|
|||
"ollie/backend"
|
||||
coresession "ollie/session"
|
||||
"ollie/toolsrv"
|
||||
"ollie/tools"
|
||||
"ollie/tools/builtin"
|
||||
"ollie/prompts"
|
||||
)
|
||||
|
||||
|
|
@ -268,7 +268,7 @@ func restoreSession(rs *rootState, ps *agent.PersistedAgent) error {
|
|||
}
|
||||
if rs.cfg.SkillsRegistry != nil {
|
||||
execOpts = append(execOpts, toolsrv.WithSkillsRegistry(rs.cfg.SkillsRegistry))
|
||||
execOpts = append(execOpts, toolsrv.WithBuiltins(tools.Builtins()))
|
||||
execOpts = append(execOpts, toolsrv.WithBuiltins(builtin.Builtins()))
|
||||
}
|
||||
newToolServer = func() toolsrv.Runner {
|
||||
srv, _ := toolsrv.Dial(rs.cfg.Ctx, toolsrv.LocalAddr(cwd), execOpts...)
|
||||
|
|
|
|||
4
justfile
4
justfile
|
|
@ -26,7 +26,7 @@ build-kf5: core ninep acme kde-kf5
|
|||
|
||||
core:
|
||||
@echo === Building ollie-core ===
|
||||
go build ./agent/... ./backend/... ./detach/... ./elevate/... ./env/... ./fs/session/... ./log/... ./mount/... ./paths/... ./prompts/... ./sandbox/... ./session/... ./skills/... ./tools/... ./toolsrv/... ./dbus/...
|
||||
go build ./agent/... ./backend/... ./detach/... ./elevate/... ./env/... ./fs/session/... ./log/... ./mount/... ./paths/... ./prompts/... ./sandbox/... ./session/... ./skills/... ./tools/builtin/... ./toolsrv/... ./dbus/...
|
||||
|
||||
ninep:
|
||||
@echo === Building ollie-9p ===
|
||||
|
|
@ -222,7 +222,7 @@ test: test-core test-9p
|
|||
|
||||
test-core:
|
||||
@echo === Testing ollie-core ===
|
||||
go test ./agent/... ./backend/... ./detach/... ./elevate/... ./env/... ./log/... ./paths/... ./sandbox/... ./session/... ./skills/... ./tools/... ./toolsrv/... ./dbus/... ./prompts/...
|
||||
go test ./agent/... ./backend/... ./detach/... ./elevate/... ./env/... ./log/... ./paths/... ./sandbox/... ./session/... ./skills/... ./tools/builtin/... ./toolsrv/... ./dbus/... ./prompts/...
|
||||
|
||||
test-9p:
|
||||
@echo === Testing ollie-9p ===
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
// Package tools provides the built-in tool handlers for the toolsrv server.
|
||||
// Each file in this package is one tool. Builtins() is the single registry.
|
||||
package tools
|
||||
package builtin
|
||||
|
||||
import "ollie/toolsrv"
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package tools
|
||||
package builtin
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package tools
|
||||
package builtin
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package tools
|
||||
package builtin
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package tools
|
||||
package builtin
|
||||
|
||||
import (
|
||||
"context"
|
||||
Loading…
Reference in New Issue