fix: improve analyse portfolio page UI layout and agent compatibility

- Fix button sizing on analyse portfolio page with min_width=290
- Remove scroll constraint on input-card to show example portfolios header
- Fix Decimal type compatibility in rehearsal engine expected return calculation
- Improve ReAct agent tool message handling

app.py

@@ -1526,9 +1526,9 @@ def create_interface() -> gr.Blocks:
         flex: 1 1 auto !important;
         display: flex !important;
         flex-direction: column !important;
-        overflow-y: auto !important;
+        overflow-y: visible !important;
         overflow-x: visible !important;
-        max-height: 800px !important;
+        max-height: none !important;
         min-height: 0;
         box-sizing: border-box !important;
         gap: 0 !important;
@@ -1560,8 +1560,9 @@ def create_interface() -> gr.Blocks:
     }
 
     .examples-header {
-        margin-bottom: 0.75rem;
-        padding-top: 1.5rem;
+        margin-top: 0.25rem;
+        margin-bottom: 0.25rem;
+        padding-top: 0.5rem;
         border-top: 1px solid rgba(255, 255, 255, 0.1);
         color: #048CFC;
         font-weight: 600;
@@ -1796,10 +1797,8 @@ def create_interface() -> gr.Blocks:
             gr.Markdown("## Navigation", elem_classes="sidebar-header")
 
             # Navigation options
-            nav_new_analysis = gr.Button("🏠 New Analysis", variant="secondary", size="lg", elem_classes="nav-btn")
+            nav_new_analysis = gr.Button("🏠 Home", variant="secondary", size="lg", elem_classes="nav-btn")
             nav_view_history = gr.Button("📜 View History", variant="secondary", size="lg", elem_classes="nav-btn")
-            nav_settings = gr.Button("⚙️ Settings", variant="secondary", size="lg", elem_classes="nav-btn")
-            nav_help = gr.Button("❓ Help & Documentation", variant="secondary", size="lg", elem_classes="nav-btn")
 
             gr.Markdown("---")
 
@@ -1940,7 +1939,7 @@ def create_interface() -> gr.Blocks:
         with gr.Group(visible=False, elem_classes="task-selection-container") as task_page:
             gr.Markdown("## What would you like to do?", elem_classes="section-title")
 
-            with gr.Row():
+            with gr.Row(equal_height=True):
                 # Analyse Portfolio - enabled
                 with gr.Column(scale=1, min_width=200):
                     task_analyse_btn = gr.Button(
@@ -2231,12 +2230,20 @@ def create_interface() -> gr.Blocks:
                             info="Enable brutal honesty mode for portfolio critique (only works with Standard Analysis)"
                         )
 
-                        # Action button
-                        analyse_btn = gr.Button(
-                            "Analyse Portfolio",
-                            variant="primary",
-                            size="lg"
-                        )
+                        # Action buttons
+                        with gr.Row():
+                            analyse_btn = gr.Button(
+                                "Analyse Portfolio",
+                                variant="primary",
+                                size="lg",
+                                min_width=290
+                            )
+                            input_back_btn = gr.Button(
+                                "Back",
+                                variant="secondary",
+                                size="lg",
+                                min_width=290
+                            )
 
                         # Examples integrated as simple buttons
                         gr.Markdown("### Example Portfolios", elem_classes="examples-header")
@@ -2673,8 +2680,8 @@ def create_interface() -> gr.Blocks:
                 test_page: gr.update(visible=True)
             }
 
-        async def handle_build_portfolio(goals, risk_tolerance, constraints, show_reasoning, session_state):
-            """Handle the Build Portfolio workflow.
+        def handle_build_portfolio(goals, risk_tolerance, constraints, show_reasoning, session_state):
+            """Handle the Build Portfolio workflow with loading state.
 
             Args:
                 goals: List of selected investment goals
@@ -2683,20 +2690,33 @@ def create_interface() -> gr.Blocks:
                 show_reasoning: Whether to show reasoning trace
                 session_state: User session
 
