cleanup

Author: ezynda3

README.md

@@ -1,13 +1,13 @@
 # JavaScript Executor MCP Server
 
-This MCP server provides JavaScript execution capabilities with ski runtime.
+This MCP server provides JavaScript execution capabilities with a modern runtime.
 
 ## Features
 
 The `executeJS` tool provides:
 
 - **Console API**: `console.log()`, `console.error()`, `console.warn()` (built-in)
-- **HTTP Server**: `serve()` for server creation (via `require('ski/http/server')`)
+- **HTTP Server**: `serve()` for server creation (via `require('http/server')`)
 - **Fetch API**: Modern `fetch()` with Request, Response, Headers, FormData (global)
 - **Timers**: `setTimeout()`, `setInterval()`, `clearTimeout()`, `clearInterval()` (global)
 - **Buffer**: Buffer, Blob, File APIs for binary data handling (global)
@@ -47,7 +47,7 @@ codebench-mcp --help
 ```
 
 **Available modules:**
-- `http` - HTTP server creation and client requests (import serve from 'ski/http/server')
+- `http` - HTTP server creation and client requests (require('http/server'))
 - `fetch` - Modern fetch API with Request, Response, Headers, FormData (available globally)
 - `timers` - setTimeout, setInterval, clearTimeout, clearInterval (available globally)
 - `buffer` - Buffer, Blob, File APIs for binary data handling (available globally)
@@ -68,13 +68,13 @@ package main
 import (
 	"log"
 
-	"github.com/mark3labs/codebench-mcp/jsserver"
+	"github.com/mark3labs/codebench-mcp/server"
 	"github.com/mark3labs/mcp-go/server"
 )
 
 func main() {
 	// Create a new JavaScript executor server
-	jss, err := jsserver.NewJSServer()
+	jss, err := server.NewJSServer()
 	if err != nil {
 		log.Fatalf("Failed to create server: %v", err)
 	}
@@ -95,17 +95,17 @@ import (
 	"context"
 	"log"
 
-	"github.com/mark3labs/codebench-mcp/jsserver"
+	"github.com/mark3labs/codebench-mcp/server"
 	"github.com/mark3labs/mcp-go/client"
 	"github.com/mark3labs/mcp-go/mcp"
 )
 
 func main() {
 	// Create the JS server with custom module configuration
-	config := jsserver.ModuleConfig{
+	config := server.ModuleConfig{
 		EnabledModules: []string{"fetch", "crypto", "buffer"},
 	}
-	jsServer, err := jsserver.NewJSServerWithConfig(config)
+	jsServer, err := server.NewJSServerWithConfig(config)
 	if err != nil {
 		log.Fatalf("Failed to create server: %v", err)
 	}
@@ -207,7 +207,7 @@ To integrate the Docker image with apps that support MCP:
 
 ### executeJS
 
-Execute JavaScript code with ski runtime environment.
+Execute JavaScript code with a modern runtime environment.
 
 **Parameters:**
 - `code` (required): JavaScript code to execute
@@ -225,7 +225,7 @@ const response = await fetch('https://api.example.com/data');
 const data = await response.json();
 
 // HTTP server (require import)
-const serve = require('ski/http/server');
+const serve = require('http/server');
 serve(8000, async (req) => {
   return new Response('Hello World');
 });
@@ -255,7 +255,7 @@ console.log('Pathname:', url.pathname);
 
 ## Limitations
 
-- **No fs or process modules** - File system and process APIs are not available in ski runtime
+- **No fs or process modules** - File system and process APIs are not available in the runtime
 - **Module access varies** - Some modules are global (fetch, http), others may need require()
 - **Each execution creates a fresh VM** - For isolation, each execution starts with a clean state
 - **Module filtering** - Configuration exists but actual runtime filtering not fully implemented

cmd/root.go

@@ -7,8 +7,8 @@ import (
 	"strings"
 
 	"github.com/mark3labs/codebench-mcp/internal/logger"
-	"github.com/mark3labs/codebench-mcp/jsserver"
-	"github.com/mark3labs/mcp-go/server"
+	"github.com/mark3labs/codebench-mcp/server"
+	mcpserver "github.com/mark3labs/mcp-go/server"
 	"github.com/spf13/cobra"
 )
 
@@ -42,7 +42,7 @@ var rootCmd = &cobra.Command{
 	Use:   "codebench-mcp",
 	Short: "JavaScript Executor MCP Server",
 	Long: `A Model Context Protocol (MCP) server that provides JavaScript execution capabilities 
