diff --git a/backend/api/today_workflow.py b/backend/api/today_workflow.py index 928840b3..1e8de027 100644 --- a/backend/api/today_workflow.py +++ b/backend/api/today_workflow.py @@ -1,9 +1,13 @@ from fastapi import APIRouter, Depends, HTTPException from typing import Any, Dict, Optional from datetime import datetime +import json +from enum import Enum from loguru import logger +from pydantic import BaseModel, Field from sqlalchemy.orm import Session +from sqlalchemy.exc import SQLAlchemyError from middleware.auth_middleware import get_current_user from services.database import get_db @@ -15,6 +19,37 @@ from services.intelligence.txtai_service import TxtaiIntelligenceService router = APIRouter(prefix="/api/today-workflow", tags=["Today Workflow"]) + +def _normalize_dependencies(dependencies: Any) -> list: + if dependencies is None: + return [] + if isinstance(dependencies, list): + return dependencies + if isinstance(dependencies, str): + try: + parsed = json.loads(dependencies) + return parsed if isinstance(parsed, list) else [] + except json.JSONDecodeError: + return [] + return [] + + +class TaskStatusEnum(str, Enum): + pending = "pending" + in_progress = "in_progress" + completed = "completed" + skipped = "skipped" + dismissed = "dismissed" + + +class TaskStatusUpdateRequest(BaseModel): + status: TaskStatusEnum = Field(..., description="New task status") + completion_notes: Optional[str] = Field( + None, + max_length=4000, + description="Optional notes about task completion or outcome", + ) + async def _index_tasks_to_sif(user_id: str, date: str, tasks: list[dict], label: str): svc = TxtaiIntelligenceService(user_id) items = [] @@ -73,7 +108,7 @@ async def get_today_workflow( "status": "skipped" if t.status == "dismissed" else t.status, "priority": t.priority, "estimatedTime": t.estimated_time, - "dependencies": t.dependencies or [], + "dependencies": _normalize_dependencies(t.dependencies), "actionUrl": t.action_url, "actionType": t.action_type, "metadata": t.metadata_json or {}, @@ -100,11 +135,21 @@ async def get_today_workflow( if created: asyncio.create_task(_index_tasks_to_sif(user_id, plan.date, response_tasks, label="today")) - try: - from datetime import date as date_type, timedelta + from datetime import date as date_type, timedelta + + try: + parsed_plan_date = date_type.fromisoformat(plan.date) + except ValueError: + logger.warning( + "Invalid plan.date format; skipping yesterday indexing plan_id={} user_id={} plan_date={} reason={}", + plan.id, + user_id, + plan.date, + "plan.date is not in ISO format YYYY-MM-DD", + ) + else: + y_str = (parsed_plan_date - timedelta(days=1)).isoformat() - y_str = (date_type.fromisoformat(plan.date) - timedelta(days=1)).isoformat() - def _fetch_yesterday(): y_plan = ( db.query(DailyWorkflowPlan) @@ -121,23 +166,33 @@ async def get_today_workflow( return y_tasks return [] - y_tasks = await run_in_threadpool(_fetch_yesterday) - - if y_tasks: - y_response = [] - for t in y_tasks: - y_response.append( - { - "id": str(t.id), - "pillarId": t.pillar_id, - "title": t.title, - "description": t.description, - "status": "skipped" if t.status == "dismissed" else t.status, - } - ) - asyncio.create_task(_index_tasks_to_sif(user_id, y_str, y_response, label="yesterday")) - except Exception: - pass + try: + y_tasks = await run_in_threadpool(_fetch_yesterday) + except SQLAlchemyError as db_error: + logger.warning( + "Failed to fetch yesterday tasks; skipping yesterday indexing plan_id={} user_id={} plan_date={} yesterday_date={} error_class={} error_message={}", + plan.id, + user_id, + plan.date, + y_str, + type(db_error).__name__, + str(db_error), + ) + else: + if y_tasks: + y_response = [] + for t in y_tasks: + y_response.append( + { + "id": str(t.id), + "pillarId": t.pillar_id, + "title": t.title, + "description": t.description, + "status": "skipped" if t.status == "dismissed" else t.status, + "dependencies": _normalize_dependencies(t.dependencies), + } + ) + asyncio.create_task(_index_tasks_to_sif(user_id, y_str, y_response, label="yesterday")) return { "success": True, @@ -158,6 +213,8 @@ async def get_today_workflow( "id": plan.id, "date": plan.date, "source": plan.source, + "quality_status": (plan.plan_json or {}).get("quality_status", "contextual"), + "contextuality_validation": (plan.plan_json or {}).get("contextuality_validation"), "created_at": plan.created_at.isoformat() if plan.created_at else None, "updated_at": plan.updated_at.isoformat() if plan.updated_at else None, }, @@ -172,15 +229,13 @@ from services.task_memory_service import TaskMemoryService @router.post("/tasks/{task_id}/status") async def set_task_status( task_id: int, - body: Dict[str, Any], + body: TaskStatusUpdateRequest, current_user: dict = Depends(get_current_user), db: Session = Depends(get_db), ) -> Dict[str, Any]: user_id = str(current_user.get("id")) - status = body.get("status") - if not status: - raise HTTPException(status_code=400, detail="status is required") - completion_notes = body.get("completion_notes") + status = body.status.value + completion_notes = body.completion_notes task = update_task_status(db, user_id, task_id, status=status, completion_notes=completion_notes) if not task: @@ -189,10 +244,18 @@ async def set_task_status( # Record outcome in memory for self-learning try: memory = TaskMemoryService(user_id, db) + normalized_status = (task.status or "").lower() + if normalized_status == "completed": + feedback_score = 1 + elif normalized_status in {"skipped", "dismissed", "rejected"}: + feedback_score = -1 + else: + feedback_score = 0 + await memory.record_task_outcome( - task, - feedback_score=1 if status == "completed" else -1 if status == "dismissed" else 0, - feedback_text=completion_notes + task, + feedback_score=feedback_score, + feedback_text=completion_notes, ) except Exception as e: logger.warning( diff --git a/backend/models/daily_workflow_models.py b/backend/models/daily_workflow_models.py index 237870f1..7a559a2d 100644 --- a/backend/models/daily_workflow_models.py +++ b/backend/models/daily_workflow_models.py @@ -13,6 +13,9 @@ class DailyWorkflowPlan(Base): user_id = Column(String(255), nullable=False, index=True) date = Column(String(10), nullable=False, index=True) source = Column(String(30), nullable=False, default="agent") + generation_mode = Column(String(30), nullable=False, default="llm_generation", index=True) + committee_agent_count = Column(Integer, nullable=False, default=0) + fallback_used = Column(Boolean, nullable=False, default=False) plan_json = Column(JSON, nullable=True) generation_run_id = Column(Integer, nullable=True, index=True) created_at = Column(DateTime, default=datetime.utcnow, index=True) diff --git a/backend/requirements.txt b/backend/requirements.txt index 6f3cb35f..9d695301 100644 --- a/backend/requirements.txt +++ b/backend/requirements.txt @@ -1,5 +1,7 @@ # Core dependencies -fastapi>=0.104.0 +fastapi>=0.115.14 +starlette>=0.40.0,<0.47.0 +sse-starlette<3.0.0 uvicorn>=0.24.0 python-multipart>=0.0.6 python-dotenv>=1.0.0 diff --git a/backend/services/intelligence/agents/agent_orchestrator.py b/backend/services/intelligence/agents/agent_orchestrator.py index afb42f15..6f0deff2 100644 --- a/backend/services/intelligence/agents/agent_orchestrator.py +++ b/backend/services/intelligence/agents/agent_orchestrator.py @@ -464,6 +464,7 @@ class AgentOrchestrationService: async def get_or_create_orchestrator(self, user_id: str) -> ALwrityAgentOrchestrator: """Get or create an orchestrator for a user""" + onboarding_gated_initialization = False if user_id not in self.orchestrators: config = AgentTeamConfiguration(user_id=user_id) self.orchestrators[user_id] = ALwrityAgentOrchestrator(config) @@ -474,6 +475,25 @@ class AgentOrchestrationService: if not orchestrator.agents and not orchestrator.execution_history: logger.info(f"Orchestrator for {user_id} has no agents. Attempting re-initialization.") orchestrator._create_specialized_agents() + + last_system_check = next( + ( + entry + for entry in reversed(orchestrator.execution_history) + if entry.get("action") == "system_check" + ), + None, + ) + if last_system_check and last_system_check.get("status") == "pending": + details = str(last_system_check.get("details") or "").lower() + onboarding_gated_initialization = "onboarding" in details + + orchestrator.onboarding_gated_initialization = onboarding_gated_initialization + orchestrator.initialization_state = { + "onboarding_gated_initialization": onboarding_gated_initialization, + "active_agent_count": len(orchestrator.agents), + "active_agent_keys": sorted(orchestrator.agents.keys()), + } return orchestrator diff --git a/backend/services/scheduler/executors/onboarding_full_website_analysis_executor.py b/backend/services/scheduler/executors/onboarding_full_website_analysis_executor.py index 47f9bc30..15efc4e7 100644 --- a/backend/services/scheduler/executors/onboarding_full_website_analysis_executor.py +++ b/backend/services/scheduler/executors/onboarding_full_website_analysis_executor.py @@ -81,7 +81,7 @@ class OnboardingFullWebsiteAnalysisExecutor(TaskExecutor): task.last_executed = datetime.utcnow() task.last_success = datetime.utcnow() - task.status = 'paused' + task.status = 'completed' # Explicitly mark as completed instead of paused task.next_execution = None task.consecutive_failures = 0 task.failure_pattern = None diff --git a/backend/services/task_memory_service.py b/backend/services/task_memory_service.py index 94cab477..6c5eea90 100644 --- a/backend/services/task_memory_service.py +++ b/backend/services/task_memory_service.py @@ -15,7 +15,7 @@ from services.intelligence.txtai_service import TxtaiIntelligenceService EXACT_DUPLICATE_LOOKBACK_DAYS = 7 SEMANTIC_SUPPRESSION_SCORE_THRESHOLD = 0.85 -SUPPRESSED_STATUSES = {"dismissed", "rejected"} +SUPPRESSED_STATUSES = {"dismissed", "rejected", "skipped"} class TaskMemoryService: """ @@ -72,7 +72,7 @@ class TaskMemoryService: self.db.commit() # 2. Index into txtai (if status is meaningful) - if task.status in ["completed", "dismissed", "rejected"]: + if task.status in ["completed", "dismissed", "rejected", "skipped"]: # We index the task text with metadata about its outcome # This allows us to search: "Has the user rejected similar tasks?" doc = { diff --git a/backend/services/today_workflow_service.py b/backend/services/today_workflow_service.py index 1be7cb21..9883767f 100644 --- a/backend/services/today_workflow_service.py +++ b/backend/services/today_workflow_service.py @@ -11,6 +11,8 @@ from services.llm_providers.main_text_generation import llm_text_gen from loguru import logger PILLAR_IDS = ["plan", "generate", "publish", "analyze", "engage", "remarket"] +MIN_TASK_EVIDENCE_LINKS = 1 +PLAN_CONTEXT_THRESHOLD = 0.65 def _today_date_str() -> str: @@ -139,6 +141,116 @@ def _sanitize_task(task: Dict[str, Any]) -> Optional[Dict[str, Any]]: return sanitized +def _derive_onboarding_evidence_links(onboarding_data: Dict[str, Any], limit: int = 2) -> List[str]: + if not isinstance(onboarding_data, dict): + return [] + + links: List[str] = [] + for key, value in onboarding_data.items(): + if key == "workflow_config": + continue + if value in (None, "", [], {}): + continue + links.append(f"onboarding:{key}") + if len(links) >= limit: + break + return links + + +def _valid_evidence_links(evidence_links: Any, grounding: Dict[str, Any]) -> List[str]: + if not isinstance(evidence_links, list): + return [] + + onboarding_data = grounding.get("onboarding_data", {}) if isinstance(grounding, dict) else {} + if not isinstance(onboarding_data, dict): + onboarding_data = {} + valid_onboarding_keys = {str(k) for k in onboarding_data.keys()} + + recent_alerts = grounding.get("recent_agent_alerts", []) if isinstance(grounding, dict) else [] + valid_alert_ids = { + str(a.get("alert_id")) + for a in recent_alerts + if isinstance(a, dict) and a.get("alert_id") is not None + } + + valid_links: List[str] = [] + for raw in evidence_links: + link = str(raw or "").strip() + if not link: + continue + + if link.startswith("onboarding:"): + key = link.split(":", 1)[1].strip() + if key and key in valid_onboarding_keys: + valid_links.append(link) + elif link.startswith("alert:"): + alert_id = link.split(":", 1)[1].strip() + if alert_id and alert_id in valid_alert_ids: + valid_links.append(link) + + return valid_links + + +def validate_plan_contextuality(plan: Dict[str, Any], grounding: Dict[str, Any]) -> Dict[str, Any]: + tasks = plan.get("tasks") if isinstance(plan, dict) else None + if not isinstance(tasks, list) or not tasks: + return { + "score": 0.0, + "threshold": PLAN_CONTEXT_THRESHOLD, + "is_contextual": False, + "task_scores": [], + "tasks_below_min_evidence": 0, + "min_evidence_links": MIN_TASK_EVIDENCE_LINKS, + } + + task_scores = [] + below_min_evidence = 0 + + for idx, task in enumerate(tasks): + metadata = task.get("metadata") if isinstance(task, dict) else {} + metadata = metadata if isinstance(metadata, dict) else {} + evidence_links = _valid_evidence_links(metadata.get("evidence_links"), grounding) + has_min_evidence = len(evidence_links) >= MIN_TASK_EVIDENCE_LINKS + if not has_min_evidence: + below_min_evidence += 1 + + reasoning_text = str(metadata.get("reasoning") or task.get("description") or "").lower() + onboarding_hits = sum(1 for l in evidence_links if l.startswith("onboarding:")) + alert_hits = sum(1 for l in evidence_links if l.startswith("alert:")) + + score = 0.0 + if has_min_evidence: + score += 0.6 + if onboarding_hits > 0: + score += 0.2 + if alert_hits > 0: + score += 0.2 + elif "alert" in reasoning_text: + score += 0.1 + + task_scores.append( + { + "task_index": idx, + "pillarId": task.get("pillarId"), + "title": task.get("title"), + "score": min(score, 1.0), + "evidence_links": evidence_links, + "has_min_evidence": has_min_evidence, + } + ) + + plan_score = sum(t["score"] for t in task_scores) / len(task_scores) + is_contextual = plan_score >= PLAN_CONTEXT_THRESHOLD and below_min_evidence == 0 + return { + "score": round(plan_score, 3), + "threshold": PLAN_CONTEXT_THRESHOLD, + "is_contextual": is_contextual, + "task_scores": task_scores, + "tasks_below_min_evidence": below_min_evidence, + "min_evidence_links": MIN_TASK_EVIDENCE_LINKS, + } + + def _build_single_task_for_missing_pillar( user_id: str, date: str, @@ -253,6 +365,7 @@ def build_grounding_context(db: Session, user_id: str, date: str) -> Dict[str, A return { "recent_agent_alerts": [ { + "alert_id": a.id, "title": a.title, "message": a.message, "created_at": a.created_at.isoformat(), @@ -272,9 +385,15 @@ from services.task_memory_service import TaskMemoryService # Initialize orchestration service (singleton) orchestration_service = AgentOrchestrationService() -async def generate_agent_enhanced_plan(db: Session, user_id: str, date: str) -> Dict[str, Any]: +async def generate_agent_enhanced_plan( + db: Session, + user_id: str, + date: str, + grounding: Optional[Dict[str, Any]] = None, + strict_contextuality: bool = False, +) -> Dict[str, Any]: activity = AgentActivityService(db, user_id) - grounding = build_grounding_context(db, user_id, date) + grounding = grounding or build_grounding_context(db, user_id, date) memory_service = TaskMemoryService(user_id, db) # 1. Get Orchestrator @@ -351,7 +470,7 @@ async def generate_agent_enhanced_plan(db: Session, user_id: str, date: str) -> # 4. Final Selection # If we have agent tasks, use them. Otherwise fall back to LLM generation. - if agent_tasks: + if agent_tasks and not strict_contextuality: logger.info(f"Generated {len(agent_tasks)} tasks via Agent Committee") # Convert TaskProposal objects to dicts for frontend @@ -369,7 +488,8 @@ async def generate_agent_enhanced_plan(db: Session, user_id: str, date: str) -> "metadata": { "source_agent": prop.source_agent, "reasoning": prop.reasoning, - "context_data": prop.context_data + "context_data": prop.context_data, + "evidence_links": _derive_onboarding_evidence_links(grounding.get("onboarding_data", {}), limit=2), } }) @@ -425,6 +545,15 @@ async def generate_agent_enhanced_plan(db: Session, user_id: str, date: str) -> f"Grounding context (Alerts):\n{json.dumps(grounding.get('recent_agent_alerts', []), indent=2)}\n" ) + if strict_contextuality: + prompt += ( + "\nStrict contextuality mode (must follow):\n" + f"- Every task.metadata must include evidence_links with at least {MIN_TASK_EVIDENCE_LINKS} entries.\n" + "- evidence_links entries must use either 'onboarding:' or 'alert:' format.\n" + "- Include metadata.reasoning that explains how the evidence applies to the task.\n" + "- Reject generic tasks without explicit ties to onboarding data or active alerts.\n" + ) + run = activity.start_run(agent_type="TodayWorkflowGenerator", prompt=prompt[:4000]) activity.log_event( event_type="plan", @@ -492,7 +621,25 @@ async def get_or_create_daily_workflow_plan(db: Session, user_id: str, date: Opt if existing: return existing, False - plan_data = await generate_agent_enhanced_plan(db, user_id, date_str) + grounding = build_grounding_context(db, user_id, date_str) + plan_data = await generate_agent_enhanced_plan(db, user_id, date_str, grounding=grounding) + validation = validate_plan_contextuality(plan_data, grounding) + + if not validation.get("is_contextual"): + logger.info("Plan contextuality below threshold for user {}. Running strict regeneration.", user_id) + regenerated_plan = await generate_agent_enhanced_plan( + db, + user_id, + date_str, + grounding=grounding, + strict_contextuality=True, + ) + regenerated_validation = validate_plan_contextuality(regenerated_plan, grounding) + plan_data = regenerated_plan + validation = regenerated_validation + + plan_data["quality_status"] = "contextual" if validation.get("is_contextual") else "low_context" + plan_data["contextuality_validation"] = validation tasks = plan_data.get("tasks", []) def _create_plan(): diff --git a/backend/sif_release_readiness_checks.py b/backend/sif_release_readiness_checks.py index 9d79e14b..d0ef7700 100644 --- a/backend/sif_release_readiness_checks.py +++ b/backend/sif_release_readiness_checks.py @@ -8,7 +8,7 @@ if str(ROOT) not in sys.path: sys.path.insert(0, str(ROOT)) from services.intelligence.monitoring.semantic_dashboard import RealTimeSemanticMonitor, SemanticHealthMetric -from services.today_workflow_service import _ensure_pillar_coverage, PILLAR_IDS +from services.today_workflow_service import _ensure_pillar_coverage, PILLAR_IDS, validate_plan_contextuality from services.intelligence.sif_agents import ContentGuardianAgent as SifGuardian from services.intelligence.agents.specialized_agents import ContentGuardianAgent as SpecializedGuardian @@ -74,6 +74,52 @@ class SIFReleaseReadinessTests(unittest.IsolatedAsyncioTestCase): self.assertIn("warning", result) self.assertEqual(result["method"], "competitor_index_search") + + def test_validate_plan_contextuality_passes_with_evidence_links(self): + plan = { + "tasks": [ + { + "pillarId": "plan", + "title": "Review strategy", + "description": "Use onboarding goals", + "metadata": { + "evidence_links": ["onboarding:business_goals", "alert:101"], + "reasoning": "Based on onboarding and alert", + }, + } + ] + } + grounding = { + "onboarding_data": {"business_goals": ["awareness"]}, + "recent_agent_alerts": [{"alert_id": 101, "title": "Drop in traffic"}], + } + + validation = validate_plan_contextuality(plan, grounding) + + self.assertTrue(validation["is_contextual"]) + self.assertEqual(validation["tasks_below_min_evidence"], 0) + + def test_validate_plan_contextuality_flags_missing_evidence_links(self): + plan = { + "tasks": [ + { + "pillarId": "generate", + "title": "Write generic post", + "description": "Create a post", + "metadata": {"reasoning": "General best practice"}, + } + ] + } + grounding = { + "onboarding_data": {"business_goals": ["awareness"]}, + "recent_agent_alerts": [{"alert_id": 101, "title": "Drop in traffic"}], + } + + validation = validate_plan_contextuality(plan, grounding) + + self.assertFalse(validation["is_contextual"]) + self.assertEqual(validation["tasks_below_min_evidence"], 1) + def test_pillar_coverage_guardrail_backfills_missing(self): tasks = [{"pillarId": "plan", "title": "Plan", "description": "d", "priority": "high", "estimatedTime": 10, "actionType": "navigate", "enabled": True}] grounding = {"workflow_config": {"enforce_pillar_coverage": True}} diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx index fc168638..46579c85 100644 --- a/frontend/src/App.tsx +++ b/frontend/src/App.tsx @@ -544,6 +544,7 @@ const App: React.FC = () => { // Get environment variables with fallbacks const clerkPublishableKey = process.env.REACT_APP_CLERK_PUBLISHABLE_KEY || ''; + const clerkJSUrl = process.env.REACT_APP_CLERK_JS_URL; // Show error if required keys are missing if (!clerkPublishableKey) { @@ -654,7 +655,7 @@ const App: React.FC = () => { // TODO: Send to error tracking service (Sentry, LogRocket, etc.) }} > - + {renderApp()} diff --git a/frontend/src/components/MainDashboard/components/WorkflowProgressBar.tsx b/frontend/src/components/MainDashboard/components/WorkflowProgressBar.tsx index cfc344a2..8efbe240 100644 --- a/frontend/src/components/MainDashboard/components/WorkflowProgressBar.tsx +++ b/frontend/src/components/MainDashboard/components/WorkflowProgressBar.tsx @@ -14,7 +14,8 @@ import { Pause, CheckCircle, Schedule, - TrendingUp + TrendingUp, + CloudOff } from '@mui/icons-material'; import { useWorkflowStore } from '../../../stores/workflowStore'; @@ -42,7 +43,9 @@ const WorkflowProgressBar: React.FC = ({ startWorkflow, isWorkflowComplete, getCompletionPercentage, - generateDailyWorkflow + generateDailyWorkflow, + isDegradedMode, + degradedModeReason } = useWorkflowStore(); const completionPercentage = getCompletionPercentage(); @@ -79,6 +82,15 @@ const WorkflowProgressBar: React.FC = ({ return 'Ready to Start'; }; + const getProvenanceLabel = () => { + const summary = currentWorkflow?.provenanceSummary; + if (!summary) return 'Daily Workflow'; + if (summary.generationMode === 'agent_committee') return 'Personalized by Agents'; + if (summary.generationMode === 'llm_generation' && !summary.fallbackUsed) return 'AI Personalized Guide'; + if (summary.fallbackUsed || summary.generationMode === 'controlled_fallback') return 'Baseline Daily Guide'; + return 'Daily Workflow'; + }; + return ( = ({ fontWeight: 600 }} /> + {/* Controls */} @@ -169,6 +191,30 @@ const WorkflowProgressBar: React.FC = ({ )} + + {isDegradedMode && ( + + + + Degraded mode + + + {degradedModeReason || 'Server workflow is unavailable; local fallback is active.'} + + + )} + {/* Progress Bar */} diff --git a/frontend/src/services/TaskWorkflowOrchestrator.ts b/frontend/src/services/TaskWorkflowOrchestrator.ts index 6799d45a..4193f65c 100644 --- a/frontend/src/services/TaskWorkflowOrchestrator.ts +++ b/frontend/src/services/TaskWorkflowOrchestrator.ts @@ -311,18 +311,15 @@ class TaskWorkflowOrchestrator { date: string, context?: TaskGenerationContext ): Promise { - // This is a placeholder implementation - // In Phase 3, this will be replaced with AI-powered task generation - const defaultTasks: TodayTask[] = [ { - id: `${userId}-${date}-plan-1`, + id: `${userId}-${date}-plan`, pillarId: 'plan', - title: 'Review content strategy', - description: 'Check and update your content strategy for the week', + title: 'Review today\'s plan', + description: 'Confirm priorities and schedule for today\'s content work.', status: 'pending', priority: 'high', - estimatedTime: 15, + estimatedTime: 10, actionType: 'navigate', actionUrl: '/content-planning-dashboard', enabled: true, @@ -330,29 +327,14 @@ class TaskWorkflowOrchestrator { color: '#4CAF50' }, { - id: `${userId}-${date}-plan-2`, - pillarId: 'plan', - title: 'Update content calendar', - description: 'Review and update your content calendar', + id: `${userId}-${date}-generate`, + pillarId: 'generate', + title: 'Generate a draft', + description: 'Create one content draft using the content writer.', status: 'pending', priority: 'medium', - estimatedTime: 10, - dependencies: [`${userId}-${date}-plan-1`], - actionType: 'navigate', - actionUrl: '/content-planning-dashboard', - enabled: true, - icon: 'CalendarMonth', - color: '#4CAF50' - }, - { - id: `${userId}-${date}-generate-1`, - pillarId: 'generate', - title: 'Create social media content', - description: 'Generate content for your social media platforms', - status: 'pending', - priority: 'high', - estimatedTime: 30, - dependencies: [`${userId}-${date}-plan-1`, `${userId}-${date}-plan-2`], + estimatedTime: 20, + dependencies: [`${userId}-${date}-plan`], actionType: 'navigate', actionUrl: '/facebook-writer', enabled: true, @@ -360,29 +342,14 @@ class TaskWorkflowOrchestrator { color: '#2196F3' }, { - id: `${userId}-${date}-generate-2`, - pillarId: 'generate', - title: 'Create blog content', - description: 'Write blog posts for your website', - status: 'pending', - priority: 'medium', - estimatedTime: 45, - dependencies: [`${userId}-${date}-plan-1`], - actionType: 'navigate', - actionUrl: '/blog-writer', - enabled: true, - icon: 'Article', - color: '#2196F3' - }, - { - id: `${userId}-${date}-publish-1`, + id: `${userId}-${date}-publish`, pillarId: 'publish', - title: 'Publish social media content', - description: 'Publish your created content to social media', + title: 'Publish approved content', + description: 'Open publishing tools and publish today\'s approved draft.', status: 'pending', - priority: 'medium', + priority: 'high', estimatedTime: 10, - dependencies: [`${userId}-${date}-generate-1`], + dependencies: [`${userId}-${date}-generate`], actionType: 'navigate', actionUrl: '/facebook-writer', enabled: true, @@ -390,29 +357,14 @@ class TaskWorkflowOrchestrator { color: '#FF9800' }, { - id: `${userId}-${date}-publish-2`, - pillarId: 'publish', - title: 'Publish blog content', - description: 'Publish blog posts to your website', + id: `${userId}-${date}-analyze`, + pillarId: 'analyze', + title: 'Check performance snapshot', + description: 'Review key analytics to assess today\'s published content.', status: 'pending', priority: 'medium', - estimatedTime: 15, - dependencies: [`${userId}-${date}-generate-2`], - actionType: 'navigate', - actionUrl: '/blog-writer', - enabled: true, - icon: 'Publish', - color: '#FF9800' - }, - { - id: `${userId}-${date}-analyze-1`, - pillarId: 'analyze', - title: 'Review content performance', - description: 'Analyze performance of published content', - status: 'pending', - priority: 'low', - estimatedTime: 20, - dependencies: [`${userId}-${date}-publish-1`, `${userId}-${date}-publish-2`], + estimatedTime: 10, + dependencies: [`${userId}-${date}-publish`], actionType: 'navigate', actionUrl: '/analytics-dashboard', enabled: true, @@ -420,95 +372,50 @@ class TaskWorkflowOrchestrator { color: '#9C27B0' }, { - id: `${userId}-${date}-engage-1`, + id: `${userId}-${date}-engage`, pillarId: 'engage', - title: 'Respond to comments', - description: 'Engage with comments on your content', + title: 'Respond to audience activity', + description: 'Reply to new comments or mentions from today\'s posts.', status: 'pending', priority: 'low', - estimatedTime: 15, - dependencies: [`${userId}-${date}-publish-1`], + estimatedTime: 10, + dependencies: [`${userId}-${date}-publish`], actionType: 'navigate', actionUrl: '/engagement-dashboard', enabled: true, icon: 'ChatBubbleOutline', color: '#E91E63' }, - // Engage pillar tasks { - id: `${userId}-${date}-engage-1`, - pillarId: 'engage', - title: 'Reply to blog comment', - description: 'Respond to comments on your latest blog post', - status: 'pending', - priority: 'high', - estimatedTime: 10, - dependencies: [`${userId}-${date}-analyze-1`], - actionType: 'navigate', - actionUrl: '/engagement-dashboard', - enabled: true, - icon: 'Comment', - color: '#E91E63' - }, - { - id: `${userId}-${date}-engage-2`, - pillarId: 'engage', - title: 'Respond to Twitter mention', - description: 'Reply to Twitter mentions and engage with followers', - status: 'pending', - priority: 'medium', - estimatedTime: 5, - dependencies: [`${userId}-${date}-engage-1`], - actionType: 'navigate', - actionUrl: '/engagement-dashboard', - enabled: true, - icon: 'Twitter', - color: '#1DA1F2' - }, - // Remarket pillar tasks - { - id: `${userId}-${date}-remarket-1`, + id: `${userId}-${date}-remarket`, pillarId: 'remarket', - title: 'Launch Retargeting Campaign', - description: 'Create and launch targeted remarketing campaigns', + title: 'Prepare remarketing audience', + description: 'Open remarketing tools to refresh your retargeting audience.', status: 'pending', - priority: 'high', - estimatedTime: 35, - dependencies: [`${userId}-${date}-engage-2`], + priority: 'low', + estimatedTime: 15, + dependencies: [`${userId}-${date}-analyze`], actionType: 'navigate', actionUrl: '/remarketing-dashboard', enabled: true, icon: 'Psychology', color: '#00695C' - }, - { - id: `${userId}-${date}-remarket-2`, - pillarId: 'remarket', - title: 'Lead Nurturing Sequence', - description: 'Set up automated lead nurturing workflows', - status: 'pending', - priority: 'medium', - estimatedTime: 30, - dependencies: [`${userId}-${date}-remarket-1`], - actionType: 'navigate', - actionUrl: '/lead-nurturing', - enabled: true, - icon: 'Refresh', - color: '#4CAF50' } ]; + const uniqueTasks = this.ensureUniqueTaskIds(defaultTasks); + // Validate dependencies and get optimal execution order const tempWorkflow: DailyWorkflow = { id: `${userId}-${date}`, date, userId, - tasks: defaultTasks, + tasks: uniqueTasks, currentTaskIndex: 0, completedTasks: 0, - totalTasks: defaultTasks.length, + totalTasks: uniqueTasks.length, workflowStatus: 'not_started', - totalEstimatedTime: defaultTasks.reduce((sum, task) => sum + task.estimatedTime, 0), + totalEstimatedTime: uniqueTasks.reduce((sum, task) => sum + task.estimatedTime, 0), actualTimeSpent: 0 }; @@ -517,13 +424,46 @@ class TaskWorkflowOrchestrator { if (!validation.isValid) { console.warn('Dependency validation failed:', validation.errors); // Return tasks without dependencies if validation fails - return defaultTasks.map(task => ({ ...task, dependencies: [] })); + return uniqueTasks.map(task => ({ ...task, dependencies: [] })); } // Get optimal execution order const orderedTasks = taskDependencyManager.getOptimalExecutionOrder(tempWorkflow); - return orderedTasks; + return this.ensureUniqueTaskIds(orderedTasks); + } + + private ensureUniqueTaskIds(tasks: TodayTask[]): TodayTask[] { + const idOccurrences = new Map(); + const oldToNew = new Map(); + + const withUniqueIds = tasks.map(task => { + const count = idOccurrences.get(task.id) ?? 0; + idOccurrences.set(task.id, count + 1); + + if (count === 0) { + oldToNew.set(task.id, task.id); + return { ...task }; + } + + const uniqueId = `${task.id}-${count + 1}`; + oldToNew.set(`${task.id}#${count + 1}`, uniqueId); + return { ...task, id: uniqueId }; + }); + + const allTaskIds = new Set(withUniqueIds.map(task => task.id)); + + return withUniqueIds.map(task => { + const dependencies = (task.dependencies ?? []) + .map(dep => oldToNew.get(dep) || dep) + .filter((dep, index, arr) => arr.indexOf(dep) === index) + .filter(dep => allTaskIds.has(dep)); + + return { + ...task, + dependencies: dependencies.length > 0 ? dependencies : undefined + }; + }); } /** diff --git a/frontend/src/stores/workflowStore.ts b/frontend/src/stores/workflowStore.ts index fb0c1031..78d40d76 100644 --- a/frontend/src/stores/workflowStore.ts +++ b/frontend/src/stores/workflowStore.ts @@ -10,10 +10,58 @@ import { WorkflowError } from '../types/workflow'; import { taskWorkflowOrchestrator } from '../services/TaskWorkflowOrchestrator'; -import { apiClient } from '../api/client'; +import { apiClient, ConnectionError, NetworkError } from '../api/client'; const isServerWorkflowId = (workflowId: string) => workflowId.startsWith('daily-'); + +const normalizeDependencies = (dependencies: unknown): string[] => { + if (Array.isArray(dependencies)) { + return dependencies.map(dep => String(dep).trim()).filter(Boolean); + } + + if (typeof dependencies === 'string') { + const raw = dependencies.trim(); + if (!raw) return []; + + try { + const parsed = JSON.parse(raw); + if (Array.isArray(parsed)) { + return parsed.map(dep => String(dep).trim()).filter(Boolean); + } + } catch {} + + return [raw]; + } + + return []; +}; + +const normalizeServerWorkflow = (workflow: DailyWorkflow): DailyWorkflow => ({ + ...workflow, + tasks: Array.isArray(workflow.tasks) + ? workflow.tasks.map(task => ({ + ...task, + dependencies: normalizeDependencies(task.dependencies), + })) + : [], +}); + +const isServerUnavailableError = (error: unknown): boolean => + error instanceof ConnectionError || error instanceof NetworkError; + +const toWorkflowError = (error: unknown, fallbackMessage: string): WorkflowError => { + if (error instanceof WorkflowError) return error; + + const message = error instanceof Error ? error.message : fallbackMessage; + return { + code: 'WORKFLOW_ERROR', + message, + timestamp: new Date(), + recoverable: false, + }; +}; + const computeProgressAndNavigation = (workflow: DailyWorkflow): { progress: WorkflowProgress; navigation: NavigationState } => { const tasks = Array.isArray(workflow.tasks) ? workflow.tasks : []; const totalTasks = tasks.length; @@ -69,6 +117,8 @@ interface WorkflowState { isWorkflowModalOpen: boolean; isLoading: boolean; error: WorkflowError | null; + isDegradedMode: boolean; + degradedModeReason: string | null; // Actions generateDailyWorkflow: (userId: string, date?: string) => Promise; @@ -108,36 +158,71 @@ export const useWorkflowStore = create()( isWorkflowModalOpen: false, isLoading: false, error: null, + isDegradedMode: false, + degradedModeReason: null, // Generate daily workflow generateDailyWorkflow: async (userId: string, date?: string) => { set({ isLoading: true, error: null }); try { - try { - const resp = await apiClient.get('/api/today-workflow', { params: date ? { date } : {} }); - const serverWorkflow = resp?.data?.data?.workflow as DailyWorkflow | undefined; - if (serverWorkflow && Array.isArray(serverWorkflow.tasks)) { - const derived = computeProgressAndNavigation(serverWorkflow); - set({ - currentWorkflow: serverWorkflow, - workflowProgress: derived.progress, - navigationState: derived.navigation, - isLoading: false - }); - return; + const resp = await apiClient.get('/api/today-workflow', { params: date ? { date } : {} }); + const serverWorkflow = resp?.data?.data?.workflow as DailyWorkflow | undefined; + const planSummary = resp?.data?.data?.plan?.provenance_summary; + + if (serverWorkflow && Array.isArray(serverWorkflow.tasks)) { + if (planSummary && !serverWorkflow.provenanceSummary) { + serverWorkflow.provenanceSummary = planSummary; } - } catch {} + const normalizedWorkflow = normalizeServerWorkflow(serverWorkflow); + const derived = computeProgressAndNavigation(normalizedWorkflow); + set({ + currentWorkflow: normalizedWorkflow, + workflowProgress: derived.progress, + navigationState: derived.navigation, + isLoading: false, + isDegradedMode: false, + degradedModeReason: null, + }); + return; + } + throw new WorkflowError({ + code: 'WORKFLOW_SCHEMA_INVALID', + message: 'Server workflow response is missing a valid tasks array.', + timestamp: new Date(), + recoverable: false, + suggestedAction: 'Refresh and try again. If this persists, contact support.' + }); + } catch (error) { + if (!isServerUnavailableError(error)) { + set({ + error: toWorkflowError(error, 'Failed to load workflow from server.'), + isLoading: false, + isDegradedMode: false, + degradedModeReason: null, + }); + return; + } + } + + try { const workflow = await taskWorkflowOrchestrator.generateDailyWorkflow(userId, date); const progress = taskWorkflowOrchestrator.getWorkflowProgress(workflow.id); const navigation = taskWorkflowOrchestrator.getNavigationState(workflow.id); - set({ currentWorkflow: workflow, workflowProgress: progress, navigationState: navigation, isLoading: false }); + set({ + currentWorkflow: workflow, + workflowProgress: progress, + navigationState: navigation, + isLoading: false, + isDegradedMode: true, + degradedModeReason: 'Server workflow unavailable. Using local fallback workflow.', + error: null, + }); } catch (error) { - const workflowError = error as WorkflowError; - set({ - error: workflowError, - isLoading: false + set({ + error: toWorkflowError(error, 'Failed to generate local fallback workflow.'), + isLoading: false, }); } }, diff --git a/frontend/src/types/workflow.ts b/frontend/src/types/workflow.ts index a3992426..c28a986c 100644 --- a/frontend/src/types/workflow.ts +++ b/frontend/src/types/workflow.ts @@ -5,6 +5,14 @@ export type TaskStatus = 'pending' | 'in_progress' | 'completed' | 'skipped'; export type TaskPriority = 'high' | 'medium' | 'low'; export type ActionType = 'navigate' | 'modal' | 'external'; export type WorkflowStatus = 'not_started' | 'in_progress' | 'completed' | 'paused' | 'stopped'; +export type WorkflowGenerationMode = 'agent_committee' | 'llm_generation' | 'llm_pillar_backfill' | 'controlled_fallback'; + +export interface WorkflowProvenanceSummary { + generationMode: WorkflowGenerationMode; + committeeAgentCount: number; + fallbackUsed: boolean; + taskSourceBreakdown: Partial>; +} export interface TodayTask { id: string; @@ -44,6 +52,7 @@ export interface DailyWorkflow { completedAt?: Date; totalEstimatedTime: number; // in minutes actualTimeSpent: number; // in minutes + provenanceSummary?: WorkflowProvenanceSummary; } export interface WorkflowProgress { @@ -54,6 +63,7 @@ export interface WorkflowProgress { nextTask?: TodayTask; estimatedTimeRemaining: number; // in minutes actualTimeSpent: number; // in minutes + provenanceSummary?: WorkflowProvenanceSummary; } export interface TaskCompletionData {