fix(controller): preserve state across workflow reset and improve signal handling

- Preserve controller state when resetting workflow to maintain continuity
- Emit controller info after workflow:started to prevent state clearing
- Add debug logs for better visibility into return-to-controller signal flow

Author: moazbuilds

src/cli/tui/routes/workflow/context/ui-state/store.ts

@@ -51,7 +51,13 @@ function createStoreInternal(workflowName: string): UIActions & { reset: (workfl
   // Reset function to reinitialize state for a new workflow
   const reset = (newWorkflowName: string) => {
     debug('[UI-STORE] Resetting store for new workflow: %s', newWorkflowName)
+    // Preserve controller state across workflow reset
+    const preservedControllerState = state.controllerState
     state = createInitialState(newWorkflowName)
+    if (preservedControllerState) {
+      debug('[UI-STORE] Preserving controller state: %s', preservedControllerState.id)
+      state.controllerState = preservedControllerState
+    }
     notifyImmediate()
   }
 

src/workflows/run.ts

@@ -245,6 +245,13 @@ export async function runWorkflow(options: RunWorkflowOptions = {}): Promise<voi
   // This ensures timeline only appears when switching to executing view
   emitter.workflowStarted(template.name, moduleSteps.length);
 
+  // Emit controller info AFTER workflow:started to prevent reset() from clearing it
+  // This enables the 'c' key to return to controller even while step agent executes
+  if (controllerResult.controllerInfo) {
+    const info = controllerResult.controllerInfo;
+    emitter.setControllerInfo(info.id, info.name, info.engine, info.model);
+  }
+
   // Pre-populate timeline
   debug('[Workflow] ========== TIMELINE POPULATION ==========');
   debug('[Workflow] startIndex=%d, actualStartIndex=%d, total moduleSteps=%d', startIndex, actualStartIndex, moduleSteps.length);

src/workflows/signals/handlers/return.ts

@@ -46,22 +46,30 @@ export async function handleReturnToControllerSignal(ctx: SignalContext): Promis
   ctx.machine.send({ type: 'PAUSE' })
   ctx.mode.pause()
 
+  debug('[ReturnToControllerSignal] After pause, machine state=%s', ctx.machine.state)
+
   // Abort current step if running
   const abortController = ctx.getAbortController()
   if (abortController && !abortController.signal.aborted) {
     debug('[ReturnToControllerSignal] Aborting current step')
     abortController.abort()
   }
+  debug('[ReturnToControllerSignal] After abort check')
 
   // CRITICAL: Emit mode-change event to abort ControllerInputProvider
   // This must be done BEFORE switching views to ensure the controller's executeWithActions aborts
   debug('[ReturnToControllerSignal] Emitting mode-change with autonomousMode=false to abort controller')
   ;(process as NodeJS.EventEmitter).emit('workflow:mode-change', { autonomousMode: 'false' })
+  debug('[ReturnToControllerSignal] After mode-change emit')
 
   // Switch to controller view
+  debug('[ReturnToControllerSignal] About to call setControllerView')
   await setControllerView(ctx.cmRoot, true)
+  debug('[ReturnToControllerSignal] After setControllerView, about to emit workflow:view')
   ctx.emitter.setWorkflowView('controller')
+  debug('[ReturnToControllerSignal] After setWorkflowView')
   ctx.emitter.updateControllerStatus('awaiting')
+  debug('[ReturnToControllerSignal] After updateControllerStatus')
 
   // Set autonomous mode to never for conversation (file persistence)
   await setAutonomousMode(ctx.cmRoot, 'never')