diff --git a/.gitignore b/.gitignore
index 524f096..abc92aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,18 @@
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 replay_pid*
+
+# Secrets and local config
+*.pem
+.env
+.env.*
+**/application.yml.bak
+
+# Build outputs
+target/
+build/
+out/
+
+# IDE/editor
+.idea/
+.vscode/
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index d65100b..302602f 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -8,7 +8,6 @@
         <processorPath useClasspath="false">
           <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.projectlombok/lombok/1.18.42/8365263844ebb62398e0dc33057ba10ba472d3b8/lombok-1.18.42.jar" />
         </processorPath>
-        <module name="MCPService.main" />
       </profile>
       <profile name="Annotation profile for ApiGateway" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
@@ -17,10 +16,13 @@
         <processorPath useClasspath="false">
           <entry name="$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.42/lombok-1.18.42.jar" />
         </processorPath>
-        <module name="apigateway" />
-        <module name="AIService" />
       </profile>
     </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="AIService" target="21" />
+      <module name="apigateway" target="21" />
+      <module name="Dummy.main" target="21" />
+    </bytecodeTargetLevel>
   </component>
   <component name="JavacSettings">
     <option name="ADDITIONAL_OPTIONS_OVERRIDE">
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 082d1c4..f705c8a 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,9 +2,6 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/Dummy.main.iml" filepath="$PROJECT_DIR$/.idea/modules/Dummy.main.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/LoggingService.main.iml" filepath="$PROJECT_DIR$/.idea/modules/LoggingService.main.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/MCPService.main.iml" filepath="$PROJECT_DIR$/.idea/modules/MCPService.main.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/SentientGate.iml" filepath="$PROJECT_DIR$/.idea/SentientGate.iml" />
     </modules>
   </component>
diff --git a/.idea/modules/MCPService.main.iml b/.idea/modules/MCPService.main.iml
deleted file mode 100644
index 0deaab9..0000000
--- a/.idea/modules/MCPService.main.iml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4">
-  <component name="AdditionalModuleElements">
-    <content url="file://$MODULE_DIR$/../../MCPService/build/generated/sources/annotationProcessor/java/main">
-      <sourceFolder url="file://$MODULE_DIR$/../../MCPService/build/generated/sources/annotationProcessor/java/main" isTestSource="false" generated="true" />
-    </content>
-  </component>
-</module>
\ No newline at end of file
diff --git a/AIService/src/main/java/edu/pict/dtos/AnomalyDetectionRequest.java b/AIService/src/main/java/edu/pict/dtos/AnomalyDetectionRequest.java
index 9b5bbad..888fc55 100644
--- a/AIService/src/main/java/edu/pict/dtos/AnomalyDetectionRequest.java
+++ b/AIService/src/main/java/edu/pict/dtos/AnomalyDetectionRequest.java
@@ -1,5 +1,6 @@
 package edu.pict.dtos;
 
+import java.util.List;
 import lombok.*;
 
 @Data
