feat: Fix flake.nix to not break build process (and maybe fix some other things too)

🔥💩😒 ass, you've be...

Fix flake.nix to avoid breaking build process, and maybe fix some other things too. Don't make us do it again,
developers.

Author: jamesbrink

.cursorrules

@@ -15,7 +15,8 @@ When updating rules:
 
 ### Using Nix Develop (Recommended)
 - Development environment: `nix develop`
-- Run server: `run`
+- Run server: `run [--port=PORT]`
+  - Run with hot reloading for development: `run-dev [--port=PORT]`
 - Run tests (automatically manages server): `run-tests`
   - Run tests with existing server: `run-tests-with-server`
   - Run test mocks (no server needed): `run-tests-dry`

.goosehints

@@ -15,7 +15,8 @@ When updating rules:
 
 ### Using Nix Develop (Recommended)
 - Development environment: `nix develop`
-- Run server: `run`
+- Run server: `run [--port=PORT]`
+  - Run with hot reloading for development: `run-dev [--port=PORT]`
 - Run tests (automatically manages server): `run-tests`
   - Run tests with existing server: `run-tests-with-server`
   - Run test mocks (no server needed): `run-tests-dry`

.windsurfrules

@@ -15,7 +15,8 @@ When updating rules:
 
 ### Using Nix Develop (Recommended)
 - Development environment: `nix develop`
-- Run server: `run`
+- Run server: `run [--port=PORT]`
+  - Run with hot reloading for development: `run-dev [--port=PORT]`
 - Run tests (automatically manages server): `run-tests`
   - Run tests with existing server: `run-tests-with-server`
   - Run test mocks (no server needed): `run-tests-dry`

CLAUDE.md

@@ -15,7 +15,8 @@ When updating rules:
 
 ### Using Nix Develop (Recommended)
 - Development environment: `nix develop`
-- Run server: `run`
+- Run server: `run [--port=PORT]`
+  - Run with hot reloading for development: `run-dev [--port=PORT]`
 - Run tests (automatically manages server): `run-tests`
   - Run tests with existing server: `run-tests-with-server`
   - Run test mocks (no server needed): `run-tests-dry`

README.md

@@ -27,9 +27,15 @@ nix develop
 # List all available commands
 menu
 
-# Run the server
+# Run the server (default port is 9421)
 run
 
+# Run the server with hot reloading for development
+run-dev
+
+# Run on specific port with hot reloading
+run-dev --port=8080
+
 # Run tests (automatically handles server startup/shutdown)
 run-tests
 
@@ -113,10 +119,10 @@ The project includes comprehensive test coverage that can be run in several ways
 4. **Manual Testing with curl:**
    ```bash
    # Test MCP package resource
-   curl -X GET "http://localhost:8000/mcp/resource?uri=nixos://package/python"
+   curl -X GET "http://localhost:9421/mcp/resource?uri=nixos://package/python"
 
    # Test MCP option resource
-   curl -X GET "http://localhost:8000/mcp/resource?uri=nixos://option/services.nginx"
+   curl -X GET "http://localhost:9421/mcp/resource?uri=nixos://option/services.nginx"
    ```
 
 5. **Debug Testing:**
@@ -130,7 +136,7 @@ The project includes comprehensive test coverage that can be run in several ways
    This runs tests in debug mode with detailed output for troubleshooting.
 
 6. **Exploring with the MCP UI:**
-   - Open your browser to: http://localhost:8000/mcp
+   - Open your browser to: http://localhost:9421/mcp
    - This provides a UI to explore MCP resources and tools
 
 ### Available Resources

flake.nix

@@ -46,7 +46,7 @@
           echo ""
           echo "MCP SDK is installed in .venv/"
           echo "Run the server with: python server.py"
