rename "proxy" to "server"

* Renames `mcp_proxy()` to `mcp_server()`
* `the$proxy_socket` becomes `the$server_socket`
* Renames file `proxy.R` to `server.R` and analogous test file
* Audits mentions of "proxy"

Author: simonpcouch

NAMESPACE

@@ -1,5 +1,5 @@
 # Generated by roxygen2: do not edit by hand
 
 export(mcp_host)
-export(mcp_proxy)
+export(mcp_server)
 import(rlang)

R/host.R

@@ -6,7 +6,7 @@
 #'
 #' @section Configuration:
 #'
-#' [mcp_proxy()] should be configured with the MCP clients via the `Rscript`
+#' [mcp_server()] should be configured with the MCP clients via the `Rscript`
 #' command. For example, to use with Claude Desktop, paste the following in your
 #' Claude Desktop configuration (on macOS, at
 #' `file.edit("~/Library/Application Support/Claude/claude_desktop_config.json")`):
@@ -16,7 +16,7 @@
 #'   "mcpServers": {
 #'     "r-acquaint": {
 #'       "command": "Rscript",
-#'       "args": ["-e", "acquaint::mcp_proxy()"]
+#'       "args": ["-e", "acquaint::mcp_server()"]
 #'     }
 #'   }
 #' }
@@ -25,12 +25,12 @@
 #' Or, to use with Claude Code, you might type in a terminal:
 #'
 #' ```bash
-#' claude mcp add -s "user" r-acquaint Rscript -e "acquaint::mcp_proxy()"
+#' claude mcp add -s "user" r-acquaint Rscript -e "acquaint::mcp_server()"
 #' ```
 #'
-#' **mcp_proxy() is not intended for interactive use.**
+#' **mcp_server() is not intended for interactive use.**
 #'
-#' The proxy interfaces with the MCP client on behalf of the host in
+#' The server interfaces with the MCP client on behalf of the host in
 #' your R session. **Use [mcp_host()] to start the host in your R session.**
 #' Place a call to `acquaint::mcp_host()` in your `.Rprofile`, perhaps with
 #' `usethis::edit_r_profile()`, to start a host for every interactive R session
@@ -46,9 +46,9 @@
 mcp_host <- function() {
   # HACK: If a host is already running in one session via `.Rprofile`,
   # `mcp_host()` will be called again when the client runs the command
-  # Rscript -e "acquaint::mcp_proxy()" and the existing host will be wiped.
+  # Rscript -e "acquaint::mcp_server()" and the existing host will be wiped.
   # Returning early in this case allows for the desired R session host to be
-  # running already before the client initiates the proxy.
+  # running already before the client initiates the server.
   if (!interactive()) {
     return(invisible())
   }
@@ -67,12 +67,12 @@ mcp_host <- function() {
     }
   )
 
-  schedule_handle_message_from_proxy()
+  schedule_handle_message_from_server()
 }
 
