Skip to content

refactor(orchestration): B3 merge enhanced_orchestration into orchestration (#10666) - #10690

Merged
mrveiss merged 4 commits into
Dev_new_guifrom
issue-10666-b3
Jun 29, 2026
Merged

mrveiss merged 4 commits into
Dev_new_guifrom
issue-10666-b3

Conversation

@mrveiss

@mrveiss mrveiss commented Jun 29, 2026

Copy link
Copy Markdown
Owner

Thinking Path

  1. Inventory: Mapped all 8 modules in enhanced_orchestration/ against existing orchestration/ modules. Identified 2 symbol collisions (WorkflowPlan, ExecutionStrategy) and 1 naming conflict (StrategyPlanner vs WorkflowPlanner).
  2. Symbol resolution:
    • WorkflowPlan: promoted the enhanced_orchestration subclass (adds structured_criteria) as a drop-in replacement in orchestration/types.py. IS-A _SharedWorkflowPlan so backward-compatible.
    • ExecutionStrategy: canonical type lives in autobot_shared.workflow; not duplicated — re-exported from orchestration/__init__ for convenience.
    • StrategyPlanner vs WorkflowPlanner: genuinely different classes; both kept with distinct names.
  3. Wire-in: Moved all 8 modules into orchestration/ with updated imports. Verified orchestration/__init__.py exports all new symbols.
  4. Delete: Removed enhanced_orchestration/ and tests/enhanced_orchestration/ only after verifying zero functional import statements remain.
  5. Startup smoke: Fixed orchestration/workflow_planning.py importing ExecutionStrategy from .types (not there — must come from autobot_shared.workflow). Fixed test_workflow_integration.py same issue.

What Changed

New modules in orchestration/:

Updated existing orchestration/ files:

  • types.py: +FALLBACK_TIERS, +WorkflowPlan subclass (structured_criteria), +WorkflowDependencies, +AgentTask alias
  • __init__.py: re-exports all new symbols + ExecutionStrategy re-export
  • performance_tracker.py: fix TYPE_CHECKING import to orchestration.types

Updated orchestrator.py: all enhanced_orchestration.* imports replaced with orchestration.* and autobot_shared.workflow.

Deleted:

  • autobot-backend/enhanced_orchestration/ (25 files)
  • autobot-backend/tests/enhanced_orchestration/ (2 files)

Tests migrated to tests/orchestration/ (10 files; all enhanced_orchestration.* imports updated).

autobot-infrastructure/shared/scripts/phase_validation_system.py: updated directory reference.

Verification

# Zero functional enhanced_orchestration imports remain
git grep -w "enhanced_orchestration" -- "*.py" | grep -E "^[^#]+:(from|import) enhanced_orchestration"
# → (no output)

# Startup import smoke: 339 passed, 0 failed
python3 -m pytest autobot-backend/tests/test_startup_imports.py -q
# → 339 passed, 82 warnings

# flake8 clean on all changed paths
python3 -m flake8 --config=.flake8 autobot-backend/orchestration/ autobot-backend/orchestrator.py autobot-backend/tests/orchestration/
# → exit 0

Model Used

Claude Sonnet 4.6

Part of #10666

@github-actions

Copy link
Copy Markdown
Contributor

✅ SSOT Configuration Compliance: Passing

🎉 No hardcoded values detected that have SSOT config equivalents!

mrveiss and others added 4 commits June 29, 2026 21:31
…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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant