chore(damn): detekt, build, tests, formatting

fixed detekt issues where possible.
fixed disttar failing build because tools is added twice in the server module.
added workflowId where required.
fixed some tests not being recognized because of runBlocking without explicit return type.
formatting + imports.

core/kernel/src/main/kotlin/com/correx/core/kernel/execution/ReplayStrategy.kt

@@ -4,4 +4,4 @@ sealed interface ReplayStrategy {
     data object Full : ReplayStrategy
     data object SkipInference : ReplayStrategy   // use recorded InferenceCompletedEvent artifacts
     data object SkipValidation : ReplayStrategy  // trust recorded outcomes
-}
+}

core/kernel/src/main/kotlin/com/correx/core/kernel/execution/StageOutcome.kt

@@ -15,4 +15,4 @@ sealed interface StageOutcome {
     data class InferenceFailure(val reason: String, val retryable: Boolean) : StageOutcome
     data class ApprovalRequired(val request: DomainApprovalRequest) : StageOutcome
     data object Cancelled : StageOutcome
-}
+}

core/kernel/src/main/kotlin/com/correx/core/kernel/execution/WorkflowResult.kt

@@ -7,4 +7,4 @@ sealed interface WorkflowResult {
     data class Completed(val sessionId: SessionId, val terminalStageId: StageId) : WorkflowResult
     data class Failed(val sessionId: SessionId, val reason: String, val retryExhausted: Boolean) : WorkflowResult
     data class Cancelled(val sessionId: SessionId) : WorkflowResult
-}
+}

core/kernel/src/main/kotlin/com/correx/core/kernel/orchestration/DefaultOrchestrationReducer.kt

@@ -46,4 +46,4 @@ class DefaultOrchestrationReducer : OrchestrationReducer {
 
         else -> state
     }
-}
+}

core/kernel/src/main/kotlin/com/correx/core/kernel/orchestration/DefaultSessionOrchestrator.kt

@@ -1,14 +1,13 @@
 package com.correx.core.kernel.orchestration
 
 import com.correx.core.approvals.model.ApprovalDecision
-import com.correx.core.artifactstore.ArtifactStore
 import com.correx.core.artifacts.ArtifactState
+import com.correx.core.artifactstore.ArtifactStore
 import com.correx.core.events.events.ArtifactValidatedEvent
-import com.correx.core.events.types.ArtifactId
-import com.correx.core.events.types.ArtifactLifecyclePhase
-import org.slf4j.LoggerFactory
 import com.correx.core.events.orchestration.OrchestrationState
 import com.correx.core.events.types.ApprovalRequestId
+import com.correx.core.events.types.ArtifactId
+import com.correx.core.events.types.ArtifactLifecyclePhase
 import com.correx.core.events.types.SessionId
 import com.correx.core.events.types.StageId
 import com.correx.core.kernel.execution.WorkflowResult
@@ -17,6 +16,7 @@ import com.correx.core.sessions.Session
 import com.correx.core.transitions.execution.StageExecutionResult
 import com.correx.core.transitions.graph.WorkflowGraph
 import com.correx.core.transitions.resolution.TransitionDecision
+import org.slf4j.LoggerFactory
 import java.util.concurrent.*
 import java.util.concurrent.atomic.*
 
@@ -94,7 +94,7 @@ class DefaultSessionOrchestrator(
             }
 
             is TransitionDecision.Stay -> if (isTerminal(enriched.graph, enriched.currentStageId)) {
-                completeWorkflow(enriched.sessionId, enriched.currentStageId, enriched.stageCount)
+                completeWorkflow(enriched.sessionId, enriched.currentStageId, enriched.stageCount, enriched.graph.id)
             } else {
                 failWorkflow(
                     sessionId = enriched.sessionId,
@@ -140,7 +140,7 @@ class DefaultSessionOrchestrator(
         if (isTerminal(ctx.graph, nextStageId)) {
             // Terminal stage is a sentinel — not executed, so don't count it.
             return StepResult.Terminal(
-                completeWorkflow(ctx.sessionId, nextStageId, ctx.stageCount),
+                completeWorkflow(ctx.sessionId, nextStageId, ctx.stageCount, ctx.graph.id),
             )
         }
 
@@ -150,6 +150,7 @@ class DefaultSessionOrchestrator(
                     currentStageId = advanceStage(ctx.sessionId, ctx.currentStageId, decision),
                 ),
             )
+
             is StepResult.Terminal -> result
         }
     }