@@ -8,6 +9,9 @@
 @Builder
 public class AnomalyDetectionRequest {
 
+    private String uuid;
+    private List<BehaviorLogEvent> history;
+
     private double failureRate;
     private int requestsPerMinute;
     private int uniqueRoutesAccessed;
diff --git a/AIService/src/main/java/edu/pict/dtos/BehaviorLogEvent.java b/AIService/src/main/java/edu/pict/dtos/BehaviorLogEvent.java
new file mode 100644
index 0000000..ec1650f
--- /dev/null
+++ b/AIService/src/main/java/edu/pict/dtos/BehaviorLogEvent.java
@@ -0,0 +1,25 @@
+package edu.pict.dtos;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class BehaviorLogEvent {
+    private String uuid;
+    private String path;
+    private String method;
+    private String routeId;
+    private String decision;
+    private long latencyMs;
+    private String queryParams;
+    private String clientIp;
+    private int statusCode;
+    private long requestSize;
+    private long timestamp;
+    private String userAgent;
+}
diff --git a/AIService/src/main/java/edu/pict/service/AnomalyDetectionService.java b/AIService/src/main/java/edu/pict/service/AnomalyDetectionService.java
index 0372001..8d5cac8 100644
--- a/AIService/src/main/java/edu/pict/service/AnomalyDetectionService.java
+++ b/AIService/src/main/java/edu/pict/service/AnomalyDetectionService.java
@@ -2,6 +2,9 @@
 
 import edu.pict.dtos.AnomalyDetectionRequest;
 import edu.pict.dtos.AnomalyDetectionResponse;
+import edu.pict.dtos.BehaviorLogEvent;
+import java.util.List;
+import java.util.Locale;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -16,9 +19,9 @@ public class AnomalyDetectionService {
     public AnomalyDetectionResponse analyze(AnomalyDetectionRequest req) {
 
         long start = System.currentTimeMillis();
+        FeatureVector features = FeatureVector.from(req);
 
-        // Convert features → model prompt OR vector
-        String prompt = buildPrompt(req);
+        String prompt = buildPrompt(features);
 
         double score = ollamaService.predictAnomalyScore(prompt);
 
@@ -32,7 +35,7 @@ public AnomalyDetectionResponse analyze(AnomalyDetectionRequest req) {
                 .build();
     }
 
-    private String buildPrompt(AnomalyDetectionRequest req) {
+    private String buildPrompt(FeatureVector vector) {
         return """
         You are an anomaly detection model.
         Given numeric behavior signals, return ONLY a number between 0 and 1.
@@ -45,11 +48,71 @@ private String buildPrompt(AnomalyDetectionRequest req) {
         routeSensitivity=%s
         """
                 .formatted(
-                        req.getFailureRate(),
-                        req.getRequestsPerMinute(),
-                        req.getUniqueRoutesAccessed(),
-                        req.getJwtReuseCount(),
-                        req.getIpReputationScore(),
-                        req.getRouteSensitivity());
+                        vector.failureRate(),
+                        vector.requestsPerMinute(),
+                        vector.uniqueRoutesAccessed(),
+                        vector.jwtReuseCount(),
+                        vector.ipReputationScore(),
+                        vector.routeSensitivity());
+    }
+
+    private record FeatureVector(
+            double failureRate,
+            int requestsPerMinute,
+            int uniqueRoutesAccessed,
+            int jwtReuseCount,
+            double ipReputationScore,
+            String routeSensitivity) {
+
+        private static FeatureVector from(AnomalyDetectionRequest req) {
+            List<BehaviorLogEvent> history = req.getHistory();
+            if (history != null && !history.isEmpty()) {
+                long errors = history.stream().filter(log -> log.getStatusCode() >= 400).count();
+                long distinctRoutes =
+                        history.stream().map(BehaviorLogEvent::getPath).filter(p -> p != null).distinct().count();
+                String sensitivity =
+                        history.stream()
+                                        .map(BehaviorLogEvent::getPath)
+                                        .filter(path -> path != null)
+                                        .anyMatch(
+                                                path ->
+                                                        path.contains("/admin")
+                                                                || path.contains("/internal")
+                                                                || path.contains("/mcp"))
+                                ? "HIGH"
+                                : "MEDIUM";
+
+                return new FeatureVector(
+                        (double) errors / history.size(),
+                        history.size(),
+                        Math.toIntExact(distinctRoutes),
+                        0,
+                        0.5,
+                        sanitizeSensitivity(sensitivity));
+            }
+
+            return new FeatureVector(
+                    clamp(req.getFailureRate(), 0.0, 1.0),
+                    Math.max(req.getRequestsPerMinute(), 0),
+                    Math.max(req.getUniqueRoutesAccessed(), 0),
+                    Math.max(req.getJwtReuseCount(), 0),
+                    clamp(req.getIpReputationScore(), 0.0, 1.0),
+                    sanitizeSensitivity(req.getRouteSensitivity()));
+        }
+    }
+
+    private static String sanitizeSensitivity(String sensitivity) {
+        if (sensitivity == null) {
+            return "MEDIUM";
+        }
+        String normalized = sensitivity.trim().toUpperCase(Locale.ROOT);
+        return switch (normalized) {
+            case "LOW", "MEDIUM", "HIGH" -> normalized;
+            default -> "MEDIUM";
+        };
+    }
+
+    private static double clamp(double value, double min, double max) {
+        return Math.max(min, Math.min(max, value));
     }
 }
diff --git a/ApiGateway/src/main/java/edu/pict/apigateway/controller/ManagementController.java b/ApiGateway/src/main/java/edu/pict/apigateway/controller/ManagementController.java
index b277b6a..80ddf35 100644
--- a/ApiGateway/src/main/java/edu/pict/apigateway/controller/ManagementController.java
+++ b/ApiGateway/src/main/java/edu/pict/apigateway/controller/ManagementController.java
@@ -13,13 +13,14 @@
 public class ManagementController {
 
     private final ReactiveStringRedisTemplate redisTemplate;
-    private static final String BLACKLIST_PREFIX = "blacklist:";
+    private static final String UUID_BLACKLIST_PREFIX = "blacklist:uuid:";
+    private static final String LEGACY_BLACKLIST_PREFIX = "blacklist:";
 
     @GetMapping
     public Mono<ResponseEntity<List<String>>> getBlacklist() {
         return redisTemplate
-                .keys(BLACKLIST_PREFIX + "*")
-                .map(key -> key.substring(BLACKLIST_PREFIX.length()))
+                .keys(UUID_BLACKLIST_PREFIX + "*")
+                .map(key -> key.substring(UUID_BLACKLIST_PREFIX.length()))
                 .collectList()
                 .map(ResponseEntity::ok);
     }
@@ -28,14 +29,15 @@ public Mono<ResponseEntity<List<String>>> getBlacklist() {
     public Mono<ResponseEntity<Void>> block(@PathVariable String uuid) {
         return redisTemplate
                 .opsForValue()
-                .set(BLACKLIST_PREFIX + uuid, "true")
+                .set(UUID_BLACKLIST_PREFIX + uuid, "true")
                 .map(success -> ResponseEntity.ok().<Void>build());
     }
 
     @DeleteMapping("/{uuid}")
     public Mono<ResponseEntity<Void>> unblock(@PathVariable String uuid) {
         return redisTemplate
-                .delete(BLACKLIST_PREFIX + uuid)
+                .delete(UUID_BLACKLIST_PREFIX + uuid)
+                .flatMap(count -> redisTemplate.delete(LEGACY_BLACKLIST_PREFIX + uuid))
                 .map(count -> ResponseEntity.ok().<Void>build());
     }
 }
diff --git a/ApiGateway/src/main/java/edu/pict/apigateway/events/DefaultGatewayEventFactory.java b/ApiGateway/src/main/java/edu/pict/apigateway/events/DefaultGatewayEventFactory.java
new file mode 100644
index 0000000..b9d0bd8
--- /dev/null
+++ b/ApiGateway/src/main/java/edu/pict/apigateway/events/DefaultGatewayEventFactory.java
@@ -0,0 +1,50 @@
+package edu.pict.apigateway.events;
+
+import edu.pict.apigateway.kafkaEvent.LogEvent;
+import edu.pict.apigateway.kafkaEvent.SecurityAlertEvent;
+import org.springframework.stereotype.Component;
+
+@Component
+public class DefaultGatewayEventFactory implements GatewayEventFactory {
+
+    @Override
+    public LogEvent buildLogEvent(RequestContext context, int statusCode, long latencyMs) {
+        return LogEvent.builder()
+                .uuid(context.uuid())
+                .path(context.path())
+                .method(context.method())
+                .routeId(context.routeId())
+                .decision("ALLOWED")
+                .latencyMs(latencyMs)
+                .queryParams(context.queryParams())
+                .clientIp(context.clientIp())
+                .statusCode(statusCode)
+                .requestSize(context.requestSize())
+                .timestamp(context.timestamp())
+                .userAgent(context.userAgent())
+                .build();
+    }
+
+    @Override
+    public SecurityAlertEvent buildSecurityAlert(
+            RequestContext context, int statusCode, String reasonPhrase) {
+        return SecurityAlertEvent.builder()
+                .uuid(context.uuid())
+                .errorCode(statusCode)
+                .reason(reasonPhrase)
+                .attemptedPath(context.path())
+                .method(context.method())
+                .userAgent(context.userAgent())
+                .clientIp(context.clientIp())
+                .alertSeverity(determineSeverity(statusCode))
+                .timestamp(context.timestamp())
+                .build();
+    }
+
+    private String determineSeverity(int code) {
+        if (code >= 500) return "HIGH";
+        if (code == 429 || code == 403 || code == 401) return "MEDIUM";
+        return "LOW";
+    }
+}
+
diff --git a/ApiGateway/src/main/java/edu/pict/apigateway/events/DefaultRequestContextExtractor.java b/ApiGateway/src/main/java/edu/pict/apigateway/events/DefaultRequestContextExtractor.java
new file mode 100644
index 0000000..a4d68b7
--- /dev/null
+++ b/ApiGateway/src/main/java/edu/pict/apigateway/events/DefaultRequestContextExtractor.java
@@ -0,0 +1,46 @@
+package edu.pict.apigateway.events;
+
+import edu.pict.apigateway.service.IpService;
+import edu.pict.apigateway.util.Constants;
+import lombok.RequiredArgsConstructor;
+import org.springframework.cloud.gateway.route.Route;
+import org.springframework.cloud.gateway.support.ServerWebExchangeUtils;
+import org.springframework.stereotype.Component;
+import org.springframework.web.server.ServerWebExchange;
+
+@Component
+@RequiredArgsConstructor
+public class DefaultRequestContextExtractor implements RequestContextExtractor {
+
+    private final IpService ipService;
+
+    @Override
+    public RequestContext extract(ServerWebExchange exchange) {
+        String uuid = exchange.getRequest().getHeaders().getFirst(Constants.VISITOR_ID);
+        String path = exchange.getRequest().getURI().getPath();
+        String method = exchange.getRequest().getMethod().toString();
+        String queryParams = exchange.getRequest().getQueryParams().toString();
+        long requestSize = exchange.getRequest().getHeaders().getContentLength();
+        String userAgent = exchange.getRequest().getHeaders().getFirst("User-Agent");
+        String remoteAddress =
+                exchange.getRequest().getRemoteAddress() != null
+                        ? exchange.getRequest().getRemoteAddress().getAddress().getHostAddress()
+                        : null;
+        String clientIp = ipService.resolveClientIp(exchange.getRequest().getHeaders(), remoteAddress);
+
+        Route route = exchange.getAttribute(ServerWebExchangeUtils.GATEWAY_ROUTE_ATTR);
+        String routeId = (route != null) ? route.getId() : "unknown";
+
+        return new RequestContext(
+                uuid,
+                path,
+                method,
+                routeId,
+                queryParams,
+                Math.max(requestSize, 0),
+                clientIp,
+                userAgent,
+                System.currentTimeMillis());
+    }
+}
+
diff --git a/ApiGateway/src/main/java/edu/pict/apigateway/events/GatewayEventFactory.java b/ApiGateway/src/main/java/edu/pict/apigateway/events/GatewayEventFactory.java
new file mode 100644
index 0000000..f85d8cf
--- /dev/null
+++ b/ApiGateway/src/main/java/edu/pict/apigateway/events/GatewayEventFactory.java
@@ -0,0 +1,11 @@
+package edu.pict.apigateway.events;
+
+import edu.pict.apigateway.kafkaEvent.LogEvent;
+import edu.pict.apigateway.kafkaEvent.SecurityAlertEvent;
+
+public interface GatewayEventFactory {
+    LogEvent buildLogEvent(RequestContext context, int statusCode, long latencyMs);
+
+    SecurityAlertEvent buildSecurityAlert(RequestContext context, int statusCode, String reasonPhrase);
+}
+
diff --git a/ApiGateway/src/main/java/edu/pict/apigateway/events/RequestContext.java b/ApiGateway/src/main/java/edu/pict/apigateway/events/RequestContext.java
new file mode 100644
index 0000000..0651e62
--- /dev/null
+++ b/ApiGateway/src/main/java/edu/pict/apigateway/events/RequestContext.java
@@ -0,0 +1,13 @@
+package edu.pict.apigateway.events;
+
+public record RequestContext(
+        String uuid,
+        String path,
+        String method,
+        String routeId,
+        String queryParams,
+        long requestSize,
+        String clientIp,
+        String userAgent,
+        long timestamp) {}
+
diff --git a/ApiGateway/src/main/java/edu/pict/apigateway/events/RequestContextExtractor.java b/ApiGateway/src/main/java/edu/pict/apigateway/events/RequestContextExtractor.java
new file mode 100644
index 0000000..d4a88fe
--- /dev/null
+++ b/ApiGateway/src/main/java/edu/pict/apigateway/events/RequestContextExtractor.java
@@ -0,0 +1,8 @@
+package edu.pict.apigateway.events;
+
+import org.springframework.web.server.ServerWebExchange;
+
+public interface RequestContextExtractor {
+    RequestContext extract(ServerWebExchange exchange);
+}
+
diff --git a/ApiGateway/src/main/java/edu/pict/apigateway/filters/global/BlacklistFilter.java b/ApiGateway/src/main/java/edu/pict/apigateway/filters/global/BlacklistFilter.java
index 0af523b..78daf6a 100644
--- a/ApiGateway/src/main/java/edu/pict/apigateway/filters/global/BlacklistFilter.java
+++ b/ApiGateway/src/main/java/edu/pict/apigateway/filters/global/BlacklistFilter.java
@@ -1,5 +1,6 @@
 package edu.pict.apigateway.filters.global;
 
+import edu.pict.apigateway.service.IpService;
 import edu.pict.apigateway.util.Constants;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -18,7 +19,10 @@
 public class BlacklistFilter implements GlobalFilter, Ordered {
 
     private final ReactiveStringRedisTemplate reactiveStringRedisTemplate;
-    private static final String BLACKLIST_PREFIX = "blacklist:";
+    private final IpService ipService;
+    private static final String LEGACY_BLACKLIST_PREFIX = "blacklist:";
+    private static final String UUID_BLACKLIST_PREFIX = "blacklist:uuid:";
+    private static final String IP_BLACKLIST_PREFIX = "blacklist:ip:";
 
     @Override
     public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
@@ -29,16 +33,49 @@ public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
             return exchange.getResponse().setComplete();
         }
 
+        String remoteAddress =
+                exchange.getRequest().getRemoteAddress() != null
+                        ? exchange.getRequest().getRemoteAddress().getAddress().getHostAddress()
+                        : null;
+        String clientIp =
+                ipService.resolveClientIp(exchange.getRequest().getHeaders(), remoteAddress);
+
         return reactiveStringRedisTemplate
-                .hasKey(BLACKLIST_PREFIX + uuid)
+                .hasKey(UUID_BLACKLIST_PREFIX + uuid)
                 .flatMap(
-                        isBlocked -> {
-                            if (Boolean.TRUE.equals(isBlocked)) {
-                                log.warn("Request blocked: UUID {} is on the blacklist.", uuid);
+                        isBlockedByUuid -> {
+                            if (Boolean.TRUE.equals(isBlockedByUuid)) {
+                                log.warn("Request blocked: UUID {} is on blacklist.", uuid);
                                 exchange.getResponse().setStatusCode(HttpStatus.FORBIDDEN);
                                 return exchange.getResponse().setComplete();
                             }
-                            return chain.filter(exchange);
+
+                            return reactiveStringRedisTemplate.hasKey(LEGACY_BLACKLIST_PREFIX + uuid);
+                        })
+                .flatMap(
+                        isBlockedLegacy -> {
+                            if (Boolean.TRUE.equals(isBlockedLegacy)) {
+                                log.warn("Request blocked: UUID {} is on legacy blacklist.", uuid);
+                                exchange.getResponse().setStatusCode(HttpStatus.FORBIDDEN);
+                                return exchange.getResponse().setComplete();
+                            }
+                            if (clientIp == null || clientIp.isBlank()) {
+                                return chain.filter(exchange);
+                            }
+                            return reactiveStringRedisTemplate
+                                    .hasKey(IP_BLACKLIST_PREFIX + clientIp)
+                                    .flatMap(
+                                            isBlockedByIp -> {
+                                                if (Boolean.TRUE.equals(isBlockedByIp)) {
+                                                    log.warn(
+                                                            "Request blocked: IP {} is on blacklist.",
+                                                            clientIp);
+                                                    exchange.getResponse()
+                                                            .setStatusCode(HttpStatus.FORBIDDEN);
+                                                    return exchange.getResponse().setComplete();
+                                                }
+                                                return chain.filter(exchange);
+                                            });
                         });
     }
 
diff --git a/ApiGateway/src/main/java/edu/pict/apigateway/filters/global/JwtExtractionFilter.java b/ApiGateway/src/main/java/edu/pict/apigateway/filters/global/JwtExtractionFilter.java
index 20579ba..1323e73 100644
--- a/ApiGateway/src/main/java/edu/pict/apigateway/filters/global/JwtExtractionFilter.java
+++ b/ApiGateway/src/main/java/edu/pict/apigateway/filters/global/JwtExtractionFilter.java
@@ -2,6 +2,7 @@
 
 import static edu.pict.apigateway.util.Constants.*;
 
+import edu.pict.apigateway.security.RouteAccessPolicy;
 import edu.pict.apigateway.service.JwtBlacklistService;
 import edu.pict.apigateway.service.JwtService;
 import io.jsonwebtoken.Claims;
@@ -21,14 +22,19 @@ public class JwtExtractionFilter implements GlobalFilter, Ordered {
 
     private final JwtService jwtService;
     private final JwtBlacklistService jwtBlacklistService;
+    private final RouteAccessPolicy routeAccessPolicy;
 
     @Override
     public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
+        String requestPath = exchange.getRequest().getPath().value();
 
         String authHeader = exchange.getRequest().getHeaders().getFirst(HttpHeaders.AUTHORIZATION);
 
-        // ✅ 1️⃣ If no JWT → directly continue (public endpoint)
+        // Require JWT for protected paths.
         if (authHeader == null || !authHeader.startsWith("Bearer ")) {
+            if (routeAccessPolicy.requiresAuthentication(requestPath)) {
+                return reject(exchange, "MISSING_JWT");
+            }
             return chain.filter(exchange);
         }
 
diff --git a/ApiGateway/src/main/java/edu/pict/apigateway/filters/global/SentientGateFilter.java b/ApiGateway/src/main/java/edu/pict/apigateway/filters/global/SentientGateFilter.java
index 88f1b7d..116a17b 100644
--- a/ApiGateway/src/main/java/edu/pict/apigateway/filters/global/SentientGateFilter.java
+++ b/ApiGateway/src/main/java/edu/pict/apigateway/filters/global/SentientGateFilter.java
@@ -1,16 +1,15 @@
 package edu.pict.apigateway.filters.global;
 
 import edu.pict.apigateway.config.kafka.KafkaTopics;
+import edu.pict.apigateway.events.GatewayEventFactory;
+import edu.pict.apigateway.events.RequestContext;
+import edu.pict.apigateway.events.RequestContextExtractor;
 import edu.pict.apigateway.kafkaEvent.LogEvent;
 import edu.pict.apigateway.kafkaEvent.SecurityAlertEvent;
-import edu.pict.apigateway.util.Constants;
-import java.util.Objects;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.gateway.filter.GatewayFilterChain;
 import org.springframework.cloud.gateway.filter.GlobalFilter;
-import org.springframework.cloud.gateway.route.Route;
-import org.springframework.cloud.gateway.support.ServerWebExchangeUtils;
 import org.springframework.core.Ordered;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.HttpStatusCode;
@@ -25,6 +24,8 @@
 public class SentientGateFilter implements GlobalFilter, Ordered {
 
     private final KafkaTemplate<String, Object> kafkaTemplate;
+    private final RequestContextExtractor requestContextExtractor;
+    private final GatewayEventFactory gatewayEventFactory;
 
     @Override
     public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
@@ -43,90 +44,34 @@ public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
                                                     ? ((HttpStatus) status).getReasonPhrase()
                                                     : "Unknown";
 
-                                    String uuid =
-                                            exchange.getRequest()
-                                                    .getHeaders()
-                                                    .getFirst(Constants.VISITOR_ID);
-                                    String path = exchange.getRequest().getURI().getPath();
-                                    String method = exchange.getRequest().getMethod().toString();
-                                    String queryParams =
-                                            exchange.getRequest().getQueryParams().toString();
-                                    long requestSize =
-                                            exchange.getRequest().getHeaders().getContentLength();
-                                    String clientIp =
-                                            Objects.requireNonNull(
-                                                            exchange.getRequest()
-                                                                    .getRemoteAddress())
-                                                    .getAddress()
-                                                    .getHostAddress();
-                                    String userAgent =
-                                            exchange.getRequest()
-                                                    .getHeaders()
-                                                    .getFirst("User-Agent");
+                                    RequestContext context = requestContextExtractor.extract(exchange);
 
-                                    Route route =
-                                            exchange.getAttribute(
-                                                    ServerWebExchangeUtils.GATEWAY_ROUTE_ATTR);
-                                    String routeId = (route != null) ? route.getId() : "unknown";
+                                    if (context.uuid() == null || context.uuid().isBlank()) {
+                                        log.warn("Skipping event publishing because visitor UUID is missing");
+                                        return;
+                                    }
 
-                                    // 1. General Pipeline: Always log the history
                                     LogEvent logEvent =
-                                            LogEvent.builder()
-                                                    .uuid(uuid)
-                                                    .path(path)
-                                                    .method(method)
-                                                    .routeId(routeId)
-                                                    .decision("ALLOWED") // In this global filter,
-                                                    // it's generally allowed
-                                                    .latencyMs(duration)
-                                                    .queryParams(queryParams)
-                                                    .clientIp(clientIp)
-                                                    .statusCode(statusCode)
-                                                    .requestSize(requestSize > 0 ? requestSize : 0)
-                                                    .timestamp(System.currentTimeMillis())
-                                                    .userAgent(userAgent)
-                                                    .build();
-
-                                    assert uuid != null;
-                                    kafkaTemplate.send(
-                                            KafkaTopics.USER_LOGS.topic(), uuid, logEvent);
+                                            gatewayEventFactory.buildLogEvent(context, statusCode, duration);
+                                    kafkaTemplate.send(KafkaTopics.USER_LOGS.topic(), context.uuid(), logEvent);
 
-                                    // 2. Security Pipeline: Trigger for non-200s (Redirection,
-                                    // Client/Server
-                                    // Errors)
                                     if (statusCode < 200 || statusCode >= 300) {
                                         SecurityAlertEvent alertEvent =
-                                                SecurityAlertEvent.builder()
-                                                        .uuid(uuid)
-                                                        .errorCode(statusCode)
-                                                        .reason(reasonPhrase)
-                                                        .attemptedPath(path)
-                                                        .method(method)
-                                                        .userAgent(userAgent)
-                                                        .clientIp(clientIp)
-                                                        .alertSeverity(
-                                                                determineSeverity(statusCode))
-                                                        .timestamp(System.currentTimeMillis())
-                                                        .build();
+                                                gatewayEventFactory.buildSecurityAlert(
+                                                        context, statusCode, reasonPhrase);
 
                                         kafkaTemplate.send(
                                                 KafkaTopics.SECURITY_EVENTS.topic(),
-                                                uuid,
+                                                context.uuid(),
                                                 alertEvent);
                                         log.warn(
                                                 "Security Event: Sent alert for UUID {} due to status {}",
-                                                uuid,
+                                                context.uuid(),
                                                 statusCode);
                                     }
                                 }));
     }
 
-    private String determineSeverity(int code) {
-        if (code >= 500) return "HIGH";
-        if (code == 429 || code == 403 || code == 401) return "MEDIUM";
-        return "LOW";
-    }
-
     @Override
     public int getOrder() {
         return Ordered.LOWEST_PRECEDENCE;
diff --git a/ApiGateway/src/main/java/edu/pict/apigateway/security/RouteAccessPolicy.java b/ApiGateway/src/main/java/edu/pict/apigateway/security/RouteAccessPolicy.java
new file mode 100644
index 0000000..cb828f3
--- /dev/null
+++ b/ApiGateway/src/main/java/edu/pict/apigateway/security/RouteAccessPolicy.java
@@ -0,0 +1,10 @@
+package edu.pict.apigateway.security;
+
+public interface RouteAccessPolicy {
+    boolean isPublicPath(String path);
+
+    default boolean requiresAuthentication(String path) {
+        return !isPublicPath(path);
+    }
+}
+
diff --git a/ApiGateway/src/main/java/edu/pict/apigateway/security/StaticRouteAccessPolicy.java b/ApiGateway/src/main/java/edu/pict/apigateway/security/StaticRouteAccessPolicy.java
new file mode 100644
index 0000000..24d6521
--- /dev/null
+++ b/ApiGateway/src/main/java/edu/pict/apigateway/security/StaticRouteAccessPolicy.java
@@ -0,0 +1,26 @@
+package edu.pict.apigateway.security;
+
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+import org.springframework.util.AntPathMatcher;
+
+@Component
+@RequiredArgsConstructor
+public class StaticRouteAccessPolicy implements RouteAccessPolicy {
+
+    private static final List<String> PUBLIC_PATTERNS =
+            List.of(
+                    "/api/auth/**",
+                    "/actuator/health",
+                    "/actuator/info",
+                    "/favicon.ico");
+
+    private final AntPathMatcher pathMatcher = new AntPathMatcher();
+
+    @Override
+    public boolean isPublicPath(String path) {
+        return PUBLIC_PATTERNS.stream().anyMatch(pattern -> pathMatcher.match(pattern, path));
+    }
+}
+
diff --git a/ApiGateway/src/main/java/edu/pict/apigateway/service/IpService.java b/ApiGateway/src/main/java/edu/pict/apigateway/service/IpService.java
index 351ac9f..d2fdb3f 100644
--- a/ApiGateway/src/main/java/edu/pict/apigateway/service/IpService.java
+++ b/ApiGateway/src/main/java/edu/pict/apigateway/service/IpService.java
@@ -14,23 +14,23 @@ public class IpService {
     private static final String X_FORWARDED_FOR = "X-Forwarded-For";
 
     public String resolveClientIp(HttpHeaders headers, String remoteAddress) {
+        boolean trustForwardedHeaders = isTrustedProxy(remoteAddress);
 
-        // 1️⃣ X-Forwarded-For (first IP only)
-        List<String> xffHeaders = headers.get(X_FORWARDED_FOR);
-        if (xffHeaders != null && !xffHeaders.isEmpty()) {
-            String firstIp = xffHeaders.get(0).split(",")[0].trim();
-            if (isValidIp(firstIp)) {
-                return firstIp;
+        if (trustForwardedHeaders) {
+            List<String> xffHeaders = headers.get(X_FORWARDED_FOR);
+            if (xffHeaders != null && !xffHeaders.isEmpty()) {
+                String firstIp = xffHeaders.get(0).split(",")[0].trim();
+                if (isValidIp(firstIp)) {
+                    return firstIp;
+                }
             }
-        }
 
-        // 2️⃣X-Real-IP
-        String realIp = headers.getFirst("X-Real-IP");
-        if (isValidIp(realIp)) {
-            return realIp;
+            String realIp = headers.getFirst("X-Real-IP");
+            if (isValidIp(realIp)) {
+                return realIp;
+            }
         }
 
-        // 3️⃣Fallback to remote address
         if (isValidIp(remoteAddress)) {
             return remoteAddress;
         }
@@ -49,4 +49,18 @@ private boolean isValidIp(String ip) {
             return false;
         }
     }
+
+    private boolean isTrustedProxy(String remoteAddress) {
+        if (!isValidIp(remoteAddress)) {
+            return false;
+        }
+        try {
+            InetAddress address = InetAddress.getByName(remoteAddress);
+            return address.isLoopbackAddress()
+                    || address.isSiteLocalAddress()
+                    || address.isAnyLocalAddress();
+        } catch (UnknownHostException ex) {
+            return false;
+        }
+    }
 }
diff --git a/ApiGateway/src/main/resources/application.yml b/ApiGateway/src/main/resources/application.yml
index b51f5fb..a227237 100644
--- a/ApiGateway/src/main/resources/application.yml
+++ b/ApiGateway/src/main/resources/application.yml
@@ -114,10 +114,10 @@ eureka:
 
 sentinel:
   security:
-    secret-key: asbdfhabsdfhnjsndjnjdsncnsadncaiusdhfiuwhe7ryh
+    secret-key: ${SENTINEL_SECURITY_SECRET_KEY}
 
 jwt:
-  secret-key: asbdfhabsdfhnjsndjnjdsncnsadncaiusdhfiuwhe7ryhasbdfhabsdfhnjsndjnjdsncnsadncaiusdhfiuwhe7ryhasbdfhabsdfhnjsndjnjdsncnsadncaiusdhfiuwhe7ryhasbdfhabsdfhnjsndjnjdsncnsadncaiusdhfiuwhe7ryhasbdfhabsdfhnjsndjnjdsncnsadncaiusdhfiuwhe7ryhasbdfhabsdfhnjsndjnjdsncnsadncaiusdhfiuwhe7ryhasbdfhabsdfhnjsndjnjdsncnsadncaiusdhfiuwhe7ryhasbdfhabsdfhnjsndjnjdsncnsadncaiusdhfiuwhe7ryhasbdfhabsdfhnjsndjnjdsncnsadncaiusdhfiuwhe7ryhasbdfhabsdfhnjsndjnjdsncnsadncaiusdhfiuwhe7ryhasbdfhabsdfhnjsndjnjdsncnsadncaiusdhfiuwhe7ryh
+  secret-key: ${JWT_SECRET_KEY}
 
 logging:
   level:
diff --git a/ApiGateway/src/main/resources/application.yml.bak b/ApiGateway/src/main/resources/application.yml.bak
deleted file mode 100644
index 716515c..0000000
--- a/ApiGateway/src/main/resources/application.yml.bak
+++ /dev/null
@@ -1,83 +0,0 @@
-server:
-  port: 8079
-spring:
-  data:
-    redis:
-      host: localhost
-      port: 6379
-  cloud:
-    gateway:
-      server:
-        webflux:
-          routes:
-            - id: user-service
-              uri: http://localhost:8081
-              predicates:
-                - Path=/api/users/**
-              filters:
-                - name: RequestRateLimiter
-                  args:
-                    redis-rate-limiter.replenishRate: 10
-                    redis-rate-limiter.burstCapacity: 20
-                    key-resolver: "#{@visitorKeyResolver}"
-
-            - id: auth-service
-              uri: http://localhost:8082
-              predicates:
-                - Path=/api/auth/**
-              filters:
-                - name: RequestRateLimiter
-                  args:
-                    redis-rate-limiter.replenishRate: 5
-                    redis-rate-limiter.burstCapacity: 10
-                    key-resolver: "#{@visitorKeyResolver}"
-
-            - id: after_route
-              uri: lb://DUMMY-SERVICE
-              predicates:
-                - Path=/dummy/**
-            - id: logging_aggregation
-              uri: lb://LOGGING-SERVICE
-              predicates:
-                - Path=/api/logs/**
-#              order=100
-#              predicates:
-#                - Cookie=mycookie,mycookievalue
-#            - id: user-service
-#              uri: lb://DUMMYSERVICE
-#              predicates:
-
-#                - Path=/api/v1/inventory/**
-#              filters:
-#                - StripPrefix=2
-
-
-  kafka:
-    producer:
-      key-serializer: org.apache.kafka.common.serialization.StringSerializer
-      value-serializer: org.springframework.kafka.support.serializer.JsonSerializer
-
-
-    properties:
-      spring.json.trusted.packages: "edu.pict.apigateway.kafkaEvent"
-
-
-eureka:
-  client:
-    service-url:
-      defaultZone: http://localhost:8761/eureka
-  instance:
-    prefer-ip-address: true
-
-
-sentinel:
-  security:
-    secret-key: asbdfhabsdfhnjsndjnjdsncnsadncaiusdhfiuwhe7ryh
-
-jwt:
-  secret-key: asbdfhabsdfhnjsndjnjdsncnsadncaiusdhfiuwhe7ryhasbdfhabsdfhnjsndjnjdsncnsadncaiusdhfiuwhe7ryhasbdfhabsdfhnjsndjnjdsncnsadncaiusdhfiuwhe7ryhasbdfhabsdfhnjsndjnjdsncnsadncaiusdhfiuwhe7ryhasbdfhabsdfhnjsndjnjdsncnsadncaiusdhfiuwhe7ryhasbdfhabsdfhnjsndjnjdsncnsadncaiusdhfiuwhe7ryhasbdfhabsdfhnjsndjnjdsncnsadncaiusdhfiuwhe7ryhasbdfhabsdfhnjsndjnjdsncnsadncaiusdhfiuwhe7ryhasbdfhabsdfhnjsndjnjdsncnsadncaiusdhfiuwhe7ryhasbdfhabsdfhnjsndjnjdsncnsadncaiusdhfiuwhe7ryhasbdfhabsdfhnjsndjnjdsncnsadncaiusdhfiuwhe7ryh
-
-logging:
-  level:
-    kafka: debug
-    redis: debug
\ No newline at end of file
diff --git a/DummyService/.gradle/8.14.4/checksums/checksums.lock b/DummyService/.gradle/8.14.4/checksums/checksums.lock
new file mode 100644
index 0000000..3e60dae
Binary files /dev/null and b/DummyService/.gradle/8.14.4/checksums/checksums.lock differ
diff --git a/DummyService/.gradle/8.14.4/fileChanges/last-build.bin b/DummyService/.gradle/8.14.4/fileChanges/last-build.bin
new file mode 100644
index 0000000..f76dd23
Binary files /dev/null and b/DummyService/.gradle/8.14.4/fileChanges/last-build.bin differ
diff --git a/DummyService/.gradle/8.14.4/fileHashes/fileHashes.bin b/DummyService/.gradle/8.14.4/fileHashes/fileHashes.bin
new file mode 100644
index 0000000..943dfd8
Binary files /dev/null and b/DummyService/.gradle/8.14.4/fileHashes/fileHashes.bin differ
diff --git a/DummyService/.gradle/8.14.4/fileHashes/fileHashes.lock b/DummyService/.gradle/8.14.4/fileHashes/fileHashes.lock
new file mode 100644
index 0000000..6c3ed72
Binary files /dev/null and b/DummyService/.gradle/8.14.4/fileHashes/fileHashes.lock differ
diff --git a/DummyService/.gradle/8.14.4/gc.properties b/DummyService/.gradle/8.14.4/gc.properties
new file mode 100644
index 0000000..e69de29
diff --git a/DummyService/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/DummyService/.gradle/buildOutputCleanup/buildOutputCleanup.lock
new file mode 100644
index 0000000..46c990b
Binary files /dev/null and b/DummyService/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/DummyService/.gradle/buildOutputCleanup/cache.properties b/DummyService/.gradle/buildOutputCleanup/cache.properties
new file mode 100644
index 0000000..8e7ebdf
--- /dev/null
+++ b/DummyService/.gradle/buildOutputCleanup/cache.properties
@@ -0,0 +1,2 @@
+#Thu Apr 09 20:58:42 IST 2026
+gradle.version=8.14.4
diff --git a/DummyService/.gradle/vcs-1/gc.properties b/DummyService/.gradle/vcs-1/gc.properties
new file mode 100644
index 0000000..e69de29
diff --git a/FIX_IMPLEMENTATION_TRACKER.md b/FIX_IMPLEMENTATION_TRACKER.md
new file mode 100644
index 0000000..b859ed0
--- /dev/null
+++ b/FIX_IMPLEMENTATION_TRACKER.md
@@ -0,0 +1,103 @@
+# SentientGate Fix Implementation Tracker
+
+Date: 2026-04-04
+Status: Phase 0 + significant Phase 1/2/3/4 changes implemented.
+
+## Implemented Changes
+
+1. Secret and repository hardening
+- Removed leaked key: `private_key.pem`
+- Removed backup config with secrets: `ApiGateway/src/main/resources/application.yml.bak`
+- Externalized secrets:
+  - `ApiGateway/src/main/resources/application.yml`
+  - `LogingService/src/main/resources/application.yml`
+  - `docker-compose.yml`
+- Hardened ignore rules in `.gitignore` (`*.pem`, `.env*`, build and IDE folders)
+
+2. Gateway design-pattern refactor and security controls
+- Added policy pattern:
+  - `ApiGateway/src/main/java/edu/pict/apigateway/security/RouteAccessPolicy.java`
+  - `ApiGateway/src/main/java/edu/pict/apigateway/security/StaticRouteAccessPolicy.java`
+- Added factory/extractor pattern for event creation:
+  - `ApiGateway/src/main/java/edu/pict/apigateway/events/RequestContext.java`
+  - `ApiGateway/src/main/java/edu/pict/apigateway/events/RequestContextExtractor.java`
+  - `ApiGateway/src/main/java/edu/pict/apigateway/events/DefaultRequestContextExtractor.java`
+  - `ApiGateway/src/main/java/edu/pict/apigateway/events/GatewayEventFactory.java`
+  - `ApiGateway/src/main/java/edu/pict/apigateway/events/DefaultGatewayEventFactory.java`
+- Updated filters:
+  - `JwtExtractionFilter`: JWT required on protected routes
+  - `SentientGateFilter`: removed `assert`, uses extractor+factory
+  - `BlacklistFilter`: checks UUID and IP blacklist keys (legacy compatible)
+- Improved proxy/IP handling:
+  - `ApiGateway/src/main/java/edu/pict/apigateway/service/IpService.java`
+- Updated blacklist management controller for namespaced UUID keys:
+  - `ApiGateway/src/main/java/edu/pict/apigateway/controller/ManagementController.java`
+
+3. MCP pipeline architecture and resilience improvements
+- Added dependency inversion ports:
+  - `MCPService/src/main/java/edu/pict/mcpservice/ports/HistoryProvider.java`
+  - `MCPService/src/main/java/edu/pict/mcpservice/ports/BlockEnforcer.java`
+  - `MCPService/src/main/java/edu/pict/mcpservice/ports/AnomalyScoringPort.java`
+- Added async strategy segregation:
+  - `MCPService/src/main/java/edu/pict/mcpservice/stratagies/blocking/AsyncThreatStrategy.java`
+  - `MCPService/src/main/java/edu/pict/mcpservice/service/AsyncThreatEvaluator.java`
+  - `MCPService/src/main/java/edu/pict/mcpservice/config/AsyncConfig.java`
+- Updated analysis pipeline:
+  - `MCPService/src/main/java/edu/pict/mcpservice/service/McpAnalysisService.java`
+  - Added pre-block check, dedup window, sync/async strategy split
+- Added Caffeine history cache + gRPC deadline:
+  - `MCPService/src/main/java/edu/pict/mcpservice/service/EventHistoryService.java`
+  - `MCPService/build.gradle`
+- Improved enforcement serialization and key strategy:
+  - `MCPService/src/main/java/edu/pict/mcpservice/service/EnforcementService.java`
+  - Stores JSON metadata and writes UUID/IP blacklist keys
+- Improved pattern matching coverage:
+  - `MCPService/src/main/java/edu/pict/mcpservice/stratagies/blocking/PatternMatchStrategy.java`
+- Batch listener behavior aligned:
+  - `MCPService/src/main/java/edu/pict/mcpservice/kafkaListeners/SecurityEventListners.java`
+- Feign endpoint correction and timeout config:
+  - `MCPService/src/main/java/edu/pict/mcpservice/clients/AiServiceFeignClient.java`
+  - `MCPService/src/main/resources/application.yml`
+
+4. Logging service correctness and performance
+- Added gRPC server implementation:
+  - `LogingService/src/main/proto/user_log_event.proto`
+  - `LogingService/src/main/java/edu/pict/loggingservice/grpc/UserLogEventGrpcService.java`
+  - `LogingService/src/main/java/edu/pict/loggingservice/repository/GatewayLogRepository.java`
+  - `LogingService/src/main/resources/application.yml`
+  - `LogingService/build.gradle`
+- Replaced `parallelStream()` with `stream()`:
+  - `LogingService/src/main/java/edu/pict/loggingservice/service/KafkaBatchService.java`
+- Added DB indexes on hot query paths:
+  - `LogingService/src/main/java/edu/pict/loggingservice/entity/GatewayLogEntity.java`
+- Hardened Kafka trusted packages and DDL config:
+  - `LogingService/src/main/resources/application.yml`
+
+5. AI request-contract compatibility and prompt-injection hardening
+- Added history-compatible event DTO:
+  - `AIService/src/main/java/edu/pict/dtos/BehaviorLogEvent.java`
+- Extended request DTO for MCP payload shape:
+  - `AIService/src/main/java/edu/pict/dtos/AnomalyDetectionRequest.java`
+- Added feature derivation and route-sensitivity sanitization:
+  - `AIService/src/main/java/edu/pict/service/AnomalyDetectionService.java`
+- Added response aliasing support in MCP consumer:
+  - `MCPService/src/main/java/edu/pict/mcpservice/model/AnomalyDetectionResponse.java`
+
+## Verification Notes
+
+Automated test runs in this execution environment were blocked by runtime/toolchain mismatch:
+- Maven builds require Java 21 `--release`, but runner JDK is older.
+- Gradle plugin resolution requires Java 17+, runner JDK is Java 11.
+
+Commands attempted:
+- `ApiGateway: ./mvnw -Dmaven.repo.local=/tmp/.m2-api test`
+- `AIService: ./mvnw -Dmaven.repo.local=/tmp/.m2-ai test`
+- `MCPService: GRADLE_USER_HOME=/tmp/.gradle-mcp ./gradlew test`
+- `LogingService: GRADLE_USER_HOME=/tmp/.gradle-log ./gradlew test`
+
+## Remaining Planned Items
+
+- Integrate Spring Security authorization chain with JWT-authenticated principal (beyond header-level enforcement).
+- Add circuit breaker policy (`Resilience4j`) around gRPC + AI calls.
+- Add dashboard cache layer for aggregate queries.
+- Add environment profile split for strict production defaults (`ddl-auto=validate`, TLS, service auth).
diff --git a/IMPLEMENTATION_CHANGES_REPORT.md b/IMPLEMENTATION_CHANGES_REPORT.md
new file mode 100644
index 0000000..15eb8e3
--- /dev/null
+++ b/IMPLEMENTATION_CHANGES_REPORT.md
@@ -0,0 +1,185 @@
+# SentientGate Implementation Changes Report
+
+Date: 2026-04-04
+Prepared for: Current remediation sprint
+
+## 1. Security and Secret Management
+
+### Changes made
+- Removed exposed private key:
+  - `private_key.pem` (deleted)
+- Removed backup config containing sensitive values:
+  - `ApiGateway/src/main/resources/application.yml.bak` (deleted)
+- Externalized secrets from source code:
+  - `ApiGateway/src/main/resources/application.yml`
+  - `LogingService/src/main/resources/application.yml`
+  - `docker-compose.yml`
+- Hardened repository ignore rules:
+  - `.gitignore` updated with `*.pem`, `.env*`, build outputs, IDE folders, `application.yml.bak`.
+
+### Impact
+- Prevents secret leakage through Git.
+- Moves runtime secrets to environment variables.
+
+---
+
+## 2. ApiGateway Refactor (SOLID + Patterns)
+
+### New design components
+- Policy Pattern:
+  - `ApiGateway/src/main/java/edu/pict/apigateway/security/RouteAccessPolicy.java`
+  - `ApiGateway/src/main/java/edu/pict/apigateway/security/StaticRouteAccessPolicy.java`
+- Factory + Extractor Pattern:
+  - `ApiGateway/src/main/java/edu/pict/apigateway/events/RequestContext.java`
+  - `ApiGateway/src/main/java/edu/pict/apigateway/events/RequestContextExtractor.java`
+  - `ApiGateway/src/main/java/edu/pict/apigateway/events/DefaultRequestContextExtractor.java`
+  - `ApiGateway/src/main/java/edu/pict/apigateway/events/GatewayEventFactory.java`
+  - `ApiGateway/src/main/java/edu/pict/apigateway/events/DefaultGatewayEventFactory.java`
+
+### Existing components updated
+- `ApiGateway/src/main/java/edu/pict/apigateway/filters/global/JwtExtractionFilter.java`
+  - Enforces JWT for protected routes using `RouteAccessPolicy`.
+- `ApiGateway/src/main/java/edu/pict/apigateway/filters/global/SentientGateFilter.java`
+  - Removed `assert`-based validation.
+  - Delegates event creation to extractor/factory components.
+- `ApiGateway/src/main/java/edu/pict/apigateway/filters/global/BlacklistFilter.java`
+  - Added UUID + IP blacklist checks.
+  - Kept legacy key compatibility.
+- `ApiGateway/src/main/java/edu/pict/apigateway/service/IpService.java`
+  - Improved trusted-proxy handling for `X-Forwarded-For` and `X-Real-IP`.
+- `ApiGateway/src/main/java/edu/pict/apigateway/controller/ManagementController.java`
+  - Moved to namespaced blacklist key strategy.
+
+### Impact
+- Better separation of responsibilities (SRP).
+- Extensible route authorization policy (OCP).
+- Stronger enforcement against UUID-only bypass.
+
+---
+
+## 3. MCPService Refactor (Pipeline, Ports, Async)
+
+### New abstractions (DIP)
+- `MCPService/src/main/java/edu/pict/mcpservice/ports/HistoryProvider.java`
+- `MCPService/src/main/java/edu/pict/mcpservice/ports/BlockEnforcer.java`
+- `MCPService/src/main/java/edu/pict/mcpservice/ports/AnomalyScoringPort.java`
+
+### Async strategy support
+- `MCPService/src/main/java/edu/pict/mcpservice/stratagies/blocking/AsyncThreatStrategy.java`
+- `MCPService/src/main/java/edu/pict/mcpservice/service/AsyncThreatEvaluator.java`
+- `MCPService/src/main/java/edu/pict/mcpservice/config/AsyncConfig.java`
+
+### Core flow updates
+- `MCPService/src/main/java/edu/pict/mcpservice/service/McpAnalysisService.java`
+  - Added blocked-user pre-check.
+  - Added dedup window.
+  - Split sync and async strategy execution.
+- `MCPService/src/main/java/edu/pict/mcpservice/service/EventHistoryService.java`
+  - Added Caffeine cache with TTL.
+  - Added gRPC deadline timeout.
+- `MCPService/src/main/java/edu/pict/mcpservice/service/EnforcementService.java`
+  - Stores JSON block metadata (not `toString()`).
+  - Writes UUID/IP blacklist keys with legacy compatibility.
+- `MCPService/src/main/java/edu/pict/mcpservice/stratagies/blocking/PatternMatchStrategy.java`
+  - Extended detection inputs beyond only attempted path.
+- `MCPService/src/main/java/edu/pict/mcpservice/kafkaListeners/SecurityEventListners.java`
+  - Batch grouping and representative-event handling.
+
+### AI integration fixes
+- `MCPService/src/main/java/edu/pict/mcpservice/clients/AiServiceFeignClient.java`
+  - Corrected service name and endpoint path.
+- `MCPService/src/main/java/edu/pict/mcpservice/model/AnomalyDetectionResponse.java`
+  - Added JSON aliases for MCP/AI response compatibility.
+- `MCPService/src/main/resources/application.yml`
+  - Restricted `trusted.packages`.
+  - Added Feign timeout config.
+- `MCPService/build.gradle`
+  - Added Caffeine dependency.
+
+### Impact
+- Reduces redundant analysis and blocking overhead.
+- Prevents consumer thread starvation from AI latency.
+- Improves reliability and architecture boundaries.
+
+---
+
+## 4. LogingService Improvements
+
+### gRPC history server implemented
+- Added proto and generated-code build setup:
+  - `LogingService/src/main/proto/user_log_event.proto`
+  - `LogingService/build.gradle`
+- Added server implementation:
+  - `LogingService/src/main/java/edu/pict/loggingservice/grpc/UserLogEventGrpcService.java`
+- Added repository support:
+  - `LogingService/src/main/java/edu/pict/loggingservice/repository/GatewayLogRepository.java`
+- Added gRPC/eureka metadata config:
+  - `LogingService/src/main/resources/application.yml`
+
+### Performance and data updates
+- `LogingService/src/main/java/edu/pict/loggingservice/service/KafkaBatchService.java`
+  - Replaced `parallelStream()` with `stream()`.
+- `LogingService/src/main/java/edu/pict/loggingservice/entity/GatewayLogEntity.java`
+  - Added DB indexes for hot query patterns.
+- `LogingService/src/main/resources/application.yml`
+  - Restricted Kafka trusted packages.
+  - Externalized DB credentials and DDL strategy.
+
+### Impact
+- Enables history-dependent MCP strategies to work.
+- Improves query and ingestion behavior under load.
+
+---
+
+## 5. AIService Contract and Prompt-Safety Updates
+
+### Changes made
+- Added MCP-compatible history DTO:
+  - `AIService/src/main/java/edu/pict/dtos/BehaviorLogEvent.java`
+- Extended request DTO compatibility:
+  - `AIService/src/main/java/edu/pict/dtos/AnomalyDetectionRequest.java`
+- Added feature derivation and input sanitization:
+  - `AIService/src/main/java/edu/pict/service/AnomalyDetectionService.java`
+
+### Impact
+- Resolves request-shape mismatch between MCP and AI service.
+- Reduces prompt manipulation risk by sanitizing route sensitivity input.
+
+---
+
+## 6. Validation Status
+
+### Build/test execution attempt
+- Commands were executed for all services.
+- Full validation was blocked by local runner toolchain mismatch:
+  - Maven/Gradle builds require Java 17/21.
+  - Current execution runner provides Java 11.
+
+### What this means
+- Code changes are implemented and organized.
+- Final compile/test confirmation should be run in your local JDK17/21 setup.
+
+---
+
+## 7. Files Added (new)
+
+- `SYSTEM_REMEDIATION_PLAN_SOLID.md`
+- `FIX_IMPLEMENTATION_TRACKER.md`
+- `IMPLEMENTATION_CHANGES_REPORT.md`
+- `ApiGateway/src/main/java/edu/pict/apigateway/security/RouteAccessPolicy.java`
+- `ApiGateway/src/main/java/edu/pict/apigateway/security/StaticRouteAccessPolicy.java`
+- `ApiGateway/src/main/java/edu/pict/apigateway/events/RequestContext.java`
+- `ApiGateway/src/main/java/edu/pict/apigateway/events/RequestContextExtractor.java`
+- `ApiGateway/src/main/java/edu/pict/apigateway/events/DefaultRequestContextExtractor.java`
+- `ApiGateway/src/main/java/edu/pict/apigateway/events/GatewayEventFactory.java`
+- `ApiGateway/src/main/java/edu/pict/apigateway/events/DefaultGatewayEventFactory.java`
+- `MCPService/src/main/java/edu/pict/mcpservice/ports/HistoryProvider.java`
+- `MCPService/src/main/java/edu/pict/mcpservice/ports/BlockEnforcer.java`
+- `MCPService/src/main/java/edu/pict/mcpservice/ports/AnomalyScoringPort.java`
+- `MCPService/src/main/java/edu/pict/mcpservice/stratagies/blocking/AsyncThreatStrategy.java`
+- `MCPService/src/main/java/edu/pict/mcpservice/config/AsyncConfig.java`
+- `MCPService/src/main/java/edu/pict/mcpservice/service/AsyncThreatEvaluator.java`
+- `LogingService/src/main/proto/user_log_event.proto`
+- `LogingService/src/main/java/edu/pict/loggingservice/grpc/UserLogEventGrpcService.java`
+- `AIService/src/main/java/edu/pict/dtos/BehaviorLogEvent.java`
+
diff --git a/LoggingService/src/main/java/edu/pict/loggingservice/repository/GatewayLogRepository.java b/LoggingService/src/main/java/edu/pict/loggingservice/repository/GatewayLogRepository.java
index 73da098..88b8299 100644
--- a/LoggingService/src/main/java/edu/pict/loggingservice/repository/GatewayLogRepository.java
+++ b/LoggingService/src/main/java/edu/pict/loggingservice/repository/GatewayLogRepository.java
@@ -21,6 +21,7 @@ public interface GatewayLogRepository extends JpaRepository<GatewayLogEntity, UU
     List<GatewayLogEntity> findByClientIp(String clientIp);
 
     List<GatewayLogEntity> findByOccurredAtBetween(Instant start, Instant end);
+    List<GatewayLogEntity> findByVisitorIdAndOccurredAtAfter(String visitorId, Instant since);
 
     List<GatewayLogEntity> findByDecision(String decision);
 
diff --git a/LoggingService/src/main/resources/application.yml b/LoggingService/src/main/resources/application.yml
index 92d2110..b250b74 100644
--- a/LoggingService/src/main/resources/application.yml
+++ b/LoggingService/src/main/resources/application.yml
@@ -10,9 +10,9 @@ spring:
   application:
     name: logging-service
   datasource:
-    url: jdbc:postgresql://localhost:5432/mydb
-    username: postgres
-    password: postgres
+    url: ${SPRING_DATASOURCE_URL:jdbc:postgresql://localhost:5432/mydb}
+    username: ${SPRING_DATASOURCE_USERNAME}
+    password: ${SPRING_DATASOURCE_PASSWORD}
     hikari:
       maximum-pool-size: 10
       minimum-idle: 2
@@ -23,7 +23,7 @@ spring:
   jpa:
     database-platform: org.hibernate.dialect.PostgreSQLDialect
     hibernate:
-      ddl-auto: update   # change to validate in prod
+      ddl-auto: ${SPRING_JPA_HIBERNATE_DDL_AUTO:update}
     show-sql: true
     properties:
       hibernate:
@@ -46,7 +46,7 @@ spring:
       properties:
         spring.deserializer.key.delegate.class: org.apache.kafka.common.serialization.StringDeserializer
         spring.deserializer.value.delegate.class: org.springframework.kafka.support.serializer.JsonDeserializer
-        spring.json.trusted.packages: "*"
+        spring.json.trusted.packages: "edu.pict.loggingservice.kafka.model"
         spring.json.use.type.headers: true
         spring.json.type.mapping: "edu.pict.apigateway.kafkaEvent.LogEvent:edu.pict.loggingservice.kafka.model.GatewayDecisionEvent"
 
@@ -61,3 +61,9 @@ eureka:
       defaultZone: http://localhost:8761/eureka
   instance:
     prefer-ip-address: true
+    metadata-map:
+      grpc.port: ${grpc.server.port}
+
+grpc:
+  server:
+    port: 9091
diff --git a/LogingService/.gradle/8.14.4/checksums/checksums.lock b/LogingService/.gradle/8.14.4/checksums/checksums.lock
new file mode 100644
index 0000000..a4cffdd
Binary files /dev/null and b/LogingService/.gradle/8.14.4/checksums/checksums.lock differ
diff --git a/LogingService/.gradle/8.14.4/executionHistory/executionHistory.lock b/LogingService/.gradle/8.14.4/executionHistory/executionHistory.lock
new file mode 100644
index 0000000..e0bd4fb
Binary files /dev/null and b/LogingService/.gradle/8.14.4/executionHistory/executionHistory.lock differ
diff --git a/LogingService/.gradle/8.14.4/fileChanges/last-build.bin b/LogingService/.gradle/8.14.4/fileChanges/last-build.bin
new file mode 100644
index 0000000..f76dd23
Binary files /dev/null and b/LogingService/.gradle/8.14.4/fileChanges/last-build.bin differ
diff --git a/LogingService/.gradle/8.14.4/fileHashes/fileHashes.bin b/LogingService/.gradle/8.14.4/fileHashes/fileHashes.bin
new file mode 100644
index 0000000..943dfd8
Binary files /dev/null and b/LogingService/.gradle/8.14.4/fileHashes/fileHashes.bin differ
diff --git a/LogingService/.gradle/8.14.4/fileHashes/fileHashes.lock b/LogingService/.gradle/8.14.4/fileHashes/fileHashes.lock
new file mode 100644
index 0000000..5bc42b6
Binary files /dev/null and b/LogingService/.gradle/8.14.4/fileHashes/fileHashes.lock differ
diff --git a/LogingService/.gradle/8.14.4/gc.properties b/LogingService/.gradle/8.14.4/gc.properties
new file mode 100644
index 0000000..e69de29
diff --git a/LogingService/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/LogingService/.gradle/buildOutputCleanup/buildOutputCleanup.lock
new file mode 100644
index 0000000..72bc566
Binary files /dev/null and b/LogingService/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/LogingService/.gradle/buildOutputCleanup/cache.properties b/LogingService/.gradle/buildOutputCleanup/cache.properties
new file mode 100644
index 0000000..8e7ebdf
--- /dev/null
+++ b/LogingService/.gradle/buildOutputCleanup/cache.properties
@@ -0,0 +1,2 @@
+#Thu Apr 09 20:58:42 IST 2026
+gradle.version=8.14.4
diff --git a/LogingService/.gradle/vcs-1/gc.properties b/LogingService/.gradle/vcs-1/gc.properties
new file mode 100644
index 0000000..e69de29
diff --git a/LogingService/src/main/java/edu/pict/loggingservice/grpc/UserLogEventGrpcService.java b/LogingService/src/main/java/edu/pict/loggingservice/grpc/UserLogEventGrpcService.java
new file mode 100644
index 0000000..53412c1
--- /dev/null
+++ b/LogingService/src/main/java/edu/pict/loggingservice/grpc/UserLogEventGrpcService.java
@@ -0,0 +1,63 @@
+package edu.pict.loggingservice.grpc;
+
+import edu.pict.loggingservice.entity.GatewayLogEntity;
+import edu.pict.loggingservice.repository.GatewayLogRepository;
+import edu.pict.mcpservice.grpc.UserLogEvent;
+import edu.pict.mcpservice.grpc.UserLogEventResponse;
+import edu.pict.mcpservice.grpc.UserLogEventServiceGrpc;
+import edu.pict.mcpservice.grpc.UserLogEventsRequest;
+import io.grpc.stub.StreamObserver;
+import java.time.Duration;
+import java.time.Instant;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import net.devh.boot.grpc.server.service.GrpcService;
+
+@GrpcService
+@RequiredArgsConstructor
+@Slf4j
+public class UserLogEventGrpcService extends UserLogEventServiceGrpc.UserLogEventServiceImplBase {
+
+    private final GatewayLogRepository repository;
+
+    @Override
+    public void getUserEvents(
+            UserLogEventsRequest request, StreamObserver<UserLogEventResponse> responseObserver) {
+        try {
+            int durationMinutes = request.getDuration() <= 0 ? 10 : request.getDuration();
+            Instant since = Instant.now().minus(Duration.ofMinutes(durationMinutes));
+
+            List<GatewayLogEntity> logs =
+                    repository.findByVisitorIdAndOccurredAtAfter(request.getUuid(), since);
+
+            List<UserLogEvent> protoEvents = logs.stream().map(this::toProto).toList();
+            responseObserver.onNext(
+                    UserLogEventResponse.newBuilder().addAllUserLogEvents(protoEvents).build());
+            responseObserver.onCompleted();
+        } catch (Exception e) {
+            log.error("Failed to fetch gRPC user events for UUID {}", request.getUuid(), e);
+            responseObserver.onError(e);
+        }
+    }
+
+    private UserLogEvent toProto(GatewayLogEntity entity) {
+        return UserLogEvent.newBuilder()
+                .setUuid(nullSafe(entity.getVisitorId()))
+                .setPath(nullSafe(entity.getPath()))
+                .setMethod(nullSafe(entity.getMethod()))
+                .setLatencyMs(entity.getLatencyMs())
+                .setQueryParams(nullSafe(entity.getQueryParams()))
+                .setClientIp(nullSafe(entity.getClientIp()))
+                .setStatusCode(entity.getStatusCode())
+                .setRequestSize(entity.getRequestSize())
+                .setTimestamp(entity.getOccurredAt().toEpochMilli())
+                .setUserAgent(nullSafe(entity.getUserAgent()))
+                .build();
+    }
+
+    private String nullSafe(String value) {
+        return value == null ? "" : value;
+    }
+}
+
diff --git a/LogingService/src/main/proto/user_log_event.proto b/LogingService/src/main/proto/user_log_event.proto
new file mode 100644
index 0000000..2dbb399
--- /dev/null
+++ b/LogingService/src/main/proto/user_log_event.proto
@@ -0,0 +1,34 @@
+syntax = "proto3";
+
+option java_multiple_files = true;
+option java_package = "edu.pict.mcpservice.grpc";
+option java_outer_classname = "UserLogEventProto";
+
+package log;
+
+message UserLogEvent {
+  string uuid = 1;
+  string path = 2;
+  string method = 3;
+  int64 latency_ms = 4;
+  string query_params = 5;
+  string client_ip = 6;
+  int32 status_code = 7;
+  int64 request_size = 8;
+  int64 timestamp = 9;
+  string user_agent = 10;
+}
+
+message UserLogEventsRequest {
+  string uuid = 1;
+  int32 duration = 2;
+}
+
+message UserLogEventResponse {
+  repeated UserLogEvent user_log_events = 1;
+}
+
+service UserLogEventService {
+  rpc GetUserEvents (UserLogEventsRequest) returns (UserLogEventResponse);
+}
+
diff --git a/MCPService/build.gradle b/MCPService/build.gradle
index 0b987f3..c44a9f5 100644
--- a/MCPService/build.gradle
+++ b/MCPService/build.gradle
@@ -51,6 +51,7 @@ dependencies {
 
     // ---------------- Kafka ----------------
     implementation 'org.springframework.kafka:spring-kafka'
+    implementation 'com.github.ben-manes.caffeine:caffeine:3.1.8'
 
     // ---------------- gRPC (ONLY STARTERS, NO MANUAL CORE DEPS) ----------------
     implementation 'net.devh:grpc-server-spring-boot-starter:2.15.0.RELEASE'
diff --git a/MCPService/src/main/java/edu/pict/mcpservice/clients/AiServiceFeignClient.java b/MCPService/src/main/java/edu/pict/mcpservice/clients/AiServiceFeignClient.java
index d8f748d..2cb51f2 100644
--- a/MCPService/src/main/java/edu/pict/mcpservice/clients/AiServiceFeignClient.java
+++ b/MCPService/src/main/java/edu/pict/mcpservice/clients/AiServiceFeignClient.java
@@ -7,9 +7,9 @@
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
-@FeignClient(name = "ai-inference-service")
+@FeignClient(name = "AI-SERVICE")
 public interface AiServiceFeignClient {
 
-    @PostMapping("/api/v1/analyze")
+    @PostMapping("/ai-service/anomaly/analyze")
     ResponseEntity<AnomalyDetectionResponse> analyze(@RequestBody AnomalyDetectionRequest request);
 }
diff --git a/MCPService/src/main/java/edu/pict/mcpservice/config/AsyncConfig.java b/MCPService/src/main/java/edu/pict/mcpservice/config/AsyncConfig.java
new file mode 100644
index 0000000..910307f
--- /dev/null
+++ b/MCPService/src/main/java/edu/pict/mcpservice/config/AsyncConfig.java
@@ -0,0 +1,26 @@
+package edu.pict.mcpservice.config;
+
+import java.util.concurrent.Executor;
+import java.util.concurrent.ThreadPoolExecutor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+
+@Configuration
+@EnableAsync
+public class AsyncConfig {
+
+    @Bean("aiAnalysisExecutor")
+    public Executor aiAnalysisExecutor() {
+        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+        executor.setCorePoolSize(5);
+        executor.setMaxPoolSize(20);
+        executor.setQueueCapacity(500);
+        executor.setThreadNamePrefix("ai-analysis-");
+        executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
+        executor.initialize();
+        return executor;
+    }
+}
+
diff --git a/MCPService/src/main/java/edu/pict/mcpservice/kafkaListeners/SecurityEventListners.java b/MCPService/src/main/java/edu/pict/mcpservice/kafkaListeners/SecurityEventListners.java
new file mode 100644
index 0000000..e69de29
diff --git a/MCPService/src/main/java/edu/pict/mcpservice/model/AnomalyDetectionResponse.java b/MCPService/src/main/java/edu/pict/mcpservice/model/AnomalyDetectionResponse.java
index c9bd84f..ddb3627 100644
--- a/MCPService/src/main/java/edu/pict/mcpservice/model/AnomalyDetectionResponse.java
+++ b/MCPService/src/main/java/edu/pict/mcpservice/model/AnomalyDetectionResponse.java
@@ -1,5 +1,6 @@
 package edu.pict.mcpservice.model;
 
+import com.fasterxml.jackson.annotation.JsonAlias;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -8,8 +9,12 @@
 @NoArgsConstructor
 @AllArgsConstructor
 public class AnomalyDetectionResponse {
+    @JsonAlias("anomaly")
     private boolean isAnomaly;
+    @JsonAlias("confidence")
     private double confidenceScore; // 0.0 to 1.0
+    @JsonAlias("modelVersion")
     private String patternDetected; // e.g., "SEQUENTIAL_SCAN"
+    @JsonAlias("inferenceTimeMs")
     private int suggestedBlockMinutes;
 }
diff --git a/MCPService/src/main/java/edu/pict/mcpservice/ports/AnomalyScoringPort.java b/MCPService/src/main/java/edu/pict/mcpservice/ports/AnomalyScoringPort.java
new file mode 100644
index 0000000..7152ec4
--- /dev/null
+++ b/MCPService/src/main/java/edu/pict/mcpservice/ports/AnomalyScoringPort.java
@@ -0,0 +1,9 @@
+package edu.pict.mcpservice.ports;
+
+import edu.pict.mcpservice.model.AnomalyDetectionRequest;
+import edu.pict.mcpservice.model.AnomalyDetectionResponse;
+
+public interface AnomalyScoringPort {
+    AnomalyDetectionResponse analyze(AnomalyDetectionRequest request);
+}
+
diff --git a/MCPService/src/main/java/edu/pict/mcpservice/ports/BlockEnforcer.java b/MCPService/src/main/java/edu/pict/mcpservice/ports/BlockEnforcer.java
new file mode 100644
index 0000000..aa7bd4f
--- /dev/null
+++ b/MCPService/src/main/java/edu/pict/mcpservice/ports/BlockEnforcer.java
@@ -0,0 +1,10 @@
+package edu.pict.mcpservice.ports;
+
+import edu.pict.mcpservice.stratagies.blocking.ThreatStrategy;
+
+public interface BlockEnforcer {
+    boolean isBlocked(String uuid);
+
+    void blockUser(String uuid, String clientIp, ThreatStrategy strategy);
+}
+
diff --git a/MCPService/src/main/java/edu/pict/mcpservice/ports/HistoryProvider.java b/MCPService/src/main/java/edu/pict/mcpservice/ports/HistoryProvider.java
new file mode 100644
index 0000000..1d9458c
--- /dev/null
+++ b/MCPService/src/main/java/edu/pict/mcpservice/ports/HistoryProvider.java
@@ -0,0 +1,9 @@
+package edu.pict.mcpservice.ports;
+
+import edu.pict.mcpservice.grpc.UserLogEvent;
+import java.util.List;
+
+public interface HistoryProvider {
+    List<UserLogEvent> getAllEventsInDuration(String uuid, int duration);
+}
+
diff --git a/MCPService/src/main/java/edu/pict/mcpservice/service/AIClient.java b/MCPService/src/main/java/edu/pict/mcpservice/service/AIClient.java
index e40c3e7..4cb4df5 100644
--- a/MCPService/src/main/java/edu/pict/mcpservice/service/AIClient.java
+++ b/MCPService/src/main/java/edu/pict/mcpservice/service/AIClient.java
@@ -3,6 +3,7 @@
 import edu.pict.mcpservice.clients.AiServiceFeignClient;
 import edu.pict.mcpservice.model.AnomalyDetectionRequest;
 import edu.pict.mcpservice.model.AnomalyDetectionResponse;
+import edu.pict.mcpservice.ports.AnomalyScoringPort;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -10,10 +11,11 @@
 @Slf4j
 @Service
 @RequiredArgsConstructor
-public class AIClient {
+public class AIClient implements AnomalyScoringPort {
 
     private final AiServiceFeignClient aiServiceFeignClient;
 
+    @Override
     public AnomalyDetectionResponse analyze(AnomalyDetectionRequest anomalyDetectionRequest) {
 
         try {
diff --git a/MCPService/src/main/java/edu/pict/mcpservice/service/AsyncThreatEvaluator.java b/MCPService/src/main/java/edu/pict/mcpservice/service/AsyncThreatEvaluator.java
new file mode 100644
index 0000000..5aaf35c
--- /dev/null
+++ b/MCPService/src/main/java/edu/pict/mcpservice/service/AsyncThreatEvaluator.java
@@ -0,0 +1,36 @@
+package edu.pict.mcpservice.service;
+
+import edu.pict.mcpservice.kafkaEvents.LogEvent;
+import edu.pict.mcpservice.kafkaEvents.SecurityAlertEvent;
+import edu.pict.mcpservice.ports.BlockEnforcer;
+import edu.pict.mcpservice.stratagies.blocking.AsyncThreatStrategy;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class AsyncThreatEvaluator {
+
+    private final BlockEnforcer blockEnforcer;
+
+    @Async("aiAnalysisExecutor")
+    public void evaluate(
+            SecurityAlertEvent alert, List<LogEvent> history, List<AsyncThreatStrategy> asyncStrategies) {
+        if (blockEnforcer.isBlocked(alert.getUuid())) {
+            log.debug("Skipping async evaluation for already blocked UUID {}", alert.getUuid());
+            return;
+        }
+
+        asyncStrategies.stream()
+                .filter(strategy -> strategy.isAvailable(alert, history))
+                .findFirst()
+                .ifPresent(
+                        strategy ->
+                                blockEnforcer.blockUser(alert.getUuid(), alert.getClientIp(), strategy));
+    }
+}
+
diff --git a/MCPService/src/main/java/edu/pict/mcpservice/stratagies/blocking/AiAnomalyStrategy.java b/MCPService/src/main/java/edu/pict/mcpservice/stratagies/blocking/AiAnomalyStrategy.java
index cebbd01..44a6ed7 100644
--- a/MCPService/src/main/java/edu/pict/mcpservice/stratagies/blocking/AiAnomalyStrategy.java
+++ b/MCPService/src/main/java/edu/pict/mcpservice/stratagies/blocking/AiAnomalyStrategy.java
@@ -14,7 +14,7 @@
 @Component
 @RequiredArgsConstructor
 @Order(6) // Always run last as it's the most "expensive" call
-public class AiAnomalyStrategy implements ThreatStrategy {
+public class AiAnomalyStrategy implements AsyncThreatStrategy {
 
     private final AIClient aiClient;
 
@@ -29,7 +29,7 @@ public boolean isAvailable(SecurityAlertEvent alert, List<LogEvent> history) {
                                 .uuid(alert.getUuid())
                                 .history(history)
                                 .build());
-        return response.isAnomaly() && response.getConfidenceScore() > 0.85;
+        return response != null && response.isAnomaly() && response.getConfidenceScore() > 0.85;
     }
 
     @Override
diff --git a/MCPService/src/main/java/edu/pict/mcpservice/stratagies/blocking/AsyncThreatStrategy.java b/MCPService/src/main/java/edu/pict/mcpservice/stratagies/blocking/AsyncThreatStrategy.java
new file mode 100644
index 0000000..48f2b48
--- /dev/null
+++ b/MCPService/src/main/java/edu/pict/mcpservice/stratagies/blocking/AsyncThreatStrategy.java
@@ -0,0 +1,4 @@
+package edu.pict.mcpservice.stratagies.blocking;
+
+public interface AsyncThreatStrategy extends ThreatStrategy {}
+
diff --git a/MCPService/src/main/java/edu/pict/mcpservice/stratagies/blocking/PatternMatchStrategy.java b/MCPService/src/main/java/edu/pict/mcpservice/stratagies/blocking/PatternMatchStrategy.java
index cd52404..7475067 100644
--- a/MCPService/src/main/java/edu/pict/mcpservice/stratagies/blocking/PatternMatchStrategy.java
+++ b/MCPService/src/main/java/edu/pict/mcpservice/stratagies/blocking/PatternMatchStrategy.java
@@ -28,8 +28,32 @@ public class PatternMatchStrategy implements ThreatStrategy {
 
     @Override
     public boolean isAvailable(SecurityAlertEvent alert, List<LogEvent> history) {
-        String path = alert.getAttemptedPath().toLowerCase();
-        return MALICIOUS_PATTERNS.stream().anyMatch(path::contains);
+        String payload =
+                String.join(
+                                " ",
+                                nullSafe(alert.getAttemptedPath()),
+                                nullSafe(alert.getReason()),
+                                nullSafe(alert.getMethod()))
+                        .toLowerCase();
+        boolean alertMatch = MALICIOUS_PATTERNS.stream().anyMatch(payload::contains);
+        if (alertMatch) {
+            return true;
+        }
+
+        if (history == null || history.isEmpty()) {
+            return false;
+        }
+
+        return history.stream()
+                .map(
+                        log ->
+                                (nullSafe(log.getPath())
+                                                + " "
+                                                + nullSafe(log.getQueryParams())
+                                                + " "
+                                                + nullSafe(log.getUserAgent()))
+                                        .toLowerCase())
+                .anyMatch(candidate -> MALICIOUS_PATTERNS.stream().anyMatch(candidate::contains));
     }
 
     @Override
@@ -41,4 +65,8 @@ public Duration getBlockDuration() {
     public String getReason() {
         return "CRITICAL_INJECTION_ATTEMPT";
     }
+
+    private String nullSafe(String value) {
+        return value == null ? "" : value;
+    }
 }
diff --git a/MCPService/src/main/resources/application.yml b/MCPService/src/main/resources/application.yml
index fbafa11..745ac85 100644
--- a/MCPService/src/main/resources/application.yml
+++ b/MCPService/src/main/resources/application.yml
@@ -28,7 +28,7 @@ spring:
       properties:
         spring.deserializer.key.delegate.class: org.apache.kafka.common.serialization.StringDeserializer
         spring.deserializer.value.delegate.class: org.springframework.kafka.support.serializer.JsonDeserializer
-        spring.json.trusted.packages: "*"
+        spring.json.trusted.packages: "edu.pict.mcpservice.kafkaEvents"
         spring.json.use.type.headers: true
         spring.json.type.mapping: "edu.pict.apigateway.kafkaEvent.SecurityAlertEvent:edu.pict.mcpservice.kafkaEvents.SecurityAlertEvent,edu.pict.apigateway.kafkaEvent.LogEvent:edu.pict.mcpservice.kafkaEvents.LogEvent"
 
@@ -36,6 +36,13 @@ spring:
       concurrency: 3
       type: batch
       ack-mode: batch
+  cloud:
+    openfeign:
+      client:
+        config:
+          default:
+            connectTimeout: 2000
+            readTimeout: 5000
 
 eureka:
   client:
diff --git a/SECURITY_FLAW_STATUS_MATRIX.md b/SECURITY_FLAW_STATUS_MATRIX.md
new file mode 100644
index 0000000..5ed9566
--- /dev/null
+++ b/SECURITY_FLAW_STATUS_MATRIX.md
@@ -0,0 +1,44 @@
+# SentientGate Security Flaw Status Matrix (31 Items)
+
+Date: 2026-04-04  
+Legend: `Fixed` = implemented, `Partial` = improved but incomplete, `Pending` = not implemented yet.
+
+| ID | Flaw | Status | Evidence | Next Action |
+|---|---|---|---|---|
+| 1 | Private key committed | Fixed | `private_key.pem` deleted | Rotate key material in all deployed environments |
+| 2 | Hardcoded HMAC/JWT secrets | Fixed | `ApiGateway/src/main/resources/application.yml` now uses env vars | Enforce secret manager in non-local env |
+| 3 | CSRF disabled | Pending | `ApiGateway/src/main/java/edu/pict/apigateway/config/SecurityConfig.java` still disables CSRF | Implement explicit CSRF/session policy |
+| 4 | `permitAll()` on all routes | Partial | `JwtExtractionFilter` now protects paths, but `SecurityConfig` still has `anyExchange().permitAll()` | Move auth enforcement into Spring Security chain |
+| 5 | Kafka trusted packages `*` | Fixed | `MCPService` + `LogingService` `application.yml` now restricted | Add tests for deserializer hardening |
+| 6 | Hardcoded DB creds | Partial | `LogingService` uses env vars; compose still weak defaults pattern | Remove weak defaults and enforce required secrets |
+| 7 | UUID-only blacklist | Fixed | `BlacklistFilter` and `EnforcementService` now use UUID + IP keys | Add ops tooling for IP unblock workflows |
+| 8 | No IP spoofing protection | Partial | `IpService` now validates trusted proxy context | Add configurable trusted proxy CIDR chain |
+| 9 | Pattern match path-only | Partial | `PatternMatchStrategy` now checks broader fields | Add body/header inspection stage upstream |
+| 10 | Prompt injection risk | Partial | `AnomalyDetectionService` sanitizes route sensitivity | Add strict prompt template + allowlist guards |
+| 11 | gRPC plaintext | Pending | `MCPService application.yml` still `negotiation-type: plaintext` | Enable TLS/mTLS for gRPC |
+| 12 | No inter-service auth | Pending | No service auth layer present | Add mTLS/API-token/JWT between services |
+| 13 | `ddl-auto: update` risk | Partial | Now env-driven in `LogingService application.yml` | Set production default to `validate` + migrations |
+| 14 | Missing `.gitignore` protections | Partial | `.gitignore` significantly hardened | Finalize tracked-file policy for sensitive configs |
+| 15 | Redis fire-and-forget block writes | Partial | JSON serialization + error callback improved | Add reliable write/ack strategy and retries/bulkhead |
+| 16 | `assert` in production path | Fixed | Removed in `SentientGateFilter` flow | Add static analysis rule to block future assertions |
+| 17 | AI path mismatch Feign vs controller | Fixed | `AiServiceFeignClient` now calls `/ai-service/anomaly/analyze` | Add integration test for MCP->AI call |
+| 18 | `findFirst()` first-match only | Pending | Strategy arbitration still first-match | Introduce severity-based strategy arbitration |
+| 19 | Burst strategy evasion | Pending | Existing threshold logic unchanged | Redesign burst detection with sliding windows |
+| 20 | No request body size limits | Pending | No global request-size guards configured | Add gateway and service request-size limits |
+| 21 | Restrictive CORS | Pending | CORS still hardcoded localhost in `SecurityConfig` | Make CORS env/profile driven |
+| 22 | No Kafka DLQ | Pending | No DLQ/retry topic wiring | Add error handler + DLQ topic |
+| 23 | Unsanitized DB text storage | Pending | Raw text fields remain | Sanitize/encode before render + constrain fields |
+| 24 | Missing healthchecks in compose | Pending | Most services lack healthchecks | Add healthchecks for redis/kafka/services |
+| 25 | Log rotation missing | Pending | No rotation policy configured | Add rolling appender/container log limits |
+| 26 | `stratagies` typo package | Pending | Path remains unchanged | Rename package to `strategies` safely |
+| 27 | `LogingService` typo name | Pending | Module name/path still typo | Rename module and references |
+| 28 | Placeholder `SECURITY.md` | Pending | File still template-level | Write real disclosure/support policy |
+| 29 | `show-sql: true` in LoggingService | Pending | Still enabled in `LogingService application.yml` | Disable in production profile |
+| 30 | No compose network isolation | Pending | Default shared network only | Add segmented docker networks |
+| 31 | No graceful shutdown config | Pending | No explicit graceful shutdown tuning | Enable graceful shutdown + timeout settings |
+
+## Totals
+- Fixed: 6
+- Partial: 8
+- Pending: 17
+
diff --git a/SYSTEM_REMEDIATION_PLAN_SOLID.md b/SYSTEM_REMEDIATION_PLAN_SOLID.md
new file mode 100644
index 0000000..b1c955b
--- /dev/null
+++ b/SYSTEM_REMEDIATION_PLAN_SOLID.md
@@ -0,0 +1,230 @@
+# SentientGate Remediation Plan + SOLID Audit
+
+Date: 2026-04-04
+Scope: Security flaws, architectural flaws, and SOLID-driven refactor plan.
+
+## 1. Execution Plan (Phased)
+
+### Phase 0: Immediate Containment (Day 0)
+- Rotate and remove leaked key material:
+  - `/private_key.pem`
+  - hardcoded secrets in `ApiGateway/src/main/resources/application.yml`
+- Move secrets to environment variables for all services.
+- Strengthen `.gitignore` for `*.pem`, `.env*`, `target/`, `build/`, `.idea/`, `application*.yml.bak`.
+- Remove tracked secret backups like `ApiGateway/src/main/resources/application.yml.bak`.
+
+Definition of Done:
+- No secrets in tracked source.
+- App starts with env-based secrets in local/dev profiles.
+
+### Phase 1: Gateway Security Baseline (Day 1-2)
+- Replace `permitAll()` with endpoint-level authorization policy.
+- Rework CSRF policy:
+  - enable for cookie/session browser flows, or
+  - explicitly disable only for fully stateless token APIs with compensating controls.
+- Integrate trusted proxy/IP extraction via `IpService` inside `SentientGateFilter`.
+- Replace UUID-only blacklist checks with UUID + IP strategy.
+- Remove production `assert` checks and replace with explicit validation/guard clauses.
+
+Definition of Done:
+- Protected internal routes require auth.
+- IP extraction is deterministic and proxy-safe.
+- Blacklist cannot be bypassed by only rotating UUID cookie.
+
+### Phase 2: MCP Pipeline Performance + Safety (Day 2-4)
+- Add pre-check: skip analysis when already blocked in Redis.
+- Add dedup window per UUID/signature for repeated alerts.
+- Add short TTL cache for recent history fetches.
+- Split strategy execution:
+  - fast deterministic strategies on consumer thread
+  - slow AI strategy on async executor.
+- Add timeout + circuit breaker for gRPC and AI calls.
+- Restrict Kafka `trusted.packages` from `"*"` to explicit packages.
+
+Definition of Done:
+- Under burst traffic, consumer lag remains bounded.
+- AI unavailability does not stall Kafka consumers.
+
+### Phase 3: Service Integration Correctness (Day 4-5)
+- Fix AI Feign client name/path mismatch.
+- Implement gRPC server in LoggingService for history retrieval.
+- Add gRPC deadlines and fallback paths in MCP.
+
+Definition of Done:
+- History-dependent strategies function correctly in integration tests.
+- MCP handles LoggingService outage without thread starvation.
+
+### Phase 4: Logging/Data Hardening (Day 5-6)
+- Replace `parallelStream()` with `stream()` in ingestion mapping.
+- Move `ddl-auto` to safer production profile (`validate`/migration-driven).
+- Add DB indexes for dashboard query paths.
+- Add short-lived cache for dashboard aggregates.
+- Store block metadata as JSON, not `record.toString()`.
+
+Definition of Done:
+- Dashboard load no longer spikes DB repeatedly.
+- Block records are machine-readable and auditable.
+
+### Phase 5: Resilience Baseline (Day 6-7)
+- Add profile-level HA guidance for Redis/Kafka/Postgres/service replicas.
+- Keep dev-simple profile; add prod-safe profile defaults.
+
+Definition of Done:
+- Clear failover and scaling baseline exists for non-local environments.
+
+### Phase 6: Verification + Documentation (Day 7)
+- Add/expand unit + integration tests for all fixed flaw classes.
+- Create fix tracker with:
+  - flaw ID
+  - changed files
+  - tests
+  - verification commands
+  - residual risks.
+
+Definition of Done:
+- Each flaw has traceable fix evidence.
+
+---
+
+## 2. SOLID Violation Audit (Current Code)
+
+## S — Single Responsibility Principle (SRP)
+
+Break 1:
+- File: `ApiGateway/src/main/java/edu/pict/apigateway/filters/global/SentientGateFilter.java`
+- Problem:
+  - same class extracts request metadata, decides alert severity, builds two event models, and publishes to Kafka.
+- Fix:
+  - split into:
+    - `RequestContextExtractor`
+    - `LogEventFactory`
+    - `SecurityAlertFactory`
+    - `SecurityEventPublisher`
+
+Break 2:
+- File: `MCPService/src/main/java/edu/pict/mcpservice/service/McpAnalysisService.java`
+- Problem:
+  - orchestrates history fetch, transforms data models, executes strategies, and triggers enforcement.
+- Fix:
+  - split orchestration:
+    - `HistoryProvider`
+    - `StrategyEvaluator`
+    - `ThreatDecisionEngine`
+    - `EnforcementCoordinator`
+
+Break 3:
+- File: `LogingService/src/main/java/edu/pict/loggingservice/service/DashboardStatsService.java`
+- Problem:
+  - handles stats retrieval, error fallback policy, throughput calculation, and p99 logic in one class.
+- Fix:
+  - separate into repository-facing query service + metrics calculation utility + caching facade.
+
+## O — Open/Closed Principle (OCP)
+
+Break 1:
+- File: `MCPService/src/main/java/edu/pict/mcpservice/service/McpAnalysisService.java`
+- Problem:
+  - transformation from gRPC model to internal model is inlined in service flow; adding alternate history sources forces edits in same class.
+- Fix:
+  - introduce mapper interface and pluggable history source adapters.
+
+Break 2:
+- File: `MCPService/src/main/java/edu/pict/mcpservice/stratagies/blocking/PatternMatchStrategy.java`
+- Problem:
+  - static embedded malicious patterns mean updates require code changes/redeploy.
+- Fix:
+  - externalize signatures to config/rules provider and keep strategy closed for modification.
+
+## L — Liskov Substitution Principle (LSP)
+
+Break 1 (behavioral contract risk):
+- File: `MCPService/src/main/java/edu/pict/mcpservice/stratagies/blocking/AiAnomalyStrategy.java`
+- Problem:
+  - strategy call can block for long periods while other strategies are fast/pure. This violates expected substitutability of `ThreatStrategy` from a caller timing perspective.
+- Fix:
+  - split strategy contracts:
+    - `SynchronousThreatStrategy`
+    - `AsynchronousThreatStrategy`
+  - evaluate each in appropriate execution pipeline.
+
+## I — Interface Segregation Principle (ISP)
+
+Break 1:
+- File: `MCPService/src/main/java/edu/pict/mcpservice/stratagies/blocking/ThreatStrategy.java` (used by all strategies)
+- Problem:
+  - single contract forces both fast deterministic and slow remote-dependent strategies into same interface behavior.
+- Fix:
+  - segregate into narrower interfaces:
+    - `RuleBasedThreatStrategy`
+    - `AiThreatStrategy`
+    - optional marker for history requirement.
+
+## D — Dependency Inversion Principle (DIP)
+
+Break 1:
+- File: `MCPService/src/main/java/edu/pict/mcpservice/service/McpAnalysisService.java`
+- Problem:
+  - depends directly on concrete `EventHistoryService` and `EnforcementService`.
+- Fix:
+  - depend on abstractions:
+    - `HistoryProvider`
+    - `BlockEnforcer`.
+
+Break 2:
+- File: `MCPService/src/main/java/edu/pict/mcpservice/service/AIClient.java`
+- Problem:
+  - concrete dependence on Feign transport details leaks into domain service behavior.
+- Fix:
+  - introduce `AnomalyScoringPort` interface; Feign/WebClient become infrastructure adapters.
+
+Break 3:
+- File: `ApiGateway/src/main/java/edu/pict/apigateway/config/SecurityConfig.java`
+- Problem:
+  - security policy is hardcoded directly in config class (`anyExchange().permitAll()`), making higher-level policy dependent on low-level implementation.
+- Fix:
+  - model policy in dedicated `AuthorizationPolicy` abstraction and apply through config.
+
+---
+
+## 3. SOLID-Aligned Target Module Structure
+
+ApiGateway:
+- `security.policy` (authorization + CSRF decisions)
+- `request.context` (visitor/IP extraction and validation)
+- `events.factory` (log/alert event composition)
+- `events.publisher` (Kafka transport only)
+
+MCPService:
+- `analysis.core` (decision engine)
+- `analysis.strategy.sync` (fast local rules)
+- `analysis.strategy.async` (AI/remote rules)
+- `analysis.history` (grpc/cache providers)
+- `analysis.enforcement` (blocking port + redis adapter)
+
+LoggingService:
+- `ingestion` (Kafka to entity mapping)
+- `history.api` (gRPC/REST adapters)
+- `dashboard.query` (aggregates + cache facade)
+
+---
+
+## 4. Priority Mapping (Flaw -> SOLID-Driven Fix)
+
+1. Secret leaks and hardcoded config -> DIP (externalized secure config) + SRP (separate secret loading responsibility).
+2. `permitAll` and CSRF disable -> DIP (policy abstraction) + SRP (security policy isolated).
+3. UUID-only blacklist and IP handling gaps -> SRP (context extraction), OCP (extensible block keys).
+4. MCP redundant analysis + blocked-user reprocessing -> SRP (pipeline steps), ISP (strategy classes by behavior), LSP (sync/async split).
+5. Missing gRPC server + client mismatch -> DIP (ports/adapters), SRP (transport adapter separation).
+6. Dashboard heavy DB load -> SRP (cache facade), OCP (cache strategy extension).
+7. `parallelStream` misuse and `record.toString()` metadata storage -> SRP + DIP (serialization abstraction).
+
+---
+
+## 5. Delivery Order for Implementation
+
+1. Phase 0 + Phase 1 (security-critical).
+2. Phase 2 + Phase 3 (pipeline correctness and stability).
+3. Phase 4 (data/query efficiency and observability quality).
+4. Phase 5 + Phase 6 (resilience baseline and proof documentation).
+
+This order minimizes immediate breach risk first, then removes systemic runtime bottlenecks.
diff --git a/UI/sentinel-gateway-ui/.codex b/UI/sentinel-gateway-ui/.codex
new file mode 100644
index 0000000..e69de29
diff --git a/UI/sentinel-gateway-ui/src/features/dashboard/Dashboard.jsx b/UI/sentinel-gateway-ui/src/features/dashboard/Dashboard.jsx
index fd877e0..7546734 100644
--- a/UI/sentinel-gateway-ui/src/features/dashboard/Dashboard.jsx
+++ b/UI/sentinel-gateway-ui/src/features/dashboard/Dashboard.jsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useMemo, useState } from 'react';
 import { Activity, ShieldCheck, ShieldAlert, Zap, ArrowUpRight, ArrowDownRight, Terminal, Box, Database, Cpu } from 'lucide-react';
 import { motion } from 'framer-motion';
 import { useQuery } from '@tanstack/react-query';
@@ -55,19 +55,21 @@ const StatCard = ({ title, value, change, icon: Icon, trend, delay = 0 }) => (
 );
 
 const Dashboard = () => {
+    const [viewMode, setViewMode] = useState('live');
+
+    const windowMinutes = useMemo(() => (viewMode === 'live' ? 60 : 360), [viewMode]);
+
     // React Query for polling dashboard stats
     const { data: stats, isLoading: loading, isError: error, refetch } = useQuery({
-        queryKey: ['dashboardStats'],
+        queryKey: ['dashboardStats', windowMinutes],
         queryFn: async () => {
             const end = new Date();
-            const start = new Date(Date.now() - 3600000); // Last hour
+            const start = new Date(Date.now() - windowMinutes * 60000);
             return await logApi.getDashboardSummary(start.toISOString(), end.toISOString());
         },
-        refetchInterval: 5000, // Poll every 5s
+        refetchInterval: viewMode === 'live' ? 5000 : false,
     });
 
-    const [chartData, setChartData] = useState([]);
-
     const formatValue = (val) => {
         if (!val && val !== 0) return '0';
         if (val >= 1000000) return (val / 1000000).toFixed(1) + 'M';
@@ -75,7 +77,7 @@ const Dashboard = () => {
         return val;
     };
 
-    if (error && loading) {
+    if (error) {
         return (
             <div className="flex flex-col items-center justify-center h-[60vh] text-center space-y-6">
                 <div className="w-20 h-20 rounded-[1.5rem] bg-rose-500/10 flex items-center justify-center text-rose-500 animate-[pulse-slow] border border-rose-500/20 shadow-[0_0_30px_rgba(225,29,72,0.2)]">
@@ -101,7 +103,7 @@ const Dashboard = () => {
                     <div className="relative">
                         <h2 className="text-5xl lg:text-6xl font-black tracking-tighter leading-none flex items-center gap-4">
                             NETWORK <span className="gradient-text">OS</span>
-                            <div className="h-3 w-3 rounded-full bg-emerald-500 animate-pulse shadow-[0_0_15px_rgba(16,185,129,0.6)] mt-2" />
+                            <div className={`h-3 w-3 rounded-full shadow-[0_0_15px_rgba(16,185,129,0.6)] mt-2 ${viewMode === 'live' ? 'bg-emerald-500 animate-pulse' : 'bg-amber-500'}`} />
                         </h2>
                         <p className="text-slate-500 mt-4 font-medium text-lg max-w-xl leading-relaxed">
                             Sentinel analytics engine processing <span className="text-indigo-500 dark:text-indigo-400 font-semibold">multi-vector traffic</span> with neural precision.
@@ -109,11 +111,17 @@ const Dashboard = () => {
                     </div>
                 </div>
                 <div className="flex bg-slate-100/50 dark:bg-white/5 border border-slate-200 dark:border-white/10 rounded-2xl p-1.5 backdrop-blur-xl">
-                    <button className="px-6 py-2.5 bg-white dark:bg-white/10 text-slate-900 dark:text-white rounded-xl text-xs font-bold leading-none transition-all shadow-sm flex items-center gap-2">
-                        <div className="w-1.5 h-1.5 rounded-full bg-purple-500 animate-ping" />
+                    <button
+                        onClick={() => setViewMode('live')}
+                        className={`px-6 py-2.5 rounded-xl text-xs font-bold leading-none transition-all shadow-sm flex items-center gap-2 ${viewMode === 'live' ? 'bg-white dark:bg-white/10 text-slate-900 dark:text-white' : 'text-slate-500 hover:text-slate-900 dark:hover:text-slate-200'}`}
+                    >
+                        <div className={`w-1.5 h-1.5 rounded-full ${viewMode === 'live' ? 'bg-purple-500 animate-ping' : 'bg-slate-400'}`} />
                         Live Data
                     </button>
-                    <button className="px-6 py-2.5 text-slate-500 hover:text-slate-900 dark:hover:text-slate-200 rounded-xl text-xs font-bold leading-none transition-all">
+                    <button
+                        onClick={() => setViewMode('history')}
+                        className={`px-6 py-2.5 rounded-xl text-xs font-bold leading-none transition-all ${viewMode === 'history' ? 'bg-white dark:bg-white/10 text-slate-900 dark:text-white' : 'text-slate-500 hover:text-slate-900 dark:hover:text-slate-200'}`}
+                    >
                         History
                     </button>
                 </div>
@@ -167,7 +175,7 @@ const Dashboard = () => {
                             </h3>
                             <p className="text-slate-500 dark:text-slate-500 text-xs mt-1 font-medium italic opacity-60">Global request distribution in 1m windows</p>
                         </div>
-                        <div className="flex gap-8">
+                        <div className="flex items-center gap-8">
                             <div className="flex items-center gap-2.5">
                                 <div className="w-2 h-2 rounded-full bg-purple-500 shadow-[0_0_12px_rgba(168,85,247,0.6)]" />
                                 <span className="text-[10px] text-slate-400 dark:text-slate-600 dark:text-slate-400 font-black uppercase tracking-[0.15em]">Core Flow</span>
@@ -176,11 +184,14 @@ const Dashboard = () => {
                                 <div className="w-2 h-2 rounded-full bg-red-500 shadow-[0_0_12px_rgba(239,68,68,0.6)]" />
                                 <span className="text-[10px] text-slate-400 dark:text-slate-600 dark:text-slate-400 font-black uppercase tracking-[0.15em]">Threat Vectors</span>
                             </div>
+                            <span className="text-[10px] text-slate-500 dark:text-slate-400 uppercase tracking-widest hidden xl:block">
+                                {viewMode === 'live' ? 'Auto-refresh every 5s' : 'Snapshot mode'}
+                            </span>
                         </div>
                     </div>
 
                     <div className="h-[400px] w-full relative overflow-hidden">
-                        {loading && chartData?.length === 0 && (
+                        {loading && (
                             <div className="absolute inset-0 flex items-center justify-center bg-[#0d0d0f]/20 backdrop-blur-sm z-10 rounded-2xl">
                                 <div className="flex flex-col items-center gap-4">
                                     <div className="w-10 h-10 border-4 border-purple-500/30 border-t-purple-500 rounded-full animate-spin" />
@@ -188,7 +199,10 @@ const Dashboard = () => {
                                 </div>
                             </div>
                         )}
-                        <StatsChart />
+                        <StatsChart
+                            windowMinutes={viewMode === 'live' ? 30 : 180}
+                            refreshInterval={viewMode === 'live' ? 5000 : false}
+                        />
                     </div>
                 </div>
 
diff --git a/UI/sentinel-gateway-ui/src/features/dashboard/StatsChart.jsx b/UI/sentinel-gateway-ui/src/features/dashboard/StatsChart.jsx
index e5c9a18..d84f88d 100644
--- a/UI/sentinel-gateway-ui/src/features/dashboard/StatsChart.jsx
+++ b/UI/sentinel-gateway-ui/src/features/dashboard/StatsChart.jsx
@@ -2,12 +2,12 @@ import React, { useEffect, useState } from 'react';
 import { AreaChart, Area, XAxis, YAxis, CartesianGrid, Tooltip, ResponsiveContainer } from 'recharts';
 import { logApi } from '../../shared/api/client';
 
-const StatsChart = () => {
+const StatsChart = ({ windowMinutes = 30, refreshInterval = 5000 }) => {
     const [chartData, setChartData] = useState([]);
 
     const fetchVelocity = () => {
         const end = new Date();
-        const start = new Date(Date.now() - 30 * 60000); // Last 30 mins
+        const start = new Date(Date.now() - windowMinutes * 60000);
 
         logApi.getTrafficVelocity(start.toISOString(), end.toISOString())
             .then(res => {
@@ -26,9 +26,10 @@ const StatsChart = () => {
 
     useEffect(() => {
         fetchVelocity();
-        const interval = setInterval(fetchVelocity, 5000);
+        if (!refreshInterval) return undefined;
+        const interval = setInterval(fetchVelocity, refreshInterval);
         return () => clearInterval(interval);
-    }, []);
+    }, [windowMinutes, refreshInterval]);
 
     return (
         <div className="w-full h-[400px] min-h-[400px]">
diff --git a/UI/sentinel-gateway-ui/src/features/logs/LogsView.jsx b/UI/sentinel-gateway-ui/src/features/logs/LogsView.jsx
index d37c90b..7ae79a1 100644
--- a/UI/sentinel-gateway-ui/src/features/logs/LogsView.jsx
+++ b/UI/sentinel-gateway-ui/src/features/logs/LogsView.jsx
@@ -4,6 +4,7 @@ import { motion, AnimatePresence } from 'framer-motion';
 import { useQuery } from '@tanstack/react-query';
 import { logApi } from '../../shared/api/client';
 import { useReactTable, getCoreRowModel, getPaginationRowModel, getSortedRowModel, flexRender, createColumnHelper } from '@tanstack/react-table';
+import { useSearchParams } from 'react-router-dom';
 
 const StatusBadge = ({ code }) => {
     const isError = code >= 400;
@@ -109,14 +110,22 @@ const columns = [
 ];
 
 const LogsView = () => {
+    const [searchParams] = useSearchParams();
     const [autoRefresh, setAutoRefresh] = useState(true);
-    const [filterPath, setFilterPath] = useState('');
+    const [filterPath, setFilterPath] = useState(searchParams.get('path') || '');
     const [filterStatus, setFilterStatus] = useState('');
+    const [selectedLog, setSelectedLog] = useState(null);
     const [pagination, setPagination] = useState({
         pageIndex: 0,
         pageSize: 50,
     });
 
+    React.useEffect(() => {
+        const queryPath = searchParams.get('path') || '';
+        setFilterPath(queryPath);
+        setPagination((prev) => ({ ...prev, pageIndex: 0 }));
+    }, [searchParams]);
+
     const { data: logsResponse, isLoading: loading, isFetching } = useQuery({
         queryKey: ['logs', pagination.pageIndex, pagination.pageSize, filterPath, filterStatus],
         queryFn: async () => {
@@ -195,6 +204,17 @@ const LogsView = () => {
                         <RefreshCcw className={`w-4 h-4 ${(autoRefresh && isFetching) ? 'animate-spin-slow' : ''}`} />
                         {autoRefresh ? 'Live' : 'Stopped'}
                     </button>
+                    <button
+                        onClick={() => {
+                            setFilterPath('');
+                            setFilterStatus('');
+                            setSelectedLog(null);
+                            setPagination((prev) => ({ ...prev, pageIndex: 0 }));
+                        }}
+                        className="px-4 py-2.5 rounded-2xl border border-slate-300 dark:border-white/10 text-slate-500 dark:text-slate-400 text-xs font-black uppercase tracking-widest hover:text-slate-900 dark:hover:text-white hover:bg-slate-100 dark:hover:bg-white/10 transition-all"
+                    >
+                        Reset
+                    </button>
                 </div>
             </div>
 
@@ -299,8 +319,9 @@ const LogsView = () => {
                                             animate={{ opacity: 1, x: 0 }}
                                             transition={{ duration: 0.2 }}
                                             key={row.id}
-                                            className="hover:bg-white/[0.02] transition-all group"
-                                        >
+                                        className="hover:bg-white/[0.02] transition-all group cursor-pointer"
+                                        onClick={() => setSelectedLog(row.original)}
+                                    >
                                             {row.getVisibleCells().map(cell => (
                                                 <td key={cell.id} className="px-8 py-5 whitespace-nowrap">
                                                     {flexRender(cell.column.columnDef.cell, cell.getContext())}
@@ -337,6 +358,33 @@ const LogsView = () => {
                     </div>
                 </div>
             </div>
+
+            <AnimatePresence>
+                {selectedLog && (
+                    <motion.div
+                        initial={{ opacity: 0, y: 10 }}
+                        animate={{ opacity: 1, y: 0 }}
+                        exit={{ opacity: 0, y: 10 }}
+                        className="glass-card rounded-[2rem] p-6 border border-slate-200 dark:border-white/5"
+                    >
+                        <div className="flex flex-col md:flex-row md:items-center md:justify-between gap-4 mb-5">
+                            <div>
+                                <p className="text-[10px] font-black uppercase tracking-[0.2em] text-slate-500 dark:text-slate-400">Selected Event</p>
+                                <p className="font-mono text-sm text-slate-700 dark:text-slate-200 mt-1">{selectedLog.path || 'Unknown path'}</p>
+                            </div>
+                            <button
+                                onClick={() => setSelectedLog(null)}
+                                className="px-4 py-2 rounded-xl border border-slate-300 dark:border-white/10 text-[10px] font-black uppercase tracking-widest text-slate-500 dark:text-slate-400 hover:text-slate-900 dark:hover:text-white hover:bg-slate-100 dark:hover:bg-white/10 transition-all self-start"
+                            >
+                                Dismiss
+                            </button>
+                        </div>
+                        <pre className="bg-slate-100 dark:bg-black/30 border border-slate-200 dark:border-white/10 rounded-2xl p-4 text-xs text-slate-700 dark:text-slate-300 overflow-x-auto">
+                            {JSON.stringify(selectedLog, null, 2)}
+                        </pre>
+                    </motion.div>
+                )}
+            </AnimatePresence>
         </motion.div>
     );
 };
diff --git a/UI/sentinel-gateway-ui/src/shared/components/Layout.jsx b/UI/sentinel-gateway-ui/src/shared/components/Layout.jsx
index db66b6d..f866164 100644
--- a/UI/sentinel-gateway-ui/src/shared/components/Layout.jsx
+++ b/UI/sentinel-gateway-ui/src/shared/components/Layout.jsx
@@ -1,6 +1,25 @@
-import React, { useState, useEffect } from 'react';
-import { NavLink, Outlet, useLocation } from 'react-router-dom';
-import { LayoutDashboard, ListFilter, ShieldAlert, Activity, Settings, Bell, Search, User, Sun, Moon, Server, Network, Zap, Layers, Database } from 'lucide-react';
+import React, { useState, useEffect, useMemo, useRef } from 'react';
+import { NavLink, Outlet, useLocation, useNavigate } from 'react-router-dom';
+import {
+    LayoutDashboard,
+    ListFilter,
+    ShieldAlert,
+    Activity,
+    Bell,
+    Search,
+    User,
+    Sun,
+    Moon,
+    Server,
+    Network,
+    Zap,
+    Layers,
+    Database,
+    Menu,
+    X,
+    Command,
+    ArrowRight,
+} from 'lucide-react';
 import { clsx } from 'clsx';
 import { twMerge } from 'tailwind-merge';
 import { motion, AnimatePresence } from 'framer-motion';
@@ -9,10 +28,26 @@ function cn(...inputs) {
     return twMerge(clsx(inputs));
 }
 
+const navItems = [
+    { name: 'Dashboard', path: '/', icon: LayoutDashboard },
+    { name: 'Service Registry', path: '/registry', icon: Network, isSubItem: true },
+    { name: 'Infrastructure Node', path: '/infrastructure', icon: Server },
+    { name: 'Kafka Cluster', path: '/infrastructure/kafka', icon: Zap, isSubItem: true },
+    { name: 'Redis Cache', path: '/infrastructure/redis', icon: Layers, isSubItem: true },
+    { name: 'PostgreSQL', path: '/infrastructure/postgres', icon: Database, isSubItem: true },
+    { name: 'Admin Logs', path: '/logs', icon: ListFilter },
+    { name: 'Blacklist', path: '/blacklist', icon: ShieldAlert },
+    { name: 'Request Flow', path: '/flow', icon: Activity },
+];
+
 const Layout = () => {
     const location = useLocation();
+    const navigate = useNavigate();
+    const searchInputRef = useRef(null);
+
+    const [sidebarOpen, setSidebarOpen] = useState(false);
+    const [commandQuery, setCommandQuery] = useState('');
 
-    // Theme Management
     const [theme, setTheme] = useState(() => {
         if (typeof window !== 'undefined') {
             const saved = localStorage.getItem('theme');
@@ -31,42 +66,114 @@ const Layout = () => {
         localStorage.setItem('theme', theme);
     }, [theme]);
 
+    useEffect(() => {
+        setSidebarOpen(false);
+        setCommandQuery('');
+    }, [location.pathname]);
+
+    useEffect(() => {
+        const onKeyDown = (event) => {
+            if ((event.metaKey || event.ctrlKey) && event.key.toLowerCase() === 'k') {
+                event.preventDefault();
+                searchInputRef.current?.focus();
+            }
+        };
+
+        window.addEventListener('keydown', onKeyDown);
+        return () => window.removeEventListener('keydown', onKeyDown);
+    }, []);
+
     const toggleTheme = () => setTheme(theme === 'dark' ? 'light' : 'dark');
 
-    const navItems = [
-        { name: 'Dashboard', path: '/', icon: LayoutDashboard },
-        { name: 'Service Registry', path: '/registry', icon: Network, isSubItem: true },
-        { name: 'Infrastructure Node', path: '/infrastructure', icon: Server },
-        { name: 'Kafka Cluster', path: '/infrastructure/kafka', icon: Zap, isSubItem: true },
-        { name: 'Redis Cache', path: '/infrastructure/redis', icon: Layers, isSubItem: true },
-        { name: 'PostgreSQL', path: '/infrastructure/postgres', icon: Database, isSubItem: true },
-        { name: 'Admin Logs', path: '/logs', icon: ListFilter },
-        { name: 'Blacklist', path: '/blacklist', icon: ShieldAlert },
-        { name: 'Request Flow', path: '/flow', icon: Activity },
-    ];
+    const matchedItems = useMemo(() => {
+        const query = commandQuery.trim().toLowerCase();
+        if (!query) return [];
+        return navItems.filter((item) => item.name.toLowerCase().includes(query) || item.path.toLowerCase().includes(query));
+    }, [commandQuery]);
+
+    const currentPageLabel = useMemo(() => {
+        const exactMatch = navItems.find((item) => item.path === location.pathname);
+        if (exactMatch) return exactMatch.name;
+
+        const nestedMatch = navItems.find(
+            (item) => item.path !== '/' && location.pathname.startsWith(item.path),
+        );
+
+        return nestedMatch?.name || 'Overview';
+    }, [location.pathname]);
+
+    const onSearchSubmit = (event) => {
+        event.preventDefault();
+
+        if (!commandQuery.trim()) {
+            searchInputRef.current?.focus();
+            return;
+        }
+
+        const exactMatch = navItems.find(
+            (item) =>
+                item.name.toLowerCase() === commandQuery.trim().toLowerCase() ||
+                item.path.toLowerCase() === commandQuery.trim().toLowerCase(),
+        );
+
+        const route = exactMatch?.path || matchedItems[0]?.path;
+        if (route) {
+            navigate(route);
+        }
+    };
 
     return (
         <div className="min-h-screen flex bg-slate-50 text-slate-900 dark:bg-[#030303] dark:text-slate-200 transition-colors duration-500">
             <div className="mesh-grid" />
             <div className="vignette" />
 
-            {/* Background Orbs */}
             <div className="fixed top-[-10%] left-[-10%] w-[40%] h-[40%] bg-purple-600/10 dark:bg-purple-600/20 rounded-full blur-[120px] mix-blend-multiply dark:mix-blend-screen animate-float pointer-events-none z-0" />
-            <div className="fixed bottom-[-10%] right-[-10%] w-[40%] h-[40%] bg-blue-600/10 dark:bg-blue-600/20 rounded-full blur-[120px] mix-blend-multiply dark:mix-blend-screen animate-float pointer-events-none z-0" style={{ animationDelay: '2s' }} />
+            <div
+                className="fixed bottom-[-10%] right-[-10%] w-[40%] h-[40%] bg-blue-600/10 dark:bg-blue-600/20 rounded-full blur-[120px] mix-blend-multiply dark:mix-blend-screen animate-float pointer-events-none z-0"
+                style={{ animationDelay: '2s' }}
+            />
+
+            <AnimatePresence>
+                {sidebarOpen && (
+                    <motion.button
+                        type="button"
+                        aria-label="Close sidebar"
+                        initial={{ opacity: 0 }}
+                        animate={{ opacity: 1 }}
+                        exit={{ opacity: 0 }}
+                        onClick={() => setSidebarOpen(false)}
+                        className="fixed inset-0 z-40 bg-black/50 backdrop-blur-sm lg:hidden"
+                    />
+                )}
+            </AnimatePresence>
 
-            {/* Sidebar */}
-            <aside className="w-72 border-r border-slate-200 dark:border-white/5 bg-white/80 dark:bg-[#050505]/80 backdrop-blur-2xl flex flex-col sticky top-0 h-screen z-50 transition-colors duration-500 overflow-y-auto">
-                <div className="p-8 shrink-0">
+            <aside
+                className={cn(
+                    'w-72 border-r border-slate-200 dark:border-white/5 bg-white/80 dark:bg-[#050505]/80 backdrop-blur-2xl flex flex-col h-screen z-50 transition-transform duration-300 overflow-y-auto fixed top-0 left-0 lg:sticky lg:translate-x-0',
+                    sidebarOpen ? 'translate-x-0' : '-translate-x-full',
+                )}
+            >
+                <div className="p-8 shrink-0 flex items-center justify-between">
                     <div className="flex items-center gap-4 group cursor-pointer">
                         <div className="w-12 h-12 rounded-[1.25rem] bg-gradient-to-br from-indigo-500 via-purple-500 to-pink-500 flex items-center justify-center shadow-lg group-hover:shadow-purple-500/50 group-hover:scale-[1.05] transition-all duration-500 relative overflow-hidden">
                             <div className="absolute inset-0 bg-white/20 opacity-0 group-hover:opacity-100 transition-opacity" />
                             <ShieldAlert className="w-6 h-6 text-white relative z-10" />
                         </div>
                         <div>
-                            <h1 className="text-2xl font-black tracking-tight bg-clip-text text-transparent bg-gradient-to-r from-slate-900 via-purple-800 to-slate-900 dark:from-white dark:via-purple-200 dark:to-white">Sentient</h1>
+                            <h1 className="text-2xl font-black tracking-tight bg-clip-text text-transparent bg-gradient-to-r from-slate-900 via-purple-800 to-slate-900 dark:from-white dark:via-purple-200 dark:to-white">
+                                Sentient
+                            </h1>
                             <p className="text-[10px] text-slate-500 font-bold tracking-[0.2em] uppercase -mt-0.5">Gateway Core</p>
                         </div>
                     </div>
+
+                    <button
+                        type="button"
+                        onClick={() => setSidebarOpen(false)}
+                        className="lg:hidden p-2 rounded-xl text-slate-500 hover:bg-slate-100 dark:hover:bg-white/10"
+                    >
+                        <X className="w-5 h-5" />
+                    </button>
                 </div>
 
                 <nav className="flex-1 px-4 space-y-1.5 pb-8">
@@ -77,18 +184,31 @@ const Layout = () => {
                             to={item.path}
                             className={({ isActive }) =>
                                 cn(
-                                    "flex items-center gap-3 px-4 py-3 rounded-[1rem] transition-all duration-300 group relative overflow-hidden",
-                                    item.isSubItem ? "ml-6 pl-5 text-sm border-l border-slate-200 dark:border-white/10 rounded-l-none my-0.5 py-2.5" : "font-semibold tracking-wide",
+                                    'flex items-center gap-3 px-4 py-3 rounded-[1rem] transition-all duration-300 group relative overflow-hidden',
+                                    item.isSubItem
+                                        ? 'ml-6 pl-5 text-sm border-l border-slate-200 dark:border-white/10 rounded-l-none my-0.5 py-2.5'
+                                        : 'font-semibold tracking-wide',
                                     isActive
-                                        ? "text-purple-700 dark:text-purple-300 bg-purple-50 dark:bg-purple-900/20"
-                                        : "text-slate-500 hover:text-slate-900 dark:hover:text-slate-200 hover:bg-slate-100 dark:hover:bg-white/[0.04]"
+                                        ? 'text-purple-700 dark:text-purple-300 bg-purple-50 dark:bg-purple-900/20'
+                                        : 'text-slate-500 hover:text-slate-900 dark:hover:text-slate-200 hover:bg-slate-100 dark:hover:bg-white/[0.04]',
                                 )
                             }
                         >
                             {({ isActive }) => (
                                 <>
-                                    {isActive && <motion.div layoutId="leftBar" className="absolute left-0 top-1/4 bottom-1/4 w-1 bg-purple-500 rounded-r-full z-10" />}
-                                    <item.icon className={cn("transition-colors duration-300 relative z-10", item.isSubItem ? "w-4 h-4" : "w-5 h-5", isActive ? "text-purple-600 dark:text-purple-400" : "group-hover:text-purple-500/70")} />
+                                    {isActive && (
+                                        <motion.div
+                                            layoutId="leftBar"
+                                            className="absolute left-0 top-1/4 bottom-1/4 w-1 bg-purple-500 rounded-r-full z-10"
+                                        />
+                                    )}
+                                    <item.icon
+                                        className={cn(
+                                            'transition-colors duration-300 relative z-10',
+                                            item.isSubItem ? 'w-4 h-4' : 'w-5 h-5',
+                                            isActive ? 'text-purple-600 dark:text-purple-400' : 'group-hover:text-purple-500/70',
+                                        )}
+                                    />
                                     <span className="relative z-10">{item.name}</span>
                                 </>
                             )}
@@ -98,14 +218,16 @@ const Layout = () => {
 
                 <div className="p-6 mt-auto">
                     <div className="relative overflow-hidden p-5 rounded-[1.5rem] bg-gradient-to-br from-purple-500/10 via-fuchsia-500/5 to-transparent border border-purple-500/10">
-                        <div className="absolute top-0 right-0 p-4 opacity-10"><Activity className="w-16 h-16" /></div>
+                        <div className="absolute top-0 right-0 p-4 opacity-10">
+                            <Activity className="w-16 h-16" />
+                        </div>
                         <p className="text-xs font-bold text-slate-900 dark:text-white mb-1 tracking-wide">System Health</p>
                         <p className="text-[10px] text-slate-500 leading-relaxed mb-4 pr-4">All nodes operating at optimal efficiency.</p>
                         <div className="h-1.5 bg-slate-200 dark:bg-white/10 rounded-full overflow-hidden">
                             <motion.div
                                 initial={{ width: 0 }}
-                                animate={{ width: "99.9%" }}
-                                transition={{ duration: 1.5, ease: "easeOut" }}
+                                animate={{ width: '99.9%' }}
+                                transition={{ duration: 1.5, ease: 'easeOut' }}
                                 className="h-full bg-gradient-to-r from-purple-500 to-indigo-500 relative"
                             >
                                 <div className="absolute inset-0 bg-white/30 animate-pulse" />
@@ -115,21 +237,72 @@ const Layout = () => {
                 </div>
             </aside>
 
-            {/* Main Content */}
-            <main className="flex-1 flex flex-col relative z-10 w-full overflow-x-hidden min-h-screen">
-                <header className="h-24 flex shrink-0 items-center justify-between px-10 bg-background/60 backdrop-blur-xl border-b border-border sticky top-0 z-40">
-                    <div className="flex-1 max-w-md">
-                        <div className="relative group flex items-center">
-                            <Search className="w-4 h-4 absolute left-4 text-slate-400 group-focus-within:text-purple-500 transition-colors" />
+            <main className="flex-1 flex flex-col relative z-10 w-full overflow-x-hidden min-h-screen lg:ml-0">
+                <header className="h-auto min-h-24 flex flex-wrap gap-4 shrink-0 items-center justify-between px-4 sm:px-6 lg:px-10 py-4 bg-background/60 backdrop-blur-xl border-b border-border sticky top-0 z-30">
+                    <div className="flex items-center gap-3">
+                        <button
+                            type="button"
+                            onClick={() => setSidebarOpen(true)}
+                            className="lg:hidden p-3 rounded-[1rem] hover:bg-slate-100 dark:hover:bg-white/10 text-slate-500 transition-colors"
+                        >
+                            <Menu className="w-5 h-5" />
+                        </button>
+
+                        <div className="hidden sm:block">
+                            <p className="text-[10px] font-black uppercase tracking-[0.2em] text-slate-400">Active Panel</p>
+                            <h2 className="text-lg font-bold tracking-tight text-slate-900 dark:text-white">{currentPageLabel}</h2>
+                        </div>
+                    </div>
+
+                    <div className="flex-1 min-w-[220px] max-w-xl">
+                        <form onSubmit={onSearchSubmit} className="relative group">
+                            <Search className="w-4 h-4 absolute left-4 top-1/2 -translate-y-1/2 text-slate-400 group-focus-within:text-purple-500 transition-colors" />
                             <input
+                                ref={searchInputRef}
                                 type="text"
-                                placeholder="Search logs, IPs, or events..."
-                                className="w-full bg-slate-100/50 dark:bg-white/5 border border-transparent shadow-sm dark:shadow-none rounded-2xl pl-12 pr-4 py-3 text-sm outline-none focus:border-purple-500/30 focus:bg-white dark:focus:bg-white/10 transition-all placeholder:text-slate-400"
+                                value={commandQuery}
+                                onChange={(event) => setCommandQuery(event.target.value)}
+                                placeholder="Jump to dashboard, logs, registry..."
+                                className="w-full bg-slate-100/50 dark:bg-white/5 border border-transparent shadow-sm dark:shadow-none rounded-2xl pl-12 pr-28 py-3 text-sm outline-none focus:border-purple-500/30 focus:bg-white dark:focus:bg-white/10 transition-all placeholder:text-slate-400"
                             />
-                        </div>
+                            <div className="absolute right-3 top-1/2 -translate-y-1/2 flex items-center gap-1 text-[10px] text-slate-400 font-bold">
+                                <Command className="w-3 h-3" />
+                                <span>K</span>
+                            </div>
+
+                            <AnimatePresence>
+                                {commandQuery.trim() && (
+                                    <motion.div
+                                        initial={{ opacity: 0, y: 8 }}
+                                        animate={{ opacity: 1, y: 0 }}
+                                        exit={{ opacity: 0, y: 8 }}
+                                        className="absolute left-0 right-0 mt-2 bg-white dark:bg-[#0f0f10] border border-slate-200 dark:border-white/10 rounded-2xl shadow-2xl overflow-hidden z-50"
+                                    >
+                                        {matchedItems.length > 0 ? (
+                                            matchedItems.slice(0, 5).map((item) => (
+                                                <button
+                                                    key={item.path}
+                                                    type="button"
+                                                    onClick={() => navigate(item.path)}
+                                                    className="w-full px-4 py-3 text-left flex items-center justify-between hover:bg-slate-100 dark:hover:bg-white/5 transition-colors"
+                                                >
+                                                    <div className="flex items-center gap-3">
+                                                        <item.icon className="w-4 h-4 text-slate-500" />
+                                                        <span className="text-sm font-medium text-slate-700 dark:text-slate-200">{item.name}</span>
+                                                    </div>
+                                                    <ArrowRight className="w-4 h-4 text-slate-400" />
+                                                </button>
+                                            ))
+                                        ) : (
+                                            <div className="px-4 py-3 text-sm text-slate-500">No matching section found.</div>
+                                        )}
+                                    </motion.div>
+                                )}
+                            </AnimatePresence>
+                        </form>
                     </div>
 
-                    <div className="flex items-center gap-4">
+                    <div className="flex items-center gap-2 sm:gap-4 ml-auto">
                         <button
                             onClick={toggleTheme}
                             className="p-3 rounded-[1rem] hover:bg-slate-100 dark:hover:bg-white/10 text-slate-500 transition-colors"
@@ -142,9 +315,7 @@ const Layout = () => {
                             <span className="absolute top-2.5 right-2.5 w-2 h-2 bg-rose-500 rounded-full border-2 border-background" />
                         </button>
 
-                        <div className="w-px h-8 bg-border mx-2" />
-
-                        <div className="flex items-center gap-3 bg-slate-100/50 dark:bg-white/5 pr-4 pl-1.5 py-1.5 rounded-full border border-border">
+                        <div className="hidden sm:flex items-center gap-3 bg-slate-100/50 dark:bg-white/5 pr-4 pl-1.5 py-1.5 rounded-full border border-border">
                             <div className="w-9 h-9 rounded-full bg-gradient-to-br from-indigo-500 to-purple-600 flex items-center justify-center text-white shadow-md">
                                 <User className="w-4 h-4" />
                             </div>
@@ -156,7 +327,7 @@ const Layout = () => {
                     </div>
                 </header>
 
-                <div className="p-10 mx-auto w-full max-w-[1600px] flex-1">
+                <div className="p-4 sm:p-6 lg:p-10 mx-auto w-full max-w-[1600px] flex-1">
                     <Outlet />
                 </div>
             </main>
diff --git a/docker-compose.yml b/docker-compose.yml
index b5a4b3c..b697e7c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,8 +5,8 @@ services:
     container_name: sentient-postgres
     environment:
       POSTGRES_DB: mydb
-      POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: postgres
+      POSTGRES_USER: ${POSTGRES_USER:-postgres}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
     ports:
       - "5433:5432"
     healthcheck:
@@ -65,6 +65,8 @@ services:
       - SPRING_DATA_REDIS_HOST=redis
       - EUREKA_CLIENT_SERVICEURL_DEFAULTZONE=http://eureka-server:8761/eureka
       - SPRING_KAFKA_BOOTSTRAP_SERVERS=kafka:9092
+      - SENTINEL_SECURITY_SECRET_KEY=${SENTINEL_SECURITY_SECRET_KEY}
+      - JWT_SECRET_KEY=${JWT_SECRET_KEY}
     depends_on:
       - eureka-server
       - redis
@@ -75,10 +77,11 @@ services:
     container_name: logging-service
     environment:
       - SPRING_DATASOURCE_URL=jdbc:postgresql://postgres:5432/mydb
-      - SPRING_DATASOURCE_USERNAME=postgres
-      - SPRING_DATASOURCE_PASSWORD=postgres
+      - SPRING_DATASOURCE_USERNAME=${POSTGRES_USER:-postgres}
+      - SPRING_DATASOURCE_PASSWORD=${POSTGRES_PASSWORD}
       - SPRING_KAFKA_BOOTSTRAP_SERVERS=kafka:9092
       - EUREKA_CLIENT_SERVICEURL_DEFAULTZONE=http://eureka-server:8761/eureka
+      - SPRING_JPA_HIBERNATE_DDL_AUTO=${SPRING_JPA_HIBERNATE_DDL_AUTO:-update}
     depends_on:
       - eureka-server
       - postgres
diff --git a/private_key.pem b/private_key.pem
deleted file mode 100644
index ca050d9..0000000
--- a/private_key.pem
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCqfaXaG0/a/zqU
-MhdtGluHD8z4D40lkpYZFKsYwFeb52Y37EEetOwcIi3pm1HsWXQLel4wBoeO+4xa
-1u2e85nmBrP6iF4sPDp0peqUcMDQSAi04i6ScE2NluP55lhcocaHoew6D84Q2P4g
-dPwmCVJcc3mYcIAY6AHTHFXZk8RB5FgIGrJ3Tvb7Xs9v8SVvNHkuvHeiOtSrsmDE
-yP4EDSFn0vbCXN2IDKPjjFOHZkdzabaXWXqqjKatnBz+M2hSVX9arReOxisIq0BW
-BEan2RLJkWNU2a7bfiMBYp8o/1kjul+pqjBx2wrEqezQa/J8bNmNjHi2oXeHPe/N
-YKOg7YG7AgMBAAECggEAAfrNhzfT+I4IJxphzUGGGI5laef8UpheJ9JmnjX1jnjk
-ZffXVbzyFO2MrO7Bx8XOJCf6mgIpZs6i9ZcTUUow2kvvoRQeS9MzNpGKpMieZIzB
-lSAfPFIThHZhFVDIa+LxBDgsHwx57xYl9UiGeQaYrzwkCFIeGqvvAX2NvaYKnF0+
-kUfssXnyCpyZVzo+VKIXS3uPVBrqVPeiCDCGYmsIVYJAwi3jDQMFq2xfm/+WfeRM
-f2ocryad+1bQklLo+gWjg6mlZjb9RyX7HEdUCkSfXEwhht/dCmKRGC5qJxZcjIf0
-4BIFMAEEP+SsgboNypgK05K+rgSsTO0FHoMIm/ComQKBgQDZ39jHuazZpEXdjlTC
-D0Hkon0QRCUC81EKpcpYFvylETwKKq0UFhaEn9FQcZUhSJDLS1iosx1qVIIK8KDE
-cu2U+wQh0tt7/6ux3+VYTGblwkMz4v376eKtHPBBoR1XZWME0UBSL+DIlKBeQvEE
-tCNvn9hNfpoT91ZoypkInMrlLwKBgQDIUyatYZTSIr11zumSgyCw8uX8KzT1FObj
-IdXALzHfZNt1srfIeFQVsg4XewHDGsVG5Nwek8JIIwKNdwpMGGMGh6M4Y1AcUZLP
-+NUnAhPFx+WfzOQjN7Xf8WUiJ9YEzqeeHb86Fi1OVA7N/1S9y7TrkljrYfXJ9mX/
-mW9tnG8hNQKBgQC3dolC1ZU5x9yVDk9NAjAIaNNLKTbJXz506tqShvjDvtmB7iHE
-cj0P/MvzI1HirwpOReooVHuGmBbRQ4L9KZHqC92U5cuwhMB9jf2/9sYG3yhbvt8E
-jBQ2ldGyUgs1Fsjku5egHXT5Mj5AYbo2rcHRMxafWuY/vdzjbQake/NWPQKBgFcb
-4UuvjRk7Rgt+aA7vuj13wg4/c43HAwdtZRdm7lbn8o5hoo0n1diBTqNjN8bxUyua
-xST+t5LKtodxZibky9rBDHauqN1Hk4GgAIAv5Q0x+WXdoK63wPyaaZHKpMP+YODe
-qpLFpfnTj4SALQdDF28Aem4QcOLbpErbG5scVS6pAoGAdQY/r1Y6ALCl7FflZzYo
-jqznwtLDoXLBH2MAYuYcg9CwddIVhzhL5dxuJnb406pEZNAVJbawnKj5Y9NxJHnN
-Nl2D/ESbfSaGy3F6SCTxYljz/NUcy5m8p3dTXXj2JhGMvw+JblBlHdKNxo2D/gFV
-22j3ezEKy+T17gC2yJvaMhY=
------END PRIVATE KEY-----