Misc cleanups (#75)

* Remove use of globalVariables

* Remove todo comment

* Reap any existing session socket when starting server

Author: shikokuchuo

NAMESPACE

@@ -4,3 +4,4 @@ export(mcp_server)
 export(mcp_session)
 export(mcp_tools)
 import(rlang)
+importFrom(stats,setNames)

R/mcptools-package.R

@@ -4,11 +4,10 @@
 
 ## usethis namespace: start
 #' @import rlang
+#' @importFrom stats setNames
 ## usethis namespace: end
 NULL
 
-utils::globalVariables(c("packageVersion", "setNames"))
-
 .onLoad <- function(libname, pkgname) {
   the$socket_url <- switch(
     Sys.info()[["sysname"]],

R/server.R

@@ -109,8 +109,9 @@
 #' @name server
 #' @export
 mcp_server <- function(tools = NULL, ..., session_tools = TRUE) {
-  # TODO: should this actually be a check for being called within Rscript or not?
+
   check_not_interactive()
+  nanonext::reap(the$session_socket) # in case session was started in .Rprofile
   the$sessions_enabled <- isTRUE(session_tools)
   set_server_tools(tools, session_tools = the$sessions_enabled)
 

R/session.R

@@ -1,14 +1,6 @@
 #' @rdname server
 #' @export
 mcp_session <- function() {
-  # HACK: If a session is already available from another session via `.Rprofile`,
-  # `mcp_session()` will be called again when the client runs the command
-  # Rscript -e "mcptools::mcp_server()" and the existing session connection
-  # will be wiped. Returning early in this case allows for the desired R
-  # session to be running already before the client initiates the server.
-  if (!interactive()) {
-    return(invisible())
-  }
 
   the$session_socket <- nanonext::socket("poly")
   i <- 1L