refactor(imports): optimize imports

core/approvals/src/main/kotlin/com/correx/core/approvals/DefaultApprovalReducer.kt

@@ -3,9 +3,9 @@ package com.correx.core.approvals
 import com.correx.core.approvals.model.ApprovalContext
 import com.correx.core.approvals.model.ApprovalDecision
 import com.correx.core.approvals.model.ApprovalGrant
-import com.correx.core.approvals.model.DomainApprovalRequest
 import com.correx.core.approvals.model.ApprovalScopeIdentity
 import com.correx.core.approvals.model.ApprovalState
+import com.correx.core.approvals.model.DomainApprovalRequest
 import com.correx.core.events.events.ApprovalDecisionResolvedEvent
 import com.correx.core.events.events.ApprovalGrantCreatedEvent
 import com.correx.core.events.events.ApprovalGrantExpiredEvent

core/approvals/src/main/kotlin/com/correx/core/approvals/domain/DefaultApprovalEngine.kt

@@ -1,14 +1,14 @@
 package com.correx.core.approvals.domain
 
+import com.correx.core.approvals.ApprovalOutcome
+import com.correx.core.approvals.ApprovalStatus
+import com.correx.core.approvals.GrantScope
 import com.correx.core.approvals.Tier
 import com.correx.core.approvals.isAtMost
 import com.correx.core.approvals.model.ApprovalContext
 import com.correx.core.approvals.model.ApprovalDecision
 import com.correx.core.approvals.model.ApprovalGrant
-import com.correx.core.approvals.ApprovalOutcome
 import com.correx.core.approvals.model.DomainApprovalRequest
-import com.correx.core.approvals.ApprovalStatus
-import com.correx.core.approvals.GrantScope
 import com.correx.core.events.types.ApprovalDecisionId
 import com.correx.core.sessions.ApprovalMode
 import kotlinx.datetime.Instant

core/approvals/src/main/kotlin/com/correx/core/approvals/model/ApprovalScopeIdentity.kt

@@ -1,8 +1,8 @@
 package com.correx.core.approvals.model
 
 import com.correx.core.events.types.ProjectId
-import com.correx.core.events.types.StageId
 import com.correx.core.events.types.SessionId
+import com.correx.core.events.types.StageId
 import kotlinx.serialization.Serializable
 
 @Serializable

core/approvals/src/test/kotlin/com/correx/core/approvals/DefaultApprovalReducerTest.kt

@@ -10,8 +10,6 @@ import com.correx.core.events.events.StoredEvent
 import com.correx.core.events.events.ToolInvokedEvent
 import com.correx.core.events.types.ApprovalDecisionId
 import com.correx.core.events.types.ApprovalRequestId
-import com.correx.core.approvals.ApprovalOutcome
-import com.correx.core.approvals.ApprovalStatus
 import com.correx.core.events.types.EventId
 import com.correx.core.events.types.GrantId
 import com.correx.core.events.types.SessionId

core/artifacts/src/main/kotlin/com/correx/core/artifacts/ArtifactProjector.kt

@@ -2,7 +2,7 @@ package com.correx.core.artifacts
 
 import com.correx.core.events.events.StoredEvent
 import com.correx.core.sessions.projections.Projection
