Dev

cmd/cli/generator/generate.go

@@ -39,7 +39,7 @@ var Cmd = &cobra.Command{
 		manager := runner.NewPlanManagerBuilder().
 			WithManifests(loadedManifests...).Build()
 
-		planManifest, err := manager.Generate()
+		planManifest, _, err := manager.Generate()
 		if err != nil {
 			cli.Errorf("Failed to generate plan: %v", err)
 			return

cmd/cli/run/run.go

@@ -56,7 +56,7 @@ var Cmd = &cobra.Command{
 			WithManifests(loadedManifests...).Build()
 
 		// Use V2 plan generation with dependency analysis
-		planManifest, graphResult, err := manager.GenerateV2()
+		planManifest, graphResult, err := manager.Generate()
 		if err != nil {
 			cli.Errorf("Failed to generate V2 plan: %v", err)
 			return
@@ -82,11 +82,11 @@ var Cmd = &cobra.Command{
 		hooksRunner := hooks.NewDefaultHooksRunner()
 
 		// Use V2 plan runner with dependency support
-		planRunner := executor.NewV2PlanRunner(registry, hooksRunner, graphResult)
+		planRunner := executor.NewRunner(registry, hooksRunner, graphResult)
 
 		runCtx := ctxBuilder.Build()
 
-		if err = planRunner.RunPlan(runCtx, planManifest); err != nil {
+		if err = planRunner.Run(runCtx, planManifest); err != nil {
 			cli.Errorf("Plan execution failed: %v", err)
 			return
 		}

internal/core/manifests/kinds/priority.go

@@ -0,0 +1,18 @@
+package kinds
+
+import "github.com/apiqube/cli/internal/core/manifests"
+
+var PriorityMap = map[string]int{
+	// Infrastructure kinds
+	manifests.ValuesKind: 10,
+
+	// Application kinds
+	manifests.ServerKind:  100,
+	manifests.ServiceKind: 110,
+
+	// Test kinds
+	manifests.HttpTestKind: 200,
+
+	// Load test kinds
+	manifests.HttpLoadTestKind: 300,
+}

internal/core/runner/depends/builder.go

@@ -0,0 +1,50 @@
+package depends
+
+import "github.com/apiqube/cli/internal/core/runner/depends/rules"
+
+// AddRule adds a new rule to the registry
+func (b *Builder) AddRule(rule rules.DependencyRule) {
+	b.registry.Register(rule)
+}
+
+// GetSaveRequirement returns save requirement for a manifest
+func (r *Result) GetSaveRequirement(manifestID string) (SaveRequirement, bool) {
+	req, exists := r.SaveRequirements[manifestID]
+	return req, exists
+}
+
+// GetDependenciesFor returns all dependencies for a manifest
+func (r *Result) GetDependenciesFor(manifestID string) []rules.Dependency {
+	var deps []rules.Dependency
+	for _, dep := range r.Dependencies {
+		if dep.From == manifestID {
+			deps = append(deps, dep)
+		}
+	}
+	return deps
+}
+
+// GetDependentsOf returns dependencies that depend on the given manifest
+func (r *Result) GetDependentsOf(manifestID string) []rules.Dependency {
+	var dependents []rules.Dependency
+	for _, dep := range r.Dependencies {
+		if dep.To == manifestID {
+			dependents = append(dependents, dep)
+		}
+	}
+	return dependents
+}
+
+// GetIntraManifestDependencies returns intra-manifest dependencies for a given manifest
+func (r *Result) GetIntraManifestDependencies(manifestID string) []rules.Dependency {
+	if deps, exists := r.IntraManifestDeps[manifestID]; exists {
+		return deps
+	}
+	return []rules.Dependency{}
+}
+
+// HasIntraManifestDependencies checks if a manifest has intra-manifest dependencies
+func (r *Result) HasIntraManifestDependencies(manifestID string) bool {
+	deps, exists := r.IntraManifestDeps[manifestID]
+	return exists && len(deps) > 0
+}