-            Returns:
+            Yields:
                 Tuple of UI updates for build results
             """
-            try:
-                if not goals:
-                    return (
-                        gr.update(visible=True),  # build_results_container
-                        "Please select at least one investment goal.",  # build_status
-                        gr.update(visible=False),  # build_reasoning_container
-                        [],  # build_reasoning_trace
-                        [],  # build_portfolio_table
-                        ""  # build_final_response
-                    )
+            import time
+
+            if not goals:
+                yield (
+                    gr.update(visible=True),  # build_results_container
+                    "Please select at least one investment goal.",  # build_status
+                    gr.update(visible=False),  # build_reasoning_container
+                    [],  # build_reasoning_trace
+                    [],  # build_portfolio_table
+                    ""  # build_final_response
+                )
+                return
+
+            # First yield: Show loading state
+            yield (
+                gr.update(visible=True),
+                "Building your portfolio... This may take a minute.",
+                gr.update(visible=False),
+                [],
+                [],
+                ""
+            )
 
+            try:
                 # Initialise MCP router and workflow router
                 from backend.mcp_router import MCPRouter
                 from backend.agents.workflow_router import WorkflowRouter
@@ -2705,11 +2725,11 @@ def create_interface() -> gr.Blocks:
                 workflow_router = WorkflowRouter(mcp_router)
 
                 # Run the build workflow
-                result = await workflow_router.route_build(
+                result = asyncio.run(workflow_router.route_build(
                     goals=goals,
                     risk_tolerance=int(risk_tolerance),
                     constraints=constraints or ""
-                )
+                ))
 
                 # Extract portfolio data for table
                 portfolio_data = []
@@ -2720,29 +2740,19 @@ def create_interface() -> gr.Blocks:
                         item.get("reasoning", "")
                     ])
 
-                # If no portfolio extracted, show the final response
-                if not portfolio_data and result.get("final_response"):
-                    return (
-                        gr.update(visible=True),
-                        "Portfolio built successfully!",
-                        gr.update(visible=show_reasoning),
-                        result.get("reasoning_trace", []),
-                        [],
-                        result.get("final_response", "")
-                    )
-
-                return (
+                # Final yield: Show results
+                yield (
                     gr.update(visible=True),
                     "Portfolio built successfully!",
                     gr.update(visible=show_reasoning),
                     result.get("reasoning_trace", []),
-                    portfolio_data,
+                    portfolio_data if portfolio_data else [],
                     result.get("final_response", "")
                 )
 
             except Exception as e:
                 logger.error(f"Build portfolio error: {e}")
-                return (
+                yield (
                     gr.update(visible=True),
                     f"Error building portfolio: {str(e)}",
                     gr.update(visible=False),
@@ -2751,10 +2761,6 @@ def create_interface() -> gr.Blocks:
                     ""
                 )
 
-        def sync_handle_build_portfolio(goals, risk_tolerance, constraints, show_reasoning, session_state):
-            """Synchronous wrapper for handle_build_portfolio."""
-            return asyncio.run(handle_build_portfolio(goals, risk_tolerance, constraints, show_reasoning, session_state))
-
         def handle_build_accept(portfolio_table):
             """Accept built portfolio and populate input for analysis.
 
@@ -2797,40 +2803,49 @@ def create_interface() -> gr.Blocks:
                 gr.update(visible=False)  # test_page
             )
 
-        async def handle_compare_portfolio(portfolio_text, session_state):
-            """Handle the Compare Strategies workflow.
+        def handle_compare_portfolio(portfolio_text, session_state):
+            """Handle the Compare Strategies workflow with loading state.
 
             Args:
                 portfolio_text: Raw portfolio text input
                 session_state: User session
 
-            Returns:
+            Yields:
                 Tuple of UI updates for compare results
             """
-            try:
-                if not portfolio_text or not portfolio_text.strip():
-                    return (
-                        gr.update(visible=True),  # compare_results_container
-                        "Please enter your portfolio holdings.",  # compare_status
-                        "",  # compare_bull_case
-                        0,  # compare_bull_confidence
-                        "",  # compare_bear_case
-                        0,  # compare_bear_confidence
-                        "",  # compare_consensus
-                        "",  # compare_stance
-                        []  # compare_debate_transcript
-                    )
+            if not portfolio_text or not portfolio_text.strip():
+                yield (
+                    gr.update(visible=True),  # compare_results_container
+                    "Please enter your portfolio holdings.",  # compare_status
+                    "",  # compare_bull_case
+                    0,  # compare_bull_confidence
+                    "",  # compare_bear_case
+                    0,  # compare_bear_confidence
+                    "",  # compare_consensus
+                    "",  # compare_stance
+                    []  # compare_debate_transcript
+                )
+                return
 
-                # Parse portfolio
-                holdings = parse_portfolio_input(portfolio_text)
+            # Parse portfolio
+            holdings = parse_portfolio_input(portfolio_text)
 
-                if not holdings:
-                    return (
-                        gr.update(visible=True),
-                        "Could not parse portfolio. Please check format.",
-                        "", 0, "", 0, "", "", []
-                    )
+            if not holdings:
+                yield (
+                    gr.update(visible=True),
+                    "Could not parse portfolio. Please check format.",
+                    "", 0, "", 0, "", "", []
+                )
+                return
 
+            # First yield: Show loading state
+            yield (
+                gr.update(visible=True),
+                "Running advisory council debate... This may take a minute.",
+                "", 0, "", 0, "", "", []
+            )
+
+            try:
                 # Initialise MCP router and workflow router
                 from backend.mcp_router import MCPRouter
                 from backend.agents.workflow_router import WorkflowRouter
@@ -2839,14 +2854,15 @@ def create_interface() -> gr.Blocks:
                 workflow_router = WorkflowRouter(mcp_router)
 
                 # Run the compare workflow
-                result = await workflow_router.route_compare(holdings=holdings)
+                result = asyncio.run(workflow_router.route_compare(holdings=holdings))
 
                 council_result = result.get("council_result", {})
                 bull_case = council_result.get("bull_case", {})
                 bear_case = council_result.get("bear_case", {})
                 consensus = council_result.get("consensus", {})
 
-                return (
+                # Final yield: Show results
+                yield (
                     gr.update(visible=True),
                     "Analysis complete!",
                     bull_case.get("thesis", ""),
@@ -2860,16 +2876,12 @@ def create_interface() -> gr.Blocks:
 
             except Exception as e:
                 logger.error(f"Compare portfolio error: {e}")
-                return (
+                yield (
                     gr.update(visible=True),
                     f"Error: {str(e)}",
                     "", 0, "", 0, "", "", []
                 )
 
-        def sync_handle_compare_portfolio(portfolio_text, session_state):
-            """Synchronous wrapper for handle_compare_portfolio."""
-            return asyncio.run(handle_compare_portfolio(portfolio_text, session_state))
-
         async def handle_test_changes(portfolio_text, changes_text, portfolio_value, session_state):
             """Handle the Test Changes workflow.
 
@@ -3694,6 +3706,12 @@ Please try again with different parameters.
             outputs=export_csv_btn
         )
 
+        # Back button from input page to task page
+        input_back_btn.click(
+            show_task_page,
+            outputs=[task_page, input_page, results_page, history_page, build_page, compare_page, test_page]
+        )
+
         # Auto-load history when History tab is selected
         def load_history_if_selected(evt: gr.SelectData, session):
             """Load history only when History tab is selected."""
@@ -4152,7 +4170,7 @@ Please try again with different parameters.
         )
 
         build_submit_btn.click(
-            sync_handle_build_portfolio,
+            handle_build_portfolio,
             inputs=[build_goals, build_risk_tolerance, build_constraints, build_show_reasoning, session_state],
             outputs=[
                 build_results_container,
@@ -4177,7 +4195,7 @@ Please try again with different parameters.
         )
 
         build_regenerate_btn.click(
-            sync_handle_build_portfolio,
+            handle_build_portfolio,
             inputs=[build_goals, build_risk_tolerance, build_constraints, build_show_reasoning, session_state],
             outputs=[
                 build_results_container,
@@ -4196,7 +4214,7 @@ Please try again with different parameters.
         )
 
         compare_submit_btn.click(
-            sync_handle_compare_portfolio,
+            handle_compare_portfolio,
             inputs=[compare_portfolio_input, session_state],
             outputs=[
                 compare_results_container,

backend/agents/react_agent.py

@@ -206,20 +206,41 @@ class PortfolioBuilderAgent:
         @tool
         async def assess_risk(
             weights: dict[str, float],
-            returns_data: dict[str, list[float]]
+            historical_prices: dict[str, list[float]],
+            portfolio_value: float = 10000.0
         ) -> dict:
             """Assess portfolio risk metrics.
 
             Args:
-                weights: Dictionary mapping tickers to allocation weights
-                returns_data: Dictionary mapping tickers to their return series
+                weights: Dictionary mapping tickers to allocation weights (0-1)
+                historical_prices: Dictionary mapping tickers to their historical prices
+                portfolio_value: Total portfolio value in dollars
 
             Returns:
                 Risk metrics including VaR, CVaR, volatility, etc.
             """
             try:
+                from decimal import Decimal
+
+                # Construct portfolio in the required format
+                portfolio = []
+                for ticker, weight in weights.items():
+                    if ticker in historical_prices:
+                        prices = historical_prices[ticker]
+                        portfolio.append({
+                            "ticker": ticker,
+                            "weight": Decimal(str(weight)),
+                            "prices": [Decimal(str(p)) for p in prices]
+                        })
+
+                if not portfolio:
+                    return {"error": "No valid portfolio data to analyse"}
+
                 return await mcp_router.call_risk_analyzer_mcp(
-                    "analyze_risk", {"weights": weights, "returns": returns_data}
+                    "analyze_risk", {
+                        "portfolio": portfolio,
+                        "portfolio_value": Decimal(str(portfolio_value))
+                    }
                 )
             except Exception as e:
                 logger.error(f"Error assessing risk: {e}")

backend/agents/rehearsal.py

@@ -262,8 +262,11 @@ class PortfolioRehearsalEngine:
             if ticker in historical_data:
                 prices = historical_data[ticker].get("close_prices", [])
                 if len(prices) >= 2:
-                    annual_return = ((prices[-1] - prices[0]) / prices[0]) * 100
-                    weight = data["weight"] / 100
+                    # Convert Decimal prices to float for arithmetic compatibility
+                    price_start = float(prices[0])
+                    price_end = float(prices[-1])
+                    annual_return = ((price_end - price_start) / price_start) * 100
+                    weight = float(data["weight"]) / 100
                     total_return += annual_return * weight
                     total_weight += weight