Merge pull request #69 from Obedience-Corp/develop

Hybrid phases, create workflow, gate fixes

Author: lancekrogers

internal/commands/next/next.go

@@ -204,6 +204,15 @@ func runNext(cmd *cobra.Command, args []string) error {
 		}
 	}
 
+	// Check if an earlier phase has incomplete after-workflow steps
+	// that should run before jumping to later phases
+	if result.Task != nil {
+		earlierWorkflow, ewErr := findEarlierIncompleteAfterWorkflow(ctx, festivalPath, result.Task.PhaseName)
+		if ewErr == nil && earlierWorkflow != "" {
+			return runWorkflowMode(ctx, festivalPath, earlierWorkflow)
+		}
+	}
+
 	// If selector says festival is complete, check for remaining incomplete workflow phases
 	if result.FestivalComplete {
 		incompleteWorkflow, wErr := findFirstIncompleteWorkflowPhase(ctx, festivalPath)
@@ -528,6 +537,58 @@ func findFirstIncompleteWorkflowPhase(ctx context.Context, festivalPath string)
 	return "", nil
 }
 
+// findEarlierIncompleteAfterWorkflow scans phases in numerical order before the given phase
+// and returns the first one with an incomplete after-position workflow. This handles hybrid
+// phases where sequences are complete but the after-workflow steps remain.
+func findEarlierIncompleteAfterWorkflow(ctx context.Context, festivalPath, currentPhaseName string) (string, error) {
+	entries, err := os.ReadDir(festivalPath)
+	if err != nil {
+		return "", err
+	}
+
+	var phases []string
+	for _, entry := range entries {
+		if entry.IsDir() && isNumberedDir(entry.Name()) {
+			phases = append(phases, entry.Name())
+		}
+	}
+	sort.Strings(phases)
+
+	store := progress.NewStore(festivalPath)
+	storeLoaded := store.Load(ctx) == nil
+
+	for _, phaseName := range phases {
+		// Stop before the current task's phase
+		if phaseName >= currentPhaseName {
+			break
+		}
+
+		phasePath := filepath.Join(festivalPath, phaseName)
+		workflowPath := filepath.Join(phasePath, "WORKFLOW.md")
+		if _, statErr := os.Stat(workflowPath); statErr != nil {
+			continue
+		}
+
+		// Only consider after-position workflows (default)
+		position := shared.WorkflowPositionForPhase(phasePath)
+		if position == frontmatter.WorkflowPositionBefore {
+			continue
+		}
+
+		// Check if workflow is incomplete
+		if storeLoaded {
+			state, ok := store.WorkflowPhaseState(phaseName)
+			if ok && state.TotalSteps > 0 && state.IsComplete() {
+				continue // Workflow is complete
+			}
+		}
+
+		return phasePath, nil
+	}
+
+	return "", nil
+}
+
 // hasSequenceDirs checks if a phase directory contains numbered subdirectories (sequences).
 func hasSequenceDirs(phasePath string) bool {
 	entries, err := os.ReadDir(phasePath)

internal/guidance/selection/output.go

@@ -768,7 +768,9 @@ func buildGateSection(task *TaskInfo) string {
 	// Task location
 	taskRelPath := filepath.Join(task.PhaseName, task.SequenceName, task.Name+".md")
 	sb.WriteString(labelValue("Task", ui.Value(task.Name, ui.TaskColor)))
+	sb.WriteString("\n")
 	sb.WriteString(labelValue("Path", ui.Dim(taskRelPath)))
+	sb.WriteString("\n")
 	sb.WriteString(labelValue("Type", ui.Value(fmt.Sprintf("gate (%s)", fm.GateType))))
 	sb.WriteString("\n")