commit

phrocker · phrocker · commit 9ae4aff5c7fc · 2026-01-20T17:45:37.000-05:00
diff --git a/.gcp.env b/.gcp.env
@@ -1,11 +1,11 @@
-SENTRIUS_VERSION=1.1.72
+SENTRIUS_VERSION=1.1.80
 SENTRIUS_SSH_VERSION=1.1.12
 SENTRIUS_KEYCLOAK_VERSION=1.1.15
 SENTRIUS_AGENT_VERSION=1.1.27
-SENTRIUS_AI_AGENT_VERSION=1.1.11
+SENTRIUS_AI_AGENT_VERSION=1.1.29
 LLMPROXY_VERSION=1.1.14
-LAUNCHER_VERSION=1.1.6
-AGENTPROXY_VERSION=1.1.10
+LAUNCHER_VERSION=1.1.11
+AGENTPROXY_VERSION=1.1.13
 SSHPROXY_VERSION=1.1.6
 RDPPROXY_VERSION=1.1.5
 GITHUB_MCP_VERSION=1.1.5
diff --git a/agent-launcher/src/main/java/io/sentrius/agent/launcher/service/PodLauncherService.java b/agent-launcher/src/main/java/io/sentrius/agent/launcher/service/PodLauncherService.java
@@ -33,15 +33,10 @@ public class PodLauncherService {
     private final CoreV1Api coreV1Api;
     private final AgentImageResolver imageResolver;
 
-    @Value("${sentrius.agent.registry}")
-    private String agentRegistry;
 
     @Value("${sentrius.agent.namespace}")
     private String agentNamespace;
 
-    @Value("${sentrius.agent.registry.version}")
-    private String agentVersion;
-
     @Value("${sentrius.agent.callback.format.url:http://sentrius-agent-%s.%s.svc.cluster.local:8090}")
     private String callbackFormatUrl;
 
@@ -183,6 +178,7 @@ public V1Pod launchAgentPod(AgentRegistrationDTO agent) throws Exception {
         argList.add("--agent.type=" + agentType);
         argList.add("--agent.clientId=" + agent.getClientId());
         argList.add("--agent.listen.websocket=true");
+        argList.add("--agent.idleSleepMs=" + agent.getIdleSleepMs());
         argList.add("--agent.callback.url=" + constructedCallbackUrl);
         if (agent.getAgentPolicyId() != null && !agent.getAgentPolicyId().isEmpty()) {
             argList.add("--agent.ai.policy.id=" + agent.getAgentPolicyId());
diff --git a/agent-launcher/src/main/java/io/sentrius/agent/launcher/service/PodMonitor.java b/agent-launcher/src/main/java/io/sentrius/agent/launcher/service/PodMonitor.java
@@ -39,9 +39,6 @@ public class PodMonitor {
 
     private final CoreV1Api coreV1Api;
 
-    @Value("${sentrius.agent.registry}")
-    private String agentRegistry;
-
     @Value("${sentrius.agent.namespace}")
     private String agentNamespace;
 
diff --git a/api/src/main/java/io/sentrius/sso/controllers/api/agents/AgentBootstrapController.java b/api/src/main/java/io/sentrius/sso/controllers/api/agents/AgentBootstrapController.java
@@ -15,6 +15,8 @@
 import io.sentrius.sso.core.config.SystemOptions;
 import io.sentrius.sso.core.controllers.BaseController;
 import io.sentrius.sso.core.dto.AgentRegistrationDTO;
+import io.sentrius.sso.core.dto.podman.ImageIntent;
+import io.sentrius.sso.core.dto.podman.LaunchConfiguration;
 import io.sentrius.sso.core.exceptions.ZtatException;
 import io.sentrius.sso.core.model.ATPLPolicyEntity;
 import io.sentrius.sso.core.model.security.enums.ApplicationAccessEnum;
@@ -36,6 +38,7 @@
 import io.sentrius.sso.core.services.security.ZeroTrustRequestService;
 import io.sentrius.sso.core.services.terminal.SessionTrackingService;
 import io.sentrius.sso.core.trust.ATPLPolicy;
+import io.sentrius.sso.core.utils.JsonUtil;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.transaction.Transactional;
@@ -206,9 +209,19 @@ public ResponseEntity<AgentRegistrationDTO> bootstrap(
     @PostMapping("/launcher/create")
     @LimitAccess(applicationAccess = {ApplicationAccessEnum.CAN_MANAGE_APPLICATION})
     public ResponseEntity<String> launchPod(
-        @RequestBody AgentRegistrationDTO registrationDTO, HttpServletRequest request, HttpServletResponse response
+        @RequestBody AgentRegistrationDTO registrationDTOPre, HttpServletRequest request, HttpServletResponse response
         ) throws GeneralSecurityException, IOException, ZtatException {
 
+        // supplement the registration DTO with image information.
+
+        var image =
+            ImageIntent.builder().tag(systemOptions.getAgentImageTag()).repo(systemOptions.getAgentRegistry()).build();
+
+        LaunchConfiguration launchConfig = LaunchConfiguration.builder().imageIntent(image).build();
+        log.info("Using agent image intent: {}", JsonUtil.MAPPER.writeValueAsString(launchConfig));
+        AgentRegistrationDTO registrationDTO  =
+            registrationDTOPre.toBuilder().idleSleepMs(systemOptions.getAgentSleepInterval()).templateLaunchConfiguration(
+                JsonUtil.MAPPER.writeValueAsString(launchConfig)).build();
         try{
             log.info("Launching agent pod with ID: {}", registrationDTO.getAgentName());
 
diff --git a/core/src/main/java/io/sentrius/sso/core/annotations/Updatable.java b/core/src/main/java/io/sentrius/sso/core/annotations/Updatable.java
@@ -11,4 +11,5 @@
 
     String description() default "";
     String group() default "General";
+    boolean isSecure() default false;
 }
diff --git a/core/src/main/java/io/sentrius/sso/core/dto/AgentRegistrationDTO.java b/core/src/main/java/io/sentrius/sso/core/dto/AgentRegistrationDTO.java
@@ -4,7 +4,6 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import lombok.Setter;
 import lombok.ToString;
 
 @Getter
@@ -25,6 +24,9 @@ public class AgentRegistrationDTO {
     private final String agentContextId = "";
     @Builder.Default
     private final String agentPolicyId = "";
+
+    @Builder.Default
+    private final Long idleSleepMs = 30000L; // Default to 30 seconds
     
     // Template-based configuration fields
     /**
@@ -69,4 +71,33 @@ public class AgentRegistrationDTO {
      * Structure: {"resources": {...}, "environmentVariables": {...}, "restartPolicy": "..."}
      */
     private final String templateLaunchConfiguration;
+
+    /**
+     * Creates a new builder with all fields deep-copied from this instance.
+     * Note: Strings are immutable in Java, so copying references is safe.
+     *
+     * @return a new builder with all fields populated from this instance
+     */
+    public AgentRegistrationDTOBuilder toBuilder() {
+        return AgentRegistrationDTO.builder()
+                .agentName(this.agentName)
+                .agentPublicKey(this.agentPublicKey)
+                .agentPublicKeyAlgo(this.agentPublicKeyAlgo)
+                .clientSecret(this.clientSecret)
+                .clientId(this.clientId)
+                .agentType(this.agentType)
+                .agentCallbackUrl(this.agentCallbackUrl)
+                .agentContextId(this.agentContextId)
+                .agentPolicyId(this.agentPolicyId)
+                .idleSleepMs(this.idleSleepMs)
+                .agentTemplateId(this.agentTemplateId)
+                .templateConfiguration(this.templateConfiguration)
+                .templateIdentity(this.templateIdentity)
+                .templatePurpose(this.templatePurpose)
+                .templateGoals(this.templateGoals)
+                .templateGuardrails(this.templateGuardrails)
+                .templateTrustPolicyId(this.templateTrustPolicyId)
+                .templateLaunchConfiguration(this.templateLaunchConfiguration);
+    }
+
 }
diff --git a/core/src/main/java/io/sentrius/sso/core/dto/SystemOption.java b/core/src/main/java/io/sentrius/sso/core/dto/SystemOption.java
@@ -19,6 +19,7 @@ public class SystemOption {
     Boolean requiresRestart = false;
     String closestType = "";
     String closestPrimitive = "";
+    boolean isSecureVariable = false;
     @Builder.Default
     String group = "General";
 
@@ -27,4 +28,11 @@ public SystemOption(String name, String value, String description) {
         this.value = value;
         this.description = description;
     }
+
+    public SystemOption(String name, String value, String description, boolean isSecureVariable) {
+        this.name = name;
+        this.value = value;
+        this.description = description;
+        this.isSecureVariable = isSecureVariable;
+    }
 }
diff --git a/core/src/main/java/io/sentrius/sso/core/dto/podman/ImageIntent.java b/core/src/main/java/io/sentrius/sso/core/dto/podman/ImageIntent.java
@@ -53,6 +53,7 @@ public static ImageIntent from(AgentRegistrationDTO agent) {
         }
         
         String launchConfig = agent.getTemplateLaunchConfiguration();
+        log.info("Launch configuration: {}", launchConfig);
         if (launchConfig == null || launchConfig.trim().isEmpty()) {
             log.debug("No templateLaunchConfiguration found for agent: {}", agent.getAgentName());
             return ImageIntent.builder().build();
@@ -83,14 +84,5 @@ public boolean hasExplicitConfig() {
         return repo != null || tag != null || selection != null;
     }
     
-    /**
-     * Wrapper class for parsing launch configuration JSON
-     */
-    @Data
-    @JsonIgnoreProperties(ignoreUnknown = true)
-    private static class LaunchConfiguration {
-        private ImageIntent imageIntent;
-        private ResourcesConfig resources;
-        private String restartPolicy;
-    }
+
 }
diff --git a/core/src/main/java/io/sentrius/sso/core/dto/podman/LaunchConfiguration.java b/core/src/main/java/io/sentrius/sso/core/dto/podman/LaunchConfiguration.java
@@ -0,0 +1,21 @@
+package io.sentrius.sso.core.dto.podman;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * Wrapper class for parsing launch configuration JSON
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class LaunchConfiguration {
+    private ImageIntent imageIntent;
+    private ResourcesConfig resources;
+    private String restartPolicy;
+}
diff --git a/dataplane/src/main/java/io/sentrius/sso/core/config/SystemOptions.java b/dataplane/src/main/java/io/sentrius/sso/core/config/SystemOptions.java
@@ -201,6 +201,10 @@ public class SystemOptions {
     @Builder.Default
     public Boolean agentSupportEnabled = false;
 
+    @Updatable(description = "Agent Sleep time between autonomous interactions", group = "Agent")
+    @Builder.Default
+    public Long agentSleepInterval = 30000L;
+
     @Updatable(description = "GitHub integration token name for agent operations. This token is used for GitHub MCP operations.", group = "Agent")
     @Builder.Default
     public String githubAgentTokenName = "";
@@ -316,6 +320,7 @@ public Map<String, SystemOption> getOptions() throws IllegalAccessException {
         var sysOpt = SystemOption.builder()
             .name(fieldName)
             .value(fieldValue == null ? "" : String.valueOf(fieldValue))
+            .isSecureVariable(updatableAnnotation.isSecure())
             .requiresRestart(requiresRestart);
 
         // Set the description if available in the annotation
diff --git a/dataplane/src/main/java/io/sentrius/sso/core/services/ATPLPolicyService.java b/dataplane/src/main/java/io/sentrius/sso/core/services/ATPLPolicyService.java
@@ -109,9 +109,10 @@ public Optional<ATPLPolicy> getPolicy(User operatingUser) {
         }
 
         for(AgentPolicyAssignment assignment : assignments) {
-            ATPLPolicy policy = getPolicy(assignment.getPolicy());
-            if (null != policy){
-                return Optional.of(policy);
+            var policy = getLatestPolicy(assignment.getPolicy().getPolicyId());
+            if (policy.isPresent()) {
+                log.info("Found policy {} for user {}", policy.get().getPolicyId(), operatingUser.getUsername());
+                return policy;
             }
         }
 
diff --git a/dataplane/src/main/java/io/sentrius/sso/core/services/automation/AutomationExecutionService.java b/dataplane/src/main/java/io/sentrius/sso/core/services/automation/AutomationExecutionService.java
@@ -12,6 +12,7 @@
 import io.sentrius.sso.core.services.TerminalService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -31,6 +32,7 @@
 @Slf4j
 @Service
 @RequiredArgsConstructor
+@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
 public class AutomationExecutionService {
 
     private final ScriptRepository scriptRepository;
diff --git a/dataplane/src/main/java/io/sentrius/sso/core/services/automation/AutomationSuggestionService.java b/dataplane/src/main/java/io/sentrius/sso/core/services/automation/AutomationSuggestionService.java
@@ -90,19 +90,6 @@ public AutomationSuggestionReview reviewSuggestion(
             String comments,
             String modifiedScript) {
         
-        // Validate reviewer
-        if (reviewer == null) {
-            throw new IllegalArgumentException("Reviewer cannot be null");
-        }
-
-        log.debug("Reviewing suggestion {} by user with ID: {}", suggestionId, reviewer.getId());
-
-        if (reviewer.getId() == null) {
-            throw new IllegalArgumentException(
-                "Reviewer must be a valid user with an ID. User object: " + reviewer
-            );
-        }
-
         AutomationSuggestion suggestion = suggestionRepository.findById(suggestionId)
             .orElseThrow(() -> new IllegalArgumentException("Suggestion not found: " + suggestionId));
         
diff --git a/enterprise-agent/src/main/java/io/sentrius/agent/analysis/agents/agents/ChatAgent.java b/enterprise-agent/src/main/java/io/sentrius/agent/analysis/agents/agents/ChatAgent.java
@@ -370,19 +370,26 @@ public void onApplicationEvent(final ApplicationReadyEvent event) {
                                             // Ensure we have at least an empty string to avoid NPE in split()
                                             enhancedMarkings = markings != null ? markings : "";
                                         }
-                                        
-                                        agentClientService.storeMemory(agentExecution,
-                                            agentExecutionContext.getAgentContext().getName(),
-                                            io.sentrius.sso.core.dto.agents.AgentMemoryDTO.builder()
-                                                .agentName(agentExecutionContext.getAgentContext().getName())
-                                                .memoryKey(memoryEntry.getKey())
-                                                .memoryValue(value.toString())
-                                                .classification(classification)
-                                                .markings(enhancedMarkings.isEmpty() ? new String[0] : enhancedMarkings.split(","))
-                                                .conversationId(agentExecution.getCommunicationId())
-                                                .build());
-                                        log.info("Stored memory: {} with classification: {} and markings: {}", 
-                                            memoryEntry.getKey(), classification, enhancedMarkings);
+
+                                        if (value.size() < 8192 ) {
+                                            agentClientService.storeMemory(
+                                                agentExecution,
+                                                agentExecutionContext.getAgentContext().getName(),
+                                                io.sentrius.sso.core.dto.agents.AgentMemoryDTO.builder()
+                                                    .agentName(agentExecutionContext.getAgentContext().getName())
+                                                    .memoryKey(memoryEntry.getKey())
+                                                    .memoryValue(value.toString())
+                                                    .classification(classification)
+                                                    .markings(enhancedMarkings.isEmpty() ? new String[0] :
+                                                        enhancedMarkings.split(","))
+                                                    .conversationId(agentExecution.getCommunicationId())
+                                                    .build()
+                                            );
+                                            log.info(
+                                                "Stored memory: {} with classification: {} and markings: {}",
+                                                memoryEntry.getKey(), classification, enhancedMarkings
+                                            );
+                                        }
                                     }
                                 } else {
                                     log.info("No persistent memory to store at this time.");
diff --git a/enterprise-agent/src/main/java/io/sentrius/agent/analysis/agents/agents/VerbRegistry.java b/enterprise-agent/src/main/java/io/sentrius/agent/analysis/agents/agents/VerbRegistry.java
@@ -98,13 +98,13 @@ public void scanEndpoints(AgentExecution execution) throws ZtatException, JsonPr
             var verbs = agentClientService.getAvailableVerbs(execution);
 
             endpoints.forEach(x -> {
-                log.info("Discovered endpoint: {}", x);
+                log.trace("Discovered endpoint: {}", x);
             });
 
             this.endpoints.addAll(endpoints);
 
             verbs.forEach(x -> {
-                log.info("Discovered verb: {}", x);
+                log.trace("Discovered verb: {}", x);
             });
         }
     }
diff --git a/enterprise-agent/src/main/java/io/sentrius/agent/analysis/agents/verbs/AgentVerbs.java b/enterprise-agent/src/main/java/io/sentrius/agent/analysis/agents/verbs/AgentVerbs.java
diff --git a/enterprise-agent/src/main/java/io/sentrius/agent/analysis/agents/verbs/ChatVerbs.java b/enterprise-agent/src/main/java/io/sentrius/agent/analysis/agents/verbs/ChatVerbs.java
diff --git a/enterprise-agent/src/main/java/io/sentrius/agent/analysis/agents/verbs/TerminalVerbs.java b/enterprise-agent/src/main/java/io/sentrius/agent/analysis/agents/verbs/TerminalVerbs.java

Original file line number	Diff line number	Diff line change
`@@ -11,4 +11,5 @@`
`11`	`11`
`12`	`12`	`String description() default "";`
`13`	`13`	`String group() default "General";`
	`14`	`+ boolean isSecure() default false;`
`14`	`15`	`}`