fix(sessions): terminalize session on workflow completion

DefaultSessionReducer skipped WorkflowCompletedEvent to avoid terminalizing on freestyle planning's mid-session completion, but that left execution/normal completions stuck ACTIVE forever — headless watchers and approval loops never saw a terminal state. Add workflowId to WorkflowCompletedEvent (defaulted for replay compat), pass graph.id at all completeWorkflow sites, and terminalize to COMPLETED unless it's the freestyle_planning handoff. Correct stale tests that pinned the ACTIVE-forever behavior.

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

@@ -21,6 +21,10 @@ data class WorkflowCompletedEvent(
     val sessionId: SessionId,
     val terminalStageId: StageId,
     val totalStages: Int,
+    // The workflow that completed. Lets the session reducer tell a session-terminal completion from
+    // the freestyle planning workflow, which completes mid-session before handing off to execution.
+    // Defaulted for backward-compatible replay of events stored before this field existed.
+    val workflowId: String = "",
 ) : EventPayload
 
 @Serializable

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

@@ -168,7 +168,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 {
                 // No outgoing edge matched: the stage finished but produced nothing that satisfies a
                 // transition (e.g. the analyst never emitted a validated `analysis`). Treat it as a
@@ -335,7 +335,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),
             )
         }
 

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

@@ -117,7 +117,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)) {
@@ -131,7 +131,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

@@ -2065,13 +2065,14 @@ 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,
         )
         correlateCritiqueOutcomes(sessionId)
-        emit(sessionId, WorkflowCompletedEvent(sessionId, terminalStageId, stageCount))
+        emit(sessionId, WorkflowCompletedEvent(sessionId, terminalStageId, stageCount, workflowId))
         cancellations.remove(sessionId)
         return WorkflowResult.Completed(sessionId, terminalStageId)
     }

core/sessions/src/main/kotlin/com/correx/core/sessions/DefaultSessionReducer.kt

@@ -8,8 +8,13 @@ import com.correx.core.events.events.StageCompletedEvent
 import com.correx.core.events.events.StageFailedEvent
 import com.correx.core.events.events.StoredEvent
 import com.correx.core.events.events.TransitionExecutedEvent
+import com.correx.core.events.events.WorkflowCompletedEvent
 import com.correx.core.events.events.WorkflowFailedEvent
 
+// The freestyle two-phase planning workflow. Its completion hands off to the execution workflow
+// rather than ending the session, so it must not terminalize (see reduce()).
+private const val PLANNING_WORKFLOW_ID = "freestyle_planning"
+
 class DefaultSessionReducer : SessionReducer {
 
     override fun reduce(
@@ -24,13 +29,19 @@ class DefaultSessionReducer : SessionReducer {
                 SessionStatus.FAILED
 
             // A failed workflow is terminal for the session: no current workflow recovers after
-            // one fails (freestyle's planning→execution handoff only fires on WorkflowCompleted).
+            // one fails.
-            // Without this, an exhausted-retry WorkflowFailed left the session ACTIVE forever, so
-            // clients/approval loops never saw a terminal state. WorkflowCompleted is deliberately
-            // NOT mapped here — planning emits its own mid-session, so it isn't session-terminal.
             is WorkflowFailedEvent ->
                 SessionStatus.FAILED
 
+            // A completed workflow is session-terminal EXCEPT the freestyle planning workflow, which
+            // completes mid-session and hands off to the execution workflow (the handoff fires on
+            // planning's WorkflowCompleted — see ServerModule). Terminalizing on it would falsely mark
+            // the session done during the planning→execution gap; leaving it ACTIVE lets the real
+            // (execution) completion terminalize. Without this, a normal single-workflow session — and
+            // the execution phase — stayed ACTIVE forever, so clients/approval loops never saw done.
+            is WorkflowCompletedEvent ->
+                if (payload.workflowId == PLANNING_WORKFLOW_ID) state.status else SessionStatus.COMPLETED
+
             is StageCompletedEvent,
             is TransitionExecutedEvent ->
                 SessionStatus.ACTIVE

core/sessions/src/test/kotlin/com/correx/core/sessions/DefaultSessionReducerTest.kt

@@ -70,6 +70,32 @@ class DefaultSessionReducerTest {
         assertEquals(SessionStatus.FAILED, reducer.reduce(initialState, event).status)
     }
 
+    @Test
+    fun `WorkflowCompletedEvent flips session status to COMPLETED`() {
+        val event = stored(
+            com.correx.core.events.events.WorkflowCompletedEvent(
+                sessionId = sessionId,
+                terminalStageId = com.correx.core.events.types.StageId("report"),
+                totalStages = 3,
+                workflowId = "review_loop",
+            ),
+        )
+        assertEquals(SessionStatus.COMPLETED, reducer.reduce(initialState, event).status)
+    }
+
+    @Test
+    fun `WorkflowCompletedEvent for freestyle planning stays ACTIVE (hands off to execution)`() {
+        val event = stored(
+            com.correx.core.events.events.WorkflowCompletedEvent(
+                sessionId = sessionId,
+                terminalStageId = com.correx.core.events.types.StageId("architect"),
+                totalStages = 2,
+                workflowId = "freestyle_planning",
+            ),
+        )
+        assertEquals(SessionStatus.ACTIVE, reducer.reduce(initialState, event).status)
+    }
+
     @Test
     fun `unrelated event leaves boundProfile unchanged`() {
         val state = initialState.copy(

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

@@ -75,7 +75,7 @@ class DefaultSessionReducerTest {
     }
 
     @Test
-    fun `WorkflowCompletedEvent leaves ACTIVE status`() {
+    fun `WorkflowCompletedEvent flips to COMPLETED status`() {
         val state = activeState()
 
         val result = reducer.reduce(
@@ -86,11 +86,11 @@ class DefaultSessionReducerTest {
             )
         )
 
-        assertEquals(SessionStatus.ACTIVE, result.status)
+        assertEquals(SessionStatus.COMPLETED, result.status)
     }
 
     @Test
-    fun `WorkflowFailedEvent leaves ACTIVE status`() {
+    fun `WorkflowFailedEvent flips to FAILED status`() {
         val state = activeState()
 
         val result = reducer.reduce(
@@ -101,7 +101,7 @@ class DefaultSessionReducerTest {
             )
         )
 
-        assertEquals(SessionStatus.ACTIVE, result.status)
+        assertEquals(SessionStatus.FAILED, result.status)
     }
 
     @Test

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

@@ -35,7 +35,7 @@ class SessionProjectorTest {
             state = projector.apply(state, it)
         }
 
-        assertEquals(SessionStatus.CREATED, state.status)
+        assertEquals(SessionStatus.COMPLETED, state.status)
     }
 
     @Test

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

@@ -59,6 +59,6 @@ class SessionReplayTest {
 
         val state = replayer.rebuild(sessionId)
 
-        assertEquals(SessionStatus.CREATED, state.status)
+        assertEquals(SessionStatus.COMPLETED, state.status)
     }
 }

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

@@ -80,7 +80,7 @@ class TransitionReplayIntegrationTest {
         val state = replayer.rebuild(sessionId)
 
         assertEquals(
-            SessionStatus.ACTIVE,
+            SessionStatus.COMPLETED,
             state.status
         )
     }