-          echo "Access the MCP Inspector at: http://localhost:8000/docs"
+          echo "Access the MCP Inspector at: http://localhost:9421/docs"
         '';
 
       in {
@@ -114,7 +114,51 @@
                 command = ''
                   echo "Starting NixMCP server..."
                   source .venv/bin/activate
-                  python server.py
+                  
+                  # Default port
+                  PORT=9421
+                  
+                  # Parse arguments to extract port if specified
+                  for arg in "$@"; do
+                    case $arg in
+                      --port=*)
+                        PORT=''${arg#*=}
+                        shift
+                        ;;
+                      *)
+                        # Unknown option
+                        ;;
+                    esac
+                  done
+                  
+                  python server.py --port $PORT
+                '';
+              }
+              {
+                name = "run-dev";
+                category = "server";
+                help = "Run the NixMCP server with hot reloading for development";
+                command = ''
+                  echo "Starting NixMCP development server with hot reloading..."
+                  source .venv/bin/activate
+                  
+                  # Default port
+                  PORT=9421
+                  
+                  # Parse arguments to extract port if specified
+                  for arg in "$@"; do
+                    case $arg in
+                      --port=*)
+                        PORT=''${arg#*=}
+                        shift
+                        ;;
+                      *)
+                        # Unknown option
+                        ;;
+                    esac
+                  done
+                  
+                  python server.py --reload --port $PORT
                 '';
               }
               {
@@ -182,7 +226,7 @@
                   fi
                   
                   # Check if server is running
-                  if ! curl -s http://localhost:8000/docs -o /dev/null; then
+                  if ! curl -s http://localhost:9421/docs -o /dev/null; then
                     echo -e "\n❌ ERROR: Server is not running!"
                     echo "Please start the server with 'run' command first"
                     exit 1
@@ -265,6 +309,7 @@
               echo "└─────────────────────────────────────────────────┘"
               echo ""
               echo "  ⚡ run               - Start the NixMCP server"
+              echo "  ⚡ run-dev           - Start the NixMCP server with hot reloading"
               echo "  🧪 run-tests          - Run all tests (auto-manages server)"
               echo "  🧪 run-tests-dry      - Run test mocks (no server needed)"
               echo "  🧪 run-tests-debug    - Run tests in debug mode"

server.py

@@ -289,8 +289,15 @@ async def get_option_resource_with_channel(option_name: str, channel: str):
 if __name__ == "__main__":
     import uvicorn
     import logging
+    import argparse
     from fastapi.middleware.cors import CORSMiddleware
 
+    # Parse command-line arguments
+    parser = argparse.ArgumentParser(description="NixMCP Server")
+    parser.add_argument("--reload", action="store_true", help="Enable hot reloading for development")
+    parser.add_argument("--port", type=int, default=9421, help="Port to run the server on (default: 9421)")
+    args = parser.parse_args()
+
     # Enable debug logging
     logging.basicConfig(level=logging.DEBUG)
 
@@ -324,12 +331,19 @@ def debug_mcp_registered():
         print(f"Error accessing resources: {e}")
         print(f"MCP object dir: {dir(mcp)}")
 
+    port = args.port
     print("\nDebug access URLs:")
-    print("  - Test URL: http://localhost:8000/mcp/resource?uri=nixos://package/python")
-    print("  - Direct FastAPI: http://localhost:8000/packages/python")
-
-    print("\nStarting NixMCP server on port 8000...")
-    print("Access FastAPI docs at http://localhost:8000/docs")
-    print("Access MCP endpoints at http://localhost:8000/mcp")
-
-    uvicorn.run("server:app", host="0.0.0.0", port=8000, log_level="debug")
+    print(f"  - Test URL: http://localhost:{port}/mcp/resource?uri=nixos://package/python")
+    print(f"  - Direct FastAPI: http://localhost:{port}/packages/python")
+
+    print(f"\nStarting NixMCP server on port {port}...")
+    print(f"Access FastAPI docs at http://localhost:{port}/docs")
+    print(f"Access MCP endpoints at http://localhost:{port}/mcp")
+    
+    uvicorn.run(
+        "server:app", 
+        host="0.0.0.0", 
+        port=port, 
+        log_level="debug",
+        reload=args.reload
+    )

test_mcp.py

@@ -21,7 +21,7 @@
 
 # Server configuration
 SERVER_HOST = "localhost"
-SERVER_PORT = 8000
+SERVER_PORT = 9421
 BASE_URL = f"http://{SERVER_HOST}:{SERVER_PORT}"
 SERVER_STARTUP_TIMEOUT = 5  # seconds