@@ -171,7 +172,7 @@ class DefaultSessionOrchestrator(
                 is StageExecutionResult.Failure -> {
                     log.debug(
                         "[Orchestrator] stage failed session=${ctx.sessionId.value} " +
-                            "stage=${stageId.value} reason=${result.reason} retryable=${result.retryable}",
+                                "stage=${stageId.value} reason=${result.reason} retryable=${result.retryable}",
                     )
                     val refreshedState = orchestrationRepository.getState(ctx.sessionId)
                     val shouldRetry = retryCoordinator.shouldRetry(

core/kernel/src/main/kotlin/com/correx/core/kernel/orchestration/OrchestrationConfig.kt

@@ -10,4 +10,4 @@ data class OrchestrationConfig(
     val stageTimeoutMs: Long = 60_000L,
     val sandboxRoot: Path = Path.of(System.getProperty("java.io.tmpdir"), "correx-sandbox"),
     val defaultSystemPromptPath: String? = null,
-)
+)

core/kernel/src/main/kotlin/com/correx/core/kernel/orchestration/OrchestrationProjector.kt

@@ -13,4 +13,4 @@ class OrchestrationProjector(
         state: OrchestrationState,
         event: StoredEvent,
     ): OrchestrationState = orchestrationReducer.reduce(state, event)
-}
+}

core/kernel/src/main/kotlin/com/correx/core/kernel/orchestration/OrchestrationReducer.kt

@@ -5,4 +5,4 @@ import com.correx.core.events.orchestration.OrchestrationState
 
 interface OrchestrationReducer {
     fun reduce(state: OrchestrationState, event: StoredEvent): OrchestrationState
-}
+}

core/kernel/src/main/kotlin/com/correx/core/kernel/orchestration/OrchestrationRepository.kt

@@ -8,4 +8,4 @@ class OrchestrationRepository(
     private val replayer: EventReplayer<OrchestrationState>,
 ) {
     fun getState(sessionId: SessionId): OrchestrationState = replayer.rebuild(sessionId)
-}
+}

core/kernel/src/main/kotlin/com/correx/core/kernel/orchestration/ReplayOrchestrator.kt

@@ -2,7 +2,6 @@ package com.correx.core.kernel.orchestration
 
 import com.correx.core.approvals.domain.NoOpApprovalEngine
 import com.correx.core.artifactstore.ArtifactStore
-import org.slf4j.LoggerFactory
 import com.correx.core.context.model.ContextPack
 import com.correx.core.events.events.ArtifactValidatedEvent
 import com.correx.core.events.events.ArtifactValidatingEvent
@@ -12,17 +11,18 @@ import com.correx.core.events.types.StageId
 import com.correx.core.inference.GenerationConfig
 import com.correx.core.inference.InferenceRequest
 import com.correx.core.inference.ResponseFormat
-import com.correx.core.sessions.Session
 import com.correx.core.kernel.execution.ReplayStrategy
 import com.correx.core.kernel.execution.WorkflowResult
 import com.correx.core.kernel.replay.ReplayInferenceProvider
 import com.correx.core.kernel.retry.exception.ReplayArtifactMissingException
 import com.correx.core.risk.NoOpRiskAssessor
+import com.correx.core.sessions.Session
 import com.correx.core.transitions.execution.StageExecutionResult
 import com.correx.core.transitions.graph.StageConfig
 import com.correx.core.transitions.graph.WorkflowGraph
 import com.correx.core.transitions.resolution.TransitionDecision
 import com.correx.core.validation.model.ValidationContext
+import org.slf4j.LoggerFactory
 import java.util.*
 import java.util.concurrent.*
 import java.util.concurrent.atomic.*