-with ski runtime including http, fetch, timers, buffer, crypto, and other modules.`,
+with a modern runtime including http, fetch, timers, buffer, crypto, and other modules.`,
 	Run: func(cmd *cobra.Command, args []string) {
 		// Initialize logger first
 		logger.Init(debugMode)
@@ -84,19 +84,19 @@ with ski runtime including http, fetch, timers, buffer, crypto, and other module
 		logger.Debug("Module configuration", "enabled", modulesToEnable)
 
 		// Create server with module configuration
-		config := jsserver.ModuleConfig{
+		config := server.ModuleConfig{
 			EnabledModules: modulesToEnable,
 		}
 
-		jss, err := jsserver.NewJSServerWithConfig(config)
+		jss, err := server.NewJSServerWithConfig(config)
 		if err != nil {
 			logger.Fatal("Failed to create server", "error", err)
 		}
 
 		logger.Info("Starting MCP server", "modules", modulesToEnable)
 
 		// Serve requests
-		if err := server.ServeStdio(jss); err != nil {
+		if err := mcpserver.ServeStdio(jss); err != nil {
 			logger.Fatal("Server error", "error", err)
 		}
 	},

jsserver/description_test.go renamed to server/description_test.go

@@ -1,4 +1,4 @@
-package jsserver
+package server
 
 import (
 	"fmt"
@@ -19,7 +19,7 @@ func TestBuildToolDescription(t *testing.T) {
 			name:           "All modules enabled",
 			enabledModules: []string{"http", "fetch", "timers", "buffer", "crypto"},
 			expectedContent: []string{
-				"ski runtime",
+				"modern runtime",
 				"Node.js-like APIs",
 				"Available modules:",
 				"• http: HTTP server creation and management",
@@ -34,7 +34,7 @@ func TestBuildToolDescription(t *testing.T) {
 			name:           "Only http and fetch",
 			enabledModules: []string{"http", "fetch"},
 			expectedContent: []string{
-				"ski runtime",
+				"modern runtime",
 				"Available modules:",
 				"• http: HTTP server creation and management",
 				"• fetch: Modern fetch API with Request, Response, Headers, FormData",
@@ -50,7 +50,7 @@ func TestBuildToolDescription(t *testing.T) {
 			name:           "No modules enabled",
 			enabledModules: []string{},
 			expectedContent: []string{
-				"ski runtime",
+				"modern runtime",
 				"No modules are currently enabled",
 				"Only basic JavaScript execution is available",
 			},

jsserver/inprocess_test.go renamed to server/inprocess_test.go

@@ -1,10 +1,10 @@
-package jsserver_test
+package server_test
 
 import (
 	"context"
 	"testing"
 
-	"github.com/mark3labs/codebench-mcp/jsserver"
+	"github.com/mark3labs/codebench-mcp/server"
 	"github.com/mark3labs/mcp-go/client"
 	"github.com/mark3labs/mcp-go/mcp"
 	"github.com/stretchr/testify/assert"
@@ -13,7 +13,7 @@ import (
 
 func TestInProcessTransport(t *testing.T) {
 	// Create the JS server
-	jsServer, err := jsserver.NewJSServer()
+	jsServer, err := server.NewJSServer()
 	require.NoError(t, err)
 
 	// Create an in-process client
@@ -34,7 +34,7 @@ func TestInProcessTransport(t *testing.T) {
 	}
 	result, err := mcpClient.Initialize(context.Background(), initRequest)
 	require.NoError(t, err)
-	assert.Equal(t, "javascript-executor", result.ServerInfo.Name)
+	assert.Equal(t, "codebench-mcp", result.ServerInfo.Name)
 
 	// List tools to verify executeJS is available
 	toolsResult, err := mcpClient.ListTools(context.Background(), mcp.ListToolsRequest{})
@@ -76,7 +76,7 @@ func TestInProcessTransport(t *testing.T) {
 
 func TestInProcessTransport_ErrorHandling(t *testing.T) {
 	// Create the JS server
-	jsServer, err := jsserver.NewJSServer()
+	jsServer, err := server.NewJSServer()
 	require.NoError(t, err)
 
 	// Create an in-process client

jsserver/module_test.go renamed to server/module_test.go

@@ -1,4 +1,4 @@
-package jsserver
+package server
 
 import (
 	"context"
@@ -75,7 +75,7 @@ func TestModuleConfiguration_DisabledModules(t *testing.T) {
 }
 
 func TestModuleConfiguration_NoConsole(t *testing.T) {
-	// Test with basic execution - console.log should work in ski runtime
+	// Test with basic execution - console.log should work in the runtime
 	config := ModuleConfig{
 		EnabledModules: []string{}, // No modules enabled
 	}

jsserver/modules/buffer/buffer.go renamed to server/modules/buffer/buffer.go

@@ -5,7 +5,7 @@ import (
 	"encoding/hex"
 
 	"github.com/grafana/sobek"
-	"github.com/mark3labs/codebench-mcp/jsserver/vm"
+	"github.com/mark3labs/codebench-mcp/server/vm"
 )
 
 // BufferModule provides Buffer global for binary data handling

jsserver/modules/cache/cache.go renamed to server/modules/cache/cache.go

@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/grafana/sobek"
-	"github.com/mark3labs/codebench-mcp/jsserver/vm"
+	"github.com/mark3labs/codebench-mcp/server/vm"
 )
 
 // CacheModule provides in-memory caching with TTL support

jsserver/modules/console/console.go renamed to server/modules/console/console.go

@@ -12,7 +12,7 @@ import (
 	"hash"
 
 	"github.com/grafana/sobek"
-	"github.com/mark3labs/codebench-mcp/jsserver/vm"
+	"github.com/mark3labs/codebench-mcp/server/vm"
 )
 
 // CryptoModule provides cryptographic functions

jsserver/modules/crypto/crypto.go renamed to server/modules/crypto/crypto.go

@@ -2,7 +2,7 @@ package encoding
 
 import (
 	"github.com/grafana/sobek"
-	"github.com/mark3labs/codebench-mcp/jsserver/vm"
+	"github.com/mark3labs/codebench-mcp/server/vm"
 )
 
 // EncodingModule provides TextEncoder and TextDecoder