Add

Author: phrocker

ai-agent/src/main/java/io/sentrius/agent/analysis/agents/verbs/AgentVerbs.java

@@ -151,7 +151,8 @@ public ArrayNode promptAgent(AgentExecution execution, Map<String, Object> args)
     @Verb(name = "interpret_user_request", returnType = ArrayNode.class, description = "Queries the LLM using the " +
         "user input.",
         isAiCallable = false, requiresTokenManagement = true)
-    public TerminalResponse interpretUserData(AgentExecution execution, @NonNull WebSocky socketConnection) throws ZtatException,
+    public TerminalResponse interpretUserData(AgentExecution execution, @NonNull WebSocky socketConnection,
+                                              @NonNull Message userMessage) throws ZtatException,
         IOException {
 
         var lastMessage = socketConnection.getMessages().stream().reduce((prev, next) -> next).orElse(null);
@@ -175,10 +176,14 @@ public TerminalResponse interpretUserData(AgentExecution execution, @NonNull Web
             List<Message> messages = new ArrayList<>();
 
             messages.add(Message.builder().role("system").content(prompt).build());
-            messages.add(Message.builder().role("system").content("Please ensure your respones abide by the " +
-                "following json format. Please summarize prior terminal sessions, using terminal output if needed " +
+            messages.add(Message.builder().role("system").content("Please ensure your nextOperation abides by the " +
+                "following json format and leave it empty if user's request doesn't require explicit use of system " +
+                "operations" +
+                ". Please summarize prior terminal " +
+                "sessions, using " +
+                "terminal output if needed " +
                 "for clarity of the next LLM request and for the user: " + terminalResponse).build());
-
+            messages.add(Message.builder().role("user").content(userMessage.getContent()).build());
             LLMRequest chatRequest = LLMRequest.builder().model("gpt-4o").messages(messages).build();
             var resp = llmService.askQuestion(execution, chatRequest);
             execution.addMessages( messages );
@@ -217,10 +222,11 @@ public TerminalResponse interpretUserData(AgentExecution execution, @NonNull Web
             List<Message> messages = new ArrayList<>();
 
             messages.add(Message.builder().role("system").content(prompt).build());
-            messages.add(Message.builder().role("system").content("Please ensure your respones abide by the " +
+            messages.add(Message.builder().role("system").content("Please ensure your nextOperation abide by the " +
                 "following json format. Please summarize prior terminal sessions, using terminal output if needed " +
                 "for clarity of the next LLM request and for the user: " + terminalResponse).build());
             messages.add(Message.builder().role("assistant").content("prior response: " + lastMessage.getTerminalSummaryForLLM()).build());
+            messages.add(Message.builder().role("user").content(userMessage.getContent()).build());
 
             LLMRequest chatRequest = LLMRequest.builder().model("gpt-4o").messages(messages).build();
             var resp = llmService.askQuestion(execution, chatRequest);

ai-agent/src/main/java/io/sentrius/agent/analysis/api/UserCommunicationService.java

@@ -28,6 +28,8 @@ public class UserCommunicationService {
 
     private final ConcurrentHashMap<String, WebSocky> sessions = new ConcurrentHashMap<>();
 
+
+
     public void createSession(String sessionId, WebSocketSession session) {
         sessions.put(sessionId, WebSocky.builder().sessionId(sessionId).webSocketSession(session).build());
     }

ai-agent/src/main/java/io/sentrius/agent/analysis/api/websocket/ChatWSHandler.java

@@ -11,8 +11,12 @@
 import java.util.stream.Stream;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.sentrius.agent.analysis.agents.agents.ChatAgent;
+import io.sentrius.agent.analysis.agents.verbs.AgentVerbs;
+import io.sentrius.agent.analysis.agents.verbs.TerminalVerbs;
 import io.sentrius.agent.analysis.api.UserCommunicationService;
+import io.sentrius.sso.core.exceptions.ZtatException;
 import io.sentrius.sso.core.services.agents.ZeroTrustClientService;
+import io.sentrius.sso.genai.Message;
 import io.sentrius.sso.protobuf.Session;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -29,15 +33,20 @@ public class ChatWSHandler extends TextWebSocketHandler {
 
     final UserCommunicationService userCommunicationService;
     final ZeroTrustClientService zeroTrustClientService;
+    final TerminalVerbs terminalVerbs;
+    final AgentVerbs agentVerbs;
     // Store active sessions, using session ID or a custom identifier
 
 
     private final ChatAgent chatAgent;
 
     @Autowired
-    public ChatWSHandler(UserCommunicationService userCommunicationService, ZeroTrustClientService zeroTrustClientService, ChatAgent chatAgent) {
+    public ChatWSHandler(UserCommunicationService userCommunicationService, ZeroTrustClientService zeroTrustClientService,
+                         TerminalVerbs terminalVerbs, AgentVerbs agentVerbs, ChatAgent chatAgent) {
         this.userCommunicationService = userCommunicationService;
         this.zeroTrustClientService = zeroTrustClientService;
+        this.terminalVerbs = terminalVerbs;
+        this.agentVerbs = agentVerbs;
         this.chatAgent = chatAgent;
     }
 
@@ -85,6 +94,8 @@ public void afterConnectionEstablished(WebSocketSession session) throws Exceptio
         session.sendMessage(new TextMessage(
             base64Message
         ));
+
+        userCommunicationService.createSession(queryParams.get("sessionId"), session);
     }
 
 
@@ -100,7 +111,10 @@ protected void handleTextMessage(WebSocketSession session, TextMessage message)
                 Map<String, String> queryParams = parseQueryParams(uri.getQuery());
                 String sessionId = queryParams.get("sessionId");
 
-                if (sessionId != null) {
+                var websocky = userCommunicationService.getSession(sessionId);
+
+                if (sessionId != null && websocky.isPresent()) {
+                    var websocketCommunication = websocky.get();
                     log.info("Received message from session ID: " + sessionId);
                     // Handle the message (e.g., process or respond)
 
@@ -113,7 +127,6 @@ protected void handleTextMessage(WebSocketSession session, TextMessage message)
                             Session.ChatMessage.parseFrom(messageBytes);
 
                         if (auditLog.getMessage().equals("heartbeat")) {
-                            log.info("heartbeat");
                             return;
                         }
                         var json = new ObjectMapper().readTree(auditLog.getMessage());
@@ -136,8 +149,25 @@ protected void handleTextMessage(WebSocketSession session, TextMessage message)
                                 session.close();
                             }
                             return;
-                        } else if ("heartbeat".equals(auditLog.getMessage())) {
+                        } else if ("user-message".equals(json.get("type").asText())) {
+                            Message userMessage = Message.builder().role("user").content(json.get("message").asText()).build();
                             log.info("Received heartbeat from session {}", sessionId);
+                            var response = agentVerbs.interpretUserData(chatAgent.getAgentExecution(),
+                                websocketCommunication, userMessage);
+                            log.info("Response: {}", response);
+                            var newMessage = Session.ChatMessage.newBuilder()
+                                .setMessage(String.format("{\"type\":\"user-message\",\"message\":\"%s\"}",
+                                    response.getResponseForUser()))
+                                .setSender("agent")
+                                .setChatGroupId("")
+                                .setSessionId(Long.parseLong(websocketCommunication.getSessionId()))
+                                .setTimestamp(System.currentTimeMillis())
+                                .build();
+                            messageBytes = newMessage.toByteArray();
+                            String base64Message = Base64.getEncoder().encodeToString(messageBytes);
+                            session.sendMessage(new TextMessage(
+                                base64Message
+                            ));
                             return; // Ignore heartbeat messages
                         } else {
                             log.info("Processing message: {}", auditLog.getMessage());
@@ -154,7 +184,7 @@ protected void handleTextMessage(WebSocketSession session, TextMessage message)
                     log.info("Session ID not found in query parameters for message handling.");
                 }
             }
-        }catch (Exception e ){
+        }catch (Exception | ZtatException e ){
             throw new RuntimeException(e);
         }
     }

ai-agent/src/main/java/io/sentrius/agent/analysis/model/WebSocky.java

@@ -24,4 +24,5 @@ public class WebSocky {
     WebSocketSession webSocketSession;
     @Builder.Default
     List<TerminalResponse> messages = new ArrayList<>();
+
 }

ai-agent/src/main/resources/chat-helper.yaml

@@ -0,0 +1,10 @@
+description: "Agent that handles logs and OpenAI access."
+context: |
+  You are a helpful agent that is responding to users via a chat interface. Please respond to the user in a friendly and helpful manner.
+  Return responses in the following format:
+  {
+    "previousOperation": "<previousOperation>",
+    "nextOperation": "<nextOperation>",
+    "terminalSummaryForLLM": "<Summary of the terminal thus far for the next LLM assessment>",
+      "responseForUser": "<Response to the user>"
+  }

api/src/main/java/io/sentrius/sso/controllers/api/UserApiController.java

@@ -136,10 +136,17 @@ public ResponseEntity<ObjectNode> addUser(HttpServletRequest request, HttpServle
 
     @GetMapping("/delete")
     @LimitAccess(userAccess = {UserAccessEnum.CAN_DEL_USERS})
-    public String deleteUser(@RequestParam("userId") String userId) throws GeneralSecurityException {
+    public String deleteUser(@RequestParam("userId") String userId, @RequestParam(required = false) String type) throws GeneralSecurityException {
         log.info("Deleting user with id: {}", userId);
-        Long id = Long.parseLong(cryptoService.decrypt(userId));
-        userService.deleteUser(id);
+        if (null != type && type.equalsIgnoreCase("non_person_entity")) {
+            log.info("Deleting non-person entity user with id: {}", userId);
+            String userIdStr = cryptoService.decrypt(userId);
+            var usr = userService.getUserByUserid(userIdStr);
+            userService.deleteUser(usr.getId());
+        } else {
+            Long id = Long.parseLong(cryptoService.decrypt(userId));
+            userService.deleteUser(id);
+        }
         return "redirect:/sso/v1/users/list?message=" + MessagingUtil.getMessageId(MessagingUtil.USER_DELETE_SUCCESS);
     }
 

api/src/main/resources/default-policy.yaml

@@ -19,6 +19,10 @@ actions:
     ztat_provider: "ztat-service.internal"
 capabilities:
   primitives:
+      - id: "accessLLM"
+        description: "access llm"
+        endpoint:
+          - "/api/v1/chat/completions"
   composed:
 ztat:
   provider: "ztat-service.internal"

api/src/main/resources/static/js/chat.js

@@ -230,11 +230,13 @@ export function switchToAgent(agentName,agentId, sessionId, agentHost) {
         appendToChatWindow(msg.sender, msg.message);
     });
 
+    container.classList.remove("hidden");
     container.style.display = "block";
     console.log("Chat container displayed");
 }
 
 export function sendMessage(event) {
+    console.log("Send message event:", event);
     if (event.key !== "Enter") return;
 
     const input = document.getElementById("chat-input");
@@ -290,4 +292,6 @@ export async function fetchAvailableAgents() {
         console.error("Error fetching available agents:", error);
         return [];
     }
-}
+}
+
+window.sendMessage = sendMessage;

api/src/main/resources/static/js/dashboard-agents.js

@@ -1,8 +1,6 @@
-// api/src/main/resources/static/js/dashboard-agents.js
 import { fetchAvailableAgents, switchToAgent } from './chat.js';
 
 document.addEventListener('DOMContentLoaded', function () {
-    console.log("Fetching agents 1...");
     const agentSelect = document.getElementById('agent-select');
     const startChatBtn = document.getElementById('start-chat-btn');
 
@@ -11,17 +9,40 @@ document.addEventListener('DOMContentLoaded', function () {
         return;
     }
 
-    console.log("Fetching agents 2...");
-    fetchAvailableAgents().then(agents => {
-        agents.forEach(agent => {
-            const option = document.createElement('option');
-            option.value = agent.agentName;
-            option.textContent = agent.agentName || agent.agentId;
-            option.dataset.agentHost = agent.agentCallback;
-            option.dataset.agentId = agent.agentId;
-            agentSelect.appendChild(option);
+    function updateAgentList() {
+        console.log('Updating agent list...');
+        fetchAvailableAgents().then(agents => {
+            const existingOptions = Array.from(agentSelect.options).reduce((map, opt) => {
+                map.set(opt.dataset.agentId, opt);
+                return map;
+            }, new Map());
+
+            const currentAgentIds = new Set(agents.map(a => a.agentId));
+
+            // Add new agents
+            agents.forEach(agent => {
+                if (!existingOptions.has(agent.agentId)) {
+                    const option = document.createElement('option');
+                    option.value = agent.agentName;
+                    option.textContent = agent.agentName || agent.agentId;
+                    option.dataset.agentHost = agent.agentCallback;
+                    option.dataset.agentId = agent.agentId;
+                    agentSelect.appendChild(option);
+                }
+            });
+
+            // Remove stale agents
+            for (let [agentId, option] of existingOptions.entries()) {
+                if (!currentAgentIds.has(agentId)) {
+                    agentSelect.removeChild(option);
+                }
+            }
+
+            startChatBtn.disabled = !agentSelect.value;
+        }).catch(err => {
+            console.error('Failed to update agent list:', err);
         });
-    });
+    }
 
     agentSelect.addEventListener('change', function () {
         startChatBtn.disabled = !agentSelect.value;
@@ -30,12 +51,17 @@ document.addEventListener('DOMContentLoaded', function () {
     startChatBtn.addEventListener('click', function () {
         const selected = agentSelect.options[agentSelect.selectedIndex];
         if (selected && selected.value) {
-            console.log("Switching to agent: ", selected.value);
             const agentName = selected.value;
             const agentHost = selected.dataset.agentHost;
             const agentId = selected.dataset.agentId;
             const sessionId = Date.now().toString();
             switchToAgent(agentName, agentId, sessionId, agentHost);
         }
     });
-});
+
+    // Initial load
+    updateAgentList();
+
+    // Refresh every 15 seconds
+    setInterval(updateAgentList, 15000);
+});

api/src/main/resources/templates/sso/dashboard.html

@@ -332,6 +332,29 @@
 
     </script>
     <style>
+        #chat-container {
+            position: fixed;
+            bottom: 20px;
+            right: 20px;
+            width: 300px;
+            height: 400px;
+            z-index: 1000;
+            background: #1e1e1e;
+            border: 1px solid #444;
+            border-radius: 8px;
+            padding: 12px;
+            display: none;
+        }
+
+        #chat-messages {
+            height: 250px; /* Adjust height as needed */
+            overflow-y: auto;
+            padding: 10px;
+            border: 1px solid #ccc;
+            background-color: #1e1e1e;
+            font-family: sans-serif;
+        }
+
         small-card {
             max-width: 300px;
             padding: 10px;
@@ -380,7 +403,7 @@
                         <span id="close-chat" onclick="toggleChat()">✖</span>
                     </div>
                     <div id="chat-messages"></div>
-                    <input type="text" id="chat-input" placeholder="Type a message..." onkeypress="sendMessage(event)">
+                    <input type="text" id="chat-input" placeholder="Type a message..." onkeydown="sendMessage(event)">
                 </div>
                 <div class="container-fluid">
                     <br><br>
@@ -448,7 +471,7 @@ <h5 class="card-title">AI Admin Operations</h5>
                                     <a href="/api/v1/users/list" class="btn btn-danger">Build Automation</a>
                                     <a href="#" class="btn btn-primary" data-bs-toggle="modal"
                                        data-bs-target="#userFormModal">Usage Patterns</a>
-                                    chat-container                                    <a href="#" class="btn btn-primary" data-bs-toggle="modal"
+                                    <a href="#" class="btn btn-primary" data-bs-toggle="modal"
                                        data-bs-target="#userFormModal">Usage Patterns</a>
                                 </div>
                                 <div class="mb-3">