accessibility-server-mcp 1.0.7 → 1.0.9

package/README.md

@@ -7,7 +7,8 @@ A comprehensive Model Context Protocol (MCP) server for web accessibility testin
 - **🌐 URL Testing**: Test any public URL for accessibility issues using Puppeteer and axe-core
 - **🕷️ Website-Wide Testing**: Crawl and test entire websites for comprehensive accessibility audits
 - **📝 HTML Snippet Testing**: Analyze raw HTML strings for accessibility compliance  
-- **📋 WCAG Compliance**: Support for WCAG 2.0, 2.1, and 2.2 standards (A, AA, AAA levels)
+- **📋 Multi-Standard Support**: Test against WCAG 2.0/2.1/2.2, Section 508, ADA, EN 301 549, and more using axe-core tags
+- **🎯 Flexible Standard Combinations**: Use presets (wcag-aa, ada, section508) or specify individual axe-core tags
 - **🎨 Color Contrast Analysis**: Check color combinations for WCAG contrast requirements
 - **♿ ARIA Validation**: Validate proper usage of ARIA attributes and roles
 - **📱 Mobile Testing**: Orientation lock detection and mobile accessibility issues
@@ -168,7 +169,69 @@ docker run -d --name accessibility-mcp \
   accessibility-mcp
 ```
 
-## 🛠️ Available MCP Tools
+## � Multi-Standard Support
+
+The server supports testing against multiple accessibility standards simultaneously:
+
+### Standard Presets
+
+Quick presets for common standard combinations:
+
+- **`wcag-a`**: WCAG 2.0/2.1/2.2 Level A
+- **`wcag-aa`**: WCAG 2.0/2.1/2.2 Level AA (default)
+- **`wcag-aaa`**: WCAG 2.0/2.1/2.2 Level AAA
+- **`section508`**: Section 508 compliance tags
+- **`ada`**: ADA Title III compliance (WCAG 2.1 AA + legal guidance)
+- **`en301549`**: EN 301 549 European standard
+- **`all-standards`**: Comprehensive testing across all standards
+
+### Individual Standard Tags
+
+Specify individual axe-core tags for fine-grained control (~150+ available):
+
+**WCAG Tags:**
+- `wcag2a`, `wcag2aa`, `wcag2aaa` - WCAG 2.0 levels
+- `wcag21a`, `wcag21aa`, `wcag21aaa` - WCAG 2.1 levels
+- `wcag22aa` - WCAG 2.2 Level AA
+- `wcag111`, `wcag131`, `wcag143`, `wcag244`, etc. - Specific success criteria
+
+**Other Standards:**
+- `section508`, `section508.22.a`, `section508.22.g` - Section 508
+- `EN-301-549` - European accessibility standard
+- `TTv5` - Trusted Tester v5
+- `RGAAv4` - French accessibility standard
+
+**Category Tags:**
+- `cat.color`, `cat.forms`, `cat.keyboard`, `cat.aria`, `cat.text-alternatives`
+- `cat.name-role-value`, `cat.semantics`, `cat.language`, etc.
+
+### Standard Combination Logic
+
+- **AND Logic** (default): Rules must match ALL specified standards (`requireAll: true`)
+- **OR Logic**: Rules match ANY specified standard (`requireAll: false`)
+
+### Usage Examples
+
+```json
+// Test against multiple presets
+{
+  "standardPresets": ["wcag-aa", "section508", "ada"]
+}
+
+// Test against specific tags with AND logic
+{
+  "standards": ["wcag21aa", "wcag244", "section508.22.a"],
+  "requireAll": true
+}
+
+// Test against category tags with OR logic
+{
+  "standards": ["cat.color", "cat.forms"],
+  "requireAll": false
+}
+```
+
+## �🛠️ Available MCP Tools
 
 The server provides four main tools for accessibility testing, with two operational modes:
 
@@ -189,7 +252,7 @@ The server provides four main tools for accessibility testing, with two operatio
 
 Test a website or HTML content for accessibility issues:
 
-**For URLs:**
+**For URLs with standard presets:**
 ```json
 {
   "name": "test_accessibility",
@@ -197,12 +260,25 @@ Test a website or HTML content for accessibility issues:
     "target": "https://example.com",
     "type": "url",
     "level": "basic",
-    "wcagLevel": "AA"
+    "standardPresets": ["wcag-aa", "section508"]
   }
 }
 ```
 
-**For HTML snippets:**
+**For URLs with specific standard tags:**
+```json
+{
+  "name": "test_accessibility",
+  "arguments": {
+    "target": "https://example.com",
+    "type": "url",
+    "level": "full",
+    "standards": ["wcag21aa", "wcag244", "section508.22.a", "EN-301-549"]
+  }
+}
+```
+
+**For HTML snippets (legacy wcagLevel still supported):**
 ```json
 {
   "name": "test_accessibility",
@@ -215,16 +291,30 @@ Test a website or HTML content for accessibility issues:
 }
 ```
 
+**For ADA compliance testing:**
+```json
+{
+  "name": "test_accessibility",
+  "arguments": {
+    "target": "https://example.com",
+    "type": "url",
+    "level": "full",
+    "standardPresets": ["ada"]
+  }
+}
+```
+
 #### 2. Test Website Accessibility
 
 Test entire websites by crawling multiple pages:
 
+**With standard presets:**
 ```json
 {
   "name": "test_website_accessibility",
   "arguments": {
     "baseUrl": "https://example.com",
-    "wcagLevel": "AA",
+    "standardPresets": ["wcag-aa", "section508"],
     "maxPages": 20,
     "maxDepth": 3,
     "concurrency": 3,
@@ -235,6 +325,32 @@ Test entire websites by crawling multiple pages:
 }
 ```
 
+**With specific standard tags:**
+```json
+{
+  "name": "test_website_accessibility",
+  "arguments": {
+    "baseUrl": "https://example.com",
+    "standards": ["wcag21aa", "wcag244", "EN-301-549"],
+    "maxPages": 10,
+    "maxDepth": 2
+  }
+}
+```
+
+**Legacy wcagLevel parameter (still supported):**
+```json
+{
+  "name": "test_website_accessibility",
+  "arguments": {
+    "baseUrl": "https://example.com",
+    "wcagLevel": "AA",
+    "maxPages": 20,
+    "maxDepth": 3
+  }
+}
+```
+
 **Key Features of Website Testing:**
 - 🕷️ **Automatic Crawling**: Discovers pages by following links
 - 📊 **Site-wide Reports**: Aggregated accessibility metrics across all pages  
@@ -263,7 +379,32 @@ Validate color combinations for WCAG compliance:
 #### 4. Get WCAG Rules (Full Mode Only)
 
 Retrieve information about WCAG accessibility rules:
+**Query rules by standard presets:**
+```json
+{
+  "name": "get_wcag_rules",
+  "arguments": {
+    "standardPresets": ["wcag-aa", "section508"],
+    "category": "color",
+    "search": "contrast",
+    "limit": 10
+  }
+}
+```
+
+**Query rules by specific standard tags:**
+```json
+{
+  "name": "get_wcag_rules",
+  "arguments": {
+    "standards": ["wcag21aa", "wcag244", "EN-301-549"],
+    "requireAll": true,
+    "limit": 20
+  }
+}
+```
 
+**Legacy wcagLevel parameter (still supported):**
 ```json
 {
   "name": "get_wcag_rules",

package/config/wcag-rules.json

@@ -158,67 +158,78 @@
       "title": "Color Contrast",
       "description": "Ensures the contrast between foreground and background colors meets WCAG 2 AA contrast ratio thresholds",
       "helpUrl": "https://dequeuniversity.com/rules/axe/4.6/color-contrast",
-      "successCriteria": "1.4.3"
+      "successCriteria": "1.4.3",
+      "applicableStandards": ["wcag2aa", "wcag21aa", "wcag22aa", "wcag143", "section508", "section508.22.g", "EN-301-549", "TTv5", "cat.color"]
     },
     "image-alt": {
       "title": "Images must have alternate text",
       "description": "Ensures <img> elements have alternate text or a role of none or presentation",
       "helpUrl": "https://dequeuniversity.com/rules/axe/4.6/image-alt",
-      "successCriteria": "1.1.1"
+      "successCriteria": "1.1.1",
+      "applicableStandards": ["wcag2a", "wcag21a", "wcag22a", "wcag111", "section508", "section508.22.a", "EN-301-549", "TTv5", "cat.text-alternatives"]
     },
     "label": {
       "title": "Form elements must have labels",
       "description": "Ensures every form element has a label",
       "helpUrl": "https://dequeuniversity.com/rules/axe/4.6/label",
-      "successCriteria": "1.3.1, 3.3.2, 4.1.2"
+      "successCriteria": "1.3.1, 3.3.2, 4.1.2",
+      "applicableStandards": ["wcag2a", "wcag21a", "wcag22a", "wcag131", "wcag332", "wcag412", "section508", "section508.22.n", "EN-301-549", "TTv5", "cat.forms"]
     },
     "link-name": {
       "title": "Links must have discernible text",
       "description": "Ensures links have discernible text",
       "helpUrl": "https://dequeuniversity.com/rules/axe/4.6/link-name",
-      "successCriteria": "2.4.4, 4.1.2"
+      "successCriteria": "2.4.4, 4.1.2",
+      "applicableStandards": ["wcag2a", "wcag21a", "wcag22a", "wcag244", "wcag412", "section508", "section508.22.a", "EN-301-549", "TTv5", "cat.name-role-value"]
     },
     "button-name": {
       "title": "Buttons must have discernible text",
       "description": "Ensures buttons have discernible text",
       "helpUrl": "https://dequeuniversity.com/rules/axe/4.6/button-name",
-      "successCriteria": "4.1.2"
+      "successCriteria": "4.1.2",
+      "applicableStandards": ["wcag2a", "wcag21a", "wcag22a", "wcag412", "section508", "section508.22.a", "EN-301-549", "TTv5", "cat.name-role-value"]
     },
     "heading-order": {
       "title": "Heading levels should only increase by one",
       "description": "Ensures the order of headings is semantically correct",
       "helpUrl": "https://dequeuniversity.com/rules/axe/4.6/heading-order",
-      "successCriteria": "1.3.1"
+      "successCriteria": "1.3.1",
+      "applicableStandards": ["wcag2a", "wcag21a", "wcag22a", "wcag131", "EN-301-549", "cat.semantics"]
     },
     "html-has-lang": {
       "title": "<html> element must have a lang attribute",
       "description": "Ensures every HTML document has a lang attribute",
       "helpUrl": "https://dequeuniversity.com/rules/axe/4.6/html-has-lang",
-      "successCriteria": "3.1.1"
+      "successCriteria": "3.1.1",
+      "applicableStandards": ["wcag2a", "wcag21a", "wcag22a", "wcag311", "section508", "section508.22.q", "EN-301-549", "TTv5", "cat.language"]
     },
     "aria-allowed-attr": {
       "title": "ARIA attributes must conform to valid names",
       "description": "Ensures ARIA attributes are allowed for an element's role",
       "helpUrl": "https://dequeuniversity.com/rules/axe/4.6/aria-allowed-attr",
-      "successCriteria": "4.1.2"
+      "successCriteria": "4.1.2",
+      "applicableStandards": ["wcag2a", "wcag21a", "wcag22a", "wcag412", "section508", "section508.22.a", "EN-301-549", "TTv5", "cat.aria"]
     },
     "aria-required-attr": {
       "title": "Required ARIA attributes must be provided",
       "description": "Ensures elements with ARIA roles have required ARIA attributes",
       "helpUrl": "https://dequeuniversity.com/rules/axe/4.6/aria-required-attr",
-      "successCriteria": "4.1.2"
+      "successCriteria": "4.1.2",
+      "applicableStandards": ["wcag2a", "wcag21a", "wcag22a", "wcag412", "section508", "section508.22.a", "EN-301-549", "TTv5", "cat.aria"]
     },
     "region": {
       "title": "All page content should be contained by landmarks",
       "description": "Ensures all page content is contained by landmarks",
       "helpUrl": "https://dequeuniversity.com/rules/axe/4.6/region",
-      "successCriteria": "1.3.1"
+      "successCriteria": "1.3.1",
+      "applicableStandards": ["wcag2a", "wcag21a", "wcag22a", "wcag131", "EN-301-549", "cat.keyboard"]
     },
     "target-size": {
       "title": "Ensure touch targets have sufficient size and spacing",
       "description": "Ensures touch targets are at least 24px by 24px",
       "helpUrl": "https://dequeuniversity.com/rules/axe/4.6/target-size",
-      "successCriteria": "2.5.8"
+      "successCriteria": "2.5.8",
+      "applicableStandards": ["wcag22aa", "wcag258", "EN-301-549", "cat.sensory-and-visual-cues"]
     }
   },
   "defaultSettings": {

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAuBA,KAAK,UAAU,GAAG,QAAQ,GAAG,MAAM,CAAC;AAEpC,UAAU,YAAY;IACpB,IAAI,EAAE,UAAU,CAAC;IACjB,aAAa,EAAE,OAAO,CAAC;CACxB;AAuCD;;;GAGG;AACH,qBAAa,sBAAsB;IACjC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAChD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAe;IAGtC,OAAO,CAAC,mBAAmB,CAAC,CAAsB;IAClD,OAAO,CAAC,mBAAmB,CAAC,CAAsB;IAClD,OAAO,CAAC,aAAa,CAAC,CAAgB;IACtC,OAAO,CAAC,0BAA0B,CAAC,CAA6B;gBAEpD,MAAM,GAAE,YAAoD;IAwBxE;;OAEG;IACH,OAAO,CAAC,sBAAsB;IAO9B;;OAEG;IACH,OAAO,CAAC,sBAAsB;IAO9B;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAOxB;;OAEG;IACH,OAAO,CAAC,6BAA6B;IAOrC;;OAEG;YACW,wBAAwB;IA8CtC;;OAEG;IACH,OAAO,CAAC,aAAa;IAwPrB;;OAEG;IACH,OAAO,CAAC,qBAAqB;IA0B7B;;OAEG;IACG,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;IAW1B;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAS/B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AA8BA,KAAK,UAAU,GAAG,QAAQ,GAAG,MAAM,CAAC;AAEpC,UAAU,YAAY;IACpB,IAAI,EAAE,UAAU,CAAC;IACjB,aAAa,EAAE,OAAO,CAAC;CACxB;AAuGD;;;GAGG;AACH,qBAAa,sBAAsB;IACjC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAChD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAe;IAGtC,OAAO,CAAC,mBAAmB,CAAC,CAAsB;IAClD,OAAO,CAAC,mBAAmB,CAAC,CAAsB;IAClD,OAAO,CAAC,aAAa,CAAC,CAAgB;IACtC,OAAO,CAAC,0BAA0B,CAAC,CAA6B;gBAEpD,MAAM,GAAE,YAAoD;IAwBxE;;OAEG;IACH,OAAO,CAAC,sBAAsB;IAO9B;;OAEG;IACH,OAAO,CAAC,sBAAsB;IAO9B;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAOxB;;OAEG;IACH,OAAO,CAAC,6BAA6B;IAOrC;;OAEG;YACW,wBAAwB;IA8CtC;;OAEG;IACH,OAAO,CAAC,aAAa;IA6VrB;;OAEG;IACH,OAAO,CAAC,qBAAqB;IA0B7B;;OAEG;IACG,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;IAW1B;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAS/B"}

package/dist/index.js

@@ -9,13 +9,56 @@ import { ColorContrastTester } from './tools/color-contrast.js';
 import { WCAGValidator } from './tools/wcag-validator.js';
 import { WebsiteAccessibilityTester } from './tools/website-accessibility-tester.js';
 // Import utilities
-import { Logger, BrowserManager } from './utils/index.js';
-// Validation schemas
+import { Logger, BrowserManager, combineStandardsAndPresets, shouldGenerateAdaGuidance, generateAdaGuidance } from './utils/index.js';
+// Shared auth schemas
+const CookieSchema = z.object({
+    name: z.string().min(1),
+    value: z.string().min(1),
+    domain: z.string().optional(),
+    path: z.string().default('/'),
+    expires: z.number().optional(),
+    httpOnly: z.boolean().default(false),
+    secure: z.boolean().default(true),
+    sameSite: z.enum(['Strict', 'Lax', 'None']).default('Lax')
+});
+const StorageStateSchema = z.object({
+    origin: z.string().url().optional(),
+    localStorage: z.record(z.string()).optional(),
+    sessionStorage: z.record(z.string()).optional()
+});
+const LoginStepSchema = z.object({
+    action: z.enum(['goto', 'type', 'click', 'waitForSelector', 'waitForNavigation', 'waitForTimeout']),
+    selector: z.string().optional(),
+    value: z.string().optional(),
+    timeout: z.number().optional()
+});
+const LoginFlowSchema = z.object({
+    loginUrl: z.string().url('Must be a valid login URL'),
+    steps: z.array(LoginStepSchema).min(1),
+    successSelector: z.string().optional(),
+    successUrlContains: z.string().optional()
+});
+const AuthSchema = z.object({
+    headers: z.record(z.string()).optional(),
+    cookies: z.array(CookieSchema).optional(),
+    storageState: z.array(StorageStateSchema).optional(),
+    loginFlow: LoginFlowSchema.optional(),
+    preNavigationScripts: z.array(z.string()).optional()
+});
+// Simplified validation schemas
 const TestAccessibilitySchema = z.object({
     target: z.string().min(1, 'Target URL or HTML is required'),
     type: z.enum(['url', 'html']).default('url'),
     level: z.enum(['basic', 'full']).default('basic'),
-    wcagLevel: z.enum(['A', 'AA', 'AAA']).default('AA')
+    auth: AuthSchema.optional(),
+    standards: z.array(z.string()).optional(),
+    standardPresets: z.array(z.enum([
+        'wcag-a', 'wcag-aa', 'wcag-aaa',
+        'section508', 'section508-full',
+        'en301549', 'trustedtester', 'rgaa',
+        'ada', 'best-practice', 'all-standards'
+    ])).optional(),
+    requireAll: z.boolean().default(true)
 });
 const ColorContrastSchema = z.object({
     foreground: z.string().min(1, 'Foreground color is required'),
@@ -24,14 +67,20 @@ const ColorContrastSchema = z.object({
     isBold: z.boolean().default(false)
 });
 const GetWCAGRulesSchema = z.object({
-    wcagLevel: z.enum(['A', 'AA', 'AAA']).optional(),
     category: z.string().optional(),
     search: z.string().optional(),
-    limit: z.number().min(1).max(50).default(20)
+    limit: z.number().min(1).max(50).default(20),
+    standards: z.array(z.string()).optional(),
+    standardPresets: z.array(z.enum([
+        'wcag-a', 'wcag-aa', 'wcag-aaa',
+        'section508', 'section508-full',
+        'en301549', 'trustedtester', 'rgaa',
+        'ada', 'best-practice', 'all-standards'
+    ])).optional(),
+    requireAll: z.boolean().default(true)
 });
 const TestWebsiteSchema = z.object({
     baseUrl: z.string().url('Must be a valid URL'),
-    wcagLevel: z.enum(['A', 'AA', 'AAA']).default('AA'),
     fullAnalysis: z.boolean().default(false),
     maxPages: z.number().min(1).max(100).default(20),
     maxDepth: z.number().min(1).max(5).default(3),
@@ -41,7 +90,17 @@ const TestWebsiteSchema = z.object({
     continueOnError: z.boolean().default(true),
     respectRobots: z.boolean().default(true),
     delay: z.number().min(0).max(10000).default(1000),
-    stayOnDomain: z.boolean().default(true)
+    stayOnDomain: z.boolean().default(true),
+    allowedDomains: z.array(z.string()).optional(),
+    auth: AuthSchema.optional(),
+    standards: z.array(z.string()).optional(),
+    standardPresets: z.array(z.enum([
+        'wcag-a', 'wcag-aa', 'wcag-aaa',
+        'section508', 'section508-full',
+        'en301549', 'trustedtester', 'rgaa',
+        'ada', 'best-practice', 'all-standards'
+    ])).optional(),
+    requireAll: z.boolean().default(true)
 });
 /**
  * Unified MCP server class for accessibility testing
@@ -65,7 +124,7 @@ export class AccessibilityMCPServer {
         this.browserManager = new BrowserManager();
         this.server = new Server({
             name: 'accessibility-mcp-server',
-            version: '1.0.7',
+            version: '1.0.9',
         }, {
             capabilities: {
                 tools: {},
@@ -157,7 +216,7 @@ export class AccessibilityMCPServer {
             const basicTools = [
                 {
                     name: 'test_accessibility',
-                    description: 'Test URL or HTML content for accessibility issues',
+                    description: 'Test URL or HTML content for accessibility issues using multiple standards (WCAG, Section 508, EN 301 549, etc.)',
                     inputSchema: {
                         type: 'object',
                         properties: {
@@ -177,11 +236,27 @@ export class AccessibilityMCPServer {
                                 default: 'basic',
                                 description: 'Testing depth level'
                             },
-                            wcagLevel: {
-                                type: 'string',
-                                enum: ['A', 'AA', 'AAA'],
-                                default: 'AA',
-                                description: 'WCAG compliance level'
+                            standards: {
+                                type: 'array',
+                                items: { type: 'string' },
+                                description: 'Specific standard tags to test (e.g., ["wcag2aa", "section508", "EN-301-549"])'
+                            },
+                            standardPresets: {
+                                type: 'array',
+                                items: {
+                                    type: 'string',
+                                    enum: ['wcag-a', 'wcag-aa', 'wcag-aaa', 'section508', 'section508-full', 'en301549', 'trustedtester', 'rgaa', 'ada', 'best-practice', 'all-standards']
+                                },
+                                description: 'Standard presets to test against (defaults to wcag-aa if not specified)'
+                            },
+                            requireAll: {
+                                type: 'boolean',
+                                default: true,
+                                description: 'Whether all standards must match (AND logic) or any standard (OR logic)'
+                            },
+                            auth: {
+                                type: 'object',
+                                description: 'Optional authentication context for protected pages'
                             }
                         },
                         required: ['target']
@@ -197,12 +272,6 @@ export class AccessibilityMCPServer {
                                 type: 'string',
                                 description: 'Base URL of the website to test'
                             },
-                            wcagLevel: {
-                                type: 'string',
-                                enum: ['A', 'AA', 'AAA'],
-                                default: 'AA',
-                                description: 'WCAG compliance level'
-                            },
                             fullAnalysis: {
                                 type: 'boolean',
                                 default: false,
@@ -260,6 +329,33 @@ export class AccessibilityMCPServer {
                                 type: 'boolean',
                                 default: true,
                                 description: 'Whether to restrict crawl to the main domain'
+                            },
+                            allowedDomains: {
+                                type: 'array',
+                                items: { type: 'string' },
+                                description: 'Additional domains allowed during crawl (e.g., IdP)'
+                            },
+                            standards: {
+                                type: 'array',
+                                items: { type: 'string' },
+                                description: 'Specific standard tags to test (e.g., [\"wcag2aa\", \"section508\"])'
+                            },
+                            standardPresets: {
+                                type: 'array',
+                                items: {
+                                    type: 'string',
+                                    enum: ['wcag-a', 'wcag-aa', 'wcag-aaa', 'section508', 'section508-full', 'en301549', 'trustedtester', 'rgaa', 'ada', 'best-practice', 'all-standards']
+                                },
+                                description: 'Standard presets to test against (defaults to wcag-aa)'
+                            },
+                            requireAll: {
+                                type: 'boolean',
+                                default: true,
+                                description: 'Whether all standards must match (AND logic)'
+                            },
+                            auth: {
+                                type: 'object',
+                                description: 'Optional authentication context for protected sites'
                             }
                         },
                         required: ['baseUrl']
@@ -299,15 +395,10 @@ export class AccessibilityMCPServer {
                 ...basicTools,
                 {
                     name: 'get_wcag_rules',
-                    description: 'Get information about WCAG accessibility rules',
+                    description: 'Get information about accessibility rules across multiple standards (WCAG, Section 508, EN 301 549, etc.)',
                     inputSchema: {
                         type: 'object',
                         properties: {
-                            wcagLevel: {
-                                type: 'string',
-                                enum: ['A', 'AA', 'AAA'],
-                                description: 'Filter rules by WCAG level'
-                            },
                             category: {
                                 type: 'string',
                                 description: 'Filter rules by category'
@@ -322,6 +413,24 @@ export class AccessibilityMCPServer {
                                 maximum: 50,
                                 default: 20,
                                 description: 'Maximum number of rules to return'
+                            },
+                            standards: {
+                                type: 'array',
+                                items: { type: 'string' },
+                                description: 'Specific standard tags to filter by'
+                            },
+                            standardPresets: {
+                                type: 'array',
+                                items: {
+                                    type: 'string',
+                                    enum: ['wcag-a', 'wcag-aa', 'wcag-aaa', 'section508', 'section508-full', 'en301549', 'trustedtester', 'rgaa', 'ada', 'best-practice', 'all-standards']
+                                },
+                                description: 'Standard presets to filter by'
+                            },
+                            requireAll: {
+                                type: 'boolean',
+                                default: true,
+                                description: 'Whether all standards must match (AND logic)'
                             }
                         }
                     }
@@ -334,12 +443,22 @@ export class AccessibilityMCPServer {
         // Handle tool calls with centralized error handling
         this.server.setRequestHandler(CallToolRequestSchema, async (request) => {
             const { name, arguments: args } = request.params;
-            this.logger.info(`Executing tool: ${name}`, { args });
+            const safeArgs = args && typeof args === 'object'
+                ? { ...args, auth: args?.auth ? '[redacted]' : undefined }
+                : args;
+            this.logger.info(`Executing tool: ${name}`, { args: safeArgs });
             let result;
             switch (name) {
                 case 'test_accessibility': {
                     const params = TestAccessibilitySchema.parse(args);
-                    result = await this.executeWithErrorHandling(() => this.getAccessibilityTester().testTarget(params), 'Accessibility test');
+                    result = await this.executeWithErrorHandling(async () => {
+                        const testResult = await this.getAccessibilityTester().testTarget(params);
+                        // Generate ADA guidance if ada preset is used
+                        if (params.standardPresets && shouldGenerateAdaGuidance(params.standardPresets)) {
+                            testResult.adaGuidance = generateAdaGuidance(testResult);
+                        }
+                        return testResult;
+                    }, 'Accessibility test');
                     break;
                 }
                 case 'check_color_contrast': {
@@ -357,7 +476,32 @@ export class AccessibilityMCPServer {
                         throw new McpError(ErrorCode.MethodNotFound, 'WCAG rules not available in simple mode');
                     }
                     const params = GetWCAGRulesSchema.parse(args || {});
-                    result = await this.executeWithErrorHandling(() => this.getWCAGValidator().getRules(params), 'WCAG rules retrieval');
+                    result = await this.executeWithErrorHandling(async () => {
+                        const validator = this.getWCAGValidator();
+                        // If standards or presets provided, use standards-based filtering
+                        if (params.standards || params.standardPresets) {
+                            const standards = combineStandardsAndPresets(params.standards, params.standardPresets);
+                            const rules = await validator.getRulesByStandards(standards, params.requireAll ?? true);
+                            // Apply additional filters
+                            let filteredRules = rules;
+                            if (params.category) {
+                                filteredRules = filteredRules.filter(rule => rule.categories.some(cat => cat.toLowerCase().includes(params.category.toLowerCase())));
+                            }
+                            if (params.search) {
+                                const searchLower = params.search.toLowerCase();
+                                filteredRules = filteredRules.filter(rule => rule.title.toLowerCase().includes(searchLower) ||
+                                    rule.description.toLowerCase().includes(searchLower) ||
+                                    rule.id.toLowerCase().includes(searchLower));
+                            }
+                            if (params.limit && filteredRules.length > params.limit) {
+                                filteredRules = filteredRules.slice(0, params.limit);
+                            }
+                            return filteredRules;
+                        }
+                        // Fallback to legacy getRules method
+                        const response = await validator.getRules(params);
+                        return response.data;
+                    }, 'WCAG rules retrieval');
                     break;
                 }
                 default:
@@ -434,7 +578,7 @@ const args = process.argv.slice(2);
 // Show help information
 if (args.includes('--help') || args.includes('-h')) {
     console.log(`
-Accessibility MCP Server v1.0.7
+Accessibility MCP Server v1.0.9
 A Model Context Protocol server for web accessibility testing with WCAG compliance.
 
 Usage:
@@ -469,7 +613,7 @@ For more information, visit: https://github.com/your-repo/accessibility-mcp
 }
 // Show version
 if (args.includes('--version') || args.includes('-v')) {
-    console.log('1.0.7');
+    console.log('1.0.9');
     process.exit(0);
 }
 // Set MCP mode environment variable when running as MCP server