replace toolsrv.Decl with inline closure over New()

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

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)
 	}