@guanlin4924/devflow-pi 0.1.12 → 0.1.14

package/plugins/devflow-core/skills/workflow-orchestrator/scripts/validate_state.rb

@@ -4,6 +4,8 @@
 require "json"
 require "optparse"
 require "yaml"
+require_relative "control_io"
+require_relative "phase_ownership"
 
 module WorkflowStateValidator
   REQUIRED_STATE_FIELDS = %w[
@@ -18,12 +20,18 @@ module WorkflowStateValidator
 
   TERMINAL_ARTIFACT_STATUSES = %w[approved completed passed].freeze
   NON_TERMINAL_ARTIFACT_STATUSES = %w[planned generated pending_rerun stale failed].freeze
+  TERMINAL_WORKFLOW_STATUSES = %w[completed failed cancelled].freeze
 
   module_function
 
-  def validate(root:, state_path:, state_override: nil, workflow_override: nil, artifact_registry_override: nil, strict_artifact_status: true, strict_registry_revision: true)
+  def validate(root:, state_path:, state_override: nil, workflow_override: nil, artifact_registry_override: nil, strict_artifact_status: true, strict_registry_revision: true, phase_owner_override: nil)
     root = File.expand_path(root)
-    state_path = File.expand_path(state_path, root)
+    canonical_state_path, = DevflowControlIO.resolve_control_path(root, ".planning/STATE.md", :state)
+    unless File.expand_path(state_path, root) == canonical_state_path
+      issues = [issue("error", "invalid_control_path", "STATE.md path must be .planning/STATE.md")]
+      return result(false, state_path, nil, nil, issues)
+    end
+    state_path = canonical_state_path
     issues = []
 
     state = state_override || load_state(state_path, issues)
@@ -34,8 +42,14 @@ module WorkflowStateValidator
     end
     return result(false, state_path, nil, nil, issues) if issues.any? { |entry| entry["severity"] == "error" }
 
+    ownership = PhaseOwnership.validate_state(root: root, state: state, owner_override: phase_owner_override)
+    unless ownership["ok"]
+      issues << issue("error", ownership["reason"], ownership["message"], ownership.reject { |key, _| %w[ok reason message].include?(key) })
+      return result(false, state_path, nil, nil, issues)
+    end
+
     workflow_path = state["workflow_config"] || File.join(".planning", "workflows", "#{state.fetch("current_flow")}.yaml")
-    abs_workflow_path = File.expand_path(workflow_path, root)
+    abs_workflow_path, workflow_path = DevflowControlIO.resolve_control_path(root, workflow_path, :workflow)
     workflow = workflow_override || load_yaml(abs_workflow_path, issues, "workflow_config")
     return result(false, state_path, workflow_path, nil, issues) unless workflow
 
@@ -103,7 +117,7 @@ module WorkflowStateValidator
 
     registry = registry_override
     unless registry
-      abs_registry_path = File.expand_path(registry_path, root)
+      abs_registry_path, = DevflowControlIO.resolve_control_path(root, registry_path, :registry)
       unless File.exist?(abs_registry_path)
         issues << issue("error", "missing_artifact_registry", "Artifact registry does not exist", path: registry_path)
         return {}
@@ -121,7 +135,7 @@ module WorkflowStateValidator
       )
     end
     Array(registry["artifacts"]).to_h { |artifact| [artifact.fetch("path"), artifact] }
-  rescue ArgumentError, TypeError, Psych::SyntaxError => e
+  rescue ArgumentError, TypeError, Psych::SyntaxError, DevflowControlIO::InvalidControlPath => e
     issues << issue("error", "invalid_artifact_registry", e.message, path: registry_path)
     {}
   end
@@ -145,8 +159,10 @@ module WorkflowStateValidator
     unknown.each do |step_id|
       issues << issue("error", "unknown_tracked_step", "Tracked step is not defined in the active workflow", step: step_id)
     end
-    missing.each do |step_id|
-      issues << issue("error", "missing_tracked_step", "Workflow step is missing from both completed_steps and pending_steps", step: step_id)
+    unless %w[failed cancelled].include?(state["status"])
+      missing.each do |step_id|
+        issues << issue("error", "missing_tracked_step", "Workflow step is missing from both completed_steps and pending_steps", step: step_id)
+      end
     end
 
     current_step = state["current_step"]
@@ -162,6 +178,10 @@ module WorkflowStateValidator
       missing_completed.each do |step_id|
         issues << issue("error", "completed_status_missing_step", "Workflow status is completed but a workflow step is not completed", step: step_id)
       end
+    elsif %w[failed cancelled].include?(state["status"])
+      if pending_ids.any?
+        issues << issue("error", "terminal_with_pending_steps", "Terminal workflow status must not retain pending steps", status: state["status"])
+      end
     elsif pending_ids.empty?
       issues << issue("error", "non_completed_without_pending_steps", "Workflow has no pending steps but status is not completed")
     end
@@ -589,7 +609,12 @@ if __FILE__ == $PROGRAM_NAME
   end.parse!
 
   root = Dir.pwd
-  state_path = File.expand_path(options[:state], root)
+  begin
+    state_path, = DevflowControlIO.resolve_control_path(root, options[:state], :state)
+  rescue DevflowControlIO::InvalidControlPath => error
+    puts JSON.pretty_generate({ "ok" => false, "errors" => [{ "code" => "invalid_control_path", "message" => error.message }] })
+    exit 1
+  end
   validation = WorkflowStateValidator.validate(
     root: root,
     state_path: state_path,