Merge PR #360 and resolve conflict in today_workflow_service.py

backend/services/intelligence/agents/agent_orchestrator.py

@@ -145,6 +145,13 @@ class ALwrityAgentOrchestrator:
             if enabled_by_key.get("content_strategist", True):
                 self.content_agent = ContentStrategyAgent(self.user_id, self.config.shared_llm, llm=self.llm)
                 self.agents['content'] = self.content_agent
+
+            # Strategy Architect Agent
+            if enabled_by_key.get("strategy_architect", True):
+                from services.intelligence.txtai_service import TxtaiIntelligenceService
+                intel_service = TxtaiIntelligenceService(self.user_id)
+                self.strategy_agent = StrategyArchitectAgent(intel_service, self.user_id)
+                self.agents['strategy'] = self.strategy_agent
             
             # Competitor Response Agent
             if enabled_by_key.get("competitor_analyst", True):

backend/services/today_workflow_service.py

@@ -292,10 +292,10 @@ async def generate_agent_enhanced_plan(db: Session, user_id: str, date: str) ->
         # Define agents to poll
         agents_to_poll = [
             orchestrator.agents.get('content'),      # ContentStrategyAgent
+            orchestrator.agents.get('strategy'),     # StrategyArchitectAgent
             orchestrator.agents.get('seo'),          # SEOOptimizationAgent
             orchestrator.agents.get('social'),       # SocialAmplificationAgent
             orchestrator.agents.get('competitor'),   # CompetitorResponseAgent
-            orchestrator.agents.get('strategy'),     # StrategyArchitectAgent
         ]
         
         # Filter out None agents (disabled/failed init)