flock-core 0.4.0b49__py3-none-any.whl → 0.4.0b50__py3-none-any.whl

flock/webapp/app/api/execution.py

@@ -3,6 +3,7 @@ import json
 from pathlib import Path
 from typing import TYPE_CHECKING, Any
 
+import markdown2  # Import markdown2
 from fastapi import (  # Ensure Form and HTTPException are imported
     APIRouter,
     Depends,
@@ -16,9 +17,6 @@ if TYPE_CHECKING:
     from flock.core.flock import Flock
 
 
-from flock.core.flock import (
-    Flock as ConcreteFlock,  # For creating Flock instance
-)
 from flock.core.logging.logging import (
     get_logger as get_flock_logger,  # For logging within the new endpoint
 )
@@ -35,12 +33,17 @@ from flock.webapp.app.services.flock_service import (
     run_current_flock_service,
     # get_current_flock_instance IS NO LONGER IMPORTED
 )
-from flock.webapp.app.utils import pydantic_to_dict
 
 router = APIRouter()
 BASE_DIR = Path(__file__).resolve().parent.parent.parent
 templates = Jinja2Templates(directory=str(BASE_DIR / "templates"))
 
+# Add markdown2 filter to Jinja2 environment for this router
+def markdown_filter(text):
+    return markdown2.markdown(text, extras=["tables", "fenced-code-blocks"])
+
+templates.env.filters['markdown'] = markdown_filter
+
 
 @router.get("/htmx/execution-form-content", response_class=HTMLResponse)
 async def htmx_get_execution_form_content(
@@ -102,14 +105,9 @@ async def htmx_get_agent_input_form(
 @router.post("/htmx/run", response_class=HTMLResponse)
 async def htmx_run_flock(
     request: Request,
-    # current_flock: Flock = Depends(get_flock_instance) # Service will use app_state
 ):
-    # The service function run_current_flock_service now takes app_state
-    # We retrieve current_flock from app_state inside the service or before calling if needed for validation here
-
-    # It's better to get flock from app_state here to validate before calling service
     current_flock_from_state: Flock | None = getattr(request.app.state, 'flock_instance', None)
-    logger = get_flock_logger("webapp.execution.regular_run") # Standard logger
+    logger = get_flock_logger("webapp.execution.regular_run")
 
     if not current_flock_from_state:
         logger.error("HTMX Run (Regular): No Flock loaded in app_state.")
@@ -150,30 +148,14 @@ async def htmx_run_flock(
             logger.error(f"HTMX Run (Regular): Error processing inputs for '{start_agent_name}': {e_parse}", exc_info=True)
             return HTMLResponse(f"<p class='error'>Error processing inputs for {start_agent_name}: {e_parse}</p>")
 
-    try:
-        logger.info(f"HTMX Run (Regular): Executing agent '{start_agent_name}' from Flock '{current_flock_from_state.name}' via service.")
-        result_data = await run_current_flock_service(start_agent_name, inputs, request.app.state)
-    except Exception as e_run:
-        logger.error(f"HTMX Run (Regular): Error during service execution for '{start_agent_name}': {e_run}", exc_info=True)
-        return templates.TemplateResponse(
-            "partials/_results_display.html",
-            {"request": request, "result_data": {"error": f"Error during execution: {e_run!s}"}},
-        )
-
-    # Process and serialize result for template
-    try:
-        processed_result = pydantic_to_dict(result_data)
-        try: json.dumps(processed_result)
-        except (TypeError, ValueError) as ser_e:
-            processed_result = f"Error: Result contains non-serializable data: {ser_e!s}\nOriginal result preview: {str(result_data)[:500]}..."
-            logger.warning(f"HTMX Run (Regular): Serialization issue: {processed_result}")
-    except Exception as proc_e:
-        processed_result = f"Error: Failed to process result data: {proc_e!s}"
-        logger.error(f"HTMX Run (Regular): Result processing error: {processed_result}", exc_info=True)
+    result_data = await run_current_flock_service(start_agent_name, inputs, request.app.state)
+    raw_json_for_template = json.dumps(result_data, indent=2)
+    # Unescape newlines for proper display in HTML <pre> tag
+    result_data_raw_json_str = raw_json_for_template.replace('\\n', '\n')
 
     return templates.TemplateResponse(
         "partials/_results_display.html",
-        {"request": request, "result_data": processed_result},
+        {"request": request, "result": result_data, "result_raw_json": result_data_raw_json_str} # Pass both
     )
 
 
@@ -181,27 +163,18 @@ async def htmx_run_flock(
 @router.post("/htmx/run-shared", response_class=HTMLResponse)
 async def htmx_run_shared_flock(
     request: Request,
-    share_id: str = Form(...), # Expect share_id from the form
-    # flock_definition_str: str = Form(...), # No longer needed
-    # start_agent_name from form is still required implicitly via form_data.get()
-    # No DI for current_flock, as we are using the one from app.state via share_id
+    share_id: str = Form(...),
 ):
     shared_logger = get_flock_logger("webapp.execution.shared_run_stateful")
     form_data = await request.form()
     start_agent_name = form_data.get("start_agent_name")
 
     if not start_agent_name:
-        shared_logger.warning("HTMX Run Shared (Stateful): Starting agent name not provided in form.")
-        return HTMLResponse("<p class='error'>Critical error: Starting agent name missing from shared run form.</p>")
-
-    shared_logger.info(f"HTMX Run Shared (Stateful): Attempting to execute agent '{start_agent_name}' using pre-loaded Flock for share_id '{share_id}'.")
-
-    inputs = {}
-    result_data: Any = None
-    temp_flock: ConcreteFlock | None = None
+        shared_logger.warning("HTMX Run Shared: Starting agent not selected.")
+        return HTMLResponse("<p class='error'>Starting agent not selected for shared run.</p>")
 
+    inputs: dict[str, Any] = {}
     try:
-        # Retrieve the pre-loaded Flock instance from app.state
         shared_flocks_store = getattr(request.app.state, 'shared_flocks', {})
         temp_flock = shared_flocks_store.get(share_id)
 
@@ -216,14 +189,11 @@ async def htmx_run_shared_flock(
             shared_logger.error(f"HTMX Run Shared: Agent '{start_agent_name}' not found in shared Flock '{temp_flock.name}'.")
             return HTMLResponse(f"<p class='error'>Agent '{start_agent_name}' not found in the provided shared Flock definition.</p>")
 
-        # Parse inputs for the agent from the temporary flock
         if agent.input and isinstance(agent.input, str):
             parsed_spec = parse_schema(agent.input)
             for name, type_str, _ in parsed_spec:
-                form_field_name = f"agent_input_{name}" # Name used in shared_run_page.html
+                form_field_name = f"agent_input_{name}"
                 raw_value = form_data.get(form_field_name)
-
-                # Input type conversion (consistent with the other endpoint)
                 if raw_value is None and "bool" in type_str.lower(): inputs[name] = False; continue
                 if raw_value is None: inputs[name] = None; continue
                 if "int" in type_str.lower(): inputs[name] = int(raw_value)
@@ -234,31 +204,19 @@ async def htmx_run_shared_flock(
 
         shared_logger.info(f"HTMX Run Shared: Executing agent '{start_agent_name}' in pre-loaded Flock '{temp_flock.name}'. Inputs: {list(inputs.keys())}")
         result_data = await temp_flock.run_async(start_agent=start_agent_name, input=inputs, box_result=False)
+        raw_json_for_template = json.dumps(result_data, indent=2)
+        # Unescape newlines for proper display in HTML <pre> tag
+        result_data_raw_json_str = raw_json_for_template.replace('\\n', '\n')
         shared_logger.info(f"HTMX Run Shared: Agent '{start_agent_name}' executed. Result keys: {list(result_data.keys()) if isinstance(result_data, dict) else 'N/A'}")
 
-        # Process and serialize result for template (same logic as other endpoint)
-        try:
-            processed_result = pydantic_to_dict(result_data)
-            try: json.dumps(processed_result)
-            except (TypeError, ValueError) as ser_e:
-                processed_result = f"Error: Result contains non-serializable data: {ser_e!s}\nOriginal result preview: {str(result_data)[:500]}..."
-                shared_logger.warning(f"HTMX Run Shared: Serialization issue: {processed_result}")
-        except Exception as proc_e:
-            processed_result = f"Error: Failed to process result data: {proc_e!s}"
-            shared_logger.error(f"HTMX Run Shared: Result processing error: {processed_result}", exc_info=True)
-
-        return templates.TemplateResponse(
-            "partials/_results_display.html",
-            {"request": request, "result_data": processed_result},
-        )
-
-    except ValueError as ve: # Catch specific input parsing errors
-        shared_logger.error(f"HTMX Run Shared: Input parsing error for agent '{start_agent_name}': {ve}", exc_info=True)
+    except ValueError as ve:
+        shared_logger.error(f"HTMX Run Shared: Input parsing error for '{start_agent_name}' (share_id: {share_id}): {ve}", exc_info=True)
         return HTMLResponse(f"<p class='error'>Invalid input format: {ve!s}</p>")
-    except Exception as e_general:
-        error_message = f"An unexpected error occurred during shared execution: {e_general!s}"
-        shared_logger.error(f"HTMX Run Shared: General error for agent '{start_agent_name}': {e_general}", exc_info=True)
-        return templates.TemplateResponse(
-            "partials/_results_display.html",
-            {"request": request, "result_data": {"error": error_message } },
-        )
+    except Exception as e:
+        shared_logger.error(f"HTMX Run Shared: Error during execution for '{start_agent_name}' (share_id: {share_id}): {e}", exc_info=True)
+        return HTMLResponse(f"<p class='error'>An unexpected error occurred: {e!s}</p>")
+
+    return templates.TemplateResponse(
+        "partials/_results_display.html",
+        {"request": request, "result": result_data, "result_raw_json": result_data_raw_json_str} # Pass both
+    )

flock/webapp/app/chat.py

@@ -6,7 +6,7 @@ from datetime import datetime
 from uuid import uuid4
 
 import markdown2  # Added for Markdown to HTML conversion
-from fastapi import APIRouter, Depends, Form, Request
+from fastapi import APIRouter, Depends, Form, Request, Response
 from fastapi.responses import HTMLResponse
 from pydantic import BaseModel
 
@@ -272,7 +272,7 @@ async def chat_settings_form(request: Request):
     return templates.TemplateResponse("partials/_chat_settings_form.html", context)
 
 
-@router.post("/chat/settings", response_class=HTMLResponse, include_in_schema=False)
+@router.post("/chat/settings", include_in_schema=False)
 async def chat_settings_submit(
     request: Request,
     agent_name: str | None = Form(default=None),
@@ -280,19 +280,23 @@ async def chat_settings_submit(
     history_key: str = Form("history"),
     response_key: str = Form("response"),
 ):
-    """Apply submitted chat config, then re-render the form with a success message."""
+    """Handles chat settings submission and triggers a toast notification."""
     cfg = get_chat_config(request)
-    cfg.agent_name = agent_name or None
+    cfg.agent_name = agent_name
     cfg.message_key = message_key
     cfg.history_key = history_key
     cfg.response_key = response_key
 
-    headers = {
-        "HX-Trigger": json.dumps({"notify": {"type": "success", "message": "Chat settings saved"}}),
-        "HX-Redirect": "/chat"
+    logger.info(f"Chat settings updated: Agent: {cfg.agent_name}, MsgKey: {cfg.message_key}, HistKey: {cfg.history_key}, RespKey: {cfg.response_key}")
+
+    toast_event = {
+        "showGlobalToast": {
+            "message": "Chat settings saved successfully!",
+            "type": "success"
+        }
     }
-    # Response body empty; HTMX will redirect
-    return HTMLResponse("", headers=headers)
+    headers = {"HX-Trigger": json.dumps(toast_event)}
+    return Response(status_code=204, headers=headers)
 
 
 # --- Stand-alone Chat HTML page access to settings --------------------------

flock/webapp/app/config.py

@@ -38,7 +38,7 @@ THEMES_DIR = FLOCK_BASE_DIR / "themes"
 CURRENT_FLOCK_INSTANCE: "Flock | None" = None
 CURRENT_FLOCK_FILENAME: str | None = None
 
-DEFAULT_THEME_NAME = OutputTheme.everblush.value # Default if random fails or invalid theme specified
+DEFAULT_THEME_NAME = OutputTheme.ciapre.value # Default if random fails or invalid theme specified
 
 def list_available_themes() -> list[str]:
     """Scans the THEMES_DIR for .toml files and returns their names (without .toml)."""

flock/webapp/app/main.py

@@ -9,6 +9,7 @@ import uuid
 from contextlib import asynccontextmanager
 from pathlib import Path
 
+import markdown2  # Import markdown2
 from fastapi import (
     Depends,
     FastAPI,
@@ -237,6 +238,12 @@ BASE_DIR = Path(__file__).resolve().parent.parent
 app.mount("/static", StaticFiles(directory=str(BASE_DIR / "static")), name="static")
 templates = Jinja2Templates(directory=str(BASE_DIR / "templates"))
 
+# Add markdown2 filter to Jinja2 environment
+def markdown_filter(text):
+    return markdown2.markdown(text, extras=["tables", "fenced-code-blocks"])
+
+templates.env.filters['markdown'] = markdown_filter
+
 core_api_router = create_api_router()
 app.include_router(core_api_router, prefix="/api", tags=["Flock API Core"])
 app.include_router(flock_management.router, prefix="/ui/api/flock", tags=["UI Flock Management"])
@@ -758,11 +765,10 @@ async def ui_load_flock_by_name_action(request: Request, selected_flock_filename
     ui_mode_query = request.query_params.get("ui_mode", "standalone")
     if loaded_flock:
         success_message_text = f"Flock '{loaded_flock.name}' loaded from '{selected_flock_filename}'."
-        response_headers["HX-Push-Url"] = "/ui/editor/properties?ui_mode=" + request.query_params.get("ui_mode", "standalone")
+        response_headers["HX-Push-Url"] = "/ui/editor/execute?ui_mode=" + ui_mode_query
         response_headers["HX-Trigger"] = json.dumps({"flockLoaded": None, "notify": {"type": "success", "message": success_message_text}})
-        # Use get_base_context_web to ensure all necessary context vars are present for the partial
         context = get_base_context_web(request, success=success_message_text, ui_mode=ui_mode_query)
-        return templates.TemplateResponse("partials/_flock_properties_form.html", context, headers=response_headers)
+        return templates.TemplateResponse("partials/_execution_view_container.html", context, headers=response_headers)
     else:
         error_message_text = f"Failed to load flock file '{selected_flock_filename}'."
         response_headers["HX-Trigger"] = json.dumps({"notify": {"type": "error", "message": error_message_text}})
@@ -790,16 +796,14 @@ async def ui_load_flock_by_upload_action(request: Request, flock_file_upload: Up
         loaded_flock = load_flock_from_file_service(filename_to_load, request.app.state)
         if loaded_flock:
             success_message_text = f"Flock '{loaded_flock.name}' loaded from '{filename_to_load}'."
-            response_headers["HX-Push-Url"] = f"/ui/editor/properties?ui_mode={ui_mode_query}"
+            response_headers["HX-Push-Url"] = f"/ui/editor/execute?ui_mode={ui_mode_query}"
             response_headers["HX-Trigger"] = json.dumps({"flockLoaded": None, "flockFileListChanged": None, "notify": {"type": "success", "message": success_message_text}})
-            # CORRECTED CALL:
             context = get_base_context_web(request, success=success_message_text, ui_mode=ui_mode_query)
-            return templates.TemplateResponse("partials/_flock_properties_form.html", context, headers=response_headers)
+            return templates.TemplateResponse("partials/_execution_view_container.html", context, headers=response_headers)
         else: error_message_text = f"Failed to process uploaded '{filename_to_load}'."
 
     final_error_msg = error_message_text or "Upload failed."
     response_headers["HX-Trigger"] = json.dumps({"notify": {"type": "error", "message": final_error_msg}})
-    # CORRECTED CALL:
     context = get_base_context_web(request, error=final_error_msg, ui_mode=ui_mode_query)
     return templates.TemplateResponse("partials/_create_flock_form.html", context, headers=response_headers)
 
@@ -807,16 +811,14 @@ async def ui_load_flock_by_upload_action(request: Request, flock_file_upload: Up
 async def ui_create_flock_action(request: Request, flock_name: str = Form(...), default_model: str = Form(None), description: str = Form(None)):
     ui_mode_query = request.query_params.get("ui_mode", "standalone")
     if not flock_name.strip():
-        # CORRECTED CALL:
         context = get_base_context_web(request, error="Flock name cannot be empty.", ui_mode=ui_mode_query)
         return templates.TemplateResponse("partials/_create_flock_form.html", context)
 
     new_flock = create_new_flock_service(flock_name, default_model, description, request.app.state)
-    success_msg_text = f"New flock '{new_flock.name}' created. Configure properties and save."
-    response_headers = {"HX-Push-Url": f"/ui/editor/properties?ui_mode={ui_mode_query}", "HX-Trigger": json.dumps({"flockLoaded": None, "notify": {"type": "success", "message": success_msg_text}})}
-    # CORRECTED CALL:
+    success_msg_text = f"New flock '{new_flock.name}' created. Navigating to Execute page. Configure properties and agents as needed."
+    response_headers = {"HX-Push-Url": f"/ui/editor/execute?ui_mode={ui_mode_query}", "HX-Trigger": json.dumps({"flockLoaded": None, "notify": {"type": "success", "message": success_msg_text}})}
     context = get_base_context_web(request, success=success_msg_text, ui_mode=ui_mode_query)
-    return templates.TemplateResponse("partials/_flock_properties_form.html", context, headers=response_headers)
+    return templates.TemplateResponse("partials/_execution_view_container.html", context, headers=response_headers)
 
 # --- Settings Page & Endpoints ---
 @app.get("/ui/settings", response_class=HTMLResponse, tags=["UI Pages"])

flock/webapp/templates/base.html

@@ -14,8 +14,10 @@
     <link rel="stylesheet" href="/static/css/chat.css">
     <!-- Font Awesome for icons -->
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css">
+    <!-- Prism.js CSS for syntax highlighting (okaidia theme) -->
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/prism/1.29.0/themes/prism-okaidia.min.css" referrerpolicy="no-referrer" />
     {# Inject Theme CSS Variables #}
-    {% if theme_css %}
+    {% if theme_css and theme_css.strip() %}
     <style>
         /* Start Theme CSS */
         {{ theme_css | safe }}
@@ -27,10 +29,17 @@
         integrity="sha384-D1Kt99CQMDuVetoL1lrYwg5t+9QdHe7NLX/SoJYkXDFfX37iInKRy5xLSi8nO7UC"
         crossorigin="anonymous"></script>
     <script defer src="https://cdn.jsdelivr.net/npm/alpinejs@3.x.x/dist/cdn.min.js"></script>
+    <!-- Prism.js JS (core and autoloader) -->
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/prism/1.29.0/components/prism-core.min.js" referrerpolicy="no-referrer"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/prism/1.29.0/plugins/autoloader/prism-autoloader.min.js" referrerpolicy="no-referrer"></script>
     <!-- Removed inline styles as they're in custom.css -->
 </head>
 
 <body>
+    <div id="global-toast-container" style="position: fixed; top: 1rem; right: 1rem; z-index: 9999; display: flex; flex-direction: column; gap: 0.5rem;">
+        <!-- Toasts will be appended here -->
+    </div>
+
     <header class="top-header">
         <span><strong>🐧 Flock Playground 🐤</strong></span>
         <span id="header-flock-status-container" hx-get="/ui/htmx/header-flock-status?ui_mode={{ ui_mode }}"
@@ -104,6 +113,87 @@
         function triggerEvent(eventName, detail = {}) {
             htmx.trigger(document.body, eventName, detail);
         }
+
+        // Add HTMX event listener for Prism highlighting
+        document.addEventListener('htmx:afterSwap', function(event) {
+            // Check if the swapped element or its parent is the main content area or results display
+            const mainContentArea = document.getElementById('main-content-area');
+            const resultsDisplay = document.getElementById('results-display-content');
+            let targetElement = event.detail.target;
+
+            if (targetElement === mainContentArea || (resultsDisplay && resultsDisplay.contains(targetElement)) || (mainContentArea && mainContentArea.contains(targetElement))) {
+                if (typeof Prism !== 'undefined') {
+                    // console.log('Prism highlighting triggered for swapped content in main area.');
+                    Prism.highlightAllUnder(mainContentArea || document.documentElement); 
+                }
+            }
+        });
+
+        // Initial highlight on page load
+        document.addEventListener('DOMContentLoaded', () => {
+            if (typeof Prism !== 'undefined') {
+                // console.log('Prism initial highlighting.');
+                Prism.highlightAll();
+            }
+        });
+    </script>
+    {# Global Toast Handler - identical to the one in chat.html #}
+    <script>
+        document.body.addEventListener('showGlobalToast', function (event) {
+            const detail = event.detail;
+            const message = detail.message || 'Done!';
+            const type = detail.type || 'info'; // success, error, warning, info
+
+            const toastContainer = document.getElementById('global-toast-container');
+            if (!toastContainer) return;
+
+            const toast = document.createElement('article');
+            toast.className = `toast-message ${type}`;
+            toast.innerHTML = `<button class="close-toast" style="float: right; background: none; border: none; font-size: 1.2rem; line-height: 1; padding: 0.25rem 0.5rem; cursor: pointer;">&times;</button>${message}`;
+            
+            toast.style.padding = '0.75rem';
+            toast.style.border = '1px solid';
+            toast.style.borderRadius = 'var(--pico-border-radius, 4px)';
+            toast.style.minWidth = '250px';
+            toast.style.maxWidth = '400px';
+            toast.style.opacity = '0';
+            toast.style.transition = 'opacity 0.3s ease-in-out, transform 0.3s ease-in-out';
+            toast.style.transform = 'translateX(100%)';
+
+            if (type === 'success') {
+                toast.style.borderColor = 'var(--pico-color-green-500, green)';
+                toast.style.backgroundColor = 'var(--pico-color-green-150, #e6fffa)';
+                toast.style.color = 'var(--pico-color-green-700, darkgreen)';
+            } else if (type === 'error') {
+                toast.style.borderColor = 'var(--pico-color-red-500, red)';
+                toast.style.backgroundColor = 'var(--pico-color-red-150, #ffe6e6)';
+                toast.style.color = 'var(--pico-color-red-700, darkred)';
+            } else { // Default/info/warning
+                toast.style.borderColor = 'var(--pico-color-blue-500, blue)';
+                toast.style.backgroundColor = 'var(--pico-color-blue-150, #e6f7ff)';
+                toast.style.color = 'var(--pico-color-blue-700, darkblue)';
+            }
+
+            toastContainer.appendChild(toast);
+
+            setTimeout(() => {
+                toast.style.opacity = '1';
+                toast.style.transform = 'translateX(0)';
+            }, 10);
+
+            const closeButton = toast.querySelector('.close-toast');
+            closeButton.onclick = () => {
+                toast.style.opacity = '0';
+                toast.style.transform = 'translateY(-20px)';
+                setTimeout(() => toast.remove(), 300);
+            };
+
+            setTimeout(() => {
+                toast.style.opacity = '0';
+                toast.style.transform = 'translateY(-20px)';
+                setTimeout(() => toast.remove(), 300);
+            }, 5000);
+        });
     </script>
 </body>
 

flock/webapp/templates/chat.html

@@ -9,7 +9,7 @@
     {# Prism.js CSS for syntax highlighting (okaidia theme) #}
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/prism/1.29.0/themes/prism-okaidia.min.css" referrerpolicy="no-referrer" />
     {# Inject active theme variables #}
-    {% if theme_css %}
+    {% if theme_css and theme_css.strip() %}
     <style>
         /* Start Theme CSS */
         /* stylelint-disable */
@@ -24,6 +24,10 @@
     <script src="https://cdnjs.cloudflare.com/ajax/libs/prism/1.29.0/plugins/autoloader/prism-autoloader.min.js" referrerpolicy="no-referrer"></script>
 </head>
 <body class="chat-page">
+    <div id="global-toast-container" style="position: fixed; top: 1rem; right: 1rem; z-index: 9999; display: flex; flex-direction: column; gap: 0.5rem;">
+        <!-- Toasts will be appended here -->
+    </div>
+
     <div id="chat-container">
         <div class="chat-header" style="justify-content: space-between;">
             <hgroup>
@@ -86,6 +90,65 @@
             Prism.highlightAll();
         });
     })();
+
+    // Global Toast Handler
+    document.body.addEventListener('showGlobalToast', function (event) {
+        const detail = event.detail;
+        const message = detail.message || 'Done!';
+        const type = detail.type || 'info'; // success, error, warning, info
+
+        const toastContainer = document.getElementById('global-toast-container');
+        if (!toastContainer) return;
+
+        const toast = document.createElement('article');
+        toast.className = `toast-message ${type}`;
+        toast.innerHTML = `<button class="close-toast" style="float: right; background: none; border: none; font-size: 1.2rem; line-height: 1; padding: 0.25rem 0.5rem; cursor: pointer;">&times;</button>${message}`;
+        
+        // Basic styling, can be enhanced in CSS file
+        toast.style.padding = '0.75rem';
+        toast.style.border = '1px solid';
+        toast.style.borderRadius = 'var(--pico-border-radius, 4px)';
+        toast.style.minWidth = '250px';
+        toast.style.maxWidth = '400px';
+        toast.style.opacity = '0'; // Start faded out
+        toast.style.transition = 'opacity 0.3s ease-in-out, transform 0.3s ease-in-out';
+        toast.style.transform = 'translateX(100%)'; // Start off-screen
+
+        if (type === 'success') {
+            toast.style.borderColor = 'var(--pico-color-green-500, green)';
+            toast.style.backgroundColor = 'var(--pico-color-green-150, #e6fffa)';
+            toast.style.color = 'var(--pico-color-green-700, darkgreen)';
+        } else if (type === 'error') {
+            toast.style.borderColor = 'var(--pico-color-red-500, red)';
+            toast.style.backgroundColor = 'var(--pico-color-red-150, #ffe6e6)';
+            toast.style.color = 'var(--pico-color-red-700, darkred)';
+        } else { // Default/info/warning
+            toast.style.borderColor = 'var(--pico-color-blue-500, blue)';
+            toast.style.backgroundColor = 'var(--pico-color-blue-150, #e6f7ff)';
+            toast.style.color = 'var(--pico-color-blue-700, darkblue)';
+        }
+
+        toastContainer.appendChild(toast);
+
+        // Animate in
+        setTimeout(() => {
+            toast.style.opacity = '1';
+            toast.style.transform = 'translateX(0)';
+        }, 10); // Small delay to allow CSS to apply initial state
+
+        const closeButton = toast.querySelector('.close-toast');
+        closeButton.onclick = () => {
+            toast.style.opacity = '0';
+            toast.style.transform = 'translateY(-20px)';
+            setTimeout(() => toast.remove(), 300);
+        };
+
+        setTimeout(() => {
+            toast.style.opacity = '0';
+            toast.style.transform = 'translateY(-20px)';
+            setTimeout(() => toast.remove(), 300);
+        }, 5000); // Auto-dismiss after 5 seconds
+    });
 </script>
 </body>
 </html>

flock/webapp/templates/partials/_agent_detail_form.html

@@ -14,9 +14,9 @@
     {% endif %}
 
     <form {% if is_new %}
-              hx-post="/api/flock/htmx/agents"
+              hx-post="/ui/api/flock/htmx/agents"
           {% else %}
-              hx-put="/api/flock/htmx/agents/{{ agent.name if agent else '' }}"
+              hx-put="/ui/api/flock/htmx/agents/{{ agent.name if agent else '' }}"
           {% endif %}
           hx-target="#agent-detail-form-content"
           hx-swap="innerHTML"
@@ -77,7 +77,7 @@
             </button>
             {% if not is_new and agent %}
             <button type="button" role="button" class="secondary outline"
-                    hx-delete="/api/flock/htmx/agents/{{ agent.name }}"
+                    hx-delete="/ui/api/flock/htmx/agents/{{ agent.name }}"
                     hx-target="#agent-detail-form-content" 
                     hx-confirm="Are you sure you want to delete agent '{{ agent.name }}'?"
                     hx-indicator="#agent-detail-loading-indicator">

flock/webapp/templates/partials/_flock_properties_form.html

@@ -23,7 +23,7 @@
         </div>
     {% endif %}
 
-    <form hx-post="/api/flock/htmx/flock-properties" hx-target="#flock-properties-form-article" hx-swap="innerHTML" hx-indicator="#flock-props-loading">
+    <form hx-post="/ui/api/flock/htmx/flock-properties" hx-target="#flock-properties-form-article" hx-swap="innerHTML" hx-indicator="#flock-props-loading">
         <label for="flock_name">Flock Name</label>
         <input type="text" id="flock_name" name="flock_name" value="{{ flock.name if flock else '' }}" required>
 
@@ -38,7 +38,7 @@
         </div>
     </form>
     <hr>
-     <form hx-post="/api/flock/htmx/save-flock" hx-target="#flock-properties-form-article" hx-swap="innerHTML" hx-indicator="#flock-save-loading">
+     <form hx-post="/ui/api/flock/htmx/save-flock" hx-target="#flock-properties-form-article" hx-swap="innerHTML" hx-indicator="#flock-save-loading">
         <label for="save_filename">Save Flock As:</label>
         <input type="text" id="save_filename" name="save_filename" 
                value="{{ current_filename if current_filename else (flock.name.replace(' ', '_').lower() + '.flock.yaml' if flock and flock.name else 'my_flock.flock.yaml') }}" 

flock/webapp/templates/partials/_results_display.html

@@ -10,24 +10,28 @@
     </header>
 
     <div x-show="viewMode === 'json'">
-        {% if result_data is string %}
-            <p class="error" style="white-space: pre-wrap;">{{ result_data }}</p>
-        {% elif result_data %}
-            <pre><code style="word-break: break-all; white-space: pre-wrap;">{{ result_data | tojson(indent=2) }}</code></pre>
+        {# Check for the new result_raw_json variable first #}
+        {% if result_raw_json is defined %}
+            <pre><code class="language-json" style="word-break: break-all; white-space: pre-wrap;">{{ result_raw_json }}</code></pre>
+        {# Fallback for old context or if result was an error string from backend before formatting #}
+        {% elif result is string %}
+            <pre><code class="language-plaintext" style="word-break: break-all; white-space: pre-wrap;">{{ result }}</code></pre>
+        {% elif result %}
+            {# Fallback if result_raw_json is somehow not provided but result (dict) is #}
+            <pre><code class="language-json" style="word-break: break-all; white-space: pre-wrap;">{{ result | tojson(indent=2) }}</code></pre>
         {% else %}
             <p>No results to display yet.</p>
         {% endif %}
     </div>
 
     <div x-show="viewMode === 'structured'">
-        {% if result_data is string %}
-            <p class="error" style="white-space: pre-wrap;">{{ result_data }}</p>
-        {% elif result_data is mapping %}
-            {# Call our new macro for structured display #}
-            {{ render_value(result_data) }}
-        {% elif result_data %}
+        {% if result is string %}
+            <p class="error" style="white-space: pre-wrap;">{{ result }}</p>
+        {% elif result is mapping %}
+            {{ render_value(result) }}
+        {% elif result %}
              <p>Structured view not available for this result type (not a dictionary).</p>
-             <pre><code>{{ result_data | tojson(indent=2) }}</code></pre>
+             <pre><code class="language-json" style="word-break: break-all; white-space: pre-wrap;">{{ result | tojson(indent=2) }}</code></pre>
         {% else %}
             <p>No results to display yet.</p>
         {% endif %}

flock/webapp/templates/partials/_structured_data_view.html

@@ -31,8 +31,8 @@
     {% elif value is none %}
         <em style="color: var(--pico-code-color);">None</em>
     {% else %}
-        {# Apply pre-wrap for multi-line strings #}
-        <span style="white-space: pre-wrap; word-break: break-word;">{{ value }}</span>
+        {# Apply pre-wrap for multi-line strings and render markdown #}
+        <div class="markdown-content" style="word-break: break-word;">{{ value | markdown | safe }}</div>
     {% endif %}
 {% endmacro %}
 

flock/webapp/templates/shared_run_page.html

@@ -14,6 +14,8 @@
     <link rel="stylesheet" href="/static/css/chat.css">
     <!-- Font Awesome for icons -->
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css">
+    <!-- Prism.js CSS for syntax highlighting (okaidia theme) -->
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/prism/1.29.0/themes/prism-okaidia.min.css" referrerpolicy="no-referrer" />
     {# Inline generated theme CSS variables #}
     {% if theme_css %}
     <style>
@@ -112,5 +114,30 @@
             <small>Built with FastAPI, HTMX, Pico.CSS by 🤍 white duck 🦆 - Theme: {{ active_theme_name | default('default') }}</small>
         </footer>
     </main>
+
+    <!-- Prism.js JS (core and autoloader) -->
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/prism/1.29.0/components/prism-core.min.js" referrerpolicy="no-referrer"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/prism/1.29.0/plugins/autoloader/prism-autoloader.min.js" referrerpolicy="no-referrer"></script>
+    <script>
+        // Add HTMX event listener for Prism highlighting
+        document.addEventListener('htmx:afterSwap', function(event) {
+            const resultsDisplay = document.getElementById('results-display');
+            // Check if the swapped element is the results display or a child of it
+            if (resultsDisplay && (event.detail.target === resultsDisplay || resultsDisplay.contains(event.detail.target))) {
+                if (typeof Prism !== 'undefined') {
+                    // console.log('Prism highlighting triggered for swapped content in results-display.');
+                    Prism.highlightAllUnder(resultsDisplay);
+                }
+            }
+        });
+
+        // Initial highlight on page load
+        document.addEventListener('DOMContentLoaded', () => {
+            if (typeof Prism !== 'undefined') {
+                // console.log('Prism initial highlighting on shared page.');
+                Prism.highlightAll(); 
+            }
+        });
+    </script>
 </body>
 </html> 

{flock_core-0.4.0b49.dist-info → flock_core-0.4.0b50.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flock-core
-Version: 0.4.0b49
+Version: 0.4.0b50
 Summary: Declarative LLM Orchestration at Scale
 Author-email: Andre Ratzenberger <andre.ratzenberger@whiteduck.de>
 License-File: LICENSE

{flock_core-0.4.0b49.dist-info → flock_core-0.4.0b50.dist-info}/RECORD

@@ -458,16 +458,16 @@ flock/tools/zendesk_tools.py,sha256=HQ7qBVSrRfemwolz0IOXl8Z02vJCLE6mTd-cARVdX88,
 flock/webapp/__init__.py,sha256=YtRbbyciN3Z2oMB9fdXZuvM3e49R8m2mY5qHLDoapRA,37
 flock/webapp/run.py,sha256=Ekg-mQSl7RUDJAEDTBJMIlLyvhWqWPMjg8hPqmgFREE,8945
 flock/webapp/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-flock/webapp/app/chat.py,sha256=AcVwgq4SQyOQnx0rheJVuR0Pp8u6Dc15YH2aMfIdK2Q,25943
-flock/webapp/app/config.py,sha256=RVMvgOKRKKzE0T95UVai75iDXajTzV6mlPUhnW3Wloo,4812
+flock/webapp/app/chat.py,sha256=NKSsrozVvnvxrLBtJjN4Ps_DMol66nw1eD5E8GmcOLU,26077
+flock/webapp/app/config.py,sha256=lqmneujnNZk-EFJV5cWpvxkqisxH3T3zT_YOI0JYThE,4809
 flock/webapp/app/dependencies.py,sha256=JUcwY1N6SZplU141lMN2wk9dOC9er5HCedrKTJN9wJk,5533
-flock/webapp/app/main.py,sha256=pVxu2w4h6QNKzi6AO-k_aHjhOS6lPYwCY0IdGIIPqy0,53784
+flock/webapp/app/main.py,sha256=489cZ_N8ZACRSGjY2PQomXM7bKYZL1_6s4BLRl4XSkM,53828
 flock/webapp/app/models_ui.py,sha256=vrEBLbhEp6FziAgBSFOLT1M7ckwadsTdT7qus5_NduE,329
 flock/webapp/app/theme_mapper.py,sha256=QzWwLWpED78oYp3FjZ9zxv1KxCyj43m8MZ0fhfzz37w,34302
 flock/webapp/app/utils.py,sha256=RF8DMKKAj1XPmm4txUdo2OdswI1ATQ7cqUm6G9JFDzA,2942
 flock/webapp/app/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 flock/webapp/app/api/agent_management.py,sha256=5xqO94QjjAYvxImyjKV9EGUQOvo4n3eqs7pGwGPSQJ4,10394
-flock/webapp/app/api/execution.py,sha256=DO2dljCXa4zwedRbtjU_QiCTP-KRVSbFknUKpVcHBuk,13013
+flock/webapp/app/api/execution.py,sha256=NNNG_ZqYS80WoLMD7MSCyDhqkkvCVMb_MfIm3dOs_HA,10381
 flock/webapp/app/api/flock_management.py,sha256=1o-6-36kTnUjI3am_BqLpdrcz0aqFXrxE-hQHIFcCsg,4869
 flock/webapp/app/api/registry_viewer.py,sha256=IoInxJiRR0yFlecG_l2_eRc6l35RQQyEDMG9BcBkipY,1020
 flock/webapp/app/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -480,14 +480,14 @@ flock/webapp/static/css/components.css,sha256=WnicEHy3ptPzggKmyG9_oZp3X30EMJBUW3
 flock/webapp/static/css/header.css,sha256=E9MgItZCk34S65NfMJ001ZsRz4oyFSJex8KvINMtCn0,1043
 flock/webapp/static/css/layout.css,sha256=ocDd7dmezdQzNAQDuQSv1xZ8-pcbNgYLUYJB1SKcfvw,1526
 flock/webapp/static/css/sidebar.css,sha256=gCwLTAiIvmHGksm0rHDpMsOGCDKBMxqx_aEc8ZQcQF8,3066
-flock/webapp/templates/base.html,sha256=013TyI0TvzyvjnIhEr3ZgJYSAIVQK2ayPAngdi0hF18,4937
-flock/webapp/templates/chat.html,sha256=CieTTl1RWG0uyltrBthblPBzNDx061WUE1x79UxT2Og,4294
+flock/webapp/templates/base.html,sha256=Eqp-WYI8ZaYr8CiKzfquYLaoWtKJ7vtHHCJBS4b53Tw,9757
+flock/webapp/templates/chat.html,sha256=4g5qgKGmkvFwuTcuf57Q2CSHj2i0MW98PbUZXaaN74I,7303
 flock/webapp/templates/chat_settings.html,sha256=nYz6ihYAUA9zN-Jru565QNl8_eJdoLMWC2LdZJtZ-20,862
 flock/webapp/templates/flock_editor.html,sha256=ysDExf9zMj4SMsSXZUpCtG9EjIv8VJ5xL4IJQOMlb7o,542
 flock/webapp/templates/index.html,sha256=eK7s5Cnh63unqPwq9NGZGEKyvYwkhudfmSn9su3Ctyg,412
 flock/webapp/templates/registry_viewer.html,sha256=suAiWDvBxJ8SsF9MhheuN6MMQUZuIhTlurmbFOcYJfI,3235
-flock/webapp/templates/shared_run_page.html,sha256=uB04jvhGISgpXl-zTJ1lbFTze9mQQXFmkYSZcx43PUc,6429
-flock/webapp/templates/partials/_agent_detail_form.html,sha256=oLz17lmv8s-DI9lOxODLJpc57NRUPmnLlOqxyDFYTDE,6015
+flock/webapp/templates/shared_run_page.html,sha256=VaiCieI1kXP6y1eFprbVh9tG1-5CS-d-z7Kw2cUAeis,7985
+flock/webapp/templates/partials/_agent_detail_form.html,sha256=a-YM1CozCXBRoBEdfAw3tL9X-rjRy4OWeiwxk6Dcjfg,6024
 flock/webapp/templates/partials/_agent_list.html,sha256=comYjOeUxQvlJzS-3D4OruJKlhC3uhCgo-X-nqiOhkA,1037
 flock/webapp/templates/partials/_agent_manager_view.html,sha256=oUJ-t2Mk3o4xjQ_HtHz0glgaHM8eqZpPB4i24ToJiJ8,2565
 flock/webapp/templates/partials/_agent_tools_checklist.html,sha256=T60fb7OrJYHUw0hJLC_otskgvbH9dZXbv5klgWBkSWk,686
@@ -504,20 +504,20 @@ flock/webapp/templates/partials/_env_vars_table.html,sha256=6TFUWvkYwzwodqXZ0yJh
 flock/webapp/templates/partials/_execution_form.html,sha256=296AFx0WSbCzX8t-L1pRl8s0AUzeOb2fmTiRlcwYoIg,3274
 flock/webapp/templates/partials/_execution_view_container.html,sha256=XuphmZKYf2IYSeA9XHqtnwAntBylrFASDXVlLBJUeDk,1031
 flock/webapp/templates/partials/_flock_file_list.html,sha256=FjIxAqB0OxA0mQ8f2jBX1_M_AM5ea7gCA8PEjPpiZVc,1209
-flock/webapp/templates/partials/_flock_properties_form.html,sha256=0xNK_h5LrZrGCFyKfOLsvEaIpK2LlDfCte8bl0-AwdI,2885
+flock/webapp/templates/partials/_flock_properties_form.html,sha256=alOsGYzktVX6aYtfxRHganBfipkzx5Kk4RxF6C0IHhk,2891
 flock/webapp/templates/partials/_flock_upload_form.html,sha256=h2dIPwPeTg5dv_ubrZiwBXReF0NjzJ6eKSwwz7mbQQs,960
 flock/webapp/templates/partials/_header_flock_status.html,sha256=reNB4Prsu9lObz5tFhGk3AMe4bNw92gDJZUKABVaVBM,158
 flock/webapp/templates/partials/_load_manager_view.html,sha256=2u4lufQMEpUlQOThUzo1zrE3AulDQ-aErruS6t91W44,2909
 flock/webapp/templates/partials/_registry_table.html,sha256=z4EW5G3DTknymBeSlpL2PZLcb2143P35upMnmHFfeJs,715
 flock/webapp/templates/partials/_registry_viewer_content.html,sha256=iQyxaLUzz1IcZouRLcMg73k-xcOZvOHVPfpuU7uXgYo,1891
-flock/webapp/templates/partials/_results_display.html,sha256=vuAbIdnG_7jzeHxeeoRvPqStD_7CJwXnyhvry_kMfLQ,1625
+flock/webapp/templates/partials/_results_display.html,sha256=zwWF7uhYfOSsPWDdG9A11ccBBgu-Pz6cupvJ1f4xTB0,2103
 flock/webapp/templates/partials/_settings_env_content.html,sha256=Q1Xr6wLHLlqiduqNk6PyF1B4juP-vvqLOLZyiHHNRLc,572
 flock/webapp/templates/partials/_settings_theme_content.html,sha256=-y5vGRKBZf3Cp5DDE1M4Qw-yunuMtCG54Sa7r60XfJE,807
 flock/webapp/templates/partials/_settings_view.html,sha256=7Uy2EfAgVJ2Kac5S6nkeaIEr2tSagVyR5CBbf07fbSQ,1349
 flock/webapp/templates/partials/_share_chat_link_snippet.html,sha256=N83lNAbkZiDfzZYviKwURPGGErSZhRlxnNzUqXsB7lE,793
 flock/webapp/templates/partials/_share_link_snippet.html,sha256=6en9lOdtu8FwVbtmkJzSQpHQ1WFXHnCbe84FDgAEF3U,1533
 flock/webapp/templates/partials/_sidebar.html,sha256=uA-SZKfVpxImT8Acpw2hhpJbOk1BlaLeSzRjleYfuSE,4450
-flock/webapp/templates/partials/_structured_data_view.html,sha256=IsmGbm2rKHZr6qx0a_n6QGs89Rq4xNFhymrZVI6OShc,2063
+flock/webapp/templates/partials/_structured_data_view.html,sha256=TEaXcMGba9ruxEc_MLxygIO1qWcuSTo1FnosFtGSKWI,2101
 flock/webapp/templates/partials/_theme_preview.html,sha256=81vP5z8958LjhGWGwjVAVw3zW0uvYwfcXlU30i9exmo,867
 flock/workflow/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 flock/workflow/activities.py,sha256=fyvefDOWZhhj5gCYIHR9Aqm2DbE6XI6-sXESFnnYRuc,9911
@@ -526,8 +526,8 @@ flock/workflow/agent_execution_activity.py,sha256=Gy6FtuVAjf0NiUXmC3syS2eJpNQF4R
 flock/workflow/flock_workflow.py,sha256=iSUF_soFvWar0ffpkzE4irkDZRx0p4HnwmEBi_Ne2sY,9666
 flock/workflow/temporal_config.py,sha256=3_8O7SDEjMsSMXsWJBfnb6XTp0TFaz39uyzSlMTSF_I,3988
 flock/workflow/temporal_setup.py,sha256=YIHnSBntzOchHfMSh8hoLeNXrz3B1UbR14YrR6soM7A,1606
-flock_core-0.4.0b49.dist-info/METADATA,sha256=BV-rirx2H3Z43076Y0lQjFUSaRQ9WxlAsmN9FJzy_-8,17879
-flock_core-0.4.0b49.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-flock_core-0.4.0b49.dist-info/entry_points.txt,sha256=rWaS5KSpkTmWySURGFZk6PhbJ87TmvcFQDi2uzjlagQ,37
-flock_core-0.4.0b49.dist-info/licenses/LICENSE,sha256=iYEqWy0wjULzM9GAERaybP4LBiPeu7Z1NEliLUdJKSc,1072
-flock_core-0.4.0b49.dist-info/RECORD,,
+flock_core-0.4.0b50.dist-info/METADATA,sha256=iqhiWpNagA97dhguRWqDQOhMmlb3-PGKFYT-v0LY_aU,17879
+flock_core-0.4.0b50.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+flock_core-0.4.0b50.dist-info/entry_points.txt,sha256=rWaS5KSpkTmWySURGFZk6PhbJ87TmvcFQDi2uzjlagQ,37
+flock_core-0.4.0b50.dist-info/licenses/LICENSE,sha256=iYEqWy0wjULzM9GAERaybP4LBiPeu7Z1NEliLUdJKSc,1072
+flock_core-0.4.0b50.dist-info/RECORD,,