@@ -87,7 +87,7 @@ class ReplayOrchestrator(
                 val nextStageId = decision.to
 
                 if (isTerminal(ctx.graph, nextStageId)) {
-                    return completeWorkflow(ctx.sessionId, nextStageId, ctx.stageCount)
+                    return completeWorkflow(ctx.sessionId, nextStageId, ctx.stageCount, ctx.graph.id)
                 }
 
                 when (val result = enterStage(ctx, nextStageId, session)) {
@@ -101,7 +101,7 @@ class ReplayOrchestrator(
             }
 
             is TransitionDecision.Stay -> if (isTerminal(ctx.graph, ctx.currentStageId)) {
-                completeWorkflow(ctx.sessionId, ctx.currentStageId, ctx.stageCount)
+                completeWorkflow(ctx.sessionId, ctx.currentStageId, ctx.stageCount, ctx.graph.id)
             } else {
                 step(ctx)
             }

core/kernel/src/main/kotlin/com/correx/core/kernel/orchestration/SessionOrchestrator.kt

@@ -2,22 +2,24 @@ package com.correx.core.kernel.orchestration
 
 import com.correx.core.approvals.ApprovalOutcome
 import com.correx.core.approvals.ApprovalStatus
+import com.correx.core.approvals.Tier
 import com.correx.core.approvals.model.ApprovalDecision
 import com.correx.core.approvals.model.DomainApprovalRequest
+import com.correx.core.artifacts.ArtifactState
+import com.correx.core.artifacts.kind.JsonSchema
+import com.correx.core.artifactstore.ArtifactStore
 import com.correx.core.context.builder.ContextPackBuilder
 import com.correx.core.context.model.ContextEntry
 import com.correx.core.context.model.ContextLayer
 import com.correx.core.context.model.ContextPack
 import com.correx.core.context.model.TokenBudget
-import com.correx.core.events.types.ContextEntryId
+import com.correx.core.events.events.ApprovalDecisionResolvedEvent
+import com.correx.core.events.events.ApprovalRequestedEvent
 import com.correx.core.events.events.ArtifactCreatedEvent
 import com.correx.core.events.events.ArtifactValidatedEvent
 import com.correx.core.events.events.ArtifactValidatingEvent
-import com.correx.core.events.events.ApprovalDecisionResolvedEvent
-import com.correx.core.events.events.ApprovalRequestedEvent
 import com.correx.core.events.events.EventMetadata
 import com.correx.core.events.events.EventPayload
-import com.correx.core.artifactstore.ArtifactStore
 import com.correx.core.events.events.InferenceCompletedEvent
 import com.correx.core.events.events.InferenceFailedEvent
 import com.correx.core.events.events.InferenceStartedEvent
@@ -26,27 +28,25 @@ import com.correx.core.events.events.NewEvent
 import com.correx.core.events.events.OrchestrationPausedEvent
 import com.correx.core.events.events.OrchestrationResumedEvent
 import com.correx.core.events.events.RiskAssessedEvent
+import com.correx.core.events.events.ToolInvocationRequestedEvent
+import com.correx.core.events.events.ToolRequest
 import com.correx.core.events.events.TransitionExecutedEvent
 import com.correx.core.events.events.WorkflowCompletedEvent
 import com.correx.core.events.events.WorkflowFailedEvent
 import com.correx.core.events.events.WorkflowStartedEvent
-import com.correx.core.artifacts.ArtifactState
-import com.correx.core.artifacts.kind.JsonSchema
 import com.correx.core.events.stores.EventStore
 import com.correx.core.events.types.ApprovalDecisionId
 import com.correx.core.events.types.ApprovalRequestId
 import com.correx.core.events.types.ArtifactId
+import com.correx.core.events.types.ContextEntryId
 import com.correx.core.events.types.ContextPackId
 import com.correx.core.events.types.EventId
 import com.correx.core.events.types.InferenceRequestId
 import com.correx.core.events.types.RiskSummaryId
 import com.correx.core.events.types.SessionId
 import com.correx.core.events.types.StageId
-import com.correx.core.events.types.ValidationReportId
-import com.correx.core.approvals.Tier
-import com.correx.core.events.events.ToolInvocationRequestedEvent
-import com.correx.core.events.events.ToolRequest
 import com.correx.core.events.types.ToolInvocationId
+import com.correx.core.events.types.ValidationReportId
 import com.correx.core.inference.FinishReason
 import com.correx.core.inference.InferenceRepository
 import com.correx.core.inference.InferenceRequest
@@ -56,14 +56,14 @@ import com.correx.core.inference.ResponseFormat
 import com.correx.core.inference.ToolCallRequest
 import com.correx.core.inference.ToolDefinition
 import com.correx.core.inference.ToolFunction
-import com.correx.core.tools.contract.ToolExecutor
-import com.correx.core.tools.contract.ToolResult
-import com.correx.core.tools.registry.ToolRegistry
 import com.correx.core.kernel.execution.WorkflowResult
 import com.correx.core.risk.RiskAssessor
 import com.correx.core.risk.RiskContext
 import com.correx.core.risk.toApprovalTier
 import com.correx.core.sessions.Session
+import com.correx.core.tools.contract.ToolExecutor
+import com.correx.core.tools.contract.ToolResult
+import com.correx.core.tools.registry.ToolRegistry
 import com.correx.core.transitions.evaluation.EvaluationContext
 import com.correx.core.transitions.evaluation.PromptResolver
 import com.correx.core.transitions.execution.StageExecutionResult
@@ -587,6 +587,7 @@ abstract class SessionOrchestrator(
             sessionId,
             WorkflowStartedEvent(
                 sessionId = sessionId,
+                workflowId = graph.id,
                 startStageId = graph.start,
                 retryPolicy = config.retryPolicy,
             ),
@@ -597,12 +598,13 @@ abstract class SessionOrchestrator(
         sessionId: SessionId,
         terminalStageId: StageId,
         stageCount: Int,
+        workflowId: String,
     ): WorkflowResult.Completed {
         log.debug(
             "[Orchestrator] COMPLETED session={} terminalStage={} stages={}",
             sessionId.value, terminalStageId.value, stageCount,
         )
-        emit(sessionId, WorkflowCompletedEvent(sessionId, terminalStageId, stageCount))
+        emit(sessionId, WorkflowCompletedEvent(sessionId, terminalStageId, stageCount, workflowId))
         cancellations.remove(sessionId)
         return WorkflowResult.Completed(sessionId, terminalStageId)
     }