Fix @main entry point and improve module loading

- Add proper @main function syntax for -m flag support
- Use Base.require for better module resolution in current environment
- Update README to show -m flag usage as recommended approach
- Remove unnecessary bin script

Author: Keno

README.md

@@ -56,10 +56,10 @@ run_stdio_server(server)
 #### Command Line Usage
 
 ```bash
-# Using the provided script
-./bin/llmbench MyBenchmarkModule [options]
+# Using the -m flag (recommended)
+julia --project -m LLMBenchMCPServer MyBenchmarkModule [options]
 
-# Or directly with Julia
+# Or using -e flag
 julia --project -e 'using LLMBenchMCPServer; LLMBenchMCPServer.main()' -- MyBenchmarkModule [options]
 ```
 

bin/llmbench

@@ -17,71 +17,71 @@ function LLMBenchServer(;
 )
     # Create base MCP server
     server = ClaudeMCPTools.MCPServer(name=name, version=version)
-    
+
     # Add basic tools if requested
     if include_basic_tools
         ClaudeMCPTools.register_tool!(server, "bash", ClaudeMCPTools.BashTool(working_dir=working_dir))
-        ClaudeMCPTools.register_tool!(server, "str_replace_editor", 
+        ClaudeMCPTools.register_tool!(server, "str_replace_editor",
             ClaudeMCPTools.StrReplaceEditorTool(base_path=working_dir))
     end
-    
+
     # Add setup_problem tool if function provided
     if setup_fn !== nothing
-        ClaudeMCPTools.register_tool!(server, "setup_problem", 
+        ClaudeMCPTools.register_tool!(server, "setup_problem",
             SetupProblemTool(setup_fn, working_dir=working_dir))
     end
-    
+
     # Add grade_problem tool if function provided
     if grade_fn !== nothing
         ClaudeMCPTools.register_tool!(server, "grade_problem",
             GradeProblemTool(grade_fn, working_dir=working_dir))
     end
-    
+
     return server
 end
 
 # Main entry point for the LLMBenchMCPServer.
 # Usage: julia --project -m LLMBenchMCPServer ModuleName [--workdir /path]
-function main(args=ARGS)
+function @main(args)
     # Handle both array and varargs inputs
     if isa(args, Tuple)
         args = collect(args)
     end
     if isempty(args) || (length(args) == 1 && args[1] in ["--help", "-h"])
         println("""
         LLMBenchMCPServer - MCP server for LLM benchmarking
-        
+
         Usage:
             julia --project -m LLMBenchMCPServer ModuleName [options]
-        
+
         Arguments:
             ModuleName          Name of the module containing setup_problem and grade functions
-        
+
         Options:
             --workdir PATH      Working directory (default: current directory)
             --no-basic-tools    Disable basic tools (bash, str_replace_editor)
             --verbose           Enable verbose output
             --help, -h          Show this help message
-        
+
         The specified module should export:
             - setup_problem(workdir::String) -> String/Dict
                 Returns the problem description
-            
+
             - grade(workdir::String, transcript::String) -> Dict/Number
                 Returns grading result with subscores, weights, and total score
-        
+
         Example:
             julia --project -m LLMBenchMCPServer MyBenchmark
         """)
         return 0
     end
-    
+
     # Parse arguments
     module_name = args[1]
     working_dir = pwd()
     include_basic_tools = true
     verbose = false
-    
+
     i = 2
     while i <= length(args)
         if args[i] == "--workdir" && i + 1 <= length(args)
@@ -98,45 +98,48 @@ function main(args=ARGS)
             i += 1
         end
     end
-    
+
     # Ensure working directory exists
     if !isdir(working_dir)
         mkpath(working_dir)
     end
-    
+
     # Load the module
     try
         # Try to load the module
         mod_symbol = Symbol(module_name)
 
-        # First check if it's already loaded
-        if !isdefined(Main, mod_symbol)
-            # Try to import it
-            try
-                Base.eval(Main, :(using $mod_symbol))
-            catch
-                # Maybe it's a local module that needs to be included
-                # Try common locations
+        # Try to load the module using Base.require
+        mod = try
+            # First try to load it as a package in the current environment
+            Base.require(Main, mod_symbol)
+        catch
+            # If that fails, check if it's already loaded
+            if isdefined(Main, mod_symbol)
+                getfield(Main, mod_symbol)
+            else
+                # Try to include it as a local file
+                loaded = false
                 for path in ["$module_name.jl", "src/$module_name.jl", "../$module_name.jl"]
                     if isfile(path)
                         include(abspath(path))
+                        loaded = true
                         break
                     end
                 end
+                
+                if loaded && isdefined(Main, mod_symbol)
+                    getfield(Main, mod_symbol)
+                else
+                    error("Could not load module: $module_name")
+                end
             end
         end
-        
-        # Get the module
-        if !isdefined(Main, mod_symbol)
-            error("Could not load module: $module_name")
-        end
-        
-        mod = getfield(Main, mod_symbol)
-        
+
         # Extract functions
         setup_fn = nothing
         grade_fn = nothing
-        
+
         if isdefined(mod, :setup_problem)
             setup_fn = getfield(mod, :setup_problem)
             if verbose
@@ -145,7 +148,7 @@ function main(args=ARGS)
         else
             println("Warning: No setup_problem function found in $module_name")
         end
-        
+
         if isdefined(mod, :grade)
             grade_fn = getfield(mod, :grade)
             if verbose
@@ -154,7 +157,7 @@ function main(args=ARGS)
         else
             println("Warning: No grade function found in $module_name")
         end
-        
+
         # Create and run the server
         server = LLMBenchServer(
             name="$module_name-MCP",
@@ -164,20 +167,20 @@ function main(args=ARGS)
             working_dir=working_dir,
             include_basic_tools=include_basic_tools
         )
-        
+
         if verbose
             println("Starting MCP server for $module_name")
             println("Working directory: $working_dir")
             println("Tools registered: $(keys(server.tools))")
         end
-        
+
         # Run the server in stdio mode
         ClaudeMCPTools.run_stdio_server(server, verbose=verbose)
-        
+
     catch e
         println(stderr, "Error: $e")
         return 1
     end
-    
+
     return 0
-end
+end