From b2462c6a0685b88bcbdb02abc181b3419ce13ff2 Mon Sep 17 00:00:00 2001 From: Levi Neely Date: Wed, 29 Jul 2026 23:23:51 +0200 Subject: [PATCH] replace toolsrv.Decl with inline closure over New() --- mgr/create.go | 8 +++++++- mgr/persist.go | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/mgr/create.go b/mgr/create.go index 90f595e..af3a361 100644 --- a/mgr/create.go +++ b/mgr/create.go @@ -152,7 +152,13 @@ func (s *Manager) CreateSession(args []string) (string, error) { "PRIME_IS_GIT_REPO=" + fmt.Sprintf("%v", rsrv.Info.IsGitRepo), } } else { - newToolServer = toolsrv.Decl(cwd, execOpts...) + newToolServer = func() toolsrv.Runner { + srv := toolsrv.New(cwd) + for _, o := range execOpts { + o(srv) + } + return srv + } } var promptEnv []string diff --git a/mgr/persist.go b/mgr/persist.go index d3cba3a..a918579 100644 --- a/mgr/persist.go +++ b/mgr/persist.go @@ -167,7 +167,13 @@ func (s *Manager) restoreSession(ps *agent.PersistedAgent) error { execOpts = append(execOpts, toolsrv.WithSkillsRegistry(s.cfg.SkillsRegistry)) execOpts = append(execOpts, toolsrv.WithBuiltins(tools.Builtins())) } - newToolServer = toolsrv.Decl(cwd, execOpts...) + newToolServer = func() toolsrv.Runner { + srv := toolsrv.New(cwd) + for _, o := range execOpts { + o(srv) + } + return srv + } promptEnv = agent.PromptEnv(cwd) }