diff --git a/mgr/create.go b/mgr/create.go
index af3a361..7609738 100644
--- a/mgr/create.go
+++ b/mgr/create.go
@@ -153,12 +153,16 @@ func (s *Manager) CreateSession(args []string) (string, error) {
 			}
 		} else {
 			newToolServer = func() toolsrv.Runner {
-			srv := toolsrv.New(cwd)
-			for _, o := range execOpts {
-				o(srv)
+				srv, _ := toolsrv.Dial(s.cfg.Ctx, toolsrv.LocalAddr(cwd), execOpts...)
+				return srv
 			}
-			return srv
-		}
+
+
+
+
+
+
+
 		}
 
 		var promptEnv []string
diff --git a/mgr/persist.go b/mgr/persist.go
index a918579..d0a1667 100644
--- a/mgr/persist.go
+++ b/mgr/persist.go
@@ -168,10 +168,7 @@ func (s *Manager) restoreSession(ps *agent.PersistedAgent) error {
 		execOpts = append(execOpts, toolsrv.WithBuiltins(tools.Builtins()))
 		}
 		newToolServer = func() toolsrv.Runner {
-			srv := toolsrv.New(cwd)
-			for _, o := range execOpts {
-				o(srv)
-			}
+			srv, _ := toolsrv.Dial(s.cfg.Ctx, toolsrv.LocalAddr(cwd), execOpts...)
 			return srv
 		}
 		promptEnv = agent.PromptEnv(cwd)