Repository navigation
refactor(orchestration): B3 merge enhanced_orchestration into orchestration (#10666) - #10690
Merged
Merged
Conversation
Contributor
✅ SSOT Configuration Compliance: Passing🎉 No hardcoded values detected that have SSOT config equivalents! |
…10666) Wire-in phase (B3): consolidate enhanced_orchestration/ logic into the single orchestration/ package without duplication. New modules added to orchestration/: - agent_router.py — TaskAgentScorer / AgentRouter alias (#6819) - blocked_plan_resumer.py — Redis pub-sub skill-promotion subscriber (#7431) - collaboration_coordinator.py — Redis pub/sub multi-agent layer (#6393) - execution_strategies/ — Strategy dispatcher + 5 strategy implementations - subagent_dispatcher.py — Reflection-pass LLM score-and-revise dispatcher - workflow_planning.py — StrategyPlanner (distinct from WorkflowPlanner) - workflow_runner.py — WorkflowRunner multi-agent execution engine (#5058) Updated existing orchestration/ files: - types.py: add FALLBACK_TIERS, WorkflowPlan subclass (structured_criteria), WorkflowDependencies, AgentTask alias - __init__.py: re-export all new symbols + ExecutionStrategy re-export - performance_tracker.py: fix TYPE_CHECKING import to orchestration.types Updated orchestrator.py: swap all enhanced_orchestration.* imports to orchestration.* and autobot_shared.workflow. Part of #10666 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
All modules/tests fully merged into orchestration/ in the previous commit. `git grep -w enhanced_orchestration -- '*.py'` returns zero functional import statements. Closes enhanced_orchestration/ and tests/enhanced_orchestration/ as part of consolidation mandated by #10666 B3. Part of #10666 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
…stration/ (#10666) Migrate all in-package tests and tests/enhanced_orchestration/ to tests/orchestration/ with updated imports pointing at orchestration.*. Files moved/created: - test_agent_scores.py (from tests/enhanced_orchestration/) - test_blocked_plan_resumer.py (from in-package blocked_plan_resumer_test.py) - test_collaboration_coordinator.py (from collaboration_coordinator_test.py) - test_execution_strategies.py (from execution_strategies_test.py) - test_failure_pattern_wiring.py (from tests/enhanced_orchestration/) - test_goap_replan_integration.py (from test_goap_replan_integration.py) - test_success_criteria.py (new — from success_criteria_test.py) - test_workflow_integration.py (from workflow_integration_test.py) - test_workflow_planning.py (from workflow_planning_test.py) - test_workflow_runner.py (from workflow_runner_test.py) Updated test_subagent_dispatcher_reflection.py: patch paths updated from enhanced_orchestration.subagent_dispatcher to orchestration.subagent_dispatcher. Part of #10666 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Applied Black, isort, and autoflake to match code-quality checks. Triggered by workflow auto-fix-formatting.yml. Co-Authored-By: Paperclip <noreply@paperclip.ing>
Closed
10 of 17 tasks
This was referenced Aug 25, 2026
Closed
4 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Thinking Path
enhanced_orchestration/against existingorchestration/modules. Identified 2 symbol collisions (WorkflowPlan,ExecutionStrategy) and 1 naming conflict (StrategyPlannervsWorkflowPlanner).WorkflowPlan: promoted theenhanced_orchestrationsubclass (addsstructured_criteria) as a drop-in replacement inorchestration/types.py. IS-A_SharedWorkflowPlanso backward-compatible.ExecutionStrategy: canonical type lives inautobot_shared.workflow; not duplicated — re-exported fromorchestration/__init__for convenience.StrategyPlannervsWorkflowPlanner: genuinely different classes; both kept with distinct names.orchestration/with updated imports. Verifiedorchestration/__init__.pyexports all new symbols.enhanced_orchestration/andtests/enhanced_orchestration/only after verifying zero functional import statements remain.orchestration/workflow_planning.pyimportingExecutionStrategyfrom.types(not there — must come fromautobot_shared.workflow). Fixedtest_workflow_integration.pysame issue.What Changed
New modules in
orchestration/:agent_router.py—TaskAgentScorer/AgentRouteralias (GH discovery(orchestration): dual AgentRouter classes (522 LOC vs 68 LOC) with same name, different scope #6819)blocked_plan_resumer.py— Redis pub-sub skill-promotion subscriber (ADR-006 Phase 3 / feat(orchestration/planner): async gap-fill resume path for blocked plans (#7268 Phase 3) #7431)collaboration_coordinator.py— Redis pub-sub multi-agent collaboration (discovery(workflow_runner): collaboration layer (_ensure_redis/_coordinate_collaboration/_broadcast_to_agents) should be a separate CollaborationCoordinator collaborator #6393)execution_strategies/—ExecutionStrategyHandlerdispatcher + 5 strategy implementations (sequential/parallel/pipeline/collaborative/adaptive)subagent_dispatcher.py— Autonomous subagent spawning with LLM reflection passworkflow_planning.py—StrategyPlanner(multi-agent; distinct fromWorkflowPlanner)workflow_runner.py—WorkflowRunnermulti-agent execution engine (refactor(orchestrator): three overlapping workflow execution paths in single Orchestrator class #5058)Updated existing
orchestration/files:types.py: +FALLBACK_TIERS, +WorkflowPlansubclass (structured_criteria), +WorkflowDependencies, +AgentTaskalias__init__.py: re-exports all new symbols +ExecutionStrategyre-exportperformance_tracker.py: fixTYPE_CHECKINGimport toorchestration.typesUpdated
orchestrator.py: allenhanced_orchestration.*imports replaced withorchestration.*andautobot_shared.workflow.Deleted:
autobot-backend/enhanced_orchestration/(25 files)autobot-backend/tests/enhanced_orchestration/(2 files)Tests migrated to
tests/orchestration/(10 files; allenhanced_orchestration.*imports updated).autobot-infrastructure/shared/scripts/phase_validation_system.py: updated directory reference.Verification
Model Used
Claude Sonnet 4.6
Part of #10666