-handle_message_from_proxy <- function(msg) {
+handle_message_from_server <- function(msg) {
   pipe <- nanonext::pipe_id(the$raio)
-  schedule_handle_message_from_proxy()
+  schedule_handle_message_from_server()
 
   # cat("RECV :", msg, "\n", sep = "", file = stderr())
   if (!nzchar(msg)) {
@@ -124,13 +124,15 @@ handle_message_from_proxy <- function(msg) {
   )
 }
 
-schedule_handle_message_from_proxy <- function() {
+schedule_handle_message_from_server <- function() {
   the$raio <- nanonext::recv_aio(the$host_socket, mode = "string")
-  promises::as.promise(the$raio)$then(handle_message_from_proxy)$catch(function(
-    e
-  ) {
-    print(e)
-  })
+  promises::as.promise(the$raio)$then(handle_message_from_server)$catch(
+    function(
+      e
+    ) {
+      print(e)
+    }
+  )
 }
 
 # Create a jsonrpc-structured response object.

R/proxy.R renamed to R/server.R

@@ -1,14 +1,14 @@
-# This R script is a proxy. It takes input on stdin, and when the input forms
+# The MCP server is a proxy. It takes input on stdin, and when the input forms
 # valid JSON, it will send the JSON to the host. Then, when it receives the
 # response, it will print the response to stdout.
 #' @rdname mcp
 #' @export
-mcp_proxy <- function() {
+mcp_server <- function() {
   # TODO: should this actually be a check for being called within Rscript or not?
   check_not_interactive()
 
-  the$proxy_socket <- nanonext::socket("poly")
-  nanonext::dial(the$proxy_socket, url = sprintf("%s%d", acquaint_socket, 1L))
+  the$server_socket <- nanonext::socket("poly")
+  nanonext::dial(the$server_socket, url = sprintf("%s%d", acquaint_socket, 1L))
 
   # Note that we're using file("stdin") instead of stdin(), which are not the
   # same.
@@ -117,14 +117,14 @@ handle_message_from_host <- function(data) {
 }
 
 schedule_handle_message_from_host <- function() {
-  r <- nanonext::recv_aio(the$proxy_socket, mode = "string")
+  r <- nanonext::recv_aio(the$server_socket, mode = "string")
   promises::as.promise(r)$then(handle_message_from_host)
 }
 
 forward_request <- function(data) {
   logcat("TO HOST: ", data)
 
-  nanonext::send_aio(the$proxy_socket, data, mode = "raw")
+  nanonext::send_aio(the$server_socket, data, mode = "raw")
 }
 
 # This process will be launched by the MCP client, so stdout/stderr aren't
@@ -199,7 +199,7 @@ check_not_interactive <- function(call = caller_env()) {
     cli::cli_abort(
       c(
         "This function is not intended for interactive use.",
-        "i" = "See {.help {.fn mcp_proxy}} for instructions on configuring this
+        "i" = "See {.help {.fn mcp_server}} for instructions on configuring this
        function with applications"
       ),
       call = call
@@ -232,10 +232,10 @@ mcp_discover <- function() {
 }
 
 select_host <- function(i) {
-  lapply(the$proxy_socket[["dialer"]], nanonext::reap)
-  attr(the$proxy_socket, "dialer") <- NULL
+  lapply(the$server_socket[["dialer"]], nanonext::reap)
+  attr(the$server_socket, "dialer") <- NULL
   nanonext::dial(
-    the$proxy_socket,
+    the$server_socket,
     url = sprintf("%s%d", acquaint_socket, as.integer(i))
   )
 }

README.Rmd

@@ -45,7 +45,7 @@ acquaint can be hooked up to any application that supports MCP. For example, to
   "mcpServers": {
     "r-acquaint": {
       "command": "Rscript",
-      "args": ["-e", "acquaint::mcp_proxy()"]
+      "args": ["-e", "acquaint::mcp_server()"]
     }
   }
 }
@@ -54,7 +54,7 @@ acquaint can be hooked up to any application that supports MCP. For example, to
 Or, to use with Claude Code, you might type in a terminal:
 
 ```bash
-claude mcp add -s "user" r-acquaint Rscript -e "acquaint::mcp_proxy()"
+claude mcp add -s "user" r-acquaint Rscript -e "acquaint::mcp_server()"
 ```
 
 Then, in your R session, call `acquaint::mcp_hostr()`.

README.md

@@ -41,7 +41,7 @@ your Claude Desktop configuration (on macOS, at
   "mcpServers": {
     "r-acquaint": {
       "command": "Rscript",
-      "args": ["-e", "acquaint::mcp_proxy()"]
+      "args": ["-e", "acquaint::mcp_server()"]
     }
   }
 }
@@ -50,7 +50,7 @@ your Claude Desktop configuration (on macOS, at
 Or, to use with Claude Code, you might type in a terminal:
 
 ``` bash
-claude mcp add -s "user" r-acquaint Rscript -e "acquaint::mcp_proxy()"
+claude mcp add -s "user" r-acquaint Rscript -e "acquaint::mcp_server()"
 ```
 
 Then, in your R session, call `acquaint::mcp_hostr()`.

man/mcp.Rd

@@ -0,0 +1,9 @@
+# check_not_interactive errors informatively
+
+    Code
+      mcp_server()
+    Condition
+      Error in `mcp_server()`:
+      ! This function is not intended for interactive use.
+      i See `mcp_server()` for instructions on configuring this function with applications
+

tests/testthat/_snaps/proxy.md

@@ -1,5 +1,5 @@
 test_that("check_not_interactive errors informatively", {
   testthat::local_mocked_bindings(interactive = function(...) TRUE)
 
-  expect_snapshot(error = TRUE, mcp_proxy())
+  expect_snapshot(error = TRUE, mcp_server())
 })