Refactor error handling and simplify execution ID extraction in TemporalEventListener

Author: Theaxiom

orchestrator/core/src/application/tool_invocation_service.rs

@@ -143,9 +143,7 @@ impl ToolInvocationService {
             .tool_router
             .route_tool(session.execution_id, &tool_name)
             .await
-            .map_err(|e| {
-                SmcpSessionError::MalformedPayload(format!("Routing error: {}", e))
-            })?;
+            .map_err(|e| SmcpSessionError::MalformedPayload(format!("Routing error: {}", e)))?;
 
         let server = self.tool_router.get_server(server_id).await.ok_or(
             SmcpSessionError::MalformedPayload("Server vanished after routing".to_string()),
@@ -335,13 +333,10 @@ impl ToolInvocationService {
 
                         loop {
                             if attempts >= max_attempts {
-                                return Err(SmcpSessionError::JudgeTimeout(
-                                    format!(
-                                        "Inner-loop semantic judge '{}' timed out after {} seconds.",
-                                        judge_agent,
-                                        timeout_seconds
-                                    ),
-                                ));
+                                return Err(SmcpSessionError::JudgeTimeout(format!(
+                                    "Inner-loop semantic judge '{}' timed out after {} seconds.",
+                                    judge_agent, timeout_seconds
+                                )));
                             }
 
                             let exec = self
@@ -1004,11 +999,7 @@ fn sanitize_segment(input: &str) -> String {
 
     // Prevent path traversal patterns after character substitution.
     // Treat empty or traversal-like segments as a safe default.
-    if sanitized.is_empty()
-        || sanitized == "."
-        || sanitized == ".."
-        || sanitized.contains("..")
-    {
+    if sanitized.is_empty() || sanitized == "." || sanitized == ".." || sanitized.contains("..") {
         "unversioned".to_string()
     } else {
         sanitized

orchestrator/core/src/infrastructure/temporal_event_listener.rs

@@ -370,29 +370,15 @@ impl TemporalEventListener {
                 self.event_bus.publish_workflow_event(domain_event.clone());
                 return Ok(String::new());
             }
-            WorkflowEvent::WorkflowExecutionStarted { execution_id, .. } => {
-                execution_id.clone()
-            }
-            WorkflowEvent::WorkflowStateEntered { execution_id, .. } => execution_id.clone(),
-            WorkflowEvent::WorkflowStateExited { execution_id, .. } => execution_id.clone(),
-            WorkflowEvent::WorkflowIterationStarted { execution_id, .. } => {
-                execution_id.clone()
-            }
-            WorkflowEvent::WorkflowIterationCompleted { execution_id, .. } => {
-                execution_id.clone()
-            }
-            WorkflowEvent::WorkflowIterationFailed { execution_id, .. } => {
-                execution_id.clone()
-            }
-            WorkflowEvent::WorkflowExecutionCompleted { execution_id, .. } => {
-                execution_id.clone()
-            }
-            WorkflowEvent::WorkflowExecutionFailed { execution_id, .. } => {
-                execution_id.clone()
-            }
-            WorkflowEvent::WorkflowExecutionCancelled { execution_id, .. } => {
-                execution_id.clone()
-            }
+            WorkflowEvent::WorkflowExecutionStarted { execution_id, .. } => *execution_id,
+            WorkflowEvent::WorkflowStateEntered { execution_id, .. } => *execution_id,
+            WorkflowEvent::WorkflowStateExited { execution_id, .. } => *execution_id,
+            WorkflowEvent::WorkflowIterationStarted { execution_id, .. } => *execution_id,
+            WorkflowEvent::WorkflowIterationCompleted { execution_id, .. } => *execution_id,
+            WorkflowEvent::WorkflowIterationFailed { execution_id, .. } => *execution_id,
+            WorkflowEvent::WorkflowExecutionCompleted { execution_id, .. } => *execution_id,
+            WorkflowEvent::WorkflowExecutionFailed { execution_id, .. } => *execution_id,
+            WorkflowEvent::WorkflowExecutionCancelled { execution_id, .. } => *execution_id,
         };
 
         let execution_id_str = execution_id_obj.0.to_string();