-import java.util.logging.Logger
+import java.util.logging.*
 
 class ArtifactProjector(private val reducer: ArtifactReducer) : Projection<ArtifactState> {
 

core/events/src/main/kotlin/com/correx/core/events/EventDispatcher.kt

@@ -9,7 +9,7 @@ import com.correx.core.events.types.CorrelationId
 import com.correx.core.events.types.EventId
 import com.correx.core.events.types.SessionId
 import kotlinx.datetime.Clock
-import java.util.UUID
+import java.util.*
 
 class EventDispatcher(private val eventStore: EventStore) {
     suspend fun emit(

core/events/src/main/kotlin/com/correx/core/events/serialization/Serialization.kt

@@ -21,9 +21,9 @@ import com.correx.core.events.events.InferenceCompletedEvent
 import com.correx.core.events.events.InferenceFailedEvent
 import com.correx.core.events.events.InferenceStartedEvent
 import com.correx.core.events.events.InferenceTimeoutEvent
+import com.correx.core.events.events.LayerTruncatedEvent
 import com.correx.core.events.events.ModelLoadedEvent
 import com.correx.core.events.events.ModelUnloadedEvent
-import com.correx.core.events.events.LayerTruncatedEvent
 import com.correx.core.events.events.OrchestrationPausedEvent
 import com.correx.core.events.events.OrchestrationResumedEvent
 import com.correx.core.events.events.RetryAttemptedEvent
@@ -40,8 +40,8 @@ import com.correx.core.events.events.ToolExecutionCompletedEvent
 import com.correx.core.events.events.ToolExecutionFailedEvent
 import com.correx.core.events.events.ToolExecutionRejectedEvent
 import com.correx.core.events.events.ToolExecutionStartedEvent
-import com.correx.core.events.events.ToolInvokedEvent
 import com.correx.core.events.events.ToolInvocationRequestedEvent
+import com.correx.core.events.events.ToolInvokedEvent
 import com.correx.core.events.events.TransitionExecutedEvent
 import com.correx.core.events.events.WorkflowCompletedEvent
 import com.correx.core.events.events.WorkflowFailedEvent

core/inference/src/main/kotlin/com/correx/core/inference/InferenceReducer.kt

@@ -1,7 +1,6 @@
 package com.correx.core.inference
 
 import com.correx.core.events.events.StoredEvent
-import com.correx.core.inference.InferenceState
 
 interface InferenceReducer {
     fun reduce(state: InferenceState, event: StoredEvent): InferenceState

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

@@ -4,11 +4,13 @@ import com.correx.core.approvals.domain.NoOpApprovalEngine
 import com.correx.core.context.model.ContextPack
 import com.correx.core.events.events.ArtifactValidatedEvent
 import com.correx.core.events.events.ArtifactValidatingEvent
-import com.correx.core.events.stores.EventStore
 import com.correx.core.events.types.InferenceRequestId
+import com.correx.core.events.types.SessionId
+import com.correx.core.events.types.StageId
 import com.correx.core.inference.GenerationConfig
 import com.correx.core.inference.InferenceRequest
 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
@@ -16,13 +18,10 @@ 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.events.types.SessionId
-import com.correx.core.events.types.StageId
-import com.correx.core.kernel.execution.WorkflowResult
 import com.correx.core.validation.model.ValidationContext
-import java.util.UUID
+import java.util.*
-import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.*
-import java.util.concurrent.atomic.AtomicBoolean
+import java.util.concurrent.atomic.*
 
 private data class ReplayContext(
     val graph: WorkflowGraph,

core/kernel/src/main/kotlin/com/correx/core/kernel/retry/DefaultRetryCoordinator.kt

@@ -1,19 +1,16 @@
 package com.correx.core.kernel.retry
 
+import com.correx.core.events.events.EventMetadata
 import com.correx.core.events.events.NewEvent
-import com.correx.core.events.execution.RetryPolicy
 import com.correx.core.events.events.RetryAttemptedEvent
-import com.correx.core.events.events.StoredEvent
+import com.correx.core.events.execution.RetryPolicy
 import com.correx.core.events.stores.EventStore
 import com.correx.core.events.types.EventId
 import com.correx.core.events.types.SessionId
 import com.correx.core.events.types.StageId
-import com.correx.core.events.events.EventMetadata
-import kotlinx.datetime.Clock
 import kotlinx.coroutines.delay
-import java.util.UUID
+import kotlinx.datetime.Clock
-import kotlin.time.Duration.Companion.milliseconds
+import java.util.*
-import kotlin.coroutines.cancellation.CancellationException
 
 class DefaultRetryCoordinator(
     private val eventStore: EventStore,

core/transitions/src/main/kotlin/com/correx/core/transitions/analysis/DeterministicAdjacencyBuilder.kt

@@ -1,8 +1,8 @@
 package com.correx.core.transitions.analysis
 
+import com.correx.core.events.types.StageId
 import com.correx.core.transitions.graph.TransitionEdge
 import com.correx.core.transitions.graph.WorkflowGraph
-import com.correx.core.events.types.StageId
 
 internal class DeterministicAdjacencyBuilder {
     fun build(graph: WorkflowGraph): Map<StageId, List<TransitionEdge>> {

core/transitions/src/main/kotlin/com/correx/core/transitions/execution/StageExecutionRequest.kt

@@ -1,8 +1,8 @@
 package com.correx.core.transitions.execution
 
-import com.correx.core.transitions.evaluation.EvaluationContext
 import com.correx.core.events.types.StageId
 import com.correx.core.events.types.TransitionId
+import com.correx.core.transitions.evaluation.EvaluationContext
 
 data class StageExecutionRequest(
     val sessionId: String,

core/transitions/src/main/kotlin/com/correx/core/transitions/mapper/DefaultStageExecutionEventMapper.kt

@@ -4,9 +4,9 @@ import com.correx.core.events.events.EventPayload
 import com.correx.core.events.events.StageCompletedEvent
 import com.correx.core.events.events.StageFailedEvent
 import com.correx.core.events.events.TransitionExecutedEvent
+import com.correx.core.events.types.SessionId
 import com.correx.core.transitions.execution.StageExecutionRequest
 import com.correx.core.transitions.execution.StageExecutionResult
-import com.correx.core.events.types.SessionId
 
 class DefaultStageExecutionEventMapper : StageExecutionEventMapper {
 

core/transitions/src/main/kotlin/com/correx/core/transitions/policy/CycleSignature.kt

@@ -1,7 +1,7 @@
 package com.correx.core.transitions.policy
 
 import com.correx.core.events.types.StageId
-import java.util.SortedSet
+import java.util.*
 
 data class CycleSignature(
     val nodes: SortedSet<StageId>,

core/transitions/src/main/kotlin/com/correx/core/transitions/policy/CycleSignatureFactory.kt

@@ -2,7 +2,7 @@ package com.correx.core.transitions.policy
 
 import com.correx.core.events.types.StageId
 import com.correx.core.transitions.graph.TransitionEdge
-import java.util.TreeSet
+import java.util.*
 
 object CycleSignatureFactory {
     fun from(nodes: List<StageId>, edges: List<TransitionEdge>): CycleSignature {

core/transitions/src/main/kotlin/com/correx/core/transitions/state/CycleDfs.kt

@@ -1,8 +1,8 @@
 package com.correx.core.transitions.state
 
+import com.correx.core.events.types.StageId
 import com.correx.core.transitions.analysis.DetectedCycle
 import com.correx.core.transitions.graph.TransitionEdge
-import com.correx.core.events.types.StageId
 
 internal class CycleDfs {
     fun dfs(

core/validation/src/main/kotlin/com/correx/core/validation/semantic/rules/CyclePolicyBindingRule.kt

@@ -1,6 +1,5 @@
 package com.correx.core.validation.semantic.rules
 
-import com.correx.core.transitions.policy.CycleSignature
 import com.correx.core.transitions.policy.CycleSignatureFactory
 import com.correx.core.validation.model.ValidationContext
 import com.correx.core.validation.model.ValidationIssue

infrastructure/inference/commons/src/main/kotlin/com/correx/infrastructure/inference/commons/ManagedInferenceProvider.kt

@@ -1,8 +1,6 @@
 package com.correx.infrastructure.inference.commons
 
-import com.correx.core.events.types.ProviderId
 import com.correx.core.inference.InferenceProvider
-import com.correx.core.inference.Tokenizer
 
 /**
  * A wrapper around [InferenceProvider] that tracks model lifecycle.

infrastructure/inference/src/main/kotlin/com/correx/infrastructure/inference/DefaultProviderRegistry.kt

@@ -5,7 +5,7 @@ import com.correx.core.inference.InferenceProvider
 import com.correx.core.inference.ModelCapability
 import com.correx.core.inference.ProviderHealth
 import com.correx.core.inference.ProviderRegistry
-import java.util.concurrent.CopyOnWriteArrayList
+import java.util.concurrent.*
 
 /**
  * In-memory [ProviderRegistry] backed by a [CopyOnWriteArrayList] for safe concurrent reads.

infrastructure/inference/src/main/kotlin/com/correx/infrastructure/inference/FirstAvailableRoutingStrategy.kt

@@ -1,10 +1,10 @@
 package com.correx.infrastructure.inference
 
+import com.correx.core.events.types.StageId
 import com.correx.core.inference.InferenceProvider
 import com.correx.core.inference.ModelCapability
 import com.correx.core.inference.NoEligibleProviderException
 import com.correx.core.inference.RoutingStrategy
-import com.correx.core.events.types.StageId
 
 /**
  * Selects the first [InferenceProvider] from [candidates] whose declared capabilities

infrastructure/inference/src/test/kotlin/com/correx/infrastructure/inference/DefaultProviderRegistryTest.kt

@@ -7,8 +7,8 @@ import com.correx.core.inference.InferenceRequest
 import com.correx.core.inference.InferenceResponse
 import com.correx.core.inference.ModelCapability
 import com.correx.core.inference.ProviderHealth
-import com.correx.core.inference.Tokenizer
 import com.correx.core.inference.Token
+import com.correx.core.inference.Tokenizer
 import com.correx.core.utils.TypeId
 import kotlinx.coroutines.test.runTest
 import org.junit.jupiter.api.Assertions.assertEquals

infrastructure/persistence/src/test/kotlin/com/correx/infrastructure/persistence/InMemoryEventStoreTest.kt

@@ -1,7 +1,7 @@
 package com.correx.infrastructure.persistence
 
-import com.correx.testing.contracts.fixtures.events.store.EventStoreContractTest
 import com.correx.core.events.stores.EventStore
+import com.correx.testing.contracts.fixtures.events.store.EventStoreContractTest
 
 class InMemoryEventStoreTest : EventStoreContractTest() {
     override fun store(): EventStore = InMemoryEventStore()

infrastructure/persistence/src/test/kotlin/com/correx/infrastructure/persistence/InMemoryReplayTest.kt

@@ -1,10 +1,10 @@
 package com.correx.infrastructure.persistence
 
 import com.correx.core.events.stores.EventStore
-import com.correx.core.sessions.projections.replay.DefaultEventReplayer
-import com.correx.core.sessions.projections.replay.EventReplayer
 import com.correx.core.sessions.SessionCounterProjection
 import com.correx.core.sessions.SessionCounterState
+import com.correx.core.sessions.projections.replay.DefaultEventReplayer
+import com.correx.core.sessions.projections.replay.EventReplayer
 import com.correx.testing.contracts.fixtures.projections.SessionReplayContractTest
 
 class InMemoryReplayTest : SessionReplayContractTest() {

infrastructure/persistence/src/test/kotlin/com/correx/infrastructure/persistence/SqliteEventStoreTest.kt

@@ -1,7 +1,7 @@
 package com.correx.infrastructure.persistence
 
-import com.correx.testing.contracts.fixtures.events.store.EventStoreContractTest
 import com.correx.core.events.stores.EventStore
+import com.correx.testing.contracts.fixtures.events.store.EventStoreContractTest
 import java.sql.DriverManager
 
 class SqliteEventStoreTest : EventStoreContractTest() {

infrastructure/persistence/src/test/kotlin/com/correx/infrastructure/persistence/SqliteReplayTest.kt

@@ -1,10 +1,10 @@
 package com.correx.infrastructure.persistence
 
 import com.correx.core.events.stores.EventStore
-import com.correx.core.sessions.projections.replay.DefaultEventReplayer
-import com.correx.core.sessions.projections.replay.EventReplayer
 import com.correx.core.sessions.SessionCounterProjection
 import com.correx.core.sessions.SessionCounterState
+import com.correx.core.sessions.projections.replay.DefaultEventReplayer
+import com.correx.core.sessions.projections.replay.EventReplayer
 import com.correx.testing.contracts.fixtures.projections.SessionReplayContractTest
 import java.sql.DriverManager
 

infrastructure/src/main/kotlin/com/correx/infrastructure/InfrastructureModule.kt

@@ -8,10 +8,10 @@ import com.correx.core.inference.InferenceProvider
 import com.correx.core.inference.InferenceRouter
 import com.correx.core.inference.ProviderRegistry
 import com.correx.core.inference.RoutingStrategy
-import com.correx.infrastructure.inference.DefaultProviderRegistry
-import com.correx.infrastructure.inference.FirstAvailableRoutingStrategy
 import com.correx.core.tools.contract.ToolExecutor
 import com.correx.core.tools.registry.ToolRegistry
+import com.correx.infrastructure.inference.DefaultProviderRegistry
+import com.correx.infrastructure.inference.FirstAvailableRoutingStrategy
 import com.correx.infrastructure.inference.commons.ModelManager
 import com.correx.infrastructure.inference.llama.cpp.DefaultModelManager
 import com.correx.infrastructure.persistence.SqliteEventStore
@@ -20,10 +20,6 @@ import com.correx.infrastructure.tools.DispatchingToolExecutor
 import com.correx.infrastructure.tools.SandboxedToolExecutor
 import com.correx.infrastructure.tools.ToolConfig
 import com.correx.infrastructure.tools.buildTools
-import com.correx.infrastructure.tools.filesystem.FileEditTool
-import com.correx.infrastructure.tools.filesystem.FileReadTool
-import com.correx.infrastructure.tools.filesystem.FileWriteTool
-import com.correx.infrastructure.tools.shell.ShellTool
 import io.ktor.client.HttpClient
 import java.nio.file.Path
 import java.sql.DriverManager

infrastructure/tools/filesystem/src/test/kotlin/com/correx/infrastructure/tools/filesystem/FileEditToolTest.kt

@@ -1,19 +1,17 @@
 package com.correx.infrastructure.tools.filesystem
 
+import com.correx.core.events.events.ToolRequest
 import com.correx.core.events.types.SessionId
 import com.correx.core.events.types.StageId
 import com.correx.core.events.types.ToolInvocationId
-import com.correx.core.events.events.ToolRequest
 import com.correx.core.tools.contract.ToolResult
 import com.correx.core.tools.contract.ValidationResult
 import kotlinx.coroutines.runBlocking
 import org.junit.jupiter.api.Assertions.assertEquals
-import org.junit.jupiter.api.Assertions.assertFalse
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test
 import java.nio.file.Files
-import java.nio.file.Path
+import java.util.*
-import java.util.UUID
 
 class FileEditToolTest {
 

infrastructure/tools/filesystem/src/test/kotlin/com/correx/infrastructure/tools/filesystem/FileReadToolTest.kt

@@ -1,18 +1,18 @@
 package com.correx.infrastructure.tools.filesystem
 
+import com.correx.core.events.events.ToolRequest
 import com.correx.core.events.types.SessionId
 import com.correx.core.events.types.StageId
 import com.correx.core.events.types.ToolInvocationId
 import com.correx.core.tools.contract.ToolResult
 import com.correx.core.tools.contract.ValidationResult
-import com.correx.core.events.events.ToolRequest
 import kotlinx.coroutines.runBlocking
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertFalse
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test
 import java.nio.file.Files
-import java.util.UUID
+import java.util.*
 
 class FileReadToolTest {
 

infrastructure/tools/filesystem/src/test/kotlin/com/correx/infrastructure/tools/filesystem/FileWriteToolTest.kt

@@ -1,19 +1,18 @@
 package com.correx.infrastructure.tools.filesystem
 
+import com.correx.core.events.events.ToolRequest
 import com.correx.core.events.types.SessionId
 import com.correx.core.events.types.StageId
 import com.correx.core.events.types.ToolInvocationId
 import com.correx.core.tools.contract.ToolResult
 import com.correx.core.tools.contract.ValidationResult
-import com.correx.core.events.events.ToolRequest
 import kotlinx.coroutines.runBlocking
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertFalse
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test
 import java.nio.file.Files
-import java.nio.file.Path
+import java.util.*
-import java.util.UUID
 
 class FileWriteToolTest {
 

infrastructure/tools/src/test/kotlin/com/correx/infrastructure/tools/shell/ShellToolTest.kt

@@ -11,7 +11,7 @@ import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertFalse
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test
-import java.util.UUID
+import java.util.*
 
 class ShellToolTest {
 

testing/approvals/src/test/kotlin/ApprovalEngineEdgeCasesTest.kt

@@ -1,10 +1,10 @@
+import com.correx.core.approvals.ApprovalStatus
+import com.correx.core.approvals.GrantScope
 import com.correx.core.approvals.Tier
 import com.correx.core.approvals.domain.DefaultApprovalEngine
 import com.correx.core.approvals.model.ApprovalContext
 import com.correx.core.approvals.model.ApprovalGrant
 import com.correx.core.approvals.model.ApprovalScopeIdentity
-import com.correx.core.approvals.ApprovalStatus
-import com.correx.core.approvals.GrantScope
 import com.correx.core.events.types.GrantId
 import com.correx.core.events.types.ProjectId
 import com.correx.core.events.types.SessionId

testing/approvals/src/test/kotlin/GrantSemanticsTest.kt

@@ -1,11 +1,11 @@
+import com.correx.core.approvals.ApprovalOutcome
+import com.correx.core.approvals.ApprovalStatus
+import com.correx.core.approvals.GrantScope
 import com.correx.core.approvals.Tier
 import com.correx.core.approvals.domain.DefaultApprovalEngine
 import com.correx.core.approvals.model.ApprovalContext
 import com.correx.core.approvals.model.ApprovalGrant
-import com.correx.core.approvals.ApprovalOutcome
 import com.correx.core.approvals.model.ApprovalScopeIdentity
-import com.correx.core.approvals.ApprovalStatus
-import com.correx.core.approvals.GrantScope
 import com.correx.core.events.types.GrantId
 import com.correx.core.events.types.SessionId
 import com.correx.core.sessions.ApprovalMode

testing/approvals/src/test/kotlin/ModeApprovalTest.kt

@@ -1,9 +1,9 @@
+import com.correx.core.approvals.ApprovalOutcome
+import com.correx.core.approvals.ApprovalStatus
 import com.correx.core.approvals.Tier
 import com.correx.core.approvals.domain.DefaultApprovalEngine
 import com.correx.core.approvals.model.ApprovalContext
-import com.correx.core.approvals.ApprovalOutcome
 import com.correx.core.approvals.model.ApprovalScopeIdentity
-import com.correx.core.approvals.ApprovalStatus
 import com.correx.core.events.types.SessionId
 import com.correx.core.sessions.ApprovalMode
 import com.correx.testing.fixtures.request

testing/approvals/src/test/kotlin/NoExecutionCouplingTest.kt

@@ -1,9 +1,9 @@
+import com.correx.core.approvals.GrantScope
 import com.correx.core.approvals.Tier
 import com.correx.core.approvals.domain.DefaultApprovalEngine
 import com.correx.core.approvals.model.ApprovalContext
 import com.correx.core.approvals.model.ApprovalGrant
 import com.correx.core.approvals.model.ApprovalScopeIdentity
-import com.correx.core.approvals.GrantScope
 import com.correx.core.events.types.GrantId
 import com.correx.core.events.types.SessionId
 import com.correx.core.sessions.ApprovalMode

testing/approvals/src/test/kotlin/TierImmutabilityTest.kt

@@ -1,12 +1,12 @@
+import com.correx.core.approvals.GrantScope
 import com.correx.core.approvals.Tier
 import com.correx.core.approvals.domain.DefaultApprovalEngine
 import com.correx.core.approvals.model.ApprovalContext
 import com.correx.core.approvals.model.ApprovalGrant
 import com.correx.core.approvals.model.ApprovalScopeIdentity
-import com.correx.core.approvals.GrantScope
-import com.correx.core.sessions.ApprovalMode
 import com.correx.core.events.types.GrantId
 import com.correx.core.events.types.SessionId
+import com.correx.core.sessions.ApprovalMode
 import com.correx.testing.fixtures.request
 import kotlinx.datetime.Instant
 import org.junit.jupiter.api.Assertions

testing/contracts/src/main/kotlin/com/correx/testing/contracts/utils/ConcurrencyRunner.kt

@@ -1,7 +1,6 @@
 package com.correx.testing.contracts.utils
 
-import java.util.concurrent.CountDownLatch
+import java.util.concurrent.*
-import java.util.concurrent.Executors
 
 object ConcurrencyRunner {
 

testing/contracts/src/main/kotlin/com/correx/testing/contracts/utils/DeterministicBarrier.kt

@@ -1,6 +1,6 @@
 package com.correx.testing.contracts.utils
 
-import java.util.concurrent.CyclicBarrier
+import java.util.concurrent.*
 
 class DeterministicBarrier(parties: Int) {
 

testing/contracts/src/test/kotlin/com/correx/testing/contracts/model/ContextSnapshotTest.kt

@@ -4,9 +4,9 @@ import com.correx.core.approvals.Tier
 import com.correx.core.approvals.domain.DefaultApprovalEngine
 import com.correx.core.approvals.model.ApprovalContext
 import com.correx.core.approvals.model.ApprovalScopeIdentity
+import com.correx.core.events.types.ProjectId
 import com.correx.core.events.types.SessionId
 import com.correx.core.events.types.StageId
-import com.correx.core.events.types.ProjectId
 import com.correx.core.sessions.ApprovalMode
 import com.correx.testing.fixtures.request
 import kotlinx.datetime.Instant

testing/contracts/src/test/kotlin/com/correx/testing/contracts/model/inference/DefaultInferenceRouterTest.kt

@@ -7,8 +7,8 @@ import com.correx.core.inference.DefaultInferenceRouter
 import com.correx.core.inference.InferenceProvider
 import com.correx.core.inference.ModelCapability
 import com.correx.core.inference.NoEligibleProviderException
-import com.correx.core.inference.ProviderRegistry
 import com.correx.core.inference.ProviderHealth
+import com.correx.core.inference.ProviderRegistry
 import com.correx.core.inference.RoutingStrategy
 import com.correx.testing.fixtures.inference.MockInferenceProvider
 import kotlinx.coroutines.runBlocking

testing/contracts/src/testFixtures/kotlin/com/correx/testing/contracts/fixtures/projections/CountingProjectionContractTest.kt

@@ -2,9 +2,9 @@ package com.correx.testing.contracts.fixtures.projections
 
 import com.correx.core.events.types.EventId
 import com.correx.core.events.types.SessionId
-import com.correx.core.sessions.projections.DefaultStateBuilder
 import com.correx.core.sessions.SessionCounterProjection
 import com.correx.core.sessions.SessionCounterState
+import com.correx.core.sessions.projections.DefaultStateBuilder
 import com.correx.testing.fixtures.EventFixtures.stored
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test

testing/contracts/src/testFixtures/kotlin/com/correx/testing/contracts/fixtures/projections/SessionReplayContractTest.kt

@@ -3,8 +3,8 @@ package com.correx.testing.contracts.fixtures.projections
 import com.correx.core.events.stores.EventStore
 import com.correx.core.events.types.EventId
 import com.correx.core.events.types.SessionId
-import com.correx.core.sessions.projections.replay.EventReplayer
 import com.correx.core.sessions.SessionCounterState
+import com.correx.core.sessions.projections.replay.EventReplayer
 import com.correx.testing.fixtures.EventFixtures.newEvent
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test

testing/deterministic/src/test/kotlin/ValidationPipelineShortCircuitTest.kt

@@ -8,7 +8,6 @@ import com.correx.core.validation.pipeline.Validator
 import com.correx.testing.fixtures.WorkflowFixtures
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertFalse
-import org.junit.jupiter.api.Assertions.assertInstanceOf
 import org.junit.jupiter.api.Test
 
 class ValidationPipelineShortCircuitTest {

testing/fixtures/src/main/kotlin/com/correx/testing/fixtures/ApprovalFixtures.kt

@@ -5,7 +5,6 @@ import com.correx.core.approvals.model.DomainApprovalRequest
 import com.correx.core.events.types.ApprovalRequestId
 import com.correx.core.events.types.RiskSummaryId
 import com.correx.core.events.types.ValidationReportId
-import com.correx.core.validation.model.ValidationContext
 import com.correx.core.validation.model.ValidationIssue
 import com.correx.core.validation.model.ValidationSection
 import com.correx.core.validation.model.ValidationSeverity

testing/fixtures/src/main/kotlin/com/correx/testing/fixtures/context/ContextFixtures.kt

@@ -1,8 +1,8 @@
 package com.correx.testing.fixtures.context
 
 import com.correx.core.context.builder.DefaultContextPackBuilder
-import com.correx.core.context.compression.ContextCompressor
 import com.correx.core.context.compression.CompressionStrategy
+import com.correx.core.context.compression.ContextCompressor
 import com.correx.core.context.model.ContextEntry
 import com.correx.core.context.model.TokenBudget
 

testing/kernel/src/test/kotlin/DefaultRetryCoordinatorTest.kt

@@ -1,8 +1,8 @@
 import com.correx.core.events.events.RetryAttemptedEvent
+import com.correx.core.events.execution.RetryPolicy
 import com.correx.core.events.stores.EventStore
 import com.correx.core.events.types.SessionId
 import com.correx.core.events.types.StageId
-import com.correx.core.events.execution.RetryPolicy
 import com.correx.core.kernel.retry.DefaultRetryCoordinator
 import com.correx.infrastructure.persistence.InMemoryEventStore
 import kotlinx.coroutines.ExperimentalCoroutinesApi

testing/projections/src/test/kotlin/ArtifactReducerTest.kt

@@ -1,7 +1,6 @@
 import com.correx.core.artifacts.ArtifactState
 import com.correx.core.artifacts.DefaultArtifactReducer
 import com.correx.core.events.events.ArtifactArchivedEvent
-import com.correx.core.events.events.ArtifactCreatedEvent
 import com.correx.core.events.events.ArtifactRejectedEvent
 import com.correx.core.events.events.ArtifactRelationshipAddedEvent
 import com.correx.core.events.events.ArtifactSupersededEvent

testing/projections/src/test/kotlin/DefaultSessionReducerTest.kt

@@ -8,11 +8,11 @@ import com.correx.core.events.events.StageFailedEvent
 import com.correx.core.events.events.StageStartedEvent
 import com.correx.core.events.events.TransitionExecutedEvent
 import com.correx.core.events.types.SessionId
+import com.correx.core.events.types.StageId
+import com.correx.core.events.types.TransitionId
 import com.correx.core.sessions.DefaultSessionReducer
 import com.correx.core.sessions.SessionState
 import com.correx.core.sessions.SessionStatus
-import com.correx.core.events.types.StageId
-import com.correx.core.events.types.TransitionId
 import com.correx.testing.fixtures.EventFixtures.stored
 import kotlinx.datetime.Instant
 import org.junit.jupiter.api.Assertions.assertEquals

testing/projections/src/test/kotlin/OrchestrationProjectorTest.kt

@@ -4,9 +4,9 @@ import com.correx.core.events.events.RetryAttemptedEvent
 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.events.orchestration.OrchestrationStatus
 import com.correx.core.events.types.SessionId
 import com.correx.core.events.types.StageId
-import com.correx.core.events.orchestration.OrchestrationStatus
 import com.correx.core.kernel.orchestration.DefaultOrchestrationReducer
 import com.correx.core.kernel.orchestration.OrchestrationProjector
 import com.correx.testing.fixtures.EventFixtures.stored

testing/projections/src/test/kotlin/OrchestrationReducerTest.kt

@@ -4,10 +4,10 @@ import com.correx.core.events.events.RetryAttemptedEvent
 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.events.types.SessionId
-import com.correx.core.events.types.StageId
 import com.correx.core.events.orchestration.OrchestrationState
 import com.correx.core.events.orchestration.OrchestrationStatus
+import com.correx.core.events.types.SessionId
+import com.correx.core.events.types.StageId
 import com.correx.core.kernel.orchestration.DefaultOrchestrationReducer
 import com.correx.testing.fixtures.EventFixtures.stored
 import org.junit.jupiter.api.Assertions.assertEquals

testing/replay/src/test/kotlin/ApprovalReplayTest.kt

@@ -1,9 +1,9 @@
+import com.correx.core.approvals.GrantScope
 import com.correx.core.approvals.Tier
 import com.correx.core.approvals.domain.DefaultApprovalEngine
 import com.correx.core.approvals.model.ApprovalContext
 import com.correx.core.approvals.model.ApprovalGrant
 import com.correx.core.approvals.model.ApprovalScopeIdentity
-import com.correx.core.approvals.GrantScope
 import com.correx.core.events.types.ApprovalDecisionId
 import com.correx.core.events.types.GrantId
 import com.correx.core.events.types.SessionId