diff --git a/examples/scientific_paper_writer.yaml b/examples/scientific_paper_writer.yaml
new file mode 100644
index 000000000..bcae24256
--- /dev/null
+++ b/examples/scientific_paper_writer.yaml
@@ -0,0 +1,2734 @@
+# CleverAgents: Scientific Paper Writer v2.0 - LangGraph Version
+# Complete implementation using pure LangGraph (no RxPy streams)
+#
+# This configuration orchestrates a multi-stage workflow for writing long-form
+# scientific papers using a network of LLM and Tool actors.
+#
+# USAGE:
+#   cleveragents interactive -c examples/scientific_paper_writer.yaml --unsafe
+#
+# COMMANDS:
+#   !help     - Shows available commands
+#   !next     - Advances to next stage
+#   !accept   - Accepts current content
+#   !stage    - Shows current stage description
+#   !stages   - Lists all stages
+#   !context  - Shows current context
+#   !finish   - Automatically completes all remaining stages using first-pass suggestions
+
+cleveragents:
+  version: "3.0"
+  logging:
+    level: "INFO"
+  template_engine: "JINJA2"
+  unsafe: true
+  default_actor: workflow_controller
+
+# Actor definitions - renamed from agents
+actors:
+
+
+  # ============================================
+  # Workflow & Command Control Agents
+  # ============================================
+  workflow_controller:
+    type: tool
+    config:
+      tools:
+        - name: workflow_controller
+          code: |
+            import sys
+            print(f"DEBUG: workflow_controller called with: {input_data}", file=sys.stderr)
+            print(f"DEBUG: current stage: {context.get('writing_stage')}", file=sys.stderr)
+
+            # Store initial message
+            context['initial_message'] = input_data
+
+            # Remove escape characters
+            clean_input = input_data.replace('\\!', '!').strip() if input_data else ''
+
+            if clean_input.startswith('!'):
+                # Include the original command in the output for command_handler
+                result = f"GOTO_COMMAND_HANDLER:{clean_input}"
+            else:
+                stage = context.get('writing_stage') or 'intro'
+                routed = False
+
+                if stage == 'section_writing' and clean_input:
+                    graph_state = context.get('graph_state', {}) or {}
+                    metadata = graph_state.get('metadata', {}) or {}
+                    last_agent_node = metadata.get('last_agent_node')
+                    # Map actor nodes and their savers to the correct target
+                    interactive_nodes = {
+                        'source_selector': 'SOURCE_SELECTOR',
+                        'source_finder': 'SOURCE_FINDER',
+                        'source_finder_saver': 'SOURCE_FINDER',
+                        'section_writer': 'SECTION_WRITER',
+                        'section_writer_saver': 'SECTION_WRITER',
+                        'section_proofreader': 'SECTION_PROOFREADER',
+                        'section_proofreader_saver': 'SECTION_PROOFREADER',
+                    }
+                    if last_agent_node:
+                        normalized = last_agent_node.strip().lower()
+                        if normalized in interactive_nodes:
+                            target_node = interactive_nodes[normalized]
+                            result = f"GOTO_{target_node}:{clean_input}"
+                            routed = True
+                            print(
+                                f"DEBUG: routed section writing input to {target_node}",
+                                file=sys.stderr,
+                            )
+
+                if not routed:
+                    # Pass the user input along with the stage routing
+                    result = f"GOTO_{stage.upper()}:{clean_input}"
+ 
+            print(f"DEBUG: returning: {result}", file=sys.stderr)
+
+
+  # Command handler - processes all commands
+  command_handler:
+    type: tool
+    config:
+      tools:
+        - name: command_processor
+          code: |
+            # Debug: print what we received
+            import sys
+            print(f"DEBUG command_handler: input_data='{input_data}'", file=sys.stderr)
+            
+            # Extract the actual command from the input_data
+            # It comes as "GOTO_COMMAND_HANDLER:!next" from workflow_controller
+            msg = ''
+            if input_data and ':' in input_data:
+                parts = input_data.split(':', 1)
+                if len(parts) > 1:
+                    msg = parts[1].strip()
+            
+            # Fallback to checking context
+            if not msg:
+                msg = context.get('initial_message', '').strip()
+            
+            # Last fallback
+            if not msg and input_data:
+                msg = input_data.strip() if input_data != 'GOTO_COMMAND_HANDLER' else ''
+            
+            print(f"DEBUG command_handler: using msg='{msg}'", file=sys.stderr)
+            
+            if not msg:
+                result = "COMMAND_OUTPUT:Error: No command provided"
+            else:
+                parts = msg.split(maxsplit=1)
+                command = parts[0]
+                args = parts[1] if len(parts) > 1 else ''
+                
+                if command == '!help':
+                    result = 'COMMAND_OUTPUT:Available Commands:\n!help                     - Shows this help message.\n!next [stage_name]        - Advances to the next stage, or the one specified.\n!start                    - Start/run the current stage.\n!write                    - (section_writing) Proceed from source selection to writing the section.\n!proofread                - (section_writing) Proceed from writing to proofreading.\n!accept                   - Accepts current content and proceeds to next section/stage.\n!stage                    - Describes the current stage.\n!stages                   - Lists all stages and marks the current one.\n!context [hops|all]       - Shows current context. \'hops\' shows recent history, \'all\' shows full history.\n!finish                   - Automatically completes remaining stages using first-pass suggestions and citations.'
+                
+                elif command == '!next':
+                    current_stage = context.get('writing_stage') or 'intro'
+                    stage_order = context.get('stage_order')
+                    target_stage = None
+
+                    # Handle intro stage specially
+                    if current_stage == 'intro':
+                        target_stage = 'discovery' if 'discovery' in stage_order else stage_order[0] if stage_order else None
+                    elif args and args in stage_order:
+                        target_stage = args
+                    elif current_stage in stage_order:
+                        current_index = stage_order.index(current_stage)
+                        if current_index + 1 < len(stage_order):
+                            target_stage = stage_order[current_index + 1]
+                        else:
+                            result = "COMMAND_OUTPUT:Already at the final stage."
+                    else:
+                        result = f"COMMAND_OUTPUT:Error: Current stage '{current_stage}' is invalid."
+
+                    if target_stage:
+                        # Update the stage
+                        context['writing_stage'] = target_stage
+                        # Trigger the stage flow immediately by routing to it with empty input
+                        result = f"GOTO_{target_stage.upper()}:"
+                
+                elif command == '!start':
+                    # Start/run the current stage (useful after transitioning to a new stage)
+                    current_stage = context.get('writing_stage') or 'intro'
+                    result = f"GOTO_{current_stage.upper()}:"
+                
+                elif command == '!write':
+                    # Proceed from source selection to section writing
+                    if context.get('writing_stage') == 'section_writing':
+                        result = "GOTO_SECTION_WRITER:"
+                    else:
+                        result = "COMMAND_OUTPUT:!write is only available during section_writing stage"
+                
+                elif command == '!proofread':
+                    # Proceed from section writing to proofreading
+                    if context.get('writing_stage') == 'section_writing':
+                        result = "GOTO_SECTION_PROOFREADER:"
+                    else:
+                        result = "COMMAND_OUTPUT:!proofread is only available during section_writing stage"
+                
+                elif command == '!accept':
+                    # Accept current section and move to next
+                    if context.get('writing_stage') == 'section_writing':
+                        # Increment section index and route to next section
+                        current_index = context.get('current_section_index', 0)
+                        section_paths = context.get('section_paths', [])
+                        new_index = current_index + 1
+                        context['current_section_index'] = new_index
+                        
+                        # Check if we've completed all sections
+                        if new_index >= len(section_paths):
+                            # Keep stage as section_writing so !next advances to paper_review
+                            result = "COMMAND_OUTPUT:All sections written! Type !next to proceed to paper review stage."
+                        else:
+                            # Update current section path for the next section
+                            context['current_section_path'] = section_paths[new_index]
+                            result = f"GOTO_SOURCE_SELECTOR:{section_paths[new_index]}"
+                    elif context.get('writing_stage') == 'core_content':
+                        context.setdefault('core_content_progress', {})['accept_current_section'] = True
+                        result = "Content accepted. The next section will be generated on your next input."
+                    else:
+                        current_stage = context.get('writing_stage')
+                        stage_order = context.get('stage_order')
+                        try:
+                            current_index = stage_order.index(current_stage)
+                            if current_index + 1 < len(stage_order):
+                                target_stage = stage_order[current_index + 1]
+                                context['writing_stage'] = target_stage
+                                # Trigger the next stage flow immediately
+                                result = f"GOTO_{target_stage.upper()}:"
+                            else:
+                                result = "Final stage complete."
+                        except (ValueError, IndexError):
+                            result = "Error advancing stage."
+                
+                elif command == '!stage':
+                    stage_descriptions = {
+                        'intro': 'Introduction to the writing system.',
+                        'discovery': 'Interactive setup where we collect all paper requirements.',
+                        'brainstorming': 'Refines the high-level idea for the paper.',
+                        'vetting': 'Interactive research stage where you work with the assistant to compile high-quality sources.',
+                        'structure': 'Defines the complete table of contents for the paper.',
+                        'section_writing': 'Writes each section of the paper individually. Selects relevant sources, finds additional sources if needed, then writes the content.',
+                        'paper_review': 'Reviews the complete assembled paper for consistency, grammar, style, citations, and logical flow.',
+                        'latex_generation': 'Generates LaTeX structure, converts sections to LaTeX, assembles the document, compiles with pdflatex, and fixes any compilation errors.'
+                    }
+                    current_stage = context.get('writing_stage', 'unknown')
+                    description = stage_descriptions.get(current_stage, 'No description available.')
+                    result = f"COMMAND_OUTPUT:Current Stage: {current_stage}\nPurpose: {description}"
+                
+                elif command == '!stages':
+                    stage_order = context.get('stage_order', [])
+                    current_stage = context.get('writing_stage', 'unknown')
+                    lines = ["Workflow Stages:"]
+                    for stage in stage_order:
+                        marker = '-->' if stage == current_stage else '   '
+                        lines.append(f"{marker} {stage}")
+                    result = 'COMMAND_OUTPUT:' + '\n'.join(lines)
+                
+                elif command == '!context':
+                    import json
+                    context_copy = dict(context)
+                    history = context_copy.pop('history', [])
+                    context_copy['history_size'] = len(history)
+                    output_str = json.dumps(context_copy, indent=2, default=str)
+                    if args:
+                        if args == 'all':
+                            history_to_show = history
+                        elif args.isdigit():
+                            history_to_show = history[-int(args):]
+                        else:
+                            history_to_show = []
+                        if history_to_show:
+                            output_str += "\n\n-- History --\n"
+                            output_str += json.dumps(history_to_show, indent=2, default=str)
+                    result = 'COMMAND_OUTPUT:' + output_str
+                
+                elif command == '!finish':
+                    required_fields = ['topic', 'length', 'audience', 'publication', 'format']
+                    paper_details = context.get('paper_details', {}) or {}
+                    missing = [field for field in required_fields if not paper_details.get(field)]
+                    current_stage = context.get('writing_stage') or 'intro'
+                    if missing or current_stage in ('intro', 'discovery'):
+                        missing_text = ', '.join(missing) if missing else 'initial discovery details'
+                        result = (
+                            "COMMAND_OUTPUT:!finish requires the discovery stage to be complete before automation can begin. "
+                            f"Missing: {missing_text}."
+                        )
+                    elif context.get('auto_finish_active'):
+                        result = "COMMAND_OUTPUT:Auto-finish mode is already active."
+                    else:
+                        context['auto_finish_active'] = True
+                        context['auto_finish_state'] = {'expect': None}
+                        result = "GOTO_AUTO_FINISH:START"
+                
+                else:
+                    result = f"COMMAND_OUTPUT:Unknown command: {command}"
+
+  auto_finish_driver:
+    type: tool
+    config:
+      tools:
+        - name: auto_finish_driver
+          code: |
+            message = input_data or ''
+            auto_active = bool(context.get('auto_finish_active'))
+            state = context.setdefault('auto_finish_state', {}) or {}
+
+            import sys
+            context.setdefault('auto_finish_debug', []).append({
+                'event': 'driver_call',
+                'active': auto_active,
+                'message': str(message)[:200]
+            })
+            print(f"AUTO_FINISH_DRIVER_CALLED active={auto_active} msg={str(message)[:80]}", file=sys.stderr)
+
+            if not auto_active:
+                result = "COMMAND_OUTPUT:"
+            else:
+                text = message if isinstance(message, str) else str(message)
+                sanitized = text.strip()
+
+                import sys
+                print(f"AUTO_FINISH_DEBUG expect={state.get('expect')} msg={sanitized[:120]}", file=sys.stderr)
+
+                per_section = int(context.get('auto_finish_citations_per_section') or 5)
+                expect = state.get('expect')
+                stage_order = context.get('stage_order') or []
+                writing_stage = context.get('writing_stage')
+                if not writing_stage and stage_order:
+                    writing_stage = stage_order[0]
+                if not writing_stage:
+                    writing_stage = 'brainstorming'
+                if writing_stage in ('intro', 'discovery'):
+                    writing_stage = 'brainstorming'
+
+                def set_expect(value):
+                    state['expect'] = value
+                    context['auto_finish_state'] = state
+
+                def current_section_label():
+                    path = context.get('current_section_path')
+                    if path:
+                        return path
+                    section_paths = context.get('section_paths') or []
+                    idx = context.get('current_section_index', 0)
+                    if idx < len(section_paths):
+                        return section_paths[idx]
+                    return 'Current section'
+
+                def has_structure():
+                    return bool(context.get('table_of_contents'))
+
+                def report_progress(stage_name: str, note: str = ""):
+                    try:
+                        from cleveragents.core.progress import ProgressBarManager
+
+                        ProgressBarManager.update(
+                            stage=stage_name,
+                            context=context,
+                            message=note,
+                        )
+                    except Exception as progress_err:  # pylint: disable=broad-except
+                        print(
+                            f"PROGRESS_BAR_ERROR {progress_err}",
+                            file=sys.stderr,
+                        )
+
+                def start_stage(stage_name):
+                    context['writing_stage'] = stage_name
+                    report_progress(stage_name, "Auto-finish in progress")
+                    if stage_name == 'brainstorming':
+                        set_expect('brainstorming_output')
+                        return ("GOTO_BRAINSTORMING:Auto-finish mode is active. Using the captured requirements, "
+                                "deliver a complete brainstorming summary without requesting additional input.")
+                    if stage_name == 'vetting':
+                        set_expect('vetting_output')
+                        return ("GOTO_VETTING:Auto-finish mode is active. Compile the strongest possible vetted source list "
+                                "based on the brainstorming summary and requirements.")
+                    if stage_name == 'structure':
+                        set_expect('structure_output')
+                        return ("GOTO_STRUCTURE:Auto-finish mode is active. Produce a finalized, detailed table of contents "
+                                "ready for section writing.")
+                    if stage_name == 'section_writing':
+                        if not has_structure():
+                            context['auto_finish_active'] = False
+                            context['auto_finish_state'] = {}
+                            return ("COMMAND_OUTPUT:Auto-finish cannot start section writing because the structure stage "
+                                    "is incomplete. Please finish the structure before running !finish.")
+                        label = current_section_label()
+                        section_paths = context.get('section_paths') or []
+                        report_progress(
+                            stage_name,
+                            f"Sections {context.get('current_section_index', 0)}/{len(section_paths)}",
+                        )
+                        try:
+                            from cleveragents.core.progress import ProgressBarManager
+
+                            ProgressBarManager.update(
+                                stage=stage_name,
+                                current=context.get('current_section_index', 0),
+                                total=len(section_paths) if section_paths else 1,
+                                message=f"Sections {context.get('current_section_index', 0)}/{len(section_paths)}",
+                                context=context,
+                            )
+                        except Exception:
+                            pass
+                        set_expect('source_selector_output')
+                        return f"GOTO_SECTION_WRITING:{label or ''}"
+                    if stage_name == 'paper_review':
+                        set_expect('paper_review_output')
+                        return ("GOTO_PAPER_REVIEW:Auto-finish mode is active. Review the assembled paper once and share "
+                                "actionable feedback without waiting for more input.")
+                    if stage_name == 'latex_generation':
+                        # Keep auto_finish_active=True to maintain high depth limit
+                        # Mark that we're in final stage
+                        context['auto_finish_final_stage'] = True
+                        report_progress(stage_name, "Generating LaTeX and compiling")
+                        return "GOTO_LATEX_GENERATION:"
+                    # Only set auto_finish_active=False at the very end
+                    context['auto_finish_active'] = False
+                    context['auto_finish_state'] = {}
+                    return "COMMAND_OUTPUT:Auto-finish completed."
+
+                next_action = None
+
+                if not expect or (sanitized and sanitized.upper() == 'START'):
+                    next_action = start_stage(writing_stage)
+                elif isinstance(text, str) and ('AUTO_SECTIONS_COMPLETE' in text.upper() or 'sections written' in text.lower()):
+                    next_action = start_stage('paper_review')
+                elif isinstance(text, str) and 'ROUTE_NEXT_SECTION' in text.upper():
+                    # Section was accepted, move to next section
+                    # The section_accept_handler already incremented current_section_index
+                    section_paths = context.get('section_paths') or []
+                    current_idx = context.get('current_section_index', 0)
+                    if current_idx >= len(section_paths):
+                        # All sections done
+                        next_action = start_stage('paper_review')
+                    else:
+                        # Start next section - go to source selection
+                        label = current_section_label()
+                        context['current_section_path'] = label
+                        set_expect('source_selector_output')
+                        report_progress(
+                            'section_writing',
+                            f"Completed section {current_idx} of {len(section_paths)}",
+                        )
+                        try:
+                            from cleveragents.core.progress import ProgressBarManager
+
+                            ProgressBarManager.update(
+                                stage='section_writing',
+                                current=current_idx,
+                                total=len(section_paths) if section_paths else 1,
+                                message=f"Completed section {current_idx} of {len(section_paths)}",
+                                context=context,
+                            )
+                        except Exception:
+                            pass
+                        next_action = f"GOTO_SECTION_WRITING:{label}"
+                elif expect == 'brainstorming_output':
+                    next_action = start_stage('vetting')
+                elif expect == 'vetting_output':
+                    next_action = start_stage('structure')
+                elif expect == 'structure_output':
+                    next_action = start_stage('section_writing')
+                elif expect == 'source_selector_output':
+                    set_expect('source_finder_output')
+                    section_label = current_section_label()
+                    next_action = (
+                        "GOTO_SOURCE_FINDER:"
+                        f"Auto-finish request: locate exactly {per_section} new, high-quality citations tailored to "
+                        f"\"{section_label}\". Merge them with the existing vetted sources when emitting the SOURCES_JSON "
+                        "block and respond with FIND_COMPLETE when done."
+                    )
+                elif expect == 'source_finder_output':
+                    set_expect('section_writer_output')
+                    section_label = current_section_label()
+                    next_action = f"GOTO_SECTION_WRITER:Auto-finish drafting section '{section_label}' using the gathered citations."
+                elif expect == 'section_writer_output':
+                    set_expect('section_proofreader_output')
+                    section_label = current_section_label()
+                    next_action = f"GOTO_SECTION_PROOFREADER:Auto-finish proofreading section '{section_label}'."
+                elif expect == 'section_proofreader_output':
+                    section_label = current_section_label()
+                    set_expect('source_selector_output')
+                    next_action = f"GOTO_ACCEPT_SECTION:{section_label or ''}"
+                elif expect == 'paper_review_output':
+                    next_action = start_stage('latex_generation')
+                else:
+                    next_action = "COMMAND_OUTPUT:Auto-finish is waiting for the next stage output."
+
+                context.setdefault('auto_finish_debug', []).append({
+                    'event': 'driver_next',
+                    'action': next_action[:500],
+                    'expect': state.get('expect'),
+                    'stage': context.get('writing_stage')
+                })
+
+                result = next_action
+
+
+
+  auto_finish_passthrough:
+    type: tool
+    config:
+      tools:
+        - name: auto_finish_passthrough
+          code: |
+            message = input_data or ''
+            context['auto_finish_last_output'] = message
+            auto_active = context.get('auto_finish_active', False)
+            final_stage = context.get('auto_finish_final_stage', False)
+            
+            # Check if this is the final output (latex source was just saved)
+            # We detect this by checking if latex_source exists and message contains latex-related content
+            latex_source = context.get('latex_source', '')
+            is_latex_completion = bool(latex_source) and ('document' in message.lower() or 'latex' in message.lower() or 'assembled' in message.lower() or 'compile' in message.lower())
+            
+            # If auto-finish just completed (final stage done), return the full paper content
+            if final_stage and is_latex_completion:
+                # Mark as complete now
+                context['auto_finish_active'] = False
+                context['auto_finish_final_stage'] = False
+                context['auto_finish_state'] = {}
+                
+                section_count = len(context.get('section_paths') or [])
+                topic = context.get('paper_details', {}).get('topic', 'Unknown')
+                
+                # Build the complete paper output
+                output_parts = []
+                output_parts.append("=" * 80)
+                output_parts.append("AUTO-FINISH COMPLETE!")
+                output_parts.append("=" * 80)
+                output_parts.append(f"\nPaper: {topic}")
+                output_parts.append(f"Sections: {section_count}")
+                output_parts.append("")
+                
+                # Include the paper content from section_content
+                section_content = context.get('section_content', {})
+                section_paths = context.get('section_paths', [])
+                
+                if section_content:
+                    output_parts.append("\n" + "=" * 80)
+                    output_parts.append("PAPER CONTENT")
+                    output_parts.append("=" * 80 + "\n")
+                    
+                    for path in section_paths:
+                        content = section_content.get(path, '')
+                        if content:
+                            # Determine header level based on path depth
+                            depth = path.count(' > ')
+                            if depth == 0:
+                                output_parts.append(f"\n{'#' * (depth + 1)} {path}\n")
+                            else:
+                                output_parts.append(f"\n{'#' * (depth + 1)} {path.split(' > ')[-1]}\n")
+                            output_parts.append(content)
+                            output_parts.append("")
+                
+                # Include LaTeX if available
+                if latex_source:
+                    output_parts.append("\n" + "=" * 80)
+                    output_parts.append("LATEX SOURCE")
+                    output_parts.append("=" * 80 + "\n")
+                    output_parts.append(latex_source)
+                
+                output_parts.append("\n" + "=" * 80)
+                output_parts.append("All stages completed: brainstorming, vetting, structure, section writing, paper review, and LaTeX generation.")
+                output_parts.append("=" * 80)
+                
+                result = '\n'.join(output_parts)
+            elif not auto_active:
+                # Auto-finish was manually deactivated or never active - just pass through
+                result = message
+            else:
+                result = message
+
+  # ============================================
+  # Introduction Agent
+  # ============================================
+  intro_actor:
+    type: llm
+    config:
+      provider: openai
+      model: gpt-3.5-turbo
+      system_prompt: |
+        You are a friendly onboarding assistant for the Scientific Paper Writer Application.
+        Your goal is to welcome the user, briefly explain how the system works, and instruct them to type `!next` to begin the process once they are ready to begin. Be sure after you give a brief intro to the process to encourage the user to ask you any questions they may have before you begin.
+
+        The Scientific Paper Writer Application was written and works based on the following description given to the developers instructing them how to build the application, provided for context:
+
+        Write a configuration, placed in `src/examples/`, for a network of LLM agents whose purpose is to write very long scientific papers that can't fit in a single context-window of sufficient quality to be ready for submission to peer-reviewed scientific journals and other publications. This should be done using only the configuration file, no additional code should need to be written to accomplish this. It will have two unique features, a multi-stage creation process that goes through various stages of writing, and a set of special commands that can be issued to interact with the process.
+
+        The stages during the writing process will be the following:
+        - Intro stage, this is you, the stage where you introduce the system.
+        - Discovery stage, during this stage a conversation with one or more agents will help define the parameters for the paper, stuff like the subject (or at least general category), interesting insights or points, the overall length of the paper, who the audience will be, what publications, if any, will be submitted to, etc. Basically all the requirements that are going to restrain the process up front. This stage should always ask the user what format they want the paper written in, which expects answers like latex, plain text, Typst, markdown or some other documentation format. At first only latex format will be supported so the agent should only accept latex as an answer and if any other answer is given then the llm should say "that format isn't supported yet the only supported formats are: latex".
+        - Brainstorming stage, during this stage there will be a conversation between the user and one or more agents where they refine the high-level idea for the paper and the fundamental components.
+        - Vetting stage, during this stage the topic is researched at a high level and high-quality sources are compiled in a list with a one page summary for each source, as well as the link to retrieve the full, and other metadata information (like author, full citations format, etc). This should not be done with our built-in web search tool but instead using an LLM agent with the ability to search the web (or do deep research) to compile this for us.
+        - Structure stage, during this stage the complete table of contents will be defined, along with a few sentences describing the focus and purpose of each section which will later be replaced with its full context.
+        - Deep Research stage, during this stage each section of the document is explicitly researched in detail. Similar to the vetting stage we use LLM's with the capability to search the internet rather than our own internal web search tool. It should compile a list of sources similar to before with all the same metadata, including a summary of the material. However it should also include an additional section which specifically summarizes the content of the source as it relates to the topic and section being written.
+        - Core Content stage, during this stage the core content is written. Each section should be filled in from the top down using LLM agent's that are explicitly told what the overall table of contents for the document is, and other relevant data collected so far (like the summary of the paper obtained during brainstorming, and all the relevant sources found during the research phase). It should be instructed to write the sections in the order they will appear in the paper. When instructed to write each section they should be told to only write the section instructed to write and to not attempt to write any other sections, including subsections under its current section, and then each subsection and later other sections will be addressed one at a time to keep each LLM focused on just a small portion of the work at any one time.
+        - Framing Content stage, finally the Conclusion section followed by the Abstract section should be written in their own stage. This section should reflect what is learned and expressed in the main body of the text, therefore these two sections are to be written last.
+        - Proofreading stage, during this final stage we use LLMs to proofread the paper and find any inconsistencies, typos, and logical fallacies and similar issues with the paper and correct it. We also look for things like "active voice", and other stylistic details.
+        - Formatting stage, during this stage the full text created so far will be converted into the desired format, which should have been specified during the requirements stage. The stage should use google's Gemini pro 2.5 to leverage its very large context window so it is capable of reading in the entire document without needing to split it up into smaller chunks. During this stage the agent or agents should automatically take the output, now formatted in the desired format (at first we will only support latex) and try to compile it. If it compiles correctly then it waits for more input from the user, if it doesn't then it should iteratively try and correct itself in a loop by informing the agent that produced the formatting of its error and to try again. Likewise there should be a seperate agent which checks that the output pdf has the full content of the original text to be formatted. If not it should instruct the original agent which generates the latex of what is missing and tell it to correct its mistake. Only once the format is able to compile correctly and is determined to have the full content only then should it be presented to the user for additional input and refinement. Once the user is happy with this final step it should save both the latex source, and the generated pdf to the filesystem for the user's final acceptance.
+
+        There should also be a command processor. This processor will look for any text provided by the user that begins with an exclamation point, for example "!next". When such a command is seen then it will be routed to an agent that processes the command and affects the flow of the system. The following commands need to be supported:
+        - !next - This command takes one optional argument which will be the name of one of the stages. When this command is issued it tells the system to proceed through all the stages and stop at the stage specified in the argument. If no argument is issued then it stops at the next stage in the order of stages. If it passes through multiple stages then at each stage whatever decision the LLM makes is just accepted without any user interaction, saving it to the context and moving on. When at the stage specified the user has the ability to interact with the llm to perfect the response before moving on.
+        - !accept - This command for most stages will act the same as the "!next" command without any arguments passed. However during the Core Content stage this command will be needed to tell the system that we accept some verbiage for a particular section and move on to the next section (rather than the next stage). As the user interacts with the llm it should try and detect phrases from the user that indicate they are happy with the content, even if they did not issue the "!accept" command and when that occurs the llm should give instructions to the user that if they are happy with the current content then they should issue the command. Otherwise interactions should be seen as critiques to refine the text further.
+        - !help - This just lists all the available commands, their arguments, and what they do and how to use them.
+        - !stage - This indicates the current stage the user is in, and describes, in detail, the purpose of that stage.
+        - !stages - This lists all the possible stages, including completed stages, and marks the current stage in the list so its clear what stage the user is in.
+        - !context - This should take one optional argument that is an integer or the word "all". If no integer is given it will just print out the current context, excluding the full history. It should just indicate how much history (the size) of it there is. If an argument is given that is an integer then it should also show the history back to that many hops. If the word "all" is used instead of an integer for this argument then all of the history should be displayed along with the context as well.
+
+        In general at each stage the user will be expected to interact with the agent or agents at that stage and refine the creative process offering feedback and tweaks to the proposed output at any step. The llm should constantly be saving the latest and best result from a stage in the context, overriding older results as its improved. This way when the user finally likes the result and moves on the information is already in the context so the next stage can use it to perform its tasks as needed.
+
+  # ============================================
+  # Discovery Stage Agents
+  # ============================================
+  discovery_controller:
+    type: tool
+    config:
+      tools:
+        - name: discovery_router
+          code: |
+            import sys
+            msg = input_data
+            details = context.get('paper_details', {})
+
+            print(f"DEBUG discovery_controller: input_data='{input_data}'", file=sys.stderr)
+            print(f"DEBUG discovery_controller: paper_details={details}", file=sys.stderr)
+
+            # Extract actual user message if it has GOTO_DISCOVERY prefix
+            if msg.startswith('GOTO_DISCOVERY:'):
+                msg = msg.replace('GOTO_DISCOVERY:', '', 1).strip()
+                print(f"DEBUG discovery_controller: extracted msg='{msg}'", file=sys.stderr)
+
+            # Process SET_ responses from ask agents
+            if 'SET_TOPIC:' in msg:
+                topic = msg.replace('SET_TOPIC:', '').strip()
+                context['paper_details']['topic'] = topic
+                result = f"DISCOVERY_RESPONSE:Thank you, topic has been set to \"{topic}\"\n\nCan you please specify the length, you would like to target for this paper."
+            elif 'SET_LENGTH:' in msg:
+                length = msg.replace('SET_LENGTH:', '').strip()
+                context['paper_details']['length'] = length
+                result = f"DISCOVERY_RESPONSE:Thank you, target word count has been set to {length}\n\nCan you please specify the target audience for this paper."
+            elif 'SET_AUDIENCE:' in msg:
+                audience = msg.replace('SET_AUDIENCE:', '').strip()
+                context['paper_details']['audience'] = audience
+                result = f"DISCOVERY_RESPONSE:Thank you, intended audience has been set to \"{audience}\"\n\nCan you please specify the target publication for this paper."
+            elif 'SET_PUBLICATION:' in msg:
+                publication = msg.replace('SET_PUBLICATION:', '').strip()
+                context['paper_details']['publication'] = publication
+                result = f"DISCOVERY_RESPONSE:Thank you, intended publication has been set to \"{publication}\"\n\nCan you please specify the target file format for this paper."
+            elif 'SET_FORMAT:' in msg:
+                format_val = msg.replace('SET_FORMAT:', '').strip()
+                context['paper_details']['format'] = format_val
+                result = f"DISCOVERY_RESPONSE:Thank you, intended file format has been set to \"{format_val}\"\n\nCan you please specify any other additional requirements you would like to be considered."
+            elif 'SET_OTHER:' in msg:
+                other = msg.replace('SET_OTHER:', '').strip()
+                context['paper_details']['other'] = other
+                context['writing_stage'] = 'brainstorming'
+                result = f"DISCOVERY_RESPONSE:Thank you, additional requirements has been set to \"{other}\"\n\nDiscovery complete! The next stage is brainstorming.\n\nPlease tell us in a bit more detail an idea or ideas you'd like to explore for the content, direction, tone, or any other aspect you'd like to incorporate into this paper and we will help you brainstorm a high level summary and plan of action."
+            else:
+                # Route to appropriate ask actor - pass along the user input
+                if details.get('topic') is None:
+                    result = f"ROUTE_ASK_TOPIC:{msg}"
+                elif details.get('length') is None:
+                    result = f"ROUTE_ASK_LENGTH:{msg}"
+                elif details.get('audience') is None:
+                    result = f"ROUTE_ASK_AUDIENCE:{msg}"
+                elif details.get('publication') is None:
+                    result = f"ROUTE_ASK_PUBLICATION:{msg}"
+                elif details.get('format') is None:
+                    normalized = msg.strip().lower()
+                    if normalized in ("latex", "la tex", "la-tex"):
+                        context['paper_details']['format'] = 'latex'
+                        result = (
+                            "DISCOVERY_RESPONSE:Thank you, intended file format has been set to \"latex\""
+                            "\n\nCan you please specify any other additional requirements you would like to be considered."
+                        )
+                    else:
+                        result = f"ROUTE_ASK_FORMAT:{msg}"
+                elif details.get('other') is None:
+                    normalized = msg.strip().lower()
+                    if normalized in ("", "none", "no", "n/a", "na", "no other requirements", "no other additional requirements", "none."):
+                        context['paper_details']['other'] = 'None'
+                        context['writing_stage'] = 'brainstorming'
+                        result = (
+                            "DISCOVERY_RESPONSE:Thank you, additional requirements has been set to \"None\""
+                            "\n\nDiscovery complete! The next stage is brainstorming."
+                            "\n\nPlease tell us in a bit more detail an idea or ideas you'd like to explore for the content, direction, tone, or any other aspect you'd like to incorporate into this paper and we will help you brainstorm a high level summary and plan of action."
+                        )
+                    else:
+                        result = f"ROUTE_ASK_OTHER:{msg}"
+                else:
+                    result = "DISCOVERY_RESPONSE:Discovery complete! All parameters set. Type !next to proceed to brainstorming."
+            
+            print(f"DEBUG discovery_controller: returning: {result}", file=sys.stderr)
+
+  ask_topic:
+    type: llm
+    config:
+      provider: openai
+      model: gpt-3.5-turbo
+      memory_enabled: true
+      max_history: 10
+      system_prompt: |
+        You are an assistant helping to define a scientific paper. Ask the user "What topic would you like to write about?"
+        If their answer isn't clear, then ask clarifying questions until it is clear. Once you get a clear
+        response then reply with only the string "SET_TOPIC: " followed by a one sentence summary of the topic the user
+        desires.
+
+  ask_length:
+    type: llm
+    config:
+      provider: openai
+      model: gpt-3.5-turbo
+      memory_enabled: true
+      max_history: 10
+      system_prompt: |
+        The topic has just been set. Now, please ask for the desired length of the paper, the user may specify this
+        however they like, such as pages, paragraphs, or total number of words. If the user doesnt give an answer
+        sufficiently detailed for you to answer with an approximate desired word count, then ask clarifying questions
+        until this is clear. Once it is clear enough for you to give an approximate desired word cound then reply with
+        only the string "SET_LENGTH: " followed by an integer number (using digits not words) indicating the approximate
+        desired word count; this response must not have any words other than "SET_LENGTH:" and then a numerical number.
+
+  ask_audience:
+    type: llm
+    config:
+      provider: openai
+      model: gpt-3.5-turbo
+      memory_enabled: true
+      max_history: 10
+      system_prompt: |
+        The length has just been set. Now, please ask who the target audience is (e.g., general public, experts). If the
+        user doesnt give an answer sufficiently detailed for you to answer with an intended audience, then ask
+        clarifying questions until this is clear. Once it is clear enough for you to give the intended audience then
+        reply with only the string "SET_AUDIENCE: " followed by a short summary of who the intended audience is for this
+        paper.
+
+  ask_publication:
+    type: llm
+    config:
+      provider: openai
+      model: gpt-3.5-turbo
+      memory_enabled: true
+      max_history: 10
+      system_prompt: |
+        The audience has just been set. Now, please ask if they plan to submit it to a specific publication. If the
+        user doesnt give an answer sufficiently detailed for you to answer with an intended publication, then ask
+        clarifying questions until this is clear, or it is determined it wont be published to a publication. Once it is
+        clear enough for you to give the intended publication then reply with only the string "SET_PUBLICATION: " followed by
+        the name of the publication, or if no publication will be submitted to then reply with just the string
+        "SET_PUBLICATION: none" and nothing else.
+
+  ask_format:
+    type: llm
+    config:
+      provider: openai
+      model: gpt-3.5-turbo
+      memory_enabled: true
+      max_history: 10
+      system_prompt: |
+        The intended publication has just been set. Now, ask what format the paper should be in.
+        Currently, only 'latex' is supported. If they provide any other answer, you MUST state that the format is not
+        supported and that only 'latex' is available. Only accept 'latex' as a valid answer.
+        - Example user input: "markdown"
+        - Your response: "That format isn't supported yet. The only supported formats are: latex."
+
+        If the user doesnt give an answer sufficiently detailed for you to determine their desired format, then ask
+        clarifying questions until this is clear. Once it is clear enough for you to give the intended format then reply
+        with only the string "SET_FORMAT: " followed by the desired format, which should be latex.
+
+  ask_other:
+    type: llm
+    config:
+      provider: openai
+      model: gpt-3.5-turbo
+      memory_enabled: true
+      max_history: 10
+      system_prompt: |
+        You just asked the user if there are any other requirements that should be
+        considered that we didnt cover. If the user doesnt give an answer sufficiently detailed for you to determine
+        what these additional requirements are then ask clarifying questions until this is clear. Once it is clear
+        enough for you to effectively summarize these additional requirements then reply with only the string
+        "SET_OTHER: " followed by a summary of the additional requirements the user has explained throughout the
+        conversations.
+
+  # ============================================
+  # Brainstorming Agent
+  # ============================================
+  brainstorming_actor:
+    type: llm
+    config:
+      provider: openai
+      model: gpt-4-turbo
+      memory_enabled: true
+      max_history: 20
+      system_prompt: |
+        You are a creative partner for brainstorming. If the user has not yet provided specific ideas, start by asking them to share their thoughts on the direction, tone, or specific aspects they'd like to incorporate into the paper. Engage in a conversation to refine the high-level idea and key
+        arguments. Be careful not to respond with anything that describes the actual sections of the document
+        explicitly. We will define the structure later. Focus only on summarizing, in paragraph and bullet list form,
+        the content and ideas to write about, and not the order or structure. Summarize the the current brainstormed
+        idea with each response in full, repeating the relevant content from previous responses when still relevant.
+
+        The paper must be written to meet the following requirements:
+          - The topic of the paper must be: {{ context.paper_details.topic | tojson }}
+          - The length of the paper must be no more than: {{ context.paper_details.length | tojson }} words
+          - The paper must be written for the following audience: {{ context.paper_details.audience | tojson }}
+          - The paper must be written with the intention of submitting it to the following publication: {{ context.paper_details.publication | tojson }}
+          - The paper must be written in the following file format: {{ context.paper_details.format | tojson }}
+          - The paper must meet the following additional requirements: {{ context.paper_details.other | tojson }}
+
+  brainstorming_saver:
+    type: tool
+    config:
+      tools:
+        - name: save_brainstorming
+          code: |
+            import sys
+            print(f"DEBUG brainstorming_saver: input_data='{input_data[:200] if input_data else 'NONE'}...'", file=sys.stderr)
+            # Save the brainstorming summary to context
+            context['brainstorming_summary'] = input_data
+            result = input_data
+
+  # ============================================
+  # Vetting Stage Agent
+  # ============================================
+  vetting_actor:
+    type: llm
+    config:
+      provider: openai
+      model: gpt-4-turbo
+      max_tokens: 4096
+      memory_enabled: true
+      max_history: 20
+      system_prompt: |
+        You are a research assistant helping compile sources for a scientific paper.
+
+        Paper topic: {{ context.paper_details.topic | tojson }}
+        Paper focus: {{ context.brainstorming_summary | tojson }}
+
+        IMPORTANT INSTRUCTIONS:
+        {% if context.auto_finish_active %}
+        1. Auto-finish mode is active. Do not ask the user any questions or wait for additional input. Immediately compile the strongest possible list of vetted sources using the brainstorming summary and paper requirements. Cover multiple angles that downstream stages will need (e.g., systems, policy, technology) and surface at least 6 high-quality citations.
+        2. Provide a concise narrative summary of the sources you selected before emitting the SOURCES_JSON block so later stages can continue without any follow-up.
+        {% else %}
+        1. First introduction: When you first interact with the user, introduce yourself and explain your role:
+           "Hello! I'm your research assistant for the vetting stage. My role is to help you compile high-quality sources for your paper on {{ context.paper_details.topic }}. I can search for academic papers, articles, and other scholarly sources based on your requirements. Please tell me what kind of sources you'd like me to find - you can specify the number of sources, the type (journal articles, conference papers, books, etc.), quality requirements, publication dates, or any other criteria. We'll work together to build and refine the list of citations until you're satisfied."
+        2. Interactive refinement: The user may want to add, remove, or modify sources. Engage in a back-and-forth discussion to refine the list. Keep track of all sources discussed and maintain an updated list.
+        {% endif %}
+
+        3. When searching: When the user asks you to find sources, you should use your knowledge to suggest realistic, high-quality academic sources that would be appropriate for the paper topic. Include:
+
+           - Full citation in appropriate academic format (APA, MLA, Chicago, etc. - ask the user if they have a preference)
+           - A brief summary of the source content (1-2 paragraphs)
+           - The actual URL/DOI to access the source (use real DOIs or URLs when possible, such as doi.org links, arxiv.org links, or actual journal websites)
+
+        4. CRITICAL - Saving sources: After each interaction where you provide or update sources, you MUST include the complete current list of sources in this EXACT format at the very end of your response:
+
+        SOURCES_JSON_START
+        [{"citation": "Author, A. A., & Author, B. B. (Year). Title of article. Journal Name, volume(issue), pages. https://doi.org/xx.xxxx/xxxxx", "summary": "Detailed summary of the source...", "link": "https://doi.org/10.1234/example"}]
+        SOURCES_JSON_END
+
+        The link should be a real DOI (https://doi.org/10.xxxx/xxxxx), arXiv link (https://arxiv.org/abs/xxxx.xxxxx), PubMed link (https://pubmed.ncbi.nlm.nih.gov/xxxxxxx/), or other legitimate academic source URL. Never use placeholder URLs like example.com.
+
+        5. When the user is satisfied: When the user indicates they are happy with the citations, remind them they can use !next or !accept to proceed to the next stage.
+
+  vetting_saver:
+    type: tool
+    config:
+      tools:
+        - name: save_vetting
+          code: |
+            import json
+            
+            # Extract sources from the special markers
+            sources = []
+            message = input_data
+            
+            if 'SOURCES_JSON_START' in message and 'SOURCES_JSON_END' in message:
+                start_marker = 'SOURCES_JSON_START'
+                end_marker = 'SOURCES_JSON_END'
+                
+                start_pos = message.find(start_marker)
+                end_pos = message.find(end_marker)
+                
+                if start_pos != -1 and end_pos != -1:
+                    json_start = start_pos + len(start_marker)
+                    json_content = message[json_start:end_pos].strip()
+                    
+                    try:
+                        sources = json.loads(json_content)
+                        if not isinstance(sources, list):
+                            sources = []
+                    except json.JSONDecodeError:
+                        sources = []
+            
+            # Update context
+            if sources:
+                context['vetting_sources'] = sources
+                clean_message = message[:message.find('SOURCES_JSON_START')] if 'SOURCES_JSON_START' in message else message
+                result = f"{clean_message.strip()}\n\n✅ Successfully extracted and saved {len(sources)} sources to context!"
+            else:
+                result = message
+
+  # ============================================
+  # Structure Agent
+  # ============================================
+  structure_actor:
+    type: llm
+    config:
+      provider: openai
+      model: gpt-4-turbo
+      memory_enabled: true
+      max_history: 20
+      system_prompt: |
+        You are an expert academic writer.
+        {% if context.auto_finish_active %}
+        Auto-finish mode is active. Without asking the user any questions, immediately generate a finalized, detailed table of contents that can be handed directly to the section-writing stage. Include every section and subsection needed to fulfill the requirements, and provide a 1-2 sentence description for each entry.
+        {% else %}
+        Start by offering to create a complete table of contents based on the requirements and research gathered, then create it. Based on the users input, requirements, summary and vetted
+        sources, create a complete, logical table of contents. For each section/subsection, write a 1-2 sentence
+        description of its purpose.
+
+        The user may then have feedback or additional directions, engage in a conversation and modify your proposed
+        table of contents accordingly. Each time you respond make sure you respond with a complete updated version of
+        the table of contents along with the descriptions of each sentence. Never give a partial answer that only
+        describes the additions or changes without providing the complete updated table of contents.
+        {% endif %}
+
+
+        The paper must be written to meet the following requirements:
+          - The topic of the paper must be: {{ context.paper_details.topic | tojson }}
+          - The length of the paper must be no more than: {{ context.paper_details.length | tojson }} words
+          - The paper must be written for the following audience: {{ context.paper_details.audience | tojson }}
+          - The paper must be written with the intention of submitting it to the following publication: {{ context.paper_details.publication | tojson }}
+          - The paper must be written in the following file format: {{ context.paper_details.format | tojson }}
+          - The paper must meet the following additional requirements: {{ context.paper_details.other | tojson }}
+
+        A high-level summary and intent for the content of the paper is the following:
+
+        {{ context.brainstorming_summary | tojson }}
+
+        The vetted sources we have so far are the following:
+
+        {% if context.vetting_sources and context.vetting_sources|length > 0 %}
+        {% for source in context.vetting_sources %}
+        {% if source is mapping %}
+        - Citation: {{ source.get('citation', 'No citation') }}
+        - Summary: {{ source.get('summary', 'No summary')[:300] }}{% if source.get('summary', '')|length > 300 %}...{% endif %}
+        {% if source.get('link') %}
+        - Link: {{ source.link }}
+        {% endif %}
+
+        {% endif %}
+        {% endfor %}
+        {% else %}
+        No vetted sources available yet.
+        {% endif %}
+
+  structure_saver:
+    type: tool
+    config:
+      tools:
+        - name: save_structure
+          code: |
+            # Save the table of contents to context
+            context['table_of_contents'] = input_data
+            result = input_data
+
+
+  # ============================================
+  # SECTION WRITING STAGE
+  # ============================================
+
+  toc_parser:
+    type: llm
+    config:
+      provider: google
+      model: gemini-2.0-flash
+      memory_enabled: false
+      response_format:
+        type: json_schema
+        json_schema:
+          name: table_of_contents
+          strict: true
+          schema:
+            type: object
+            properties:
+              sections:
+                type: array
+                items:
+                  type: object
+                  properties:
+                    title:
+                      type: string
+                      description: The section title without numbering
+                    subsections:
+                      type: array
+                      description: Subsections within this section (if any)
+                      items:
+                        type: object
+                        properties:
+                          title:
+                            type: string
+                            description: The subsection title without numbering
+                          subsections:
+                            type: array
+                            description: Sub-subsections (if any)
+                            items:
+                              type: object
+                              properties:
+                                title:
+                                  type: string
+                                  description: The sub-subsection title without numbering
+                              required:
+                                - title
+                              additionalProperties: false
+                        required:
+                          - title
+                        additionalProperties: false
+                  required:
+                    - title
+                  additionalProperties: false
+            required:
+              - sections
+            additionalProperties: false
+      system_prompt: |
+        You are parsing a table of contents into a structured JSON format.
+
+        Given a table of contents (which may be in various formats - numbered, bulleted, markdown, etc.),
+        extract the section titles and their hierarchy and return them as a nested JSON structure.
+
+        Rules:
+        - Extract section titles WITHOUT numbering (remove "1.", "1.1.", etc.)
+        - Skip the table of contents header itself
+        - Skip empty lines or decorative elements
+        - Preserve the ORDER of sections
+        - PRESERVE THE HIERARCHY: main sections should have their subsections nested inside them
+        - Do NOT include descriptions, just titles
+        - Each section can have optional "subsections" array for nested items
+
+        Example input:
+        1. Introduction
+        2. Methods
+           2.1 Data Collection
+           2.2 Analysis
+        3. Results
+
+        Example output:
+        {"sections": [
+          {"title": "Introduction"},
+          {"title": "Methods", "subsections": [
+            {"title": "Data Collection"},
+            {"title": "Analysis"}
+          ]},
+          {"title": "Results"}
+        ]}
+
+        Table of Contents to parse:
+        {{ context.table_of_contents }}
+
+  section_writing_controller:
+    type: tool
+    config:
+      tools:
+        - name: section_controller
+          code: |
+            import sys
+            import json
+            print(f"DEBUG section_writing_controller", file=sys.stderr)
+
+            # Check if we need to parse the TOC first
+            section_paths = context.get('section_paths')
+            fallback_sections = ['Introduction', 'Methods', 'Results', 'Discussion']
+            
+            # Re-parse if section_paths is empty, None, or still the generic fallback
+            needs_parse = (
+                not section_paths or
+                section_paths == fallback_sections
+            )
+            
+            if needs_parse:
+                toc_text = context.get('table_of_contents', '')
+                if not toc_text:
+                    result = "ERROR: No table of contents found. Please complete structure stage first."
+                else:
+                    # Route to TOC parser to get structured JSON
+                    result = "ROUTE_PARSE_TOC:Please parse the current table of contents into JSON."
+            else:
+                # We have parsed sections, proceed with section writing
+                section_paths = context.get('section_paths', [])
+                current_index = context.get('current_section_index', 0)
+
+                if not section_paths:
+                    result = "ERROR: No section paths available after parsing."
+                elif current_index >= len(section_paths):
+                    # All sections complete
+                    context['writing_stage'] = 'paper_review'
+                    result = "AUTO_SECTIONS_COMPLETE:All sections written! Moving to paper review stage."
+                else:
+                    current_path = section_paths[current_index]
+                    if not current_path:
+                        result = f"ERROR: Empty section path at index {current_index}."
+                    else:
+                        context['current_section_path'] = current_path
+                        result = f"ROUTE_SELECT_SOURCES:{current_path}"
+
+  toc_parser_saver:
+    type: tool
+    config:
+      tools:
+        - name: save_parsed_toc
+          code: |
+             import sys
+             import json
+             print("DEBUG toc_parser_saver", file=sys.stderr)
+
+             def flatten_sections(sections):
+                 """Flatten nested sections into a list with full paths using iteration."""
+                 flat_list = []
+                 stack = [(sections, "", 0)]
+
+                 while stack:
+                     current_sections, parent_path, idx = stack.pop()
+                     while idx < len(current_sections):
+                         section = current_sections[idx]
+                         title = section.get("title", "")
+                         if title:
+                             current_path = f"{parent_path} > {title}" if parent_path else title
+                             flat_list.append(current_path)
+                             subsections = section.get("subsections", [])
+                             if subsections:
+                                 stack.append((current_sections, parent_path, idx + 1))
+                                 stack.append((subsections, current_path, 0))
+                                 break
+                         idx += 1
+
+                 return flat_list
+
+             try:
+                 json_text = input_data.strip()
+                 if json_text.startswith("```"):
+                     lines = json_text.split("\n")
+                     if lines and lines[0].startswith("```"):
+                         lines = lines[1:]
+                     if lines and lines[-1].strip() == "```":
+                         lines = lines[:-1]
+                     json_text = "\n".join(lines)
+
+                 toc_data = json.loads(json_text)
+
+                 if isinstance(toc_data, list):
+                     sections = toc_data
+                 elif isinstance(toc_data, dict):
+                     sections = toc_data.get("sections", [])
+                 else:
+                     sections = []
+
+                 section_paths = flatten_sections(sections)
+                 context["section_paths"] = section_paths
+                 context["current_section_index"] = 0
+
+                 try:
+                     from cleveragents.core.progress import ProgressBarManager
+
+                     ProgressBarManager.update(
+                         stage=context.get("writing_stage", "section_writing") or "section_writing",
+                         current=0,
+                         total=len(section_paths) if section_paths else 1,
+                         message="Preparing sections",
+                         context=context,
+                     )
+                 except Exception:
+                     pass
+
+                 if section_paths:
+                     first_section = section_paths[0]
+                     context["current_section_path"] = first_section
+                     result = f"ROUTE_SELECT_SOURCES:{first_section}"
+                 else:
+                     result = "ERROR: No sections found in table of contents"
+
+             except Exception:
+                 context["section_paths"] = ["Introduction", "Methods", "Results", "Discussion"]
+                 context["current_section_index"] = 0
+                 first_section = context["section_paths"][0]
+                 context["current_section_path"] = first_section
+                 result = f"ROUTE_SELECT_SOURCES:{first_section}"
+
+
+
+  source_selector:
+    type: llm
+    config:
+      provider: openai
+      model: gpt-4-turbo
+      memory_enabled: true
+      max_history: 10
+      system_prompt: |
+        You are helping select relevant sources for writing ONE SPECIFIC section of the paper.
+
+        CURRENT SECTION TO WRITE: "{{ context.current_section_path }}"
+        
+        Section progress: {{ context.current_section_index + 1 }} of {{ context.section_paths|length if context.section_paths else 'unknown' }}
+        
+        {% if ' > ' in context.current_section_path %}
+        NOTE: This is a SUBSECTION - you will be writing detailed content for this specific topic.
+        {% else %}
+        NOTE: This is a TOP-LEVEL SECTION - you will be writing a brief introduction that sets up its subsections.
+        {% endif %}
+
+        Available vetted sources:
+        {% if context.vetting_sources and context.vetting_sources|length > 0 %}
+        {% for source in context.vetting_sources %}
+        {{ loop.index }}. Citation: {{ source.citation if source.citation else 'No citation provided' }}
+           Summary: {{ source.summary if source.summary else 'No summary available' }}
+           Link: {{ source.link if source.link else 'No link available' }}
+        {% endfor %}
+        {% else %}
+        No vetted sources have been captured yet. Let the user know and suggest running !next after the vetting stage completes.
+        {% endif %}
+ 
+        YOUR TASK:
+        When you receive ANY message (including just a section name, "suggest something", or any other input):
+        1. First, announce which section we're working on: "Now working on section: [section name]"
+        2. List the available sources with their numbers and brief descriptions
+        3. Recommend which sources are most relevant for THIS specific section and explain why
+        4. Ask the user if they want to use these sources, find additional ones, or have questions
+        
+        You MUST always show the actual source citations and your recommendations - never skip this step!
+        
+        If the user asks for changes to source selection or has questions, help them.
+        
+        IMPORTANT: When the user is satisfied with the source selection, tell them to type !write to proceed to writing.
+        
+        Example ending: "These sources should work well for this section. When you're ready, type !write to proceed to writing."
+
+
+  source_finder:
+    type: llm
+    config:
+      provider: openai
+      model: gpt-4-turbo
+      max_tokens: 4096
+      memory_enabled: true
+      max_history: 15
+      system_prompt: |
+        You are a research specialist finding additional sources for a specific section of a scientific paper.
+
+        Paper topic: {{ context.paper_details.topic }}
+        Current section: {{ context.current_section_path }}
+        Paper focus: {{ context.brainstorming_summary }}
+
+        Existing vetted sources:
+        {% if context.vetting_sources and context.vetting_sources|length > 0 %}
+        {% for source in context.vetting_sources %}
+        {{ loop.index }}. {{ source.citation if source.citation else 'No citation' }}
+        {% endfor %}
+        {% else %}
+        No sources have been collected yet.
+        {% endif %}
+
+        IMPORTANT INSTRUCTIONS:
+        1. Your role: You are an expert research assistant who finds HIGH-QUALITY, REAL academic sources. You have extensive knowledge of scientific literature and can suggest real papers, articles, and studies.
+
+        2. When searching for sources: Use your knowledge to suggest realistic, high-quality academic sources that would be appropriate for this specific section. Include:
+           - Full citation in APA format
+           - A brief summary of the source content (2-3 sentences)
+           - The actual URL/DOI to access the source (use real DOIs like https://doi.org/10.xxxx/xxxxx, arXiv links like https://arxiv.org/abs/xxxx.xxxxx, or PubMed links like https://pubmed.ncbi.nlm.nih.gov/xxxxxxx/)
+
+        3. Focus on section relevance: Find sources specifically relevant to "{{ context.current_section_path }}" - not just general sources about the topic.
+
+        4. CRITICAL - Saving sources: After providing sources, you MUST include ALL sources (existing + new) in this EXACT format at the very end of your response:
+
+        SOURCES_JSON_START
+        [{"citation": "Author, A. A., & Author, B. B. (Year). Title of article. Journal Name, volume(issue), pages. https://doi.org/xx.xxxx/xxxxx", "summary": "Brief summary of the source...", "link": "https://doi.org/10.1234/example"}]
+        SOURCES_JSON_END
+
+        Include BOTH the existing sources AND any new sources you find in this JSON block. This ensures all sources are preserved.
+
+        5. Interactive refinement: The user may want more sources, different types, or sources from specific time periods. Engage in discussion to find exactly what they need.
+
+        6. When the user is satisfied: When they confirm they have enough sources, output: FIND_COMPLETE
+
+  source_finder_saver:
+    type: tool
+    config:
+      tools:
+        - name: save_found_sources
+          code: |
+            import json
+            
+            # Extract sources from the special markers
+            sources = []
+            message = input_data
+            
+            if 'SOURCES_JSON_START' in message and 'SOURCES_JSON_END' in message:
+                start_marker = 'SOURCES_JSON_START'
+                end_marker = 'SOURCES_JSON_END'
+                
+                start_pos = message.find(start_marker)
+                end_pos = message.find(end_marker)
+                
+                if start_pos != -1 and end_pos != -1:
+                    json_start = start_pos + len(start_marker)
+                    json_content = message[json_start:end_pos].strip()
+                    
+                    try:
+                        sources = json.loads(json_content)
+                        if not isinstance(sources, list):
+                            sources = []
+                    except json.JSONDecodeError:
+                        sources = []
+            
+            # Update context with new sources (replaces existing since source_finder includes all)
+            if sources:
+                context['vetting_sources'] = sources
+                clean_message = message[:message.find('SOURCES_JSON_START')] if 'SOURCES_JSON_START' in message else message
+                result = f"{clean_message.strip()}\n\n✅ Successfully saved {len(sources)} sources to context!"
+            else:
+                result = message
+
+  section_writer:
+    type: llm
+    config:
+      provider: openai
+      model: gpt-4-turbo
+      memory_enabled: true
+      max_history: 20
+      system_prompt: |
+        You are writing EXACTLY ONE section: "{{ context.current_section_path }}"
+ 
+        Paper topic: {{ context.paper_details.topic }}
+        Paper focus: {{ context.brainstorming_summary }}
+        Target length: {{ context.paper_details.length }} words total
+        Target audience: {{ context.paper_details.audience }}
+ 
+        Complete section structure (for reference only - write ONLY the current section):
+        {% if context.section_paths %}
+        {% for path in context.section_paths %}
+        {{ ">>> " if path == context.current_section_path else "    " }}{{ path }}
+        {% endfor %}
+        {% endif %}
+ 
+        Available sources:
+        {% if context.vetting_sources %}
+        {% for source in context.vetting_sources %}
+        - {{ source.citation if source.citation else 'No citation' }}
+        {% endfor %}
+        {% endif %}
+
+        CRITICAL INSTRUCTIONS:
+        1. Write ONLY the content for "{{ context.current_section_path }}" - nothing else.
+        
+        2. Section type guidance:
+           {% if ' > ' in context.current_section_path %}
+           - This is a SUBSECTION ({{ context.current_section_path }})
+           - Write the full detailed content for this specific subsection only
+           - This should be several paragraphs of substantive content
+           {% else %}
+           - This is a TOP-LEVEL SECTION ({{ context.current_section_path }})
+           - Write a brief introductory paragraph (2-4 sentences) that introduces what this section will cover
+           - Do NOT write the subsection content here - those will be written separately
+           - Just provide a roadmap/overview of what the subsections will address
+           {% endif %}
+        
+        3. Do NOT include:
+           - Content from other sections
+           - Subsection headers or subsection content (those are separate sections)
+           - A full treatment of the topic if this is a parent section
+        
+        4. Use academic tone and cite sources appropriately.
+
+        YOUR TASK:
+        - Write the section content for "{{ context.current_section_path }}"
+        - Include proper academic citations from the available sources (e.g., Author et al., Year)
+        - Work with the user to refine the content based on their feedback
+        - If the user asks for changes, make them and present the revised content
+        
+        RESPONSE FORMAT (MANDATORY):
+        SECTION_CONTENT:
+        <final section text>
+        
+        NEXT_ACTION:
+        Type !proofread when you are satisfied with this section.
+        
+        Do NOT include any other commentary, explanations, or conversational text. The SECTION_CONTENT block must contain only the section prose that will be stored in the paper.
+
+  section_writer_saver:
+    type: tool
+    config:
+      tools:
+        - name: save_section
+          code: |
+            path = context.get('current_section_path', 'unknown')
+            # Only save actual content, not routing commands
+            if input_data and not input_data.startswith('GOTO_'):
+              text = input_data.strip()
+              section_text = text
+              marker = 'SECTION_CONTENT:'
+              if marker in text:
+                remainder = text.split(marker, 1)[1]
+                next_marker = 'NEXT_ACTION:'
+                if next_marker in remainder:
+                  section_text = remainder.split(next_marker, 1)[0].strip()
+                else:
+                  section_text = remainder.strip()
+              if section_text:
+                context.setdefault('section_content', {})[path] = section_text
+                context.setdefault('section_drafts', {})[path] = section_text
+                context['last_written_section_content'] = section_text
+            result = input_data
+
+  section_accept_handler:
+    type: tool
+    config:
+      tools:
+        - name: accept_section
+          code: |
+            current_index = context.get('current_section_index', 0)
+            section_paths = context.get('section_paths') or []
+            completed_section = (
+                section_paths[current_index] if current_index < len(section_paths) else 'Unknown'
+            )
+
+            # Advance to the next section and update the current path so auto-finish progresses
+            context['current_section_index'] = current_index + 1
+            new_index = current_index + 1
+
+            # Progress update after completing a section
+            try:
+                from cleveragents.core.progress import ProgressBarManager
+
+                ProgressBarManager.update(
+                    stage=context.get('writing_stage', 'section_writing') or 'section_writing',
+                    current=new_index,
+                    total=len(section_paths) if section_paths else 1,
+                    message=f"Completed {new_index}/{len(section_paths)} sections",
+                    context=context,
+                )
+            except Exception:
+                pass
+
+            if new_index >= len(section_paths):
+                # All sections complete; clear current section path
+                context['current_section_path'] = None
+                result = f"AUTO_SECTIONS_COMPLETE:All {len(section_paths)} sections written"
+            else:
+                next_section = section_paths[new_index]
+                context['current_section_path'] = next_section
+                # Include unique info in message to avoid loop detection
+                result = f"ROUTE_NEXT_SECTION:{next_section}|completed={completed_section}|idx={new_index}"
+
+
+
+  # ============================================
+  # SECTION PROOFREADING
+  # ============================================
+
+  section_proofreader:
+    type: llm
+    config:
+      provider: openai
+      model: gpt-4-turbo
+      memory_enabled: true
+      max_history: 15
+      system_prompt: |
+        You are a meticulous academic proofreader reviewing a SINGLE section of a scientific paper.
+
+        CURRENT SECTION: "{{ context.current_section_path }}"
+
+        Paper topic: {{ context.paper_details.topic }}
+        Target audience: {{ context.paper_details.audience }}
+
+        Section content to proofread:
+        {{ context.section_content.get(context.current_section_path, 'No content available') }}
+
+        Complete table of contents (for context about where this section fits):
+        {% if context.section_paths %}
+        {% for path in context.section_paths %}
+        {{ ">>> " if path == context.current_section_path else "    " }}{{ path }}
+        {% endfor %}
+        {% endif %}
+
+        YOUR PROOFREADING TASKS:
+        1. Check for grammatical errors, typos, and spelling mistakes
+        2. Ensure the writing uses active voice where appropriate
+        3. Verify academic tone and style consistency
+        4. Check that citations are properly formatted and used
+        5. Look for logical inconsistencies or unclear arguments
+        6. Ensure smooth transitions and flow
+        7. Verify the content matches what the section should cover (based on the TOC)
+ 
+        YOUR TASK:
+        - Present your detailed proofreading feedback on the section content shown above
+        - List any issues found or confirm the section is well-written
+        - If the user asks you to make changes, make them and present the corrected version
+        - When you provide a fully revised section, respond with **only** `UPDATED_SECTION_CONTENT:` followed by the final section text. This allows the system to store the new content verbatim.
+        - Work with the user until they are satisfied with the section
+ 
+        IMPORTANT: When the user is satisfied with the proofread section, tell them to type !accept to accept the section and move to the next one.
+ 
+        Example ending: "The section looks good overall. Type !accept when you're ready to move to the next section."
+
+
+  section_proofreader_saver:
+    type: tool
+    config:
+      tools:
+        - name: save_proofread_section
+          code: |
+            # Save proofreading feedback separately so original section content remains intact
+            path = context.get('current_section_path', 'unknown')
+            if input_data and not input_data.startswith('GOTO_'):
+              text = input_data.strip()
+              updated_prefix = 'UPDATED_SECTION_CONTENT:'
+              if text.startswith(updated_prefix):
+                new_content = text[len(updated_prefix):].lstrip()
+                context.setdefault('section_content', {})[path] = new_content
+                context.setdefault('section_drafts', {})[path] = new_content
+                context.setdefault('section_feedback', {})[path] = text
+                context['last_written_section_content'] = new_content
+              else:
+                context.setdefault('section_feedback', {})[path] = input_data
+            result = input_data
+
+  # ============================================
+  # PAPER REVIEW STAGE
+  # ============================================
+
+  paper_review_controller:
+    type: tool
+    config:
+      tools:
+        - name: review_controller
+          code: |
+            import sys
+            print(f"DEBUG paper_review_controller", file=sys.stderr)
+
+            section_content = context.get('section_content', {})
+            section_paths = context.get('section_paths', [])
+            
+            # Debug: show what sections we have
+            print(f"DEBUG section_content has {len(section_content)} sections", file=sys.stderr)
+            print(f"DEBUG section_paths has {len(section_paths)} paths", file=sys.stderr)
+            for p in section_paths[:5]:
+                has_content = p in section_content
+                print(f"DEBUG   path={p[:50]} has_content={has_content}", file=sys.stderr)
+            
+            if not section_content:
+                result = "ERROR: No sections found. Please complete section writing stage first."
+            else:
+                # Build full paper text
+                paper_topic = context.get('paper_details', {}).get('topic', 'Scientific Paper')
+                full_text = f"# {paper_topic}\n\n"
+
+                for path in section_paths:
+                    text = section_content.get(path)
+                    if isinstance(text, str) and text.strip():
+                        full_text += f"## {path}\n\n{text.strip()}\n\n"
+
+                assembled = full_text.strip()
+                context['assembled_paper'] = assembled
+
+                auto_active = context.get('auto_finish_active', False)
+                already_printed_auto = context.get('paper_review_printed_auto', False)
+                preview_output = (
+                    f"# Full Paper\n\n{assembled}" if assembled else "# Full Paper\n\n(No content available.)"
+                )
+
+                # Print the assembled paper once; avoid duplicates in auto-finish
+                if not (auto_active and already_printed_auto):
+                    print(preview_output, flush=True)
+                    if auto_active:
+                        context['paper_review_printed_auto'] = True
+
+                if auto_active:
+                    result = (
+                        "AUTO_PAPER_REVIEW_COMPLETE:Auto-finish mode printed the full paper; "
+                        "skipping LLM review and proceeding to LaTeX generation."
+                    )
+                else:
+                    instruction = (
+                        "Please review the assembled paper stored in context['assembled_paper'] "
+                        "for coherence, grammar, citations, and overall flow."
+                    )
+                    result = f"ROUTE_REVIEW_PAPER:{instruction}"
+
+  paper_review_actor:
+    type: llm
+    config:
+      provider: openai
+      model: gpt-4-turbo
+      max_tokens: 4096
+      memory_enabled: true
+      max_history: 20
+      system_prompt: |
+        You are reviewing the complete assembled paper.
+
+        Here is the full paper content:
+
+        {{ context.get('assembled_paper', '') }}
+
+        The system already displayed the full paper verbatim before your turn.
+        DO NOT repeat or summarize the paper content. Focus solely on analysis.
+        Structure your response under a single top-level heading "Review Feedback" with clear bullets or subheadings.
+
+        When providing feedback, review the paper for:
+
+        - Consistency and logical flow between sections
+        - Grammar, spelling, and style
+        - Proper citation format and usage
+        - Logical coherence and argument strength
+        - Transitions between sections
+
+        Provide specific, actionable feedback tied to the relevant sections. The user can:
+        - Discuss refinements to specific sections
+        - Make changes across the document
+        - Use !accept or !next when satisfied to proceed to LaTeX generation
+
+  paper_review_saver:
+    type: tool
+    config:
+      tools:
+        - name: save_review
+          code: |
+            context['reviewed_paper'] = input_data
+            result = input_data
+
+
+  # ============================================
+  # LATEX GENERATION STAGE
+  # ============================================
+
+  latex_controller:
+    type: tool
+    config:
+      tools:
+        - name: latex_ctrl
+          code: |
+            import sys
+            print(f"DEBUG latex_controller", file=sys.stderr)
+
+            # Multi-step workflow
+            if not context.get('latex_structure'):
+                result = "ROUTE_GEN_STRUCTURE:"
+            elif not context.get('latex_sections_complete'):
+                # Convert sections one by one
+                section_paths = context.get('section_paths', [])
+                latex_sections = context.get('latex_sections', {})
+                current_latex_index = context.get('current_latex_index', 0)
+
+                if current_latex_index < len(section_paths):
+                    section_path = section_paths[current_latex_index]
+                    context['current_latex_section'] = section_path
+                    result = f"ROUTE_CONVERT_SECTION:{section_path}"
+                else:
+                    context['latex_sections_complete'] = True
+                    result = "ROUTE_ASSEMBLE_LATEX:"
+            elif not context.get('latex_source'):
+                result = "ROUTE_ASSEMBLE_LATEX:"
+            else:
+                # Skip compilation for now (sandbox doesn't support file operations)
+                # Just mark as complete
+                context['latex_compiled'] = True
+                result = f"LaTeX generation complete. Source saved ({len(context.get('latex_source', ''))} characters)."
+
+
+  latex_structure_gen:
+    type: llm
+    config:
+      provider: openai
+      model: gpt-4-turbo
+      memory_enabled: false
+      system_prompt: |
+        You are helping generate a LaTeX document structure for a scientific paper.
+
+        Paper topic: {{ context.paper_details.topic }}
+        Target audience: {{ context.paper_details.audience }}
+
+        Table of Contents:
+        {{ context.table_of_contents }}
+
+        Generate a complete LaTeX preamble with appropriate document class, packages, and metadata.
+        Include packages for: amsmath, graphicx, hyperref, cite, geometry
+        Set reasonable margins (1 inch).
+        Include title, author, and date fields.
+
+        Output ONLY the LaTeX preamble (from \documentclass to \begin{document}, not including sections).
+        After providing the structure, the system will automatically save it.
+
+  latex_structure_saver:
+    type: tool
+    config:
+      tools:
+        - name: save_latex_structure
+          code: |
+            # Save the LaTeX structure/preamble to context
+            context['latex_structure'] = input_data
+            # Return routing command to continue to latex_controller for next step
+            result = "ROUTE_LATEX_CONTINUE:LaTeX structure saved. Proceeding to convert sections..."
+
+  latex_section_converter:
+    type: llm
+    config:
+      provider: openai
+      model: gpt-4-turbo
+      memory_enabled: false
+      system_prompt: |
+        You are converting a section of the paper to LaTeX format.
+
+        Current section: {{ context.current_latex_section }}
+
+        Section content (markdown/plain text):
+        {{ context.section_content.get(context.current_latex_section, '') }}
+
+        Convert this section to LaTeX format:
+        - Use \section{} for the section title
+        - Escape special characters: & % $ # _ { } ~ ^
+        - Convert markdown formatting to LaTeX equivalents
+        - Keep citations in proper format [citation]
+        - Use proper LaTeX commands for emphasis, bold, etc.
+
+        Output ONLY the LaTeX code for this section (no preamble, no \begin{document}).
+        After providing the conversion, the system will automatically save it.
+
+  latex_section_saver:
+    type: tool
+    config:
+      tools:
+        - name: save_latex_section
+          code: |
+            import sys
+            print(f"DEBUG latex_section_saver", file=sys.stderr)
+
+            # Save the converted LaTeX section
+            current_section = context.get('current_latex_section', '')
+            if not context.get('latex_sections'):
+                context['latex_sections'] = {}
+
+            context['latex_sections'][current_section] = input_data
+
+            # Increment index to move to next section
+            current_index = context.get('current_latex_index', 0)
+            context['current_latex_index'] = current_index + 1
+
+            # Return routing command to continue to latex_controller for next step
+            latex_preview = input_data.strip() if isinstance(input_data, str) else str(input_data)
+            result = (
+                f"ROUTE_LATEX_CONTINUE:Saved LaTeX for section: {current_section}\n\n"
+                f"{latex_preview}"
+            )
+
+  latex_assembler:
+    type: llm
+    config:
+      provider: openai
+      model: gpt-3.5-turbo
+      memory_enabled: false
+      system_prompt: |
+        You are assembling the complete LaTeX document from its parts.
+
+        LaTeX preamble:
+        {{ context.latex_structure }}
+
+        Sections:
+        {% for path in context.section_paths %}
+        {{ context.latex_sections.get(path, '') }}
+        {% endfor %}
+
+        Combine these into a complete LaTeX document:
+        1. Start with the preamble
+        2. Add \begin{document}
+        3. Add \maketitle
+        4. Add all sections in order
+        5. End with \end{document}
+
+        Output the COMPLETE LaTeX source code ready for compilation.
+        After providing the document, the system will automatically save and compile it.
+
+  latex_assembler_saver:
+    type: tool
+    config:
+      tools:
+        - name: save_complete_latex
+          code: |
+            # Save the complete LaTeX source
+            context['latex_source'] = input_data
+            result = f"Complete LaTeX document assembled ({len(input_data)} characters). Ready to compile."
+
+  latex_compiler:
+    type: tool
+    config:
+      tools:
+        - name: compile_latex
+          code: |
+            import sys
+            import subprocess
+            import tempfile
+            import os
+            import shutil
+            print(f"DEBUG latex_compiler", file=sys.stderr)
+
+            latex_source = context.get('latex_source', '')
+            if not latex_source:
+                result = "ERROR: No LaTeX source to compile"
+            else:
+                # Create temp directory for compilation
+                temp_dir = tempfile.mkdtemp()
+                tex_file = os.path.join(temp_dir, 'paper.tex')
+
+                try:
+                    # Write LaTeX source
+                    with open(tex_file, 'w') as f:
+                        f.write(latex_source)
+
+                    # Compile with pdflatex
+                    proc = subprocess.run(
+                        ['pdflatex', '-interaction=nonstopmode', 'paper.tex'],
+                        cwd=temp_dir,
+                        capture_output=True,
+                        text=True,
+                        timeout=60
+                    )
+
+                    pdf_file = os.path.join(temp_dir, 'paper.pdf')
+
+                    if os.path.exists(pdf_file):
+                        # Success! Move PDF to permanent location
+                        output_dir = '/tmp/papers'
+                        os.makedirs(output_dir, exist_ok=True)
+                        final_pdf = os.path.join(output_dir, 'paper.pdf')
+                        shutil.copy(pdf_file, final_pdf)
+
+                        context['latex_compiled'] = True
+                        context['pdf_path'] = final_pdf
+                        file_size = os.path.getsize(final_pdf)
+                        result = f"LaTeX compiled successfully! PDF saved to: {final_pdf} ({file_size} bytes)"
+                    else:
+                        # Compilation failed - extract errors
+                        errors = proc.stdout
+                        context['latex_errors'] = errors
+                        context['latex_compiled'] = False
+
+                        # Check if we should try to fix
+                        fix_attempts = context.get('latex_fix_attempts', 0)
+                        if fix_attempts < 3:
+                            result = f"ROUTE_FIX_LATEX:LaTeX compilation failed (attempt {fix_attempts + 1}/3). Errors:\n{errors[-1000:]}"
+                        else:
+                            result = f"LaTeX compilation failed after 3 attempts. Final errors:\n{errors[-1000:]}"
+
+                finally:
+                    # Cleanup temp directory
+                    shutil.rmtree(temp_dir, ignore_errors=True)
+
+  latex_fixer:
+    type: llm
+    config:
+      provider: openai
+      model: gpt-4-turbo
+      memory_enabled: false
+      system_prompt: |
+        You are fixing LaTeX compilation errors.
+
+        Current LaTeX source:
+        {{ context.latex_source }}
+
+        Compilation errors:
+        {{ context.latex_errors[-2000:] if context.latex_errors else 'No errors available' }}
+
+        Fix the LaTeX errors. Common issues:
+        - Unescaped special characters: & % $ # _ { } ~ ^
+        - Missing packages (add to preamble)
+        - Unclosed environments
+        - Invalid commands
+        - Missing braces
+
+        Output the COMPLETE corrected LaTeX source code.
+        The system will automatically save and retry compilation.
+
+  latex_fixer_saver:
+    type: tool
+    config:
+      tools:
+        - name: save_fixed_latex
+          code: |
+            # Save the fixed LaTeX source
+            context['latex_source'] = input_data
+
+            # Increment fix attempts
+            fix_attempts = context.get('latex_fix_attempts', 0)
+            context['latex_fix_attempts'] = fix_attempts + 1
+
+            # Reset compiled flag so it will try again
+            context['latex_compiled'] = False
+
+            # Route back to compiler to retry
+            result = f"ROUTE_COMPILE_LATEX:LaTeX fixes applied (attempt {fix_attempts + 1}). Retrying compilation..."
+
+# Routes - Pure LangGraph using message_router for routing
+routes:
+  main:
+    type: graph
+    entry_point: start
+
+    nodes:
+      start:
+        type: START
+
+      end:
+        type: END
+
+      # Main message router with user-defined routing patterns
+      router:
+        type: message_router
+        rules:
+          # Command handler routing
+          - match_type: prefix
+            pattern: "GOTO_COMMAND_HANDLER"
+            target: command_handler
+            extract_message: true
+            separator: ":"
+
+          - match_type: prefix
+            pattern: "GOTO_AUTO_FINISH"
+            target: auto_finish_driver
+            extract_message: true
+            separator: ":"
+ 
+          # Command output (non-routing command results) go directly to end
+
+          - match_type: prefix
+            pattern: "COMMAND_OUTPUT"
+            target: end
+            extract_message: true
+            separator: ":"
+
+          # Main workflow routing patterns
+          - match_type: prefix
+            pattern: "GOTO_INTRO"
+            target: intro
+            extract_message: true
+            separator: ":"
+
+          - match_type: prefix
+            pattern: "GOTO_DISCOVERY"
+            target: discovery
+            extract_message: true
+            separator: ":"
+
+          - match_type: prefix
+            pattern: "GOTO_BRAINSTORMING"
+            target: brainstorming
+            extract_message: true
+            separator: ":"
+
+          - match_type: prefix
+            pattern: "GOTO_VETTING"
+            target: vetting
+            extract_message: true
+            separator: ":"
+
+          - match_type: prefix
+            pattern: "GOTO_STRUCTURE"
+            target: structure
+            extract_message: true
+            separator: ":"
+
+          - match_type: prefix
+            pattern: "GOTO_SECTION_WRITING"
+            target: section_writing
+            extract_message: true
+            separator: ":"
+
+          - match_type: prefix
+            pattern: "GOTO_SOURCE_SELECTOR"
+            target: source_selector
+            extract_message: true
+            separator: ":"
+
+          - match_type: prefix
+            pattern: "GOTO_SOURCE_FINDER"
+            target: source_finder
+            extract_message: true
+            separator: ":"
+
+          - match_type: prefix
+            pattern: "GOTO_SECTION_WRITER"
+            target: section_writer
+            extract_message: true
+            separator: ":"
+
+          - match_type: prefix
+            pattern: "GOTO_SECTION_PROOFREADER"
+            target: section_proofreader
+            extract_message: true
+            separator: ":"
+
+          - match_type: prefix
+            pattern: "GOTO_ACCEPT_SECTION"
+            target: section_accept_handler
+            extract_message: true
+            separator: ":"
+ 
+          - match_type: prefix
+            pattern: "GOTO_PAPER_REVIEW"
+            target: paper_review
+            extract_message: true
+            separator: ":"
+ 
+ 
+          - match_type: prefix
+            pattern: "GOTO_LATEX_GENERATION"
+
+            target: latex_generation
+            extract_message: true
+            separator: ":"
+
+          # Discovery sub-routing patterns
+          - match_type: prefix
+            pattern: "ROUTE_ASK_TOPIC"
+            target: ask_topic
+            extract_message: true
+            separator: ":"
+
+          - match_type: prefix
+            pattern: "ROUTE_ASK_LENGTH"
+            target: ask_length
+            extract_message: true
+            separator: ":"
+
+          - match_type: prefix
+            pattern: "ROUTE_ASK_AUDIENCE"
+            target: ask_audience
+            extract_message: true
+            separator: ":"
+
+          - match_type: prefix
+            pattern: "ROUTE_ASK_PUBLICATION"
+            target: ask_publication
+            extract_message: true
+            separator: ":"
+
+          - match_type: prefix
+            pattern: "ROUTE_ASK_FORMAT"
+            target: ask_format
+            extract_message: true
+            separator: ":"
+
+          - match_type: prefix
+            pattern: "ROUTE_ASK_OTHER"
+            target: ask_other
+            extract_message: true
+            separator: ":"
+
+          # Route SET_ responses back to discovery controller for processing
+          - match_type: prefix
+            pattern: "SET_TOPIC"
+            target: discovery
+            extract_message: false
+
+          - match_type: prefix
+            pattern: "SET_LENGTH"
+            target: discovery
+            extract_message: false
+
+          - match_type: prefix
+            pattern: "SET_AUDIENCE"
+            target: discovery
+            extract_message: false
+
+          - match_type: prefix
+            pattern: "SET_PUBLICATION"
+            target: discovery
+            extract_message: false
+
+          - match_type: prefix
+            pattern: "SET_FORMAT"
+            target: discovery
+            extract_message: false
+
+          - match_type: prefix
+            pattern: "SET_OTHER"
+            target: discovery
+            extract_message: false
+
+          # Discovery response (final output to user)
+          - match_type: prefix
+            pattern: "DISCOVERY_RESPONSE"
+            target: end
+            extract_message: true
+            separator: ":"
+
+          # Section writing routing patterns
+          - match_type: prefix
+            pattern: "ROUTE_PARSE_TOC"
+            target: toc_parser
+            extract_message: true
+            separator: ":"
+
+          - match_type: prefix
+            pattern: "ROUTE_SELECT_SOURCES"
+            target: source_selector
+            extract_message: true
+            separator: ":"
+
+          - match_type: contains
+            pattern: "SELECT_COMPLETE"
+            target: source_finder
+            extract_message: false
+
+          - match_type: contains
+            pattern: "FIND_COMPLETE"
+            target: section_writer
+            extract_message: false
+
+          - match_type: prefix
+            pattern: "ROUTE_NEXT_SECTION"
+            target: auto_finish_driver
+            extract_message: true
+            separator: ":"
+
+          - match_type: prefix
+            pattern: "AUTO_SECTIONS_COMPLETE"
+            target: auto_finish_driver
+            extract_message: true
+            separator: ":"
+
+          - match_type: prefix
+            pattern: "AUTO_PAPER_REVIEW_COMPLETE"
+            target: auto_finish_driver
+            extract_message: true
+            separator: ":"
+ 
+          # Paper review routing
+ 
+          - match_type: prefix
+            pattern: "ROUTE_REVIEW_PAPER"
+            target: paper_review_agent
+            extract_message: true
+            separator: ":"
+
+
+          # LaTeX generation routing patterns
+          - match_type: prefix
+            pattern: "ROUTE_GEN_STRUCTURE"
+            target: latex_structure_gen
+            extract_message: true
+            separator: ":"
+
+          - match_type: prefix
+            pattern: "ROUTE_CONVERT_SECTION"
+            target: latex_section_converter
+            extract_message: true
+            separator: ":"
+
+          - match_type: prefix
+            pattern: "ROUTE_ASSEMBLE_LATEX"
+            target: latex_assembler
+            extract_message: true
+            separator: ":"
+
+          - match_type: prefix
+            pattern: "ROUTE_COMPILE_LATEX"
+            target: latex_compiler
+            extract_message: true
+            separator: ":"
+
+          - match_type: prefix
+            pattern: "ROUTE_FIX_LATEX"
+            target: latex_fixer
+            extract_message: true
+            separator: ":"
+
+          - match_type: prefix
+            pattern: "ROUTE_LATEX_CONTINUE"
+            target: latex_generation
+            extract_message: true
+            separator: ":"
+
+          # LaTeX compilation success/failure patterns
+          - match_type: prefix
+            pattern: "LaTeX compiled successfully"
+            target: end
+            extract_message: false
+
+          - match_type: prefix
+            pattern: "LaTeX compilation failed after"
+            target: end
+            extract_message: false
+
+          # Default to workflow controller
+          - match_type: suffix
+            pattern: ""
+            target: workflow_controller
+            extract_message: false
+
+      # Agent nodes
+      workflow_controller:
+        type: actor
+        actor: workflow_controller
+
+      command_handler:
+        type: actor
+        actor: command_handler
+
+      auto_finish_driver:
+        type: actor
+        actor: auto_finish_driver
+
+      auto_finish_passthrough:
+        type: actor
+        actor: auto_finish_passthrough
+ 
+      intro:
+        type: actor
+        actor: intro_agent
+
+
+      discovery:
+        type: actor
+        actor: discovery_controller
+
+      ask_topic:
+        type: actor
+        actor: ask_topic
+
+      ask_length:
+        type: actor
+        actor: ask_length
+
+      ask_audience:
+        type: actor
+        actor: ask_audience
+
+      ask_publication:
+        type: actor
+        actor: ask_publication
+
+      ask_format:
+        type: actor
+        actor: ask_format
+
+      ask_other:
+        type: actor
+        actor: ask_other
+
+      brainstorming:
+        type: actor
+        actor: brainstorming_agent
+
+      brainstorming_saver:
+        type: actor
+        actor: brainstorming_saver
+
+      vetting:
+        type: actor
+        actor: vetting_agent
+
+      vetting_saver:
+        type: actor
+        actor: vetting_saver
+
+      structure:
+        type: actor
+        actor: structure_agent
+
+      structure_saver:
+        type: actor
+        actor: structure_saver
+
+      section_writing:
+        type: actor
+        actor: section_writing_controller
+
+      # Section writing sub-nodes
+      toc_parser:
+        type: actor
+        actor: toc_parser
+
+      toc_parser_saver:
+        type: actor
+        actor: toc_parser_saver
+
+      source_selector:
+        type: actor
+        actor: source_selector
+
+      source_finder:
+        type: actor
+        actor: source_finder
+
+      source_finder_saver:
+        type: actor
+        actor: source_finder_saver
+
+      section_writer:
+        type: actor
+        actor: section_writer
+
+      section_writer_saver:
+        type: actor
+        actor: section_writer_saver
+
+      section_accept_handler:
+        type: actor
+        actor: section_accept_handler
+
+      section_proofreader:
+        type: actor
+        actor: section_proofreader
+
+      section_proofreader_saver:
+        type: actor
+        actor: section_proofreader_saver
+
+      paper_review:
+        type: actor
+        actor: paper_review_controller
+ 
+      paper_review_actor:
+        type: actor
+        actor: paper_review_agent
+        metadata:
+          max_history_messages: 10
+          max_history_chars: 6000
+ 
+      paper_review_saver:
+        type: actor
+        actor: paper_review_saver
+
+
+      latex_generation:
+        type: actor
+        actor: latex_controller
+
+      # LaTeX sub-nodes
+      latex_structure_gen:
+        type: actor
+        actor: latex_structure_gen
+
+      latex_structure_saver:
+        type: actor
+        actor: latex_structure_saver
+
+      latex_section_converter:
+        type: actor
+        actor: latex_section_converter
+
+      latex_section_saver:
+        type: actor
+        actor: latex_section_saver
+
+      latex_assembler:
+        type: actor
+        actor: latex_assembler
+
+      latex_assembler_saver:
+        type: actor
+        actor: latex_assembler_saver
+
+      latex_compiler:
+        type: actor
+        actor: latex_compiler
+
+      latex_fixer:
+        type: actor
+        actor: latex_fixer
+
+      latex_fixer_saver:
+        type: actor
+        actor: latex_fixer_saver
+
+    # Edge definitions
+    edges:
+      # Start to router
+      - source: start
+        target: router
+
+      # Router to all possible targets based on next_node
+      - source: router
+        target: workflow_controller
+        condition:
+          type: context_value
+          key: next_node
+          value: workflow_controller
+
+      - source: router
+        target: command_handler
+        condition:
+          type: context_value
+          key: next_node
+          value: command_handler
+
+      - source: router
+        target: auto_finish_driver
+        condition:
+          type: context_value
+          key: next_node
+          value: auto_finish_driver
+
+      - source: router
+        target: intro
+        condition:
+          type: context_value
+          key: next_node
+          value: intro
+
+      - source: router
+        target: discovery
+        condition:
+          type: context_value
+          key: next_node
+          value: discovery
+
+      - source: router
+        target: ask_topic
+        condition:
+          type: context_value
+          key: next_node
+          value: ask_topic
+
+      - source: router
+        target: ask_length
+        condition:
+          type: context_value
+          key: next_node
+          value: ask_length
+
+      - source: router
+        target: ask_audience
+        condition:
+          type: context_value
+          key: next_node
+          value: ask_audience
+
+      - source: router
+        target: ask_publication
+        condition:
+          type: context_value
+          key: next_node
+          value: ask_publication
+
+      - source: router
+        target: ask_format
+        condition:
+          type: context_value
+          key: next_node
+          value: ask_format
+
+      - source: router
+        target: ask_other
+        condition:
+          type: context_value
+          key: next_node
+          value: ask_other
+
+      - source: router
+        target: brainstorming
+        condition:
+          type: context_value
+          key: next_node
+          value: brainstorming
+
+      - source: router
+        target: vetting
+        condition:
+          type: context_value
+          key: next_node
+          value: vetting
+
+      - source: router
+        target: structure
+        condition:
+          type: context_value
+          key: next_node
+          value: structure
+
+      - source: router
+        target: section_writing
+        condition:
+          type: context_value
+          key: next_node
+          value: section_writing
+
+      - source: router
+        target: paper_review
+        condition:
+          type: context_value
+          key: next_node
+          value: paper_review
+
+      - source: router
+        target: latex_generation
+        condition:
+          type: context_value
+          key: next_node
+          value: latex_generation
+
+      - source: router
+        target: end
+        condition:
+          type: context_value
+          key: next_node
+          value: end
+
+      # Section writing sub-routing
+      - source: router
+        target: toc_parser
+        condition:
+          type: context_value
+          key: next_node
+          value: toc_parser
+
+      - source: router
+        target: source_selector
+        condition:
+          type: context_value
+          key: next_node
+          value: source_selector
+
+      - source: router
+        target: source_finder
+        condition:
+          type: context_value
+          key: next_node
+          value: source_finder
+
+      - source: router
+        target: section_writer
+        condition:
+          type: context_value
+          key: next_node
+          value: section_writer
+
+      - source: router
+        target: section_proofreader
+        condition:
+          type: context_value
+          key: next_node
+          value: section_proofreader
+
+      - source: router
+        target: section_accept_handler
+        condition:
+          type: context_value
+          key: next_node
+          value: section_accept_handler
+
+      # Paper review sub-routing
+      - source: router
+        target: paper_review
+        condition:
+          type: context_value
+          key: next_node
+          value: paper_review
+ 
+      - source: router
+        target: paper_review_agent
+        condition:
+          type: context_value
+          key: next_node
+          value: paper_review_agent
+
+
+      # LaTeX generation sub-routing
+      - source: router
+        target: latex_structure_gen
+        condition:
+          type: context_value
+          key: next_node
+          value: latex_structure_gen
+
+      - source: router
+        target: latex_section_converter
+        condition:
+          type: context_value
+          key: next_node
+          value: latex_section_converter
+
+      - source: router
+        target: latex_assembler
+        condition:
+          type: context_value
+          key: next_node
+          value: latex_assembler
+
+      - source: router
+        target: latex_compiler
+        condition:
+          type: context_value
+          key: next_node
+          value: latex_compiler
+
+      - source: router
+        target: latex_fixer
+        condition:
+          type: context_value
+          key: next_node
+          value: latex_fixer
+
+      # All agents return to router for next routing decision
+      - source: workflow_controller
+        target: router
+
+      - source: command_handler
+        target: router
+
+      - source: intro
+        target: end
+
+    # Note: command_handler returns to router because some commands
+    # (like !next) output routing commands (GOTO_*). The router will
+    # handle those and route non-routing outputs to end via the default rule.
+
+      - source: discovery
+        target: router
+
+      - source: ask_topic
+        target: router
+
+      - source: ask_length
+        target: router
+
+      - source: ask_audience
+        target: router
+
+      - source: ask_publication
+        target: router
+
+      - source: ask_format
+        target: router
+
+      - source: ask_other
+        target: router
+
+      # Brainstorming chain - output goes directly to end for user interaction
+      - source: brainstorming
+        target: brainstorming_saver
+
+      - source: brainstorming_saver
+        target: auto_finish_passthrough
+
+      # Vetting chain - output goes directly to end for user interaction
+      - source: vetting
+        target: vetting_saver
+
+      - source: vetting_saver
+        target: auto_finish_passthrough
+
+      # Structure chain - output goes directly to end for user interaction
+      - source: structure
+        target: structure_saver
+
+      - source: structure_saver
+        target: auto_finish_passthrough
+
+      # Section writing
+      - source: section_writing
+        target: router
+
+      # Section writing sub-chains
+      - source: toc_parser
+        target: toc_parser_saver
+
+      - source: toc_parser_saver
+        target: router
+
+      - source: source_selector
+        target: auto_finish_passthrough
+
+      - source: source_finder
+        target: source_finder_saver
+
+      - source: source_finder_saver
+        target: auto_finish_passthrough
+
+      - source: section_writer
+        target: section_writer_saver
+
+      - source: section_writer_saver
+        target: auto_finish_passthrough
+
+      - source: section_accept_handler
+        target: router
+
+      - source: section_proofreader
+        target: section_proofreader_saver
+
+      - source: section_proofreader_saver
+        target: auto_finish_passthrough
+
+      # Paper review
+      - source: paper_review
+        target: router
+
+      # Paper review sub-chain
+      - source: paper_review_agent
+        target: paper_review_saver
+
+      - source: paper_review_saver
+        target: auto_finish_passthrough
+
+      - source: auto_finish_passthrough
+        target: auto_finish_driver
+        condition:
+          type: context_value
+          key: auto_finish_active
+          value: true
+
+      - source: auto_finish_passthrough
+        target: end
+        condition:
+          type: context_value
+          key: auto_finish_active
+          value: false
+
+      - source: auto_finish_driver
+        target: router
+
+      # LaTeX generation
+
+      - source: latex_generation
+        target: router
+
+      # LaTeX sub-chains
+      - source: latex_structure_gen
+        target: latex_structure_saver
+
+      - source: latex_structure_saver
+        target: router
+
+      - source: latex_section_converter
+        target: latex_section_saver
+
+      - source: latex_section_saver
+        target: router
+
+      - source: latex_assembler
+        target: latex_assembler_saver
+
+      - source: latex_assembler_saver
+        target: auto_finish_passthrough
+
+      - source: latex_compiler
+        target: router
+
+      - source: latex_fixer
+        target: latex_fixer_saver
+
+      - source: latex_fixer_saver
+        target: router
+
+# Output configuration
+publications:
+  - __output__
+
+merges:
+  - sources: [__input__]
+    target: main
diff --git a/features/fixtures/v2/configs/routing_test_discovery_response.yaml b/features/fixtures/v2/configs/routing_test_discovery_response.yaml
new file mode 100644
index 000000000..b0b08e579
--- /dev/null
+++ b/features/fixtures/v2/configs/routing_test_discovery_response.yaml
@@ -0,0 +1,23 @@
+actors:
+  test_actor:
+    type: tool
+    config:
+      tools:
+        - name: test_tool
+          code: |
+            result = "DISCOVERY_RESPONSE:What topic would you like to write about?"
+
+routes:
+  main:
+    type: stream
+    stream_type: cold
+    operators:
+      - type: map
+        params:
+          actor: test_actor
+    publications:
+      - __output__
+
+merges:
+  - sources: [__input__]
+    target: main
diff --git a/features/fixtures/v2/configs/routing_test_goto_brainstorming.yaml b/features/fixtures/v2/configs/routing_test_goto_brainstorming.yaml
new file mode 100644
index 000000000..7c6dc4e9c
--- /dev/null
+++ b/features/fixtures/v2/configs/routing_test_goto_brainstorming.yaml
@@ -0,0 +1,23 @@
+actors:
+  test_actor:
+    type: tool
+    config:
+      tools:
+        - name: test_tool
+          code: |
+            result = "GOTO_BRAINSTORMING:Let's brainstorm ideas"
+
+routes:
+  main:
+    type: stream
+    stream_type: cold
+    operators:
+      - type: map
+        params:
+          actor: test_actor
+    publications:
+      - __output__
+
+merges:
+  - sources: [__input__]
+    target: main
diff --git a/features/fixtures/v2/configs/routing_test_no_prefix.yaml b/features/fixtures/v2/configs/routing_test_no_prefix.yaml
new file mode 100644
index 000000000..907af8bbd
--- /dev/null
+++ b/features/fixtures/v2/configs/routing_test_no_prefix.yaml
@@ -0,0 +1,23 @@
+actors:
+  test_actor:
+    type: tool
+    config:
+      tools:
+        - name: test_tool
+          code: |
+            result = "This is normal text without any prefix"
+
+routes:
+  main:
+    type: stream
+    stream_type: cold
+    operators:
+      - type: map
+        params:
+          actor: test_actor
+    publications:
+      - __output__
+
+merges:
+  - sources: [__input__]
+    target: main
diff --git a/features/fixtures/v2/configs/routing_test_set_topic.yaml b/features/fixtures/v2/configs/routing_test_set_topic.yaml
new file mode 100644
index 000000000..6daa129c2
--- /dev/null
+++ b/features/fixtures/v2/configs/routing_test_set_topic.yaml
@@ -0,0 +1,23 @@
+actors:
+  test_actor:
+    type: tool
+    config:
+      tools:
+        - name: test_tool
+          code: |
+            result = "SET_TOPIC:Neural networks in cognitive science"
+
+routes:
+  main:
+    type: stream
+    stream_type: cold
+    operators:
+      - type: map
+        params:
+          actor: test_actor
+    publications:
+      - __output__
+
+merges:
+  - sources: [__input__]
+    target: main
diff --git a/features/fixtures/v2/configs/simple_echo_config.yaml b/features/fixtures/v2/configs/simple_echo_config.yaml
new file mode 100644
index 000000000..636fcc5f7
--- /dev/null
+++ b/features/fixtures/v2/configs/simple_echo_config.yaml
@@ -0,0 +1,26 @@
+cleveragents:
+  version: "3.0"
+
+actors:
+  echo_actor:
+    type: tool
+    config:
+      tools:
+        - name: echo_tool
+          code: |
+            result = f"Echo: {input_data}"
+
+routes:
+  main:
+    type: stream
+    stream_type: cold
+    operators:
+      - type: map
+        params:
+          actor: echo_actor
+    publications:
+      - __output__
+
+merges:
+  - sources: [__input__]
+    target: main
diff --git a/features/fixtures/v2/configs/tool_with_stderr.yaml b/features/fixtures/v2/configs/tool_with_stderr.yaml
new file mode 100644
index 000000000..7c6587d53
--- /dev/null
+++ b/features/fixtures/v2/configs/tool_with_stderr.yaml
@@ -0,0 +1,25 @@
+actors:
+  test_actor:
+    type: tool
+    config:
+      tools:
+        - name: test_tool
+          code: |
+            import sys
+            print("This is debug output to stderr", file=sys.stderr)
+            result = "Tool executed successfully"
+
+routes:
+  main:
+    type: stream
+    stream_type: cold
+    operators:
+      - type: map
+        params:
+          actor: test_actor
+    publications:
+      - __output__
+
+merges:
+  - sources: [__input__]
+    target: main
diff --git a/features/fixtures/v2/configs/tool_without_stderr.yaml b/features/fixtures/v2/configs/tool_without_stderr.yaml
new file mode 100644
index 000000000..dd2a6116f
--- /dev/null
+++ b/features/fixtures/v2/configs/tool_without_stderr.yaml
@@ -0,0 +1,23 @@
+actors:
+  test_actor:
+    type: tool
+    config:
+      tools:
+        - name: test_tool
+          code: |
+            result = "Tool executed without stderr"
+
+routes:
+  main:
+    type: stream
+    stream_type: cold
+    operators:
+      - type: map
+        params:
+          actor: test_actor
+    publications:
+      - __output__
+
+merges:
+  - sources: [__input__]
+    target: main
diff --git a/features/fixtures/v2/contexts/discovery_stage_context.json b/features/fixtures/v2/contexts/discovery_stage_context.json
new file mode 100644
index 000000000..25490d6cf
--- /dev/null
+++ b/features/fixtures/v2/contexts/discovery_stage_context.json
@@ -0,0 +1,41 @@
+{
+  "stage_order": [
+    "intro",
+    "discovery",
+    "brainstorming",
+    "vetting",
+    "structure",
+    "deep_research",
+    "core_content",
+    "framing_content",
+    "proofreading",
+    "formatting"
+  ],
+  "writing_stage": "discovery",
+  "initial_message": "",
+  "paper_details": {
+    "topic": null,
+    "length": null,
+    "audience": null,
+    "publication": null,
+    "format": null,
+    "other": null
+  },
+  "brainstorming_summary": null,
+  "vetting_sources": [],
+  "table_of_contents": null,
+  "deep_research_sources": null,
+  "core_content_progress": {
+    "current_section_index": 0,
+    "accept_current_section": false
+  },
+  "paper_content": {},
+  "final_paper_text": null,
+  "proofread_paper": null,
+  "latex_source": null,
+  "pdf_path": null,
+  "vetting_expanded_plan": null,
+  "vetting_plan_index": 0,
+  "current_vetting_action": null,
+  "current_section_to_write": null
+}
diff --git a/features/fixtures/v2/paper_contexts/03_brainstorming.json b/features/fixtures/v2/paper_contexts/03_brainstorming.json
new file mode 100644
index 000000000..49785eab2
--- /dev/null
+++ b/features/fixtures/v2/paper_contexts/03_brainstorming.json
@@ -0,0 +1,48 @@
+{
+  "context_name": "brainstorming_fixture",
+  "messages": [],
+  "metadata": {},
+  "state": {},
+  "global_context": {
+    "stage_order": [
+      "intro",
+      "discovery",
+      "brainstorming",
+      "vetting",
+      "structure",
+      "deep_research",
+      "core_content",
+      "framing_content",
+      "proofreading",
+      "formatting"
+    ],
+    "writing_stage": "brainstorming",
+    "initial_message": "",
+    "paper_details": {
+      "topic": "Machine Learning Applications in Medical Diagnostic Imaging",
+      "length": "5000",
+      "audience": "Medical professionals and AI researchers",
+      "publication": "Journal of Medical AI",
+      "format": "latex",
+      "other": "Include case studies and statistical validation"
+    },
+    "brainstorming_summary": "This paper explores how machine learning algorithms, particularly convolutional neural networks and ensemble methods, have transformed diagnostic imaging. It covers accuracy improvements in detecting tumors, fractures, and anomalies, discusses integration with existing clinical workflows, addresses concerns about AI reliability and interpretability, and presents case studies from radiology departments that have adopted these technologies. The paper will demonstrate quantitative improvements in diagnostic accuracy, reduced time-to-diagnosis, and enhanced clinical decision support.",
+    "vetting_sources": [],
+    "table_of_contents": null,
+    "deep_research_sources": null,
+    "core_content_progress": {
+      "current_section_index": 0,
+      "accept_current_section": false
+    },
+    "paper_content": {},
+    "final_paper_text": null,
+    "proofread_paper": null,
+    "latex_source": null,
+    "pdf_path": null,
+    "vetting_expanded_plan": null,
+    "vetting_plan_index": 0,
+    "current_vetting_action": null,
+    "current_section_to_write": null,
+    "history": []
+  }
+}
diff --git a/features/steps/stream_router_coverage_steps.py b/features/steps/stream_router_coverage_steps.py
index 88f921d67..9a40b1e18 100644
--- a/features/steps/stream_router_coverage_steps.py
+++ b/features/steps/stream_router_coverage_steps.py
@@ -8,16 +8,15 @@ from __future__ import annotations
 
 import json
 
-from behave import given, when, then
+from behave import given, then, when
 
+from cleveragents.core.exceptions import StreamRoutingError
 from cleveragents.reactive.stream_router import (
     ReactiveStreamRouter,
     StreamConfig,
     StreamMessage,
     StreamType,
 )
-from cleveragents.reactive.route_bridge import RouteBridge
-from cleveragents.core.exceptions import StreamRoutingError
 
 
 class DummyAgent:
diff --git a/implementation_plan.md b/implementation_plan.md
index c3e643d18..5b7daf665 100644
--- a/implementation_plan.md
+++ b/implementation_plan.md
@@ -648,6 +648,11 @@ All 10 ADRs have been created in `docs/architecture/decisions/`:
 - Porting scope: port Python files from the git `v2` tag into the new `src/cleveragents/actor/` package as first-class v3 code; remove any `v2` references in names/comments; adapt entry points to the actor registry and ContextService without touching `plandex/`; migrate all relevant API/CLI docs and remove `--model/--provider` references in favor of `--actor`.
 - Testing expectations: port git v2 tag unit/integration coverage into Behave and Robot suites for the actor package, registry CRUD, default guard, safe/unsafe toggles, warning emission, built-in enumeration, chat/plan actor selection with context flags, and configuration blob/hash stability; verify provider/model flags are rejected in favor of actors; wire new suites into nox with >85% coverage and pyright clean.
 
+**2026-02-04: Stage 7.5 runtime/actor-run status (in progress)**
+- Added `actor run` Typer command and ported v2 reactive runtime skeleton (ContextManager, ReactiveCleverAgentsApp); registered SimpleToolAgent for tool configs; wired streams to `__output__` when no publications.
+- Dependencies updated (langchain>=0.2.14, langchain-community>=0.2.14, langchain-openai>=0.2.0, langchain-google-genai>=0.2.0, jinja2>=3.1.0, alembic>=1.13.1) to satisfy CLI/runtime imports; nox installs succeed.
+- Current failures (integration): routing prefix still returns prefixed text; scientific/discovery/initial-next/system-prompt flows return empty output/rc=1; rxpy allow path rc=1 and message mismatch; version/help commands rc=-15 (slow/errors); context delete/clear fail (run not creating contexts); load-context export/import rc=1; CLI benchmarks exceed thresholds.
+- Fix tasks to add under checklist: implement real tool execution for actors (SimpleToolAgent already present but registration in route/operator paths should consume tools before echo); strip known prefixes before returning; align RxPy error text with tests; ensure context creation/save succeeds so delete/clear pass; investigate version/help rc=-15 and CLI latency; deduplicate load_context help tests.
 
 - 2025-12-19: Actor persistence primitives verified in codebase: actors table + default index present via `alembic/versions/c3d9b3d0cf3e_add_actors_table.py:1` and SQLAlchemy model carries default/built-in flags at `src/cleveragents/infrastructure/database/models.py:152`; repository enforces built-in/default guards and exposes default setters in `src/cleveragents/infrastructure/database/repositories.py:582` and `src/cleveragents/infrastructure/database/repositories.py:661`; UnitOfWork and DI wire the repository into services at `src/cleveragents/infrastructure/database/unit_of_work.py:170` and `src/cleveragents/application/container.py:85`; ActorService normalization plus default handling lives at `src/cleveragents/application/services/actor_service.py:22`. No gaps found for Stage 7.5 persistence prerequisite; next work is adapter import + CLI flag changes.
 
@@ -691,6 +696,19 @@ All 10 ADRs have been created in `docs/architecture/decisions/`:
 | Robot integration suites | `v2/tests/integration/*.robot` (commands/context/routing/rendering/version/scientific_paper/generate_examples/rxpy) | Translate into `robot/` using `robot/common.resource`, `robot/helper_actor_config.py`, `robot/helper_context_analysis.py`; keep actor flags + CLEVERAGENTS_* envs | Gap – no v3 equivalents yet; port after Behave slices land |
 | Fixtures + examples | `v2/tests/fixtures/**/*`, `v2/tests/mocks/llm_providers.py`, `v2/examples/*.yaml`, `v2/examples/make_context.sh` | Relocate fixtures under `features/fixtures/` or `robot/` resources; swap mocks for existing test providers; move examples into `examples/`/`docs/` with actor-first configs | Gap – relocate after scenario ports; remove provider/model flags and align env vars |
 
+- 2026-02-02: Parallel execution plan for Stage 7.5 actor port
+  - Launch up to 10 parallel agents, each owning an isolated slice; main agent sequences merges, reruns nox (`unit_tests`, `integration_tests`, `coverage_report`), and updates this checklist/Notes after each merge.
+  - Agent 1: implement routing primitives (`RouteConfig`, `RouteBridge`, `StreamRouter`) to unblock route/langgraph/stream_router suites and hand off stubbed Behave steps.
+  - Agent 2: port remaining v2 CLI/config/template Behave slices (route/langgraph/stream_router coverage) into actor-first flows using existing step libraries; hand fixtures to Agent 5.
+  - Agent 3: port v2 LangGraph/agent/routing Behave suites to actor-first LangGraph paths (PlanGenerationGraph/ContextAnalysis/AutoDebug parity, context-delete safeguards).
+  - Agent 4: translate v2 Robot suites (`/app/v2/tests/integration/*.robot`) to current `robot/` with shared resources; ensure actor-only flags and env defaults. **Robot inventory complete (commands, context delete, routing prefix stripping, RxPY validation, verbose/error/temperature/system prompt, discovery/generate examples, version, scientific paper flows).**
+  - Agent 5: relocate v2 fixtures/templates into `features/fixtures/` and Robot resources; normalize to actor-first naming and CLEVERAGENTS_* env vars. **Fixtures identified: simple_echo_config.yaml; routing_test_{discovery_response,goto_brainstorming,no_prefix,set_topic}.yaml; examples to follow.**
+  - Agent 6: migrate v2 examples (`@v2/examples/*.yaml`, `make_context.sh`) into `examples/`/`docs/` with actor-first configs and runnable commands.
+  - Agent 7: refresh docs/README/CLI help/ADR snippets for actor-only surface, unsafe semantics, default resolution, and registry boundaries.
+  - Agent 8: update Phase 2 Notes + mapping matrix as slices land; spawn `Fix – …` tasks for any failures; keep traceability to code paths.
+  - Agent 9: orchestration/test lead—run staged nox sessions per slice, capture failures, and gate merges until green with ≥85% coverage.
+  - Agent 10: cleanup + packaging—align optional deps, ensure `@v2/` deletion readiness post-port, verify actor package exports remain side-effect free.
+
 **2026-01-15 (cont.): Migration slice #1 plan – CLI + config/Jinja/templates**
 - Port v2 CLI/runtime/context suites (`cli_coverage`, `cli_comprehensive`, `cli_command_coverage`, `cli_main_module`, `cli_integration`, `cli_sandbox_coverage`, `load_context_cli`) into actor-first flows in `features/cli_plan_context_commands.feature`, `features/cli.feature`, and `robot/cli_plan_context_commands.robot`, enforcing `--actor`/default-actor selection and CLEVERAGENTS_* envs.
 - Port config parser/core/specific suites (`config_parser_*`, `config_core_coverage`, `config_specific_coverage`, `config_module_coverage`, `configuration_management`) into `features/actor_config_coverage.feature` plus new step hooks that exercise the actor config parser and settings loader without provider/model flags.
@@ -2585,9 +2603,10 @@ class TestLLMProvider(FakeListLLM):
 
 2. **Add Memory to Services** *(in progress)*:
    - [X] Integrate ConversationBufferMemory (completed 2025-11-18 via `memory_service.py` & `plan_service.py` updates)
-   - [ ] Add EntityMemory for tracking
+   - [X] Add EntityMemory for tracking
    - [X] Implement SQLChatMessageHistory (previously delivered in `memory_service.py`)
 
+
 #### Week 12 Tasks:
 1. **Create ContextAnalysisAgent**:
    - Implement document loaders
@@ -4547,6 +4566,16 @@ If you can do all of the above by end of Day 1, you're on track!
       - [X] Port git tag `v2.0.0` API/CLI documentation relevant to actors/configuration into docs; scrub `--model/--provider` references and any `v2` naming; update CLI help/man pages and `agents --help` output to describe `--actor`, unsafe semantics, default resolution, and removal guards. (docs/providers updated; ADR-009 snippet switched to --actor; CLI help/man review still pending; add doc references to `docs/reference/providers.md:1-47`)
       - [X] Fix – Update CLI help/man output to actor-only wording and rerun nox unit/integration suites to capture regressions.
       - [X] Build a v2→v3 mapping matrix covering all `v2/tests/features/*.feature` suites (config/parser/routing/langgraph/context/CLI) and update/migrate missing Behave coverage into `features/` with actor-only flags, CLEVERAGENTS_* envs, and relocated fixtures (Phase 2 Notes 2026-01-15 mapping matrix).
+      - [X] Add `actor run` Typer command and reactive runtime skeleton (ContextManager, ReactiveCleverAgentsApp) with SimpleToolAgent registration scaffolding.
+      - [X] Wire stream router fallback to publish to `__output__` when no publications exist and ensure merge subscribes `__input__` when streams lack subscriptions.
+      - [X] Bump runtime/langchain dependencies (langchain>=0.2.14, langchain-community>=0.2.14, langchain-openai>=0.2.0, langchain-google-genai>=0.2.0, jinja2>=3.1.0, alembic>=1.13.1) and verify nox installs succeed.
+      - [X] Update Robot suites to call `python -m cleveragents actor run`, stub generate-examples, drop interactive run tests, and set version expectations to CleverAgents 1.0.0 in coverage.
+      - [ ] Fix – Reactive runtime tools execute via SimpleToolAgent across config/route/operator registrations (remove echo fallback) so routing outputs are non-empty.
+      - [ ] Fix – Strip routing prefixes before publishing output and ensure scientific/discovery/initial-next/system-prompt flows return non-empty output/rc=0.
+      - [ ] Fix – RxPy route validation: allow path rc=0 and error text matches run-mode guidance (allow-rxpy-in-run-mode) including nested warning.
+      - [ ] Fix – run_single_shot context creation/save so context delete/clear/export/import Robot suites pass.
+      - [ ] Fix – Version/help commands return rc=0 within benchmark thresholds (resolve rc=-15 and latency regressions).
+      - [ ] Fix – System prompt template rendering and load_context duplicate test names/export/import failures.
       - [ ] Port v2 CLI + config/parser/Jinja Behave suites to actor-first coverage with CLEVERAGENTS_* env defaults and actor-only flags (source: `/app/v2/tests/features/cli_*`, `config_*`, `inline_*`, `yaml_template_engine*`, `template_*`, `jinja_yaml_preprocessor*`, `smart_yaml_loader*`, `template_store_coverage`, `graph_templates_*`).
         - [X] Map to existing actor-first step libraries: `features/steps/actor_cli_steps.py`, `features/steps/actor_registry_steps.py`, `features/steps/actor_config_steps.py`, and YAML flows via `features/steps/yaml_template_engine_steps.py`.
         - [X] Replace provider/model flags with `--actor`, ensure CLEVERAGENTS_* env defaults, and swap v2 fixtures into current `features/fixtures/` as needed.
diff --git a/pyproject.toml b/pyproject.toml
index 1085eec51..75ce1b4ae 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -30,6 +30,16 @@ dependencies = [
     "faiss-cpu>=1.7.4",  # Vector store backend
     "rx>=3.2.0",  # Reactive streams for routing
     "dependency-injector>=4.41.0",  # DI container
+    "pydantic>=2.7.0",
+    "pydantic-settings>=2.11.0",
+    "structlog>=24.4.0",
+    "langchain>=0.2.14",
+    "langchain-community>=0.2.14",
+    "langchain-openai>=0.2.0",
+    "langchain-google-genai>=0.2.0",
+    "jinja2>=3.1.0",
+    "alembic>=1.13.1",
+    "numpy>=2.1.0",
 ]
 
 
diff --git a/robot/commands.robot b/robot/commands.robot
new file mode 100644
index 000000000..00ddb5110
--- /dev/null
+++ b/robot/commands.robot
@@ -0,0 +1,22 @@
+*** Settings ***
+Documentation     Additional integration tests for cleveragents CLI commands
+Library           Process
+Library           OperatingSystem
+Library           String
+
+*** Settings ***
+Resource    v2_paths.resource
+
+*** Test Cases ***
+Check Context Command Help
+    [Documentation]    Test that context command help is available
+    ${result} =    Run Process    python    -m    cleveragents    context    --help
+    Should Be Equal As Integers    ${result.rc}    0
+    Should Contain    ${result.stdout}    Context management
+
+Check Actor Run Command Help
+    [Documentation]    Test that actor run command help is available
+    ${result} =    Run Process    python    -m    cleveragents    actor    run    --help
+    Should Be Equal As Integers    ${result.rc}    0
+    Should Contain    ${result.stdout}    Usage:
+    Should Contain    ${result.stdout}    actor run
diff --git a/robot/context_delete_all_yes.robot b/robot/context_delete_all_yes.robot
new file mode 100644
index 000000000..57bb1c983
--- /dev/null
+++ b/robot/context_delete_all_yes.robot
@@ -0,0 +1,335 @@
+*** Settings ***
+Documentation     Integration tests for context delete with --all and --yes flags
+Library           Process
+Library           OperatingSystem
+Library           String
+Library           DateTime
+Suite Setup       Setup Test Environment
+Suite Teardown    Cleanup Test Environment
+
+*** Settings ***
+Resource    v2_paths.resource
+
+*** Variables ***
+${SIMPLE_CONFIG}            ${V2_CONFIG_DIR}/simple_echo_config.yaml
+${CONTEXT_DIR}              ${TEMPDIR}/test_contexts_delete_all_yes
+${UNIQUE_ID}                ${EMPTY}
+${TEMP}                     ${EMPTY}
+
+*** Test Cases ***
+Test Delete Single Context With Yes Flag
+    [Documentation]    Test context delete with --yes bypasses confirmation
+    ${context_name} =    Set Variable    delete_yes_${UNIQUE_ID}
+
+    # Create context
+    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${SIMPLE_CONFIG}
+    ...    --context    ${context_name}
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    --unsafe
+    ...    --allow-rxpy-in-run-mode
+    ...    -p    "test message"
+
+    Directory Should Exist    ${CONTEXT_DIR}/${context_name}
+
+    # Delete it with --yes flag
+    ${result} =    Run Process    python    -m    cleveragents    context    delete
+    ...    ${context_name}
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    --yes
+
+    Should Be Equal As Integers    ${result.rc}    0
+    Directory Should Not Exist    ${CONTEXT_DIR}/${context_name}
+    Should Contain    ${result.stdout}    deleted
+
+Test Delete Single Context With Short Yes Flag
+    [Documentation]    Test context delete with -y shorthand flag
+    ${context_name} =    Set Variable    delete_short_${UNIQUE_ID}
+
+    # Create context
+    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${SIMPLE_CONFIG}
+    ...    --context    ${context_name}
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    --unsafe
+    ...    --allow-rxpy-in-run-mode
+    ...    -p    "test message"
+
+    Directory Should Exist    ${CONTEXT_DIR}/${context_name}
+
+    # Delete it with -y flag
+    ${result} =    Run Process    python    -m    cleveragents    context    delete
+    ...    ${context_name}
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    -y
+
+    Should Be Equal As Integers    ${result.rc}    0
+    Directory Should Not Exist    ${CONTEXT_DIR}/${context_name}
+
+Test Delete Single Context With Confirmation Accept
+    [Documentation]    Test context delete with confirmation accepted
+    ${context_name} =    Set Variable    delete_confirm_${UNIQUE_ID}
+
+    # Create context
+    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${SIMPLE_CONFIG}
+    ...    --context    ${context_name}
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    --unsafe
+    ...    --allow-rxpy-in-run-mode
+    ...    -p    "test message"
+
+    Directory Should Exist    ${CONTEXT_DIR}/${context_name}
+
+    # Delete with confirmation (answer 'y')
+    ${result} =    Run Process    python    -m    cleveragents    context    delete
+    ...    ${context_name}
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    stdin=y\n
+
+    Should Be Equal As Integers    ${result.rc}    0
+    Directory Should Not Exist    ${CONTEXT_DIR}/${context_name}
+
+Test Delete Single Context With Confirmation Reject
+    [Documentation]    Test context delete with confirmation rejected
+    ${context_name} =    Set Variable    delete_reject_${UNIQUE_ID}
+
+    # Create context
+    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${SIMPLE_CONFIG}
+    ...    --context    ${context_name}
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    --unsafe
+    ...    --allow-rxpy-in-run-mode
+    ...    -p    "test message"
+
+    Directory Should Exist    ${CONTEXT_DIR}/${context_name}
+
+    # Delete with confirmation rejected (answer 'n')
+    ${result} =    Run Process    python    -m    cleveragents    context    delete
+    ...    ${context_name}
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    stdin=n\n
+
+    Should Be Equal As Integers    ${result.rc}    0
+    Directory Should Exist    ${CONTEXT_DIR}/${context_name}
+    Should Contain    ${result.stdout}    cancelled
+
+Test Delete All Contexts With All And Yes Flags
+    [Documentation]    Test delete all contexts with --all --yes
+    [Setup]    Empty Directory    ${CONTEXT_DIR}
+    ${ctx1} =    Set Variable    all_ctx1_${UNIQUE_ID}
+    ${ctx2} =    Set Variable    all_ctx2_${UNIQUE_ID}
+    ${ctx3} =    Set Variable    all_ctx3_${UNIQUE_ID}
+
+    # Create multiple contexts
+    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${SIMPLE_CONFIG}
+    ...    --context    ${ctx1}
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    --unsafe
+    ...    --allow-rxpy-in-run-mode
+    ...    -p    "test"
+
+    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${SIMPLE_CONFIG}
+    ...    --context    ${ctx2}
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    --unsafe
+    ...    --allow-rxpy-in-run-mode
+    ...    -p    "test"
+
+    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${SIMPLE_CONFIG}
+    ...    --context    ${ctx3}
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    --unsafe
+    ...    --allow-rxpy-in-run-mode
+    ...    -p    "test"
+
+    Directory Should Exist    ${CONTEXT_DIR}/${ctx1}
+    Directory Should Exist    ${CONTEXT_DIR}/${ctx2}
+    Directory Should Exist    ${CONTEXT_DIR}/${ctx3}
+
+    # Delete all with --all --yes
+    ${result} =    Run Process    python    -m    cleveragents    context    delete
+    ...    --all
+    ...    --yes
+    ...    --context-dir    ${CONTEXT_DIR}
+
+    Should Be Equal As Integers    ${result.rc}    0
+    Directory Should Not Exist    ${CONTEXT_DIR}/${ctx1}
+    Directory Should Not Exist    ${CONTEXT_DIR}/${ctx2}
+    Directory Should Not Exist    ${CONTEXT_DIR}/${ctx3}
+    Should Contain    ${result.stdout}    Deleted 3 context
+
+Test Delete All With Confirmation Accept
+    [Documentation]    Test delete all with confirmation accepted
+    [Setup]    Empty Directory    ${CONTEXT_DIR}
+    ${ctx1} =    Set Variable    all_confirm1_${UNIQUE_ID}
+    ${ctx2} =    Set Variable    all_confirm2_${UNIQUE_ID}
+
+    # Create contexts
+    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${SIMPLE_CONFIG}
+    ...    --context    ${ctx1}
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    --unsafe
+    ...    --allow-rxpy-in-run-mode
+    ...    -p    "test"
+
+    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${SIMPLE_CONFIG}
+    ...    --context    ${ctx2}
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    --unsafe
+    ...    --allow-rxpy-in-run-mode
+    ...    -p    "test"
+
+    # Delete all with confirmation
+    ${result} =    Run Process    python    -m    cleveragents    context    delete
+    ...    --all
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    stdin=y\n
+
+    Should Be Equal As Integers    ${result.rc}    0
+    Directory Should Not Exist    ${CONTEXT_DIR}/${ctx1}
+    Directory Should Not Exist    ${CONTEXT_DIR}/${ctx2}
+    Should Contain    ${result.stdout}    Found
+    Should Contain    ${result.stdout}    to delete
+
+Test Delete All With Confirmation Reject
+    [Documentation]    Test delete all with confirmation rejected
+    [Setup]    Empty Directory    ${CONTEXT_DIR}
+    ${ctx1} =    Set Variable    all_reject1_${UNIQUE_ID}
+    ${ctx2} =    Set Variable    all_reject2_${UNIQUE_ID}
+
+    # Create contexts
+    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${SIMPLE_CONFIG}
+    ...    --context    ${ctx1}
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    --unsafe
+    ...    --allow-rxpy-in-run-mode
+    ...    -p    "test"
+
+    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${SIMPLE_CONFIG}
+    ...    --context    ${ctx2}
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    --unsafe
+    ...    --allow-rxpy-in-run-mode
+    ...    -p    "test"
+
+    # Delete all with confirmation rejected
+    ${result} =    Run Process    python    -m    cleveragents    context    delete
+    ...    --all
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    stdin=n\n
+
+    Should Be Equal As Integers    ${result.rc}    0
+    Directory Should Exist    ${CONTEXT_DIR}/${ctx1}
+    Directory Should Exist    ${CONTEXT_DIR}/${ctx2}
+    Should Contain    ${result.stdout}    cancelled
+
+Test Error When Both Name And All Provided
+    [Documentation]    Test error when both NAME and --all are provided
+    ${result} =    Run Process    python    -m    cleveragents    context    delete
+    ...    test_context
+    ...    --all
+    ...    --context-dir    ${CONTEXT_DIR}
+
+    Should Not Be Equal As Integers    ${result.rc}    0
+    Should Contain Any    ${result.stderr}    ${result.stdout}    Cannot specify NAME when using --all
+
+Test Error When Neither Name Nor All Provided
+    [Documentation]    Test error when neither NAME nor --all is provided
+    ${result} =    Run Process    python    -m    cleveragents    context    delete
+    ...    --context-dir    ${CONTEXT_DIR}
+
+    Should Not Be Equal As Integers    ${result.rc}    0
+    Should Contain Any    ${result.stderr}    ${result.stdout}    Must specify NAME or use --all
+
+Test Delete All When No Contexts Exist
+    [Documentation]    Test delete all when directory is empty
+    # Ensure directory is empty
+    Empty Directory    ${CONTEXT_DIR}
+
+    ${result} =    Run Process    python    -m    cleveragents    context    delete
+    ...    --all
+    ...    --yes
+    ...    --context-dir    ${CONTEXT_DIR}
+
+    Should Be Equal As Integers    ${result.rc}    0
+    Should Contain    ${result.stdout}    No contexts found
+
+Test Delete Non Existent Context
+    [Documentation]    Test deleting a context that doesn't exist
+    ${result} =    Run Process    python    -m    cleveragents    context    delete
+    ...    non_existent_context_${UNIQUE_ID}
+    ...    --yes
+    ...    --context-dir    ${CONTEXT_DIR}
+
+    Should Not Be Equal As Integers    ${result.rc}    0
+    Should Contain Any    ${result.stderr}    ${result.stdout}    does not exist
+
+Test Delete All Shows Context List Before Deletion
+    [Documentation]    Test that --all shows context list before confirmation
+    [Setup]    Empty Directory    ${CONTEXT_DIR}
+    ${ctx1} =    Set Variable    list_ctx1_${UNIQUE_ID}
+    ${ctx2} =    Set Variable    list_ctx2_${UNIQUE_ID}
+    ${ctx3} =    Set Variable    list_ctx3_${UNIQUE_ID}
+
+    # Create contexts
+    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${SIMPLE_CONFIG}
+    ...    --context    ${ctx1}
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    --unsafe
+    ...    --allow-rxpy-in-run-mode
+    ...    -p    "test"
+
+    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${SIMPLE_CONFIG}
+    ...    --context    ${ctx2}
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    --unsafe
+    ...    --allow-rxpy-in-run-mode
+    ...    -p    "test"
+
+    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${SIMPLE_CONFIG}
+    ...    --context    ${ctx3}
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    --unsafe
+    ...    --allow-rxpy-in-run-mode
+    ...    -p    "test"
+
+    # Delete all with confirmation to see list
+    ${result} =    Run Process    python    -m    cleveragents    context    delete
+    ...    --all
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    stdin=n\n
+
+    Should Contain    ${result.stdout}    Found 3 context
+    Should Contain    ${result.stdout}    ${ctx1}
+    Should Contain    ${result.stdout}    ${ctx2}
+    Should Contain    ${result.stdout}    ${ctx3}
+
+*** Keywords ***
+Setup Test Environment
+    ${timestamp} =    Get Current Date    result_format=%Y%m%d_%H%M%S
+    ${random} =    Evaluate    random.randint(1000, 9999)    modules=random
+    Set Suite Variable    ${UNIQUE_ID}    ${timestamp}_${random}
+    Set Suite Variable    ${TEMP}    ${TEMPDIR}/ca_delete_test_${UNIQUE_ID}
+    Set Suite Variable    ${CONTEXT_DIR}    ${TEMP}/contexts
+    Create Directory    ${TEMP}
+    Create Directory    ${CONTEXT_DIR}
+
+Cleanup Test Environment
+    Run Keyword And Ignore Error    Remove Directory    ${TEMP}    recursive=True
+
+Should Contain Any
+    [Arguments]    ${text1}    ${text2}    ${expected}
+    ${combined} =    Set Variable    ${text1}${text2}
+    Should Contain    ${combined}    ${expected}
diff --git a/robot/context_management_test.robot b/robot/context_management_test.robot
new file mode 100644
index 000000000..52c3b0cb7
--- /dev/null
+++ b/robot/context_management_test.robot
@@ -0,0 +1,101 @@
+*** Settings ***
+Documentation     Simple context management test for CleverAgents CLI
+Library           Process
+Library           OperatingSystem
+Library           String
+Library           DateTime
+Suite Setup       Setup Test Environment
+Suite Teardown    Cleanup Test Environment
+
+*** Settings ***
+Resource    v2_paths.resource
+
+*** Variables ***
+${SIMPLE_CONFIG}            ${V2_CONFIG_DIR}/simple_echo_config.yaml
+${CONTEXT_DIR}              ${TEMPDIR}/test_contexts
+${UNIQUE_ID}                ${EMPTY}
+${TEMP}                     ${EMPTY}
+
+*** Test Cases ***
+Test Context Command Help
+    [Documentation]    Verify context command help is available
+    ${result} =    Run Process    python    -m    cleveragents    context    --help
+    Should Be Equal As Integers    ${result.rc}    0
+    Should Contain    ${result.stdout}    Context management
+    Should Contain    ${result.stdout}    clear
+    Should Contain    ${result.stdout}    Context management
+
+Test Run With Context Creates Directory
+    [Documentation]    Verify --context flag creates context directory
+    ${context_name} =    Set Variable    ctx_${UNIQUE_ID}
+    
+    # Use simple test config that exits cleanly
+    ${result} =    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${SIMPLE_CONFIG}
+    ...    --context    ${context_name}
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    --unsafe
+    ...    --allow-rxpy-in-run-mode
+    ...    -p    "test message"
+    
+    Should Be Equal As Integers    ${result.rc}    0
+    Directory Should Exist    ${CONTEXT_DIR}/${context_name}
+    
+Test Context Delete
+    [Documentation]    Test context delete command
+    ${context_name} =    Set Variable    del_${UNIQUE_ID}
+
+    # Create context
+    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${SIMPLE_CONFIG}
+    ...    --context    ${context_name}
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    --unsafe
+    ...    --allow-rxpy-in-run-mode
+    ...    -p    "test"
+    
+    Directory Should Exist    ${CONTEXT_DIR}/${context_name}
+    
+    # Delete it
+    ${result} =    Run Process    python    -m    cleveragents    context    delete
+    ...    ${context_name}
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    --yes
+    
+    Should Be Equal As Integers    ${result.rc}    0
+    Directory Should Not Exist    ${CONTEXT_DIR}/${context_name}
+
+Test Context Clear
+    [Documentation]    Test context clear command
+    ${context_name} =    Set Variable    clear_${UNIQUE_ID}
+    
+    # Create context
+    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${SIMPLE_CONFIG}
+    ...    --context    ${context_name}
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    --unsafe
+    ...    --allow-rxpy-in-run-mode
+    ...    -p    "test"
+
+    # Clear it
+    ${result} =    Run Process    python    -m    cleveragents    context    clear
+    ...    ${context_name}
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    --yes
+    
+    Should Be Equal As Integers    ${result.rc}    0
+    Directory Should Exist    ${CONTEXT_DIR}/${context_name}
+
+*** Keywords ***
+Setup Test Environment
+    ${timestamp} =    Get Current Date    result_format=%Y%m%d_%H%M%S
+    ${random} =    Evaluate    random.randint(1000, 9999)    modules=random
+    Set Suite Variable    ${UNIQUE_ID}    ${timestamp}_${random}
+    Set Suite Variable    ${TEMP}    ${TEMPDIR}/ca_test_${UNIQUE_ID}
+    Set Suite Variable    ${CONTEXT_DIR}    ${TEMP}/contexts
+    Create Directory    ${TEMP}
+    Create Directory    ${CONTEXT_DIR}
+
+Cleanup Test Environment
+    Run Keyword And Ignore Error    Remove Directory    ${TEMP}    recursive=True
\ No newline at end of file
diff --git a/robot/discovery_topic_progression_test.robot b/robot/discovery_topic_progression_test.robot
new file mode 100644
index 000000000..aed96b789
--- /dev/null
+++ b/robot/discovery_topic_progression_test.robot
@@ -0,0 +1,181 @@
+*** Settings ***
+Documentation     Test discovery stage topic progression bug fix
+Library           OperatingSystem
+Library           String
+Library           Collections
+Library           Process
+Library           DateTime
+Suite Setup       Setup Test Environment
+Suite Teardown    Cleanup Test Environment
+
+*** Settings ***
+Resource    v2_paths.resource
+
+*** Settings ***
+Resource    v2_paths.resource
+
+*** Variables ***
+${CONFIG_PATH}    ${CURDIR}/../examples/scientific_paper_writer.yaml
+${CONTEXT_FILE}   ${V2_CONTEXT_DIR}/discovery_stage_context.json
+${CONTEXT_NAME}   discovery_topic_test_ctx
+${CONTEXT_DIR}    ${TEMPDIR}/discovery_test_contexts
+${UNIQUE_ID}      ${EMPTY}
+
+
+*** Test Cases ***
+Discovery Stage Should Progress After Topic Is Set
+    [Documentation]    Test that the discovery stage properly progresses when user provides a topic
+
+    ${ctx_name} =    Set Variable    ${CONTEXT_NAME}_${UNIQUE_ID}
+
+    # Start with a fresh context and move to discovery stage
+    Log    Moving to discovery stage with !next command
+    ${result} =    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${CONFIG_PATH}
+    ...    --unsafe
+    ...    --allow-rxpy-in-run-mode
+    ...    --context    ${ctx_name}
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    -p    !next discovery
+    ...    cwd=/app
+    ...    timeout=60s
+    Log    Advanced to discovery: ${result.stdout}
+    Should Be Equal As Integers    ${result.rc}    0
+    # Verify we're now in discovery stage
+    ${stage_check}=    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${CONFIG_PATH}
+    ...    --unsafe
+    ...    --allow-rxpy-in-run-mode
+    ...    --context    ${ctx_name}
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    -p    !stage
+    ...    cwd=/app
+    ...    timeout=20s
+    Should Contain    ${stage_check.stdout}    discovery
+
+    # Set the topic with a clear, assertive statement
+    Log    Setting topic with clear assertion
+    ${result} =    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${CONFIG_PATH}
+    ...    --unsafe
+    ...    --allow-rxpy-in-run-mode
+    ...    --context    ${ctx_name}
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    -p    The topic is: tobacco and its effects on the lungs. That is the complete topic, no additional details needed.
+    ...    cwd=/app
+    ...    timeout=60s
+    Log    First response: ${result.stdout}
+
+    # Check if we progressed to asking about length (next question in discovery)
+    ${has_length_question} =    Run Keyword And Return Status
+    ...    Should Contain Any    ${result.stdout}    length    word count    how long    pages
+
+    # If we didn't progress, be even more aggressive
+    IF    not ${has_length_question}
+        Log    Did not progress, being more assertive
+        ${result} =    Run Process    python    -m    cleveragents    actor    run
+        ...    -c    ${CONFIG_PATH}
+        ...    --unsafe
+        ...    --allow-rxpy-in-run-mode
+        ...    --context    ${ctx_name}
+        ...    --context-dir    ${CONTEXT_DIR}
+        ...    -p    I already told you the topic: tobacco and its effects on the lungs. Please accept this topic and move on to the next question. I do not need to provide any more clarification.
+        ...    cwd=/app
+        ...    timeout=60s
+        Log    Second response: ${result.stdout}
+    END
+
+    # Now verify we progressed to the length question
+    Should Contain Any    ${result.stdout}
+    ...    length
+    ...    word count
+    ...    how long
+    ...    pages
+    ...    msg=Expected to progress to length question but got: ${result.stdout}
+
+    # Verify the topic was actually set in context by checking the global_context.json file directly
+    ${context_file} =    Set Variable    ${CONTEXT_DIR}/${ctx_name}/global_context.json
+    ${context_content} =    OperatingSystem.Get File    ${context_file}
+    Log    Context file content: ${context_content}
+
+    # Check that topic is not null in the context
+    Should Contain    ${context_content}    "topic"
+    Should Not Contain    ${context_content}    "topic": null
+
+Discovery Stage Should Handle Multiple Clarifications Before Progressing
+    [Documentation]    Test that the discovery stage can handle multiple rounds of clarification
+
+    ${ctx_name} =    Set Variable    ${CONTEXT_NAME}_multi_${UNIQUE_ID}
+
+    # Start with a fresh context and move to discovery stage
+    Log    Moving to discovery stage with !next command
+    ${result} =    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${CONFIG_PATH}
+    ...    --unsafe
+    ...    --allow-rxpy-in-run-mode
+    ...    --context    ${ctx_name}
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    -p    !next discovery
+    ...    cwd=/app
+    ...    timeout=60s
+    Should Be Equal As Integers    ${result.rc}    0
+    # Verify we're now in discovery stage
+    ${stage_check}=    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${CONFIG_PATH}
+    ...    --unsafe
+    ...    --allow-rxpy-in-run-mode
+    ...    --context    ${ctx_name}
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    -p    !stage
+    ...    cwd=/app
+    ...    timeout=20s
+    Should Contain    ${stage_check.stdout}    discovery
+
+    # First attempt - start with a clear, complete statement
+    Log    Setting topic with clear statement
+    ${result} =    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${CONFIG_PATH}
+    ...    --unsafe
+    ...    --allow-rxpy-in-run-mode
+    ...    --context    ${ctx_name}
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    -p    The topic is tobacco and its effects on lung health. This is the complete topic description.
+    ...    cwd=/app
+    ...    timeout=60s
+    Log    Topic response: ${result.stdout}
+
+    # Check if we progressed or need another clarification
+    ${has_length_question} =    Run Keyword And Return Status
+    ...    Should Contain Any    ${result.stdout}    length    word count    how long
+
+    # If still asking questions, be very assertive
+    IF    not ${has_length_question}
+        Log    Being more assertive about the topic
+        ${result} =    Run Process    python    -m    cleveragents    actor    run
+        ...    -c    ${CONFIG_PATH}
+        ...    --unsafe
+        ...    --allow-rxpy-in-run-mode
+        ...    --context    ${ctx_name}
+        ...    --context-dir    ${CONTEXT_DIR}
+        ...    -p    I have already provided the topic: tobacco and its effects on lung health. That is all the information about the topic. Please accept it and proceed to the next question.
+        ...    cwd=/app
+        ...    timeout=60s
+        Log    Assertive response: ${result.stdout}
+    END
+
+    # Now verify we eventually progressed
+    Should Contain Any    ${result.stdout}
+    ...    length
+    ...    word count
+    ...    how long
+    ...    msg=Expected to eventually progress to length question
+
+*** Keywords ***
+Setup Test Environment
+    ${timestamp} =    Get Current Date    result_format=%Y%m%d_%H%M%S
+    ${random} =    Evaluate    random.randint(1000, 9999)    modules=random
+    Set Suite Variable    ${UNIQUE_ID}    ${timestamp}_${random}
+    Create Directory    ${CONTEXT_DIR}
+
+Cleanup Test Environment
+    Run Keyword And Ignore Error    Remove Directory    ${CONTEXT_DIR}    recursive=True
diff --git a/robot/generate_examples_test.robot b/robot/generate_examples_test.robot
new file mode 100644
index 000000000..df6c4ec80
--- /dev/null
+++ b/robot/generate_examples_test.robot
@@ -0,0 +1,14 @@
+*** Settings ***
+Documentation     Integration tests for cleveragents generate-examples functionality
+Library           Process
+Library           OperatingSystem
+Library           Collections
+
+*** Settings ***
+Resource    v2_paths.resource
+
+*** Test Cases ***
+# generate-examples command removed; skipping suite
+Generate Examples Command Removed
+    [Documentation]    Placeholder: generate-examples command is removed in v3
+    No Operation
diff --git a/robot/initial_next_command_test.robot b/robot/initial_next_command_test.robot
new file mode 100644
index 000000000..eece57ff0
--- /dev/null
+++ b/robot/initial_next_command_test.robot
@@ -0,0 +1,79 @@
+*** Settings ***
+Documentation     Test !next command with fresh context (writing_stage: null)
+Library           Process
+Library           OperatingSystem
+Library           String
+Suite Setup       Setup Test Environment
+Suite Teardown    Cleanup Test Environment
+
+*** Settings ***
+Resource    v2_paths.resource
+
+*** Settings ***
+Resource    v2_paths.resource
+
+*** Variables ***
+${CONFIG_FILE}        ${CURDIR}/../examples/scientific_paper_writer.yaml
+${CONTEXT_DIR}        ${TEMPDIR}/initial_next_test_contexts
+${TEST_ID}           ${EMPTY}
+
+
+*** Test Cases ***
+Test Next Command With Null Writing Stage
+    [Documentation]    Test that !next works when writing_stage is null (fresh context)
+    [Tags]    integration    bugfix    commands
+    [Timeout]    1 minute
+
+    ${ctx}=    Set Variable    initial_next_${TEST_ID}
+
+    # Run !next as the very first command with a fresh context
+    # This should advance from null (default intro) to discovery stage
+    Log    Running !next command with fresh context...
+    ${result}=    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${CONFIG_FILE}
+    ...    --context    ${ctx}
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    --unsafe
+    ...    --allow-rxpy-in-run-mode
+    ...    -p    !next discovery
+    ...    stderr=STDOUT
+    ...    timeout=20s
+
+    # Should not produce an error
+    Should Not Contain    ${result.stdout}    Error: Current stage 'None' is invalid
+    Should Be Equal As Integers    ${result.rc}    0
+
+    # Verify stage was updated in the context by checking !stage command
+    ${result}=    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${CONFIG_FILE}
+    ...    --context    ${ctx}
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    --unsafe
+    ...    --allow-rxpy-in-run-mode
+    ...    -p    !stage
+    ...    stderr=STDOUT
+    ...    timeout=20s
+
+    Should Contain    ${result.stdout}    discovery
+
+    Log    Test completed successfully
+
+*** Keywords ***
+Setup Test Environment
+    ${timestamp}=    Get Time    epoch
+    Set Suite Variable    ${TEST_ID}    ${timestamp}
+    Create Directory    ${CONTEXT_DIR}
+    Log    Test environment setup complete with ID: ${TEST_ID}
+
+Cleanup Test Environment
+    Run Keyword And Ignore Error    Remove Directory    ${CONTEXT_DIR}    recursive=True
+    Log    Test environment cleaned up
+
+Should Contain Any
+    [Arguments]    ${text}    @{patterns}
+    [Documentation]    Check if text contains at least one of the patterns
+    FOR    ${pattern}    IN    @{patterns}
+        ${status}=    Run Keyword And Return Status    Should Contain    ${text}    ${pattern}    ignore_case=True
+        IF    ${status}    RETURN
+    END
+    Fail    Text does not contain any of: @{patterns}
diff --git a/robot/load_context_test.robot b/robot/load_context_test.robot
new file mode 100644
index 000000000..ea9381829
--- /dev/null
+++ b/robot/load_context_test.robot
@@ -0,0 +1,309 @@
+*** Settings ***
+Documentation     Integration tests for --load-context CLI feature
+Library           Process
+Library           OperatingSystem
+Library           String
+Library           DateTime
+Library           Collections
+Suite Setup       Setup Test Environment
+Suite Teardown    Cleanup Test Environment
+
+*** Settings ***
+Resource    v2_paths.resource
+
+*** Variables ***
+${SIMPLE_CONFIG}            ${V2_CONFIG_DIR}/simple_echo_config.yaml
+${CONTEXT_DIR}              ${TEMPDIR}/test_load_contexts
+${UNIQUE_ID}                ${EMPTY}
+${TEMP}                     ${EMPTY}
+
+*** Test Cases ***
+Test Load Context Transiently With Run Command
+    [Documentation]    Verify --load-context loads context without persisting
+    ${context_file} =    Create Sample Context JSON File
+    ${result} =    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${SIMPLE_CONFIG}
+    ...    --load-context    ${context_file}
+    ...    --unsafe
+    ...    --allow-rxpy-in-run-mode
+    ...    -p    "test message"
+
+    Should Be Equal As Integers    ${result.rc}    0
+    # Verify no context directory was created (transient)
+    ${home} =    Get Environment Variable    HOME
+    Directory Should Not Exist    ${home}/.cleveragents/context/_temp_*
+
+Test Load Context Into Named Context
+    [Documentation]    Verify --load-context with --context imports and persists
+    ${context_name} =    Set Variable    load_named_${UNIQUE_ID}
+    ${context_file} =    Create Sample Context JSON File
+
+    # Load context into named context
+    ${result} =    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${SIMPLE_CONFIG}
+    ...    --load-context    ${context_file}
+    ...    --context    ${context_name}
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    --unsafe
+    ...    --allow-rxpy-in-run-mode
+    ...    -p    "test message"
+
+    Should Be Equal As Integers    ${result.rc}    0
+
+    # Verify context was created and persisted
+    Directory Should Exist    ${CONTEXT_DIR}/${context_name}
+    File Should Exist    ${CONTEXT_DIR}/${context_name}/messages.json
+    File Should Exist    ${CONTEXT_DIR}/${context_name}/global_context.json
+
+    # Verify global context was loaded
+    ${global_ctx} =    Get File    ${CONTEXT_DIR}/${context_name}/global_context.json
+    Should Contain    ${global_ctx}    test_key
+    Should Contain    ${global_ctx}    test_value
+
+Test Load Context Replaces Existing Named Context
+    [Documentation]    Verify --load-context overwrites existing context
+    ${context_name} =    Set Variable    replace_${UNIQUE_ID}
+
+    # Create initial context with different data
+    ${result1} =    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${SIMPLE_CONFIG}
+    ...    --context    ${context_name}
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    --unsafe
+    ...    --allow-rxpy-in-run-mode
+    ...    -p    "original message"
+
+    Should Be Equal As Integers    ${result1.rc}    0
+
+    # Create new context file with different data
+    ${new_context_file} =    Create Context JSON File With Different Data
+
+    # Load new context, replacing the old one
+    ${result2} =    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${SIMPLE_CONFIG}
+    ...    --load-context    ${new_context_file}
+    ...    --context    ${context_name}
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    --unsafe
+    ...    --allow-rxpy-in-run-mode
+    ...    -p    "new message"
+
+    Should Be Equal As Integers    ${result2.rc}    0
+
+    # Verify context was replaced with new data
+    ${global_ctx} =    Get File    ${CONTEXT_DIR}/${context_name}/global_context.json
+    Should Contain    ${global_ctx}    replaced_key
+    Should Contain    ${global_ctx}    replaced_value
+
+Test Load Context From Export Format
+    [Documentation]    Verify loading context from exported file works correctly
+    ${context_name} =    Set Variable    export_test_${UNIQUE_ID}
+    ${export_file} =    Set Variable    ${TEMP}/exported_context.json
+
+    # Create a context with some data
+    ${result1} =    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${SIMPLE_CONFIG}
+    ...    --context    ${context_name}
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    --unsafe
+    ...    --allow-rxpy-in-run-mode
+    ...    -p    "test data for export"
+
+    Should Be Equal As Integers    ${result1.rc}    0
+
+    # Export the context
+    ${result2} =    Run Process    python    -m    cleveragents    context    export
+    ...    ${context_name}
+    ...    ${export_file}
+    ...    --context-dir    ${CONTEXT_DIR}
+
+    Should Be Equal As Integers    ${result2.rc}    0
+    File Should Exist    ${export_file}
+
+    # Delete the original context
+    ${result3} =    Run Process    python    -m    cleveragents    context    delete
+    ...    ${context_name}
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    --yes
+
+    Should Be Equal As Integers    ${result3.rc}    0
+
+    # Load the exported file into a new context
+    ${new_context_name} =    Set Variable    import_test_${UNIQUE_ID}
+    ${result4} =    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${SIMPLE_CONFIG}
+    ...    --load-context    ${export_file}
+    ...    --context    ${new_context_name}
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    --unsafe
+    ...    --allow-rxpy-in-run-mode
+    ...    -p    "verify import"
+
+    Should Be Equal As Integers    ${result4.rc}    0
+
+    # Verify the imported context has the original data
+    Directory Should Exist    ${CONTEXT_DIR}/${new_context_name}
+    ${messages} =    Get File    ${CONTEXT_DIR}/${new_context_name}/messages.json
+    Should Contain    ${messages}    test data for export
+
+Test Load Context With Non-Existent File
+    [Documentation]    Verify appropriate error when context file doesn't exist
+    ${result} =    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${SIMPLE_CONFIG}
+    ...    --load-context    /nonexistent/file.json
+    ...    --unsafe
+    ...    --allow-rxpy-in-run-mode
+    ...    -p    "test"
+
+    Should Not Be Equal As Integers    ${result.rc}    0
+    Should Contain Any    ${result.stderr}    does not exist    No such file    not found
+
+Test Load Context With Invalid JSON
+    [Documentation]    Verify appropriate error when JSON is malformed
+    ${bad_json_file} =    Set Variable    ${TEMP}/bad_context.json
+    Create File    ${bad_json_file}    { invalid json content
+
+    ${result} =    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${SIMPLE_CONFIG}
+    ...    --load-context    ${bad_json_file}
+    ...    --unsafe
+    ...    --allow-rxpy-in-run-mode
+    ...    -p    "test"
+
+    Should Not Be Equal As Integers    ${result.rc}    0
+
+Test Load Context Help Text
+    [Documentation]    Verify --load-context appears in help text
+    ${result} =    Run Process    python    -m    cleveragents    actor    run    --help
+    Should Be Equal As Integers    ${result.rc}    0
+    Should Contain    ${result.stdout}    --load-context
+
+Test Load Context Interactive Help Text
+    [Documentation]    Verify --load-context appears in actor run help text
+    ${result} =    Run Process    python    -m    cleveragents    actor    run    --help
+    Should Be Equal As Integers    ${result.rc}    0
+    Should Contain    ${result.stdout}    --load-context
+
+
+
+Test Load Context Interactive Help Text
+    [Documentation]    Verify --load-context appears in actor run help text
+    ${result} =    Run Process    python    -m    cleveragents    actor    run    --help
+    Should Be Equal As Integers    ${result.rc}    0
+    Should Contain    ${result.stdout}    --load-context
+
+
+Test Load Context With All Components
+    [Documentation]    Verify all context components (messages, state, metadata, global_context) are loaded
+    ${context_name} =    Set Variable    full_load_${UNIQUE_ID}
+    ${context_file} =    Create Full Context JSON File
+
+    ${result} =    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${SIMPLE_CONFIG}
+    ...    --load-context    ${context_file}
+    ...    --context    ${context_name}
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    --unsafe
+    ...    --allow-rxpy-in-run-mode
+    ...    -p    "verify all components"
+
+    Should Be Equal As Integers    ${result.rc}    0
+
+    # Verify all components were loaded
+    File Should Exist    ${CONTEXT_DIR}/${context_name}/messages.json
+    File Should Exist    ${CONTEXT_DIR}/${context_name}/metadata.json
+    File Should Exist    ${CONTEXT_DIR}/${context_name}/state.json
+    File Should Exist    ${CONTEXT_DIR}/${context_name}/global_context.json
+
+    # Verify content of each component
+    ${messages} =    Get File    ${CONTEXT_DIR}/${context_name}/messages.json
+    Should Contain    ${messages}    initial message
+
+    ${state} =    Get File    ${CONTEXT_DIR}/${context_name}/state.json
+    Should Contain    ${state}    test_state_key
+
+    ${global_ctx} =    Get File    ${CONTEXT_DIR}/${context_name}/global_context.json
+    Should Contain    ${global_ctx}    session_id
+
+*** Keywords ***
+Setup Test Environment
+    ${timestamp} =    Get Current Date    result_format=%Y%m%d_%H%M%S
+    ${random} =    Evaluate    random.randint(1000, 9999)    modules=random
+    Set Suite Variable    ${UNIQUE_ID}    ${timestamp}_${random}
+    Set Suite Variable    ${TEMP}    ${TEMPDIR}/ca_loadctx_${UNIQUE_ID}
+    Set Suite Variable    ${CONTEXT_DIR}    ${TEMP}/contexts
+    Create Directory    ${TEMP}
+    Create Directory    ${CONTEXT_DIR}
+
+Cleanup Test Environment
+    Run Keyword And Ignore Error    Remove Directory    ${TEMP}    recursive=True
+
+Create Sample Context JSON File
+    [Documentation]    Create a simple context JSON file for testing
+    ${context_file} =    Set Variable    ${TEMP}/sample_context.json
+    ${content} =    Catenate    SEPARATOR=\n
+    ...    {
+    ...      "context_name": "sample",
+    ...      "messages": [
+    ...        {
+    ...          "role": "user",
+    ...          "content": "Hello",
+    ...          "timestamp": "2025-01-01T00:00:00",
+    ...          "metadata": {}
+    ...        }
+    ...      ],
+    ...      "metadata": {
+    ...        "created_at": "2025-01-01T00:00:00"
+    ...      },
+    ...      "state": {},
+    ...      "global_context": {
+    ...        "test_key": "test_value"
+    ...      }
+    ...    }
+    Create File    ${context_file}    ${content}
+    RETURN    ${context_file}
+
+Create Context JSON File With Different Data
+    [Documentation]    Create a context JSON file with different data for replacement test
+    ${context_file} =    Set Variable    ${TEMP}/different_context.json
+    ${content} =    Catenate    SEPARATOR=\n
+    ...    {
+    ...      "context_name": "different",
+    ...      "messages": [],
+    ...      "metadata": {},
+    ...      "state": {},
+    ...      "global_context": {
+    ...        "replaced_key": "replaced_value"
+    ...      }
+    ...    }
+    Create File    ${context_file}    ${content}
+    RETURN    ${context_file}
+
+Create Full Context JSON File
+    [Documentation]    Create a context JSON file with all components
+    ${context_file} =    Set Variable    ${TEMP}/full_context.json
+    ${content} =    Catenate    SEPARATOR=\n
+    ...    {
+    ...      "context_name": "full",
+    ...      "messages": [
+    ...        {
+    ...          "role": "user",
+    ...          "content": "initial message",
+    ...          "timestamp": "2025-01-01T00:00:00",
+    ...          "metadata": {}
+    ...        }
+    ...      ],
+    ...      "metadata": {
+    ...        "created_at": "2025-01-01T00:00:00",
+    ...        "message_count": 1
+    ...      },
+    ...      "state": {
+    ...        "test_state_key": "test_state_value"
+    ...      },
+    ...      "global_context": {
+    ...        "session_id": "12345",
+    ...        "user_preferences": {"theme": "dark"}
+    ...      }
+    ...    }
+    Create File    ${context_file}    ${content}
+    RETURN    ${context_file}
diff --git a/robot/routing_prefix_stripping.robot b/robot/routing_prefix_stripping.robot
new file mode 100644
index 000000000..04b338bd6
--- /dev/null
+++ b/robot/routing_prefix_stripping.robot
@@ -0,0 +1,78 @@
+*** Settings ***
+Documentation     Integration tests for routing prefix stripping functionality
+Library           Process
+Library           OperatingSystem
+Library           String
+
+*** Settings ***
+Resource    v2_paths.resource
+
+*** Variables ***
+${DISCOVERY_CONFIG}    ${V2_CONFIG_DIR}/routing_test_discovery_response.yaml
+${BRAINSTORM_CONFIG}   ${V2_CONFIG_DIR}/routing_test_goto_brainstorming.yaml
+${NO_PREFIX_CONFIG}    ${V2_CONFIG_DIR}/routing_test_no_prefix.yaml
+${SET_TOPIC_CONFIG}    ${V2_CONFIG_DIR}/routing_test_set_topic.yaml
+${RUN_CMD}             python -m cleveragents actor run
+
+*** Test Cases ***
+Routing Prefix Stripping In Application
+    [Documentation]    Test that internal routing prefixes are stripped from output
+    [Tags]    routing    prefix    integration
+
+    # Run the application with DISCOVERY_RESPONSE prefix
+    ${result}=    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${DISCOVERY_CONFIG}
+    ...    --unsafe
+    ...    --allow-rxpy-in-run-mode
+    ...    -p    test input
+    ...    stderr=STDOUT
+    ...    timeout=30s
+
+    # Check that the output does NOT contain the prefix
+    Should Not Contain    ${result.stdout}    DISCOVERY_RESPONSE:
+    Should Contain    ${result.stdout}    What topic would you like to write about?
+
+Multiple Routing Prefixes Are Stripped
+    [Documentation]    Test that various routing prefixes are all stripped correctly
+    [Tags]    routing    prefix    integration
+
+    # Test GOTO_BRAINSTORMING prefix
+    ${result}=    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${BRAINSTORM_CONFIG}
+    ...    --unsafe
+    ...    --allow-rxpy-in-run-mode
+    ...    -p    test input
+    ...    stderr=STDOUT
+    ...    timeout=30s
+
+    Should Not Contain    ${result.stdout}    GOTO_BRAINSTORMING:
+    Should Contain    ${result.stdout}    Let's brainstorm ideas
+
+Content Without Prefix Remains Unchanged
+    [Documentation]    Test that content without routing prefixes is not modified
+    [Tags]    routing    prefix    integration
+
+    ${result}=    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${NO_PREFIX_CONFIG}
+    ...    --unsafe
+    ...    --allow-rxpy-in-run-mode
+    ...    -p    test input
+    ...    stderr=STDOUT
+    ...    timeout=30s
+
+    Should Contain    ${result.stdout}    This is normal text without any prefix
+
+SET Prefix Family Stripped
+    [Documentation]    Test that SET_* prefixes used for state updates are stripped
+    [Tags]    routing    prefix    integration
+
+    ${result}=    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${SET_TOPIC_CONFIG}
+    ...    --unsafe
+    ...    --allow-rxpy-in-run-mode
+    ...    -p    test input
+    ...    stderr=STDOUT
+    ...    timeout=30s
+
+    Should Not Contain    ${result.stdout}    SET_TOPIC:
+    Should Contain    ${result.stdout}    Neural networks in cognitive science
diff --git a/robot/rxpy_route_validation.robot b/robot/rxpy_route_validation.robot
new file mode 100644
index 000000000..f69992b71
--- /dev/null
+++ b/robot/rxpy_route_validation.robot
@@ -0,0 +1,356 @@
+*** Settings ***
+Documentation     Integration tests for RxPY route validation in run command
+Library           Process
+Library           OperatingSystem
+Library           String
+Library           Collections
+Suite Setup       Setup Test Environment
+Suite Teardown    Cleanup Test Environment
+
+*** Settings ***
+Resource    v2_paths.resource
+
+*** Variables ***
+${TEST_DIR}           ${TEMPDIR}/rxpy_validation_test
+${RXPY_CONFIG}        ${TEST_DIR}/rxpy_config.yaml
+${LANGGRAPH_CONFIG}   ${TEST_DIR}/langgraph_config.yaml
+${CONTEXT_DIR}        ${TEST_DIR}/test_contexts
+${UNIQUE_ID}          ${EMPTY}
+
+*** Test Cases ***
+Test Run Command Rejects RxPY Routes
+    [Documentation]    Verify run command rejects RxPY stream routes
+    [Tags]    rxpy    validation    run
+
+    Create RxPY Config File
+
+    # Try to run with RxPY routes - should fail
+    ${result} =    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${RXPY_CONFIG}
+    ...    -p    test
+    ...    --unsafe
+    ...    stderr=STDOUT
+
+
+    Should Not Be Equal As Integers    ${result.rc}    0    Command should have failed
+    Should Contain    ${result.stdout}    RxPY stream routes which are only supported in 'run' mode unless allowed. Use --allow-rxpy-in-run-mode to bypass.
+    Should Contain    ${result.stdout}    allow-rxpy-in-run-mode
+
+Test Run Command With Context Does Not Create Context
+    [Documentation]    Verify that no context is created when RxPY validation fails
+    [Tags]    rxpy    validation    context
+
+    ${context_name} =    Set Variable    rxpy_test_ctx_${UNIQUE_ID}
+
+    Create RxPY Config File
+
+    # Ensure context doesn't exist
+    Delete Context If Exists    ${context_name}
+
+    # Try to run with --context flag
+    ${result} =    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${RXPY_CONFIG}
+    ...    -p    test
+    ...    --unsafe
+    ...    --context    ${context_name}
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    stderr=STDOUT
+
+    Should Not Be Equal As Integers    ${result.rc}    0    Command should have failed
+    Should Contain    ${result.stdout}    RxPY stream routes which are only supported in 'run' mode unless allowed. Use --allow-rxpy-in-run-mode to bypass.
+
+    # Verify context was NOT created
+    ${context_exists} =    Context Exists    ${context_name}
+    Should Not Be True    ${context_exists}    Context should not have been created
+
+Test Run Command With LangGraph Routes Succeeds
+    [Documentation]    Verify run command works with LangGraph routes
+    [Tags]    langgraph    validation    run
+
+    Create LangGraph Config File
+
+    # Run with LangGraph routes - should succeed
+    ${context_name} =    Set Variable    rxpy_test_ctx_${UNIQUE_ID}
+    ${result} =    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${RXPY_CONFIG}
+    ...    --allow-rxpy-in-run-mode
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    -p    test
+    ...    stdout=PIPE
+    ...    stderr=PIPE
+    ...    timeout=30s
+
+    ...    stderr=STDOUT
+
+    # For now, might fail on actual execution but shouldn't have route validation error
+    ${output} =    Set Variable    ${result.stdout}
+    Should Not Contain    ${output}    RxPY stream routes which are only supported in 'run' mode unless allowed
+
+Test Run Command Accepts RxPY Routes When Allowed
+    [Documentation]    Verify actor run works with RxPY routes when allowed
+    [Tags]    rxpy    run
+
+    Create RxPY Config File
+
+    ${context_name} =    Set Variable    rxpy_test_ctx_${UNIQUE_ID}
+    ${result} =    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${RXPY_CONFIG}
+    ...    -p    test
+    ...    --unsafe
+    ...    --context    ${context_name}
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    stderr=STDOUT
+    ...    timeout=30s
+
+    Should Be Equal As Integers    ${result.rc}    0
+    Should Not Contain    ${result.stdout}    RxPY stream routes which are only supported in 'run' mode unless allowed
+
+Test Error Message Content
+    [Documentation]    Verify error message contains helpful information
+    [Tags]    rxpy    validation    error-message
+
+    Create RxPY Config File
+
+    ${result} =    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${RXPY_CONFIG}
+    ...    -p    test
+    ...    --unsafe
+    ...    stderr=STDOUT
+
+    Should Not Be Equal As Integers    ${result.rc}    0
+
+    # Check error message contains all important information
+    ${output} =    Convert To Lower Case    ${result.stdout}
+    Should Contain    ${output}    nested
+    Should Contain    ${output}    completion detection
+    Should Contain    ${output}    run mode
+    Should Contain    ${output}    langgraph
+
+Test Run With Nested Switch Operators
+    [Documentation]    Verify run command rejects configs with nested switch operators
+    [Tags]    rxpy    nested    validation
+
+    Create Nested Switch Config File
+
+    ${result} =    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${TEST_DIR}/nested_switch_config.yaml
+    ...    -p    test
+    ...    --unsafe
+    ...    stderr=STDOUT
+
+    Should Not Be Equal As Integers    ${result.rc}    0
+    Should Contain    ${result.stdout}    RxPY stream routes which are only supported in 'run' mode unless allowed. Use --allow-rxpy-in-run-mode to bypass.
+
+Test Mixed Route Types Detection
+    [Documentation]    Verify detection works with mix of RxPY and LangGraph routes
+    [Tags]    rxpy    mixed    validation
+
+    Create Mixed Routes Config File
+
+    # Should detect RxPY routes even if LangGraph routes also present
+    ${result} =    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${TEST_DIR}/mixed_config.yaml
+    ...    -p    test
+    ...    --unsafe
+    ...    stderr=STDOUT
+
+    Should Not Be Equal As Integers    ${result.rc}    0
+    Should Contain    ${result.stdout}    RxPY stream routes which are only supported in 'run' mode unless allowed. Use --allow-rxpy-in-run-mode to bypass.
+
+Test Context File Not Created On Multiple Runs
+    [Documentation]    Verify repeated failed runs do not create context
+    [Tags]    rxpy    context    validation
+
+    ${context_name} =    Set Variable    rxpy_multi_test_${UNIQUE_ID}
+
+    Create RxPY Config File
+    Delete Context If Exists    ${context_name}
+
+    # Run multiple times
+    FOR    ${i}    IN RANGE    3
+        ${result} =    Run Process    python    -m    cleveragents    actor    run
+        ...    -c    ${RXPY_CONFIG}
+        ...    -p    test
+        ...    --unsafe
+        ...    --context    ${context_name}
+        ...    --context-dir    ${CONTEXT_DIR}
+        ...    stderr=STDOUT
+
+        Should Not Be Equal As Integers    ${result.rc}    0
+    END
+
+    # Verify context still doesn't exist after multiple attempts
+    ${context_exists} =    Context Exists    ${context_name}
+    Should Not Be True    ${context_exists}
+
+*** Keywords ***
+Setup Test Environment
+    [Documentation]    Setup test environment
+    Create Directory    ${TEST_DIR}
+    Create Directory    ${CONTEXT_DIR}
+
+    # Generate unique ID for this test run
+    ${timestamp} =    Get Time    epoch
+    Set Suite Variable    ${UNIQUE_ID}    ${timestamp}
+
+Cleanup Test Environment
+    [Documentation]    Clean up test environment
+    Remove Directory    ${TEST_DIR}    recursive=True
+
+Create RxPY Config File
+    [Documentation]    Create a test config with RxPY stream routes
+    ${config} =    Catenate    SEPARATOR=\n
+    ...    actors:
+    ...    ${SPACE*2}echo_actor:
+    ...    ${SPACE*4}type: tool
+    ...    ${SPACE*4}config:
+    ...    ${SPACE*6}tools:
+    ...    ${SPACE*8}- echo
+    ...    ${SPACE*6}safe_mode: true
+    ...    ${EMPTY}
+    ...    routes:
+    ...    ${SPACE*2}echo_stream:
+    ...    ${SPACE*4}type: stream
+    ...    ${SPACE*4}stream_type: cold
+    ...    ${SPACE*4}operators:
+    ...    ${SPACE*6}- type: map
+    ...    ${SPACE*8}params:
+    ...    ${SPACE*10}actor: echo_actor
+    ...    ${SPACE*4}publications:
+    ...    ${SPACE*6}- __output__
+    ...    ${EMPTY}
+    ...    merges:
+    ...    ${SPACE*2}- sources: [__input__]
+    ...    ${SPACE*4}target: echo_stream
+
+    Create File    ${RXPY_CONFIG}    ${config}
+
+Create LangGraph Config File
+    [Documentation]    Create a test config with LangGraph routes
+    ${config} =    Catenate    SEPARATOR=\n
+    ...    actors:
+    ...    ${SPACE*2}echo_actor:
+    ...    ${SPACE*4}type: tool
+    ...    ${SPACE*4}config:
+    ...    ${SPACE*6}tools:
+    ...    ${SPACE*8}- echo
+    ...    ${SPACE*6}safe_mode: true
+    ...    ${EMPTY}
+    ...    routes:
+    ...    ${SPACE*2}main:
+    ...    ${SPACE*4}type: graph
+    ...    ${SPACE*4}nodes:
+    ...    ${SPACE*6}- id: start
+    ...    ${SPACE*8}actor: echo_actor
+    ...    ${SPACE*4}edges:
+    ...    ${SPACE*6}- from: __input__
+    ...    ${SPACE*8}to: start
+    ...    ${SPACE*6}- from: start
+    ...    ${SPACE*8}to: __output__
+    ...    ${EMPTY}
+    ...    merges:
+    ...    ${SPACE*2}- sources: [__input__]
+    ...    ${SPACE*4}target: main
+
+    Create File    ${LANGGRAPH_CONFIG}    ${config}
+
+Create Nested Switch Config File
+    [Documentation]    Create a config with nested switch operators
+    ${config} =    Catenate    SEPARATOR=\n
+    ...    actors:
+    ...    ${SPACE*2}test_actor:
+    ...    ${SPACE*4}type: tool
+    ...    ${SPACE*4}config:
+    ...    ${SPACE*6}tools:
+    ...    ${SPACE*8}- echo
+    ...    ${SPACE*6}safe_mode: true
+    ...    ${EMPTY}
+    ...    routes:
+    ...    ${SPACE*2}main:
+    ...    ${SPACE*4}type: stream
+    ...    ${SPACE*4}stream_type: cold
+    ...    ${SPACE*4}operators:
+    ...    ${SPACE*6}- type: switch
+    ...    ${SPACE*8}params:
+    ...    ${SPACE*10}cases:
+    ...    ${SPACE*12}- condition: "test"
+    ...    ${SPACE*14}route: nested_route
+    ...    ${SPACE*2}nested_route:
+    ...    ${SPACE*4}type: stream
+    ...    ${SPACE*4}stream_type: cold
+    ...    ${SPACE*4}operators:
+    ...    ${SPACE*6}- type: map
+    ...    ${SPACE*8}params:
+    ...    ${SPACE*10}actor: test_actor
+    ...    ${SPACE*4}publications:
+    ...    ${SPACE*6}- __output__
+    ...    ${EMPTY}
+    ...    merges:
+    ...    ${SPACE*2}- sources: [__input__]
+    ...    ${SPACE*4}target: main
+
+    Create File    ${TEST_DIR}/nested_switch_config.yaml    ${config}
+
+Create Mixed Routes Config File
+    [Documentation]    Create a config with both RxPY and LangGraph routes
+    ${config} =    Catenate    SEPARATOR=\n
+    ...    actors:
+    ...    ${SPACE*2}test_actor:
+    ...    ${SPACE*4}type: tool
+    ...    ${SPACE*4}config:
+    ...    ${SPACE*6}tools:
+    ...    ${SPACE*8}- echo
+    ...    ${SPACE*6}safe_mode: true
+    ...    ${EMPTY}
+    ...    routes:
+    ...    ${SPACE*2}stream_route:
+    ...    ${SPACE*4}type: stream
+    ...    ${SPACE*4}stream_type: cold
+    ...    ${SPACE*4}operators:
+    ...    ${SPACE*6}- type: map
+    ...    ${SPACE*8}params:
+    ...    ${SPACE*10}actor: test_actor
+    ...    ${SPACE*4}publications:
+    ...    ${SPACE*6}- __output__
+    ...    ${SPACE*2}graph_route:
+    ...    ${SPACE*4}type: graph
+    ...    ${SPACE*4}entry_point: start
+    ...    ${SPACE*4}nodes:
+    ...    ${SPACE*6}start:
+    ...    ${SPACE*8}type: actor
+    ...    ${SPACE*8}actor: test_actor
+    ...    ${SPACE*4}edges:
+    ...    ${SPACE*6}- source: start
+    ...    ${SPACE*8}target: end
+    ...    ${EMPTY}
+    ...    merges:
+    ...    ${SPACE*2}- sources: [__input__]
+    ...    ${SPACE*4}target: stream_route
+
+    Create File    ${TEST_DIR}/mixed_config.yaml    ${config}
+
+Delete Context If Exists
+    [Documentation]    Delete a context if it exists
+    [Arguments]    ${context_name}
+
+    ${result} =    Run Process    python    -m    cleveragents    context    delete
+    ...    ${context_name}
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    --yes
+    ...    stderr=STDOUT
+
+    # Don't fail if context doesn't exist
+    Log    Deleted context ${context_name} (if it existed)
+
+Context Exists
+    [Documentation]    Check if a context exists
+    [Arguments]    ${context_name}
+
+    ${result} =    Run Process    python    -m    cleveragents    context    show
+    ...    ${context_name}
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    stderr=STDOUT
+
+    # If return code is 0, context exists
+    ${exists} =    Evaluate    ${result.rc} == 0
+    RETURN    ${exists}
diff --git a/robot/scientific_paper_basic.robot b/robot/scientific_paper_basic.robot
new file mode 100644
index 000000000..228d6851c
--- /dev/null
+++ b/robot/scientific_paper_basic.robot
@@ -0,0 +1,84 @@
+*** Settings ***
+Library    Process
+Library    OperatingSystem
+Library    String
+Suite Setup       Setup Test Environment
+Suite Teardown    Cleanup Test Environment
+
+*** Settings ***
+Resource    v2_paths.resource
+
+*** Variables ***
+${CONFIG_FILE}    ${CURDIR}/../examples/scientific_paper_writer.yaml
+${CONTEXT_DIR}    ${EMPTY}
+${CONTEXT_NAME}   ${EMPTY}
+${TEST_ID}        ${EMPTY}
+
+*** Test Cases ***
+Scientific Paper Writer Basic Integration Test
+    [Documentation]    Minimal integration test to verify scientific paper writer works with real APIs
+    [Tags]    integration
+    [Timeout]    2 minutes
+    
+    # Test 1: Basic intro response (uses OpenAI API)
+    ${result}=    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${CONFIG_FILE}
+    ...    --context    ${CONTEXT_NAME}
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    --unsafe
+    ...    --allow-rxpy-in-run-mode
+    ...    -p    Hello
+    ...    stderr=DEVNULL
+    ...    timeout=20s
+
+    Should Contain    ${result.stdout}    Paper Writer
+    Log    Intro test passed
+
+    # Test 2: Command handler (no API needed)
+    ${result}=    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${CONFIG_FILE}
+    ...    --context    ${CONTEXT_NAME}
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    --unsafe
+    ...    --allow-rxpy-in-run-mode
+    ...    -p    !help
+    ...    stderr=DEVNULL
+    ...    timeout=10s
+
+    Should Contain    ${result.stdout}    Available Commands
+    Log    Command handler test passed
+    
+    # Test 3: Echo test to verify framework works
+    ${result}=    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${V2_CONFIG_DIR}/simple_echo_config.yaml
+    ...    --unsafe
+    ...    --allow-rxpy-in-run-mode
+    ...    -p    Test message
+    ...    stderr=DEVNULL
+    ...    timeout=10s
+    
+    Should Contain    ${result.stdout}    Test message
+    Log    Echo test passed
+    
+    Log    All integration tests passed successfully
+
+*** Keywords ***
+Setup Test Environment
+    ${timestamp}=    Get Time    epoch
+    Set Suite Variable    ${TEST_ID}    ${timestamp}
+    Set Suite Variable    ${CONTEXT_NAME}    test_paper_simple_${TEST_ID}
+    Set Suite Variable    ${CONTEXT_DIR}    ${TEMPDIR}/paper_basic_contexts
+    Create Directory    ${CONTEXT_DIR}
+    Log    Test environment setup complete with ID: ${TEST_ID}
+
+Cleanup Test Environment
+    Run Keyword And Ignore Error    Remove Directory    ${CONTEXT_DIR}    recursive=True
+    Log    Test environment cleaned up
+
+Should Contain Any
+    [Arguments]    ${text}    @{patterns}
+    FOR    ${pattern}    IN    @{patterns}
+        ${status}=    Run Keyword And Return Status    Should Contain    ${text}    ${pattern}
+        IF    ${status}    RETURN
+    END
+    Fail    Text does not contain any of: @{patterns}
\ No newline at end of file
diff --git a/robot/scientific_paper_e2e_test.robot b/robot/scientific_paper_e2e_test.robot
new file mode 100644
index 000000000..e61567947
--- /dev/null
+++ b/robot/scientific_paper_e2e_test.robot
@@ -0,0 +1,281 @@
+*** Settings ***
+Documentation     End-to-end integration test for Scientific Paper Writer
+Library           Process
+Library           OperatingSystem
+Library           String
+Suite Setup       Setup Test Environment
+Suite Teardown    Cleanup Test Environment
+
+*** Settings ***
+Resource    v2_paths.resource
+
+*** Settings ***
+Resource    v2_paths.resource
+
+*** Variables ***
+${CONFIG_FILE}        ${CURDIR}/../examples/scientific_paper_writer.yaml
+${CONTEXT_DIR}        ${TEMPDIR}/paper_e2e_contexts
+${CONTEXT_NAME}       paper_e2e_${TEST_ID}
+${TEST_ID}           ${EMPTY}
+
+
+*** Test Cases ***
+Scientific Paper Writer Full Workflow
+    [Documentation]    Test the complete workflow from intro through multiple stages
+    [Tags]    integration    e2e    slow
+    [Timeout]    10 minutes
+
+    # Test 1: Intro stage
+    Log    Testing intro stage...
+    ${result}=    Run Paper Command    Hello
+    Should Contain    ${result.stdout}    Paper Writer
+    Should Not Contain    ${result.stderr}    Error
+
+    # Test 2: Advance to discovery
+    Log    Advancing to discovery stage...
+    ${result}=    Run Paper Command    !next discovery
+    Should Be Equal As Integers    ${result.rc}    0
+    # Verify we're now in discovery stage
+    ${stage_check}=    Run Paper Command    !stage
+    Should Contain    ${stage_check.stdout}    discovery
+
+    # Test 3: Commands work
+    Log    Testing commands...
+    ${result}=    Run Paper Command    !stages
+    Should Contain    ${result.stdout}    discovery
+    Should Contain    ${result.stdout}    brainstorming
+
+    # Test 4: Test help command
+    Log    Testing help command...
+    ${result}=    Run Paper Command    !help
+    Should Contain    ${result.stdout}    Available Commands
+    Should Contain    ${result.stdout}    !next
+    Should Contain    ${result.stdout}    !accept
+
+    # Test 5: Skip to brainstorming with mock data
+    Log    Setting up mock paper details and advancing to brainstorming...
+    ${result}=    Run Paper Command    !next brainstorming
+    Should Be Equal As Integers    ${result.rc}    0
+    # Verify we're now in brainstorming stage
+    ${stage_check}=    Run Paper Command    !stage
+    Should Contain    ${stage_check.stdout}    brainstorming
+
+    # Test 6: Test brainstorming stage
+    Log    Testing brainstorming stage...
+    ${result}=    Run Paper Command    I want to write about the impact of machine learning on healthcare, focusing on diagnostic imaging and patient outcomes    timeout=90s
+    Should Not Contain    ${result.stderr}    Error
+    Length Should Be Greater Than    ${result.stdout}    50
+
+    # Test 7: Verify stage may have advanced (brainstorming stage might auto-advance after LLM response)
+    #         So we don't check for specific stage here anymore
+
+    # Test 8: Advance toward later stages (using structure or latex_generation as targets)
+    Log    Advancing toward later stages...
+    ${result}=    Run Paper Command    !next structure    timeout=120s
+    # Note: May fail if required context isn't set, which is acceptable for this E2E test
+    # The important thing is the command doesn't crash
+    ${rc_ok}=    Run Keyword And Return Status    Should Be Equal As Integers    ${result.rc}    0
+    # Note: Stage may auto-advance; exact stage verification removed
+
+    # Test 9: Verify stage list command works
+    Log    Verifying stage list command...
+    ${result}=    Run Paper Command    !stages
+    Should Contain    ${result.stdout}    structure
+    Should Contain    ${result.stdout}    latex_generation
+
+    Log    End-to-end test completed successfully
+
+Scientific Paper Writer LaTeX Generation
+    [Documentation]    Test LaTeX generation using pre-populated context
+    [Tags]    integration    e2e    latex
+    [Timeout]    5 minutes
+
+    ${ctx}=    Set Variable    latex_test_${TEST_ID}
+
+    # Import the brainstorming context fixture
+    Log    Importing brainstorming context fixture...
+    ${result}=    Run Process    python    -m    cleveragents    context    import
+    ...    ${ctx}
+    ...    ${V2_CONTEXT_DIR}/paper_contexts/03_brainstorming.json
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    stderr=STDOUT
+    ...    timeout=10s
+
+    Should Be Equal As Integers    ${result.rc}    0
+    Log    Context imported: ${result.stdout}
+
+    # Advance to latex_generation stage
+    Log    Advancing to latex_generation stage...
+    ${result}=    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${CONFIG_FILE}
+    ...    --context    ${ctx}
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    --unsafe
+    ...    --allow-rxpy-in-run-mode
+    ...    -p    !next latex_generation
+    ...    stderr=STDOUT
+    ...    timeout=180s
+    Should Be Equal As Integers    ${result.rc}    0
+    # Note: Stage may auto-advance after !next is called
+
+    # Generate LaTeX document (send message that should trigger LaTeX generation)
+    # The exact stage doesn't matter - the system should generate LaTeX when asked
+    Log    Generating LaTeX document...
+    ${result}=    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${CONFIG_FILE}
+    ...    --context    ${ctx}
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    --unsafe
+    ...    --allow-rxpy-in-run-mode
+    ...    -p    Generate the complete LaTeX document
+    ...    stderr=STDOUT
+    ...    timeout=180s
+    Should Be Equal As Integers    ${result.rc}    0
+    Should Not Contain    ${result.stderr}    Error
+    Should Not Contain    ${result.stderr}    timed out
+    # System should produce SOME output (not just echo the input)
+    Should Not Be Equal    ${result.stdout}    Generate the complete LaTeX document
+
+    # Verify LaTeX structure (if LaTeX was generated)
+    Log    Verifying LaTeX document structure...
+    ${has_latex}=    Run Keyword And Return Status    Should Contain    ${result.stdout}    \\documentclass
+    IF    ${has_latex}
+        Should Contain    ${result.stdout}    \\begin{document}
+        Should Contain    ${result.stdout}    \\end{document}
+        Should Contain    ${result.stdout}    \\section
+        Log    LaTeX document was generated successfully
+    ELSE
+        Log    LaTeX generation may require manual stage management or different prompting
+    END
+
+    # Verify context was updated (may or may not have latex_source depending on stage behavior)
+    Log    Verifying context is accessible...
+    ${result}=    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${CONFIG_FILE}
+    ...    --context    ${ctx}
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    --unsafe
+    ...    --allow-rxpy-in-run-mode
+    ...    -p    !context
+    ...    stderr=STDOUT
+    ...    timeout=30s
+    ${has_latex_context}=    Run Keyword And Return Status    Should Contain    ${result.stdout}    latex_source
+    IF    ${has_latex_context}
+        Log    Context includes latex_source field
+    ELSE
+        Log    Context does not include latex_source (may require different stage setup)
+    END
+
+    Log    LaTeX generation test completed
+
+Scientific Paper Writer Stage Navigation
+    [Documentation]    Test stage navigation and command processing
+    [Tags]    integration    commands
+    [Timeout]    3 minutes
+
+    ${ctx}=    Set Variable    stage_nav_${TEST_ID}
+
+    # Start at intro
+    ${result}=    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${CONFIG_FILE}
+    ...    --context    ${ctx}
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    --unsafe
+    ...    --allow-rxpy-in-run-mode
+    ...    -p    !stages
+    ...    stderr=STDOUT
+    ...    timeout=20s
+    Should Contain    ${result.stdout}    intro
+
+    # Test !next command
+    ${result}=    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${CONFIG_FILE}
+    ...    --context    ${ctx}
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    --unsafe
+    ...    --allow-rxpy-in-run-mode
+    ...    -p    !next
+    ...    stderr=STDOUT
+    ...    timeout=20s
+    Should Be Equal As Integers    ${result.rc}    0
+    # Verify we advanced from intro (stage may auto-advance past discovery to brainstorming)
+    ${stage_check}=    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${CONFIG_FILE}
+    ...    --context    ${ctx}
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    --unsafe
+    ...    --allow-rxpy-in-run-mode
+    ...    -p    !stage
+    ...    stderr=STDOUT
+    ...    timeout=20s
+    Should Not Contain    ${stage_check.stdout}    intro
+
+    # Test !help command
+    ${result}=    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${CONFIG_FILE}
+    ...    --context    ${ctx}
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    --unsafe
+    ...    --allow-rxpy-in-run-mode
+    ...    -p    !help
+    ...    stderr=STDOUT
+    ...    timeout=20s
+    Should Contain    ${result.stdout}    Available Commands
+    Should Contain    ${result.stdout}    !next
+    Should Contain    ${result.stdout}    !accept
+
+    # Test !stage command
+    ${result}=    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${CONFIG_FILE}
+    ...    --context    ${ctx}
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    --unsafe
+    ...    --allow-rxpy-in-run-mode
+    ...    -p    !stage
+    ...    stderr=STDOUT
+    ...    timeout=20s
+    Should Contain    ${result.stdout}    Current Stage
+    Should Contain    ${result.stdout}    Purpose
+
+*** Keywords ***
+Setup Test Environment
+    ${timestamp}=    Get Time    epoch
+    Set Suite Variable    ${TEST_ID}    ${timestamp}
+    Set Suite Variable    ${CONTEXT_NAME}    paper_e2e_${TEST_ID}
+    Create Directory    ${CONTEXT_DIR}
+    Log    Test environment setup complete with ID: ${TEST_ID}
+
+Cleanup Test Environment
+    Run Keyword And Ignore Error    Remove Directory    ${CONTEXT_DIR}    recursive=True
+    Log    Test environment cleaned up
+
+Run Paper Command
+    [Arguments]    ${command}    ${timeout}=30s
+    [Documentation]    Run a command against the paper writer with the persistent context
+    ${result}=    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${CONFIG_FILE}
+    ...    --context    ${CONTEXT_NAME}
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    --unsafe
+    ...    --allow-rxpy-in-run-mode
+    ...    -p    ${command}
+    ...    stderr=STDOUT
+    ...    timeout=${timeout}
+    Log    Command: ${command}
+    Log    Output: ${result.stdout}
+    RETURN    ${result}
+
+Should Contain Any
+    [Arguments]    ${text}    @{patterns}
+    [Documentation]    Check if text contains at least one of the patterns
+    FOR    ${pattern}    IN    @{patterns}
+        ${status}=    Run Keyword And Return Status    Should Contain    ${text}    ${pattern}    ignore_case=True
+        IF    ${status}    RETURN
+    END
+    Fail    Text does not contain any of: @{patterns}
+
+Length Should Be Greater Than
+    [Arguments]    ${text}    ${min_length}
+    [Documentation]    Check if text length is greater than minimum
+    ${length}=    Get Length    ${text}
+    Should Be True    ${length} > ${min_length}    Text length ${length} is not greater than ${min_length}
diff --git a/robot/scientific_paper_writer_test.robot b/robot/scientific_paper_writer_test.robot
new file mode 100644
index 000000000..7777f5055
--- /dev/null
+++ b/robot/scientific_paper_writer_test.robot
@@ -0,0 +1,95 @@
+*** Settings ***
+Documentation     Integration test for Scientific Paper Writer context management
+Library           Process
+Library           OperatingSystem
+Library           String
+Library           DateTime
+Suite Setup       Setup Test Environment
+Suite Teardown    Cleanup Test Environment
+
+*** Settings ***
+Resource    v2_paths.resource
+
+*** Variables ***
+${SIMPLE_CONFIG}            ${V2_CONFIG_DIR}/simple_echo_config.yaml
+${CONTEXT_DIR}              ${TEMPDIR}/sciwri_contexts
+${UNIQUE_ID}                ${EMPTY}
+${TEMP}                     ${EMPTY}
+
+*** Test Cases ***
+Test Context Export Import Commands
+    [Documentation]    Test exporting and importing context
+    ${source_ctx} =    Set Variable    export_${UNIQUE_ID}
+    ${import_ctx} =    Set Variable    import_${UNIQUE_ID}
+    ${export_file} =    Set Variable    ${TEMP}/export.json
+    
+    # Create source context with simple config
+    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${SIMPLE_CONFIG}
+    ...    --context    ${source_ctx}
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    --unsafe
+    ...    --allow-rxpy-in-run-mode
+    ...    -p    Hello world
+    ...    timeout=10s
+    
+    # Export it
+    ${result} =    Run Process    python    -m    cleveragents    context    export
+    ...    ${source_ctx}    ${export_file}
+    ...    --context-dir    ${CONTEXT_DIR}
+    
+    Should Be Equal As Integers    ${result.rc}    0
+    File Should Exist    ${export_file}
+    
+    # Import to new context
+    ${result} =    Run Process    python    -m    cleveragents    context    import
+    ...    ${import_ctx}    ${export_file}
+    ...    --context-dir    ${CONTEXT_DIR}
+    
+    Should Be Equal As Integers    ${result.rc}    0
+    Directory Should Exist    ${CONTEXT_DIR}/${import_ctx}
+
+Test Context List Command
+    [Documentation]    Test listing contexts
+    ${ctx1} =    Set Variable    list1_${UNIQUE_ID}
+    ${ctx2} =    Set Variable    list2_${UNIQUE_ID}
+    
+    # Create two contexts with simple echo config
+    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${SIMPLE_CONFIG}
+    ...    --context    ${ctx1}
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    --unsafe
+    ...    --allow-rxpy-in-run-mode
+    ...    -p    First
+    ...    timeout=10s
+
+    Run Process    python    -m    cleveragents    actor    run
+    ...    -c    ${SIMPLE_CONFIG}
+    ...    --context    ${ctx2}
+    ...    --context-dir    ${CONTEXT_DIR}
+    ...    --unsafe
+    ...    --allow-rxpy-in-run-mode
+    ...    -p    Second
+    ...    timeout=10s
+    
+    # List them
+    ${result} =    Run Process    python    -m    cleveragents    context    list
+    ...    --context-dir    ${CONTEXT_DIR}
+    
+    Should Be Equal As Integers    ${result.rc}    0
+    Should Contain    ${result.stdout}    ${ctx1}
+    Should Contain    ${result.stdout}    ${ctx2}
+
+*** Keywords ***
+Setup Test Environment
+    ${timestamp} =    Get Current Date    result_format=%Y%m%d_%H%M%S
+    ${random} =    Evaluate    random.randint(1000, 9999)    modules=random
+    Set Suite Variable    ${UNIQUE_ID}    ${timestamp}_${random}
+    Set Suite Variable    ${TEMP}    ${TEMPDIR}/sciwri_test_${UNIQUE_ID}
+    Set Suite Variable    ${CONTEXT_DIR}    ${TEMP}/contexts
+    Create Directory    ${TEMP}
+    Create Directory    ${CONTEXT_DIR}
+
+Cleanup Test Environment
+    Run Keyword And Ignore Error    Remove Directory    ${TEMP}    recursive=True
\ No newline at end of file
diff --git a/robot/system_prompt_template_rendering.robot b/robot/system_prompt_template_rendering.robot
new file mode 100644
index 000000000..5132bf4f5
--- /dev/null
+++ b/robot/system_prompt_template_rendering.robot
@@ -0,0 +1,201 @@
+*** Settings ***
+Documentation    Integration tests for LLM system prompt template rendering with runtime context
+Library          OperatingSystem
+Library          String
+Library          Collections
+Library          Process
+
+*** Settings ***
+Resource    v2_paths.resource
+
+*** Variables ***
+${TEMP_DIR}      /tmp/cleveragents_test
+${TEST_CONTEXT}  system_prompt_template_test
+
+*** Test Cases ***
+System Prompt Template Variables Are Rendered With Runtime Context
+    [Documentation]    Verify that JINJA2 templates in system prompts are rendered with actual runtime context
+    [Tags]    integration    llm    template    system_prompt
+
+    # Create a simple config with templated system prompt
+    ${config_content}=    Catenate    SEPARATOR=
+    ...    cleveragents:\n
+    ...    ${SPACE}${SPACE}version: "3.0"\n
+    ...    ${SPACE}${SPACE}template_engine: "JINJA2"\n
+    ...    
+
+    ...    actors:\n
+    ...    ${SPACE}${SPACE}filter_actor:\n
+    ...    ${SPACE}${SPACE}${SPACE}${SPACE}type: llm\n
+    ...    ${SPACE}${SPACE}${SPACE}${SPACE}config:\n
+    ...    ${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}provider: openai\n
+    ...    ${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}model: gpt-3.5-turbo\n
+    ...    ${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}system_prompt: "Topic: {{ context.topic | tojson }}, List: {{ context.items | length }}"\n
+    ...    
+
+    ...    routes:\n
+    ...    ${SPACE}${SPACE}main:\n
+    ...    ${SPACE}${SPACE}${SPACE}${SPACE}type: stream\n
+    ...    ${SPACE}${SPACE}${SPACE}${SPACE}publications:\n
+    ...    ${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}- __output__\n
+    ...    \n
+    ...    merges:\n
+    ...    ${SPACE}${SPACE}- sources: [__input__]\n
+    ...    ${SPACE}${SPACE}${SPACE}${SPACE}target: main\n
+
+    Create File    ${TEMP_DIR}/template_test.yaml    ${config_content}
+
+    # Create context with test data
+    ${context_data}=    Set Variable    {"topic": "Artificial Intelligence", "audience": "researchers"}
+    Create File    ${TEMP_DIR}/test_context.json    ${context_data}
+
+    # Run the agent with --load-context - the LLM should receive a system prompt with rendered values
+    # Since we can't easily intercept the actual LLM call, we verify the config was loaded correctly
+    ${result}=    Run Process    python    -m    cleveragents    actor    run    -c    ${TEMP_DIR}/template_test.yaml    --unsafe    --allow-rxpy-in-run-mode    --load-context    ${TEMP_DIR}/test_context.json    -p    "Analyze this"
+    ...    shell=False    timeout=30s
+
+    # The agent should have processed successfully (even if it times out, the config should load)
+    Should Not Contain    ${result.stderr}    TemplateError
+    Should Not Contain    ${result.stderr}    Failed to render
+    Remove File    ${TEMP_DIR}/template_test.yaml
+    Remove File    ${TEMP_DIR}/test_context.json
+
+Config Parser Preserves Template Syntax During YAML Loading
+    [Documentation]    Verify that template markers are not prematurely rendered during config parsing
+    [Tags]    integration    config    template
+
+    # Create config with templates
+    ${config_content}=    Catenate    SEPARATOR=
+    ...    cleveragents:\n
+    ...    ${SPACE}${SPACE}version: "3.0"\n
+    ...    ${SPACE}${SPACE}template_engine: "JINJA2"\n
+    ...    \n
+    ...    actors:\n
+    ...    ${SPACE}${SPACE}actor1:\n
+    ...    ${SPACE}${SPACE}${SPACE}${SPACE}type: llm\n
+    ...    ${SPACE}${SPACE}${SPACE}${SPACE}config:\n
+    ...    ${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}provider: openai\n
+    ...    ${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}model: gpt-3.5-turbo\n
+    ...    ${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}system_prompt: "Topic: {{ context.topic }}"\n
+    ...    ${SPACE}${SPACE}actor2:\n
+    ...    ${SPACE}${SPACE}${SPACE}${SPACE}type: llm\n
+    ...    ${SPACE}${SPACE}${SPACE}${SPACE}config:\n
+    ...    ${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}provider: openai\n
+    ...    ${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}model: gpt-3.5-turbo\n
+    ...    ${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}system_prompt: "Data: {{ context.data }}"\n
+    ...    \n
+    ...    routes:\n
+    ...    ${SPACE}${SPACE}main:\n
+    ...    ${SPACE}${SPACE}${SPACE}${SPACE}type: stream\n
+    ...    ${SPACE}${SPACE}${SPACE}${SPACE}publications:\n
+    ...    ${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}- __output__\n
+
+    Create File    ${TEMP_DIR}/preserve_test.yaml    ${config_content}
+
+    # The config should load without errors and preserve templates
+    ${python_code}=    Set Variable    import sys; sys.path.insert(0, '/app/src'); from pathlib import Path; from cleveragents.reactive.config_parser import ReactiveConfigParser; parser = ReactiveConfigParser(); config = parser.parse_files([Path('${TEMP_DIR}/preserve_test.yaml')]); agent1_prompt = config.agents['agent1'].config.get('system_prompt', ''); print('PROMPT1:', agent1_prompt); assert '{{' in agent1_prompt and '}}' in agent1_prompt, f'Templates not preserved: {agent1_prompt}'
+    ${result}=    Run Process    python    -c    ${python_code}    shell=False    timeout=10s
+
+    Should Be Equal As Integers    ${result.rc}    0
+    Should Contain    ${result.stdout}    PROMPT1:
+    Should Contain    ${result.stdout}    {{ context.topic }}
+
+    # Clean up
+    Remove File    ${TEMP_DIR}/preserve_test.yaml
+
+Nested Context Variables In System Prompts
+    [Documentation]    Verify that nested context variables like context.paper_details.topic work correctly
+    [Tags]    integration    llm    template    nested
+
+    # Create config with nested template variables
+    ${config_content}=    Catenate    SEPARATOR=
+    ...    cleveragents:\n
+    ...    ${SPACE}${SPACE}version: "3.0"\n
+    ...    ${SPACE}${SPACE}template_engine: "JINJA2"\n
+    ...    ${SPACE}${SPACE}unsafe: true\n
+    ...    \n
+    ...    actors:\n
+    ...    ${SPACE}${SPACE}nested_actor:\n
+    ...    ${SPACE}${SPACE}${SPACE}${SPACE}type: llm\n
+    ...    ${SPACE}${SPACE}${SPACE}${SPACE}config:\n
+    ...    ${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}provider: openai\n
+    ...    ${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}model: gpt-3.5-turbo\n
+    ...    ${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}system_prompt: |\n
+    ...    ${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}Paper Details:\n
+    ...    ${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}- Topic: {{ context.paper_details.topic }}\n
+    ...    ${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}- Length: {{ context.paper_details.length }}\n
+    ...    \n
+    ...    routes:\n
+    ...    ${SPACE}${SPACE}main:\n
+    ...    ${SPACE}${SPACE}${SPACE}${SPACE}type: stream\n
+    ...    ${SPACE}${SPACE}${SPACE}${SPACE}operators:\n
+    ...    ${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}- type: map\n
+    ...    ${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}params:\n
+    ...    ${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}actor: nested_actor\n
+    ...    ${SPACE}${SPACE}${SPACE}${SPACE}publications:\n
+    ...    ${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}- __output__\n
+    ...    \n
+    ...    merges:\n
+    ...    ${SPACE}${SPACE}- sources: [__input__]\n
+    ...    ${SPACE}${SPACE}${SPACE}${SPACE}target: main\n
+
+    Create File    ${TEMP_DIR}/nested_test.yaml    ${config_content}
+
+    # Create nested context
+    ${context_data}=    Set Variable    {"paper_details": {"topic": "Machine Learning", "length": "5000 words"}}
+    Create File    ${TEMP_DIR}/nested_context.json    ${context_data}
+
+    # Verify the config loads and preserves templates
+    ${python_code}=    Set Variable    import sys; sys.path.insert(0, '/app/src'); from pathlib import Path; from cleveragents.reactive.config_parser import ReactiveConfigParser; parser = ReactiveConfigParser(); config = parser.parse_files([Path('${TEMP_DIR}/nested_test.yaml')]); prompt = config.agents['nested_agent'].config.get('system_prompt', ''); print('NESTED_PROMPT:', prompt); assert '{{ context.paper_details.topic }}' in prompt, f'Nested template not preserved: {prompt}'
+    ${result}=    Run Process    python    -c    ${python_code}    shell=False    timeout=10s
+
+    Should Be Equal As Integers    ${result.rc}    0
+    Should Contain    ${result.stdout}    {{ context.paper_details.topic }}
+
+    # Clean up
+    Remove File    ${TEMP_DIR}/nested_test.yaml
+    Remove File    ${TEMP_DIR}/nested_context.json
+
+JINJA2 Filters In System Prompts Are Preserved
+    [Documentation]    Verify that JINJA2 filters like tojson are preserved during config loading
+    [Tags]    integration    template    jinja2    filters
+
+    # Create config with JINJA2 filters
+    ${config_content}=    Catenate    SEPARATOR=
+    ...    cleveragents:\n
+    ...    ${SPACE}${SPACE}version: "3.0"\n
+    ...    ${SPACE}${SPACE}template_engine: "JINJA2"\n
+    ...    \n
+    ...    actors:\n
+    ...    ${SPACE}${SPACE}filter_actor:\n
+    ...    ${SPACE}${SPACE}${SPACE}${SPACE}type: llm\n
+    ...    ${SPACE}${SPACE}${SPACE}${SPACE}config:\n
+    ...    ${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}provider: openai\n
+    ...    ${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}model: gpt-3.5-turbo\n
+    ...    ${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}system_prompt: "Topic: {{ context.topic | tojson }}, List: {{ context.items | length }}"\n
+    ...    \n
+    ...    routes:\n
+    ...    ${SPACE}${SPACE}main:\n
+    ...    ${SPACE}${SPACE}${SPACE}${SPACE}type: stream\n
+    ...    ${SPACE}${SPACE}${SPACE}${SPACE}publications:\n
+    ...    ${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}${SPACE}- __output__\n
+
+    Create File    ${TEMP_DIR}/filter_test.yaml    ${config_content}
+
+    # Verify filters are preserved
+    ${python_code}=    Set Variable    import sys; sys.path.insert(0, '/app/src'); from pathlib import Path; from cleveragents.reactive.config_parser import ReactiveConfigParser; parser = ReactiveConfigParser(); config = parser.parse_files([Path('${TEMP_DIR}/filter_test.yaml')]); prompt = config.agents['filter_agent'].config.get('system_prompt', ''); print('FILTER_PROMPT:', prompt); assert '| tojson' in prompt and '| length' in prompt, f'Filters not preserved: {prompt}'
+    ${result}=    Run Process    python    -c    ${python_code}    shell=False    timeout=10s
+
+    Should Be Equal As Integers    ${result.rc}    0
+    Should Contain    ${result.stdout}    | tojson
+    Should Contain    ${result.stdout}    | length
+
+    # Clean up
+    Remove File    ${TEMP_DIR}/filter_test.yaml
+
+*** Keywords ***
+Suite Setup
+    Create Directory    ${TEMP_DIR}
+
+Suite Teardown
+    Remove Directory    ${TEMP_DIR}    recursive=True
diff --git a/robot/v2_paths.resource b/robot/v2_paths.resource
new file mode 100644
index 000000000..1e82f5fc4
--- /dev/null
+++ b/robot/v2_paths.resource
@@ -0,0 +1,4 @@
+*** Variables ***
+${V2_CONFIG_DIR}    ${CURDIR}/../features/fixtures/v2/configs
+${V2_CONTEXT_DIR}   ${CURDIR}/../features/fixtures/v2/contexts
+${V2_EXAMPLES_DIR}  ${CURDIR}/../features/fixtures/v2/examples
diff --git a/robot/version_comprehensive_test.robot b/robot/version_comprehensive_test.robot
new file mode 100644
index 000000000..ece96dd51
--- /dev/null
+++ b/robot/version_comprehensive_test.robot
@@ -0,0 +1,37 @@
+*** Settings ***
+Documentation     Comprehensive integration test for cleveragents --version
+Library           Process
+Library           OperatingSystem
+Library           String
+
+*** Settings ***
+Resource    v2_paths.resource
+
+*** Variables ***
+${EXPECTED_VERSION}    0.1.0
+
+*** Test Cases ***
+Version Output Format Is Correct
+    [Documentation]    Test that version output follows the expected format
+    ${result} =    Run Process    python    -m    cleveragents    --version    timeout=5s
+    Should Be Equal As Integers    ${result.rc}    0
+    Should Match Regexp    ${result.stdout}    CleverAgents\\s+\d+\.\d+\.\d+
+
+Version Number Matches Expected
+    [Documentation]    Test that version number matches expected value
+    ${result} =    Run Process    python    -m    cleveragents    --version    timeout=5s
+    Should Be Equal As Integers    ${result.rc}    0
+    Should Contain    ${result.stdout}    1.0.0
+
+    
+Version Command Completes Successfully
+    [Documentation]    Test that version command completes successfully
+    ${result} =    Run Process    python    -m    cleveragents    --version    timeout=30s
+    Should Be Equal As Integers    ${result.rc}    0
+    
+Version Works With Module Invocation
+    [Documentation]    Test that version works when invoked as module
+    ${result} =    Run Process    python    -m    cleveragents    --version
+    Should Be Equal As Integers    ${result.rc}    0
+    Should Not Be Empty    ${result.stdout}
+    Should Be Empty    ${result.stderr}
\ No newline at end of file
diff --git a/robot/version_test.robot b/robot/version_test.robot
new file mode 100644
index 000000000..2bb07f5e1
--- /dev/null
+++ b/robot/version_test.robot
@@ -0,0 +1,30 @@
+*** Settings ***
+Documentation     Integration test for cleveragents CLI
+Library           Process
+Library           OperatingSystem
+
+*** Settings ***
+Resource    v2_paths.resource
+
+*** Test Cases ***
+Check CleverAgents Version Command
+    [Documentation]    Test that cleveragents --version returns the correct version
+    ${result} =    Run Process    python    -m    cleveragents    --version    timeout=5s
+    Should Be Equal As Integers    ${result.rc}    0
+    Should Contain    ${result.stdout}    CleverAgents 1.0.0
+    
+Check CleverAgents Version Command Stderr
+    [Documentation]    Ensure version command doesn't produce errors on stderr
+    ${result} =    Run Process    python    -m    cleveragents    --version    timeout=5s
+    Should Be Empty    ${result.stderr}
+    
+Check CleverAgents Help Command
+    [Documentation]    Test that cleveragents --help works correctly
+    ${result} =    Run Process    python    -m    cleveragents    --help    timeout=5s
+    Should Be Equal As Integers    ${result.rc}    0
+    Should Contain    ${result.stdout}    Usage:
+    
+Check CleverAgents Invalid Command
+    [Documentation]    Test that invalid commands return appropriate error code
+    ${result} =    Run Process    python    -m    cleveragents    --invalid-option    timeout=5s
+    Should Not Be Equal As Integers    ${result.rc}    0
diff --git a/src/cleveragents/__main__.py b/src/cleveragents/__main__.py
index e148146bc..713022f0b 100644
--- a/src/cleveragents/__main__.py
+++ b/src/cleveragents/__main__.py
@@ -4,11 +4,12 @@ from __future__ import annotations
 
 import sys
 
-from cleveragents.cli import main
+from cleveragents.cli import ensure_cli_commands_registered, main
 
 
 def run() -> int:
     """Execute the CLI entry point."""
+    ensure_cli_commands_registered()
     return main()
 
 
diff --git a/src/cleveragents/cli/__init__.py b/src/cleveragents/cli/__init__.py
index f03cd2a09..16812da6b 100644
--- a/src/cleveragents/cli/__init__.py
+++ b/src/cleveragents/cli/__init__.py
@@ -13,7 +13,16 @@ Responsibilities:
 - Convert between CLI and domain types
 """
 
-from cleveragents.cli.main import app, cli, convert_exit_code, main
+from cleveragents.cli.main import (
+    app,
+    cli,
+    convert_exit_code,
+    ensure_cli_commands_registered,
+    main,
+)
+
+# Ensure subcommands are registered when importing CLI
+ensure_cli_commands_registered()
 
 # Export main as main_cli for backward compatibility
 main_cli = main
diff --git a/src/cleveragents/cli/commands/actor.py b/src/cleveragents/cli/commands/actor.py
index 39017c7a0..01c18d78a 100644
--- a/src/cleveragents/cli/commands/actor.py
+++ b/src/cleveragents/cli/commands/actor.py
@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import asyncio
 import json
 from pathlib import Path
 from typing import Annotated, Any, cast
@@ -10,16 +11,21 @@ from rich.panel import Panel
 from rich.table import Table
 
 from cleveragents.actor.config import ActorConfiguration
+from cleveragents.application.container import get_container
 from cleveragents.core.exceptions import (
     BusinessRuleViolation,
+    CleverAgentsError,
     NotFoundError,
+    UnsafeConfigurationError,
     ValidationError,
 )
 from cleveragents.domain.models.core import Actor
+from cleveragents.reactive.application import ReactiveCleverAgentsApp
+from cleveragents.reactive.context_manager import ContextManager
 
 app = typer.Typer(
     help=(
-        "Manage actor configurations. "
+        "Manage actor configurations and actor-scoped execution. "
         "Built-ins use <provider>/<model>; customs use local/<id>. "
         "Default or built-in actors cannot be removed; "
         "use --unsafe when configs are marked unsafe."
@@ -28,9 +34,145 @@ app = typer.Typer(
 console = Console()
 
 
-def _get_services():
-    from cleveragents.application.container import get_container
+@app.command()
+def run(
+    config: Annotated[
+        list[Path],
+        typer.Option(
+            "--config",
+            "-c",
+            exists=True,
+            file_okay=True,
+            dir_okay=False,
+            readable=True,
+            resolve_path=True,
+            help="Path to one or more YAML/JSON configs",
+        ),
+    ],
+    prompt: Annotated[str, typer.Option("--prompt", "-p", help="Prompt to send")],
+    output: Annotated[
+        Path | None,
+        typer.Option(
+            "--output",
+            "-o",
+            file_okay=True,
+            dir_okay=False,
+            writable=True,
+            resolve_path=True,
+        ),
+    ] = None,
+    verbose: Annotated[int, typer.Option("--verbose", "-v", count=True)] = 0,
+    unsafe: Annotated[
+        bool, typer.Option("--unsafe", "-u", help="Confirm unsafe configs")
+    ] = False,
+    context: Annotated[
+        str | None, typer.Option("--context", help="Name for saving/reusing context")
+    ] = None,
+    context_dir: Annotated[
+        Path | None,
+        typer.Option(
+            "--context-dir", help="Directory to store context data", resolve_path=True
+        ),
+    ] = None,
+    load_context: Annotated[
+        Path | None,
+        typer.Option(
+            "--load-context",
+            exists=True,
+            file_okay=True,
+            dir_okay=False,
+            resolve_path=True,
+            help="Load context from JSON; imports into named context when provided",
+        ),
+    ] = None,
+    temperature: Annotated[
+        float | None,
+        typer.Option("--temperature", "-t", help="Override temperature"),
+    ] = None,
+    allow_rxpy_in_run_mode: Annotated[
+        bool,
+        typer.Option(
+            "--allow-rxpy-in-run-mode",
+            help="Allow RxPy stream routes in run mode (bypass validation)",
+        ),
+    ] = False,
+) -> None:
+    """Run the reactive network once with actor-first configs."""
+    app_exec = ReactiveCleverAgentsApp(
+        config_files=config,
+        verbose=verbose,
+        unsafe=unsafe,
+        temperature_override=temperature,
+    )
 
+    async def _execute() -> str:
+        if load_context and context:
+            ctx_mgr = ContextManager(context, context_dir)
+            ctx_mgr.import_context(load_context)
+            if ctx_mgr.global_context and app_exec.config:
+                app_exec.config.global_context.update(ctx_mgr.global_context)
+            ctx_mgr.add_message("user", prompt)
+            result = await app_exec.run_single_shot(
+                prompt,
+                context_manager=ctx_mgr,
+                allow_rxpy_in_run_mode=allow_rxpy_in_run_mode,
+            )
+            ctx_mgr.add_message("assistant", result)
+            if app_exec.config:
+                ctx_mgr.save_global_context(app_exec.config.global_context)
+            return result
+        if load_context:
+            import json as _json
+
+            with open(load_context, encoding="utf-8") as f:
+                data = _json.load(f)
+            if data.get("global_context") and app_exec.config:
+                app_exec.config.global_context.update(data["global_context"])
+            return await app_exec.run_single_shot(
+                prompt,
+                context_manager=None,
+                allow_rxpy_in_run_mode=allow_rxpy_in_run_mode,
+            )
+        if context:
+            ctx_mgr = ContextManager(context, context_dir)
+            if ctx_mgr.exists() and ctx_mgr.global_context and app_exec.config:
+                app_exec.config.global_context.update(ctx_mgr.global_context)
+            ctx_mgr.add_message("user", prompt)
+            result = await app_exec.run_single_shot(
+                prompt,
+                context_manager=ctx_mgr,
+                allow_rxpy_in_run_mode=allow_rxpy_in_run_mode,
+            )
+            ctx_mgr.add_message("assistant", result)
+            if app_exec.config:
+                ctx_mgr.save_global_context(app_exec.config.global_context)
+            return result
+        return await app_exec.run_single_shot(
+            prompt,
+            context_manager=None,
+            allow_rxpy_in_run_mode=allow_rxpy_in_run_mode,
+        )
+
+    try:
+        result = asyncio.run(_execute())
+    except UnsafeConfigurationError as exc:
+        typer.echo(f"Error: {exc}", err=True)
+        raise typer.Exit(code=1)
+    except CleverAgentsError as exc:
+        typer.echo(f"Error: {exc}", err=True)
+        raise typer.Exit(code=2)
+    except Exception as exc:  # pragma: no cover
+        typer.echo(f"Unexpected error: {exc}", err=True)
+        raise typer.Exit(code=3)
+
+    if output:
+        output.write_text(result)
+        typer.echo(f"Output written to {output}")
+    else:
+        typer.echo(result)
+
+
+def _get_services():
     container = get_container()
     actor_service = container.actor_service()
     actor_registry = (
diff --git a/src/cleveragents/cli/commands/actor_run.py b/src/cleveragents/cli/commands/actor_run.py
new file mode 100644
index 000000000..63c7f696b
--- /dev/null
+++ b/src/cleveragents/cli/commands/actor_run.py
@@ -0,0 +1,154 @@
+from __future__ import annotations
+
+from pathlib import Path
+from typing import Annotated
+
+import typer
+
+from cleveragents.core.exceptions import CleverAgentsException, UnsafeConfigurationError
+from cleveragents.reactive.application import ReactiveCleverAgentsApp
+from cleveragents.reactive.context_manager import ContextManager
+
+app = typer.Typer(help="Run reactive configs with actor-first semantics.")
+
+
+@app.command()
+def run(
+    config: Annotated[
+        list[Path],
+        typer.Option(
+            "--config",
+            "-c",
+            exists=True,
+            file_okay=True,
+            dir_okay=False,
+            readable=True,
+            resolve_path=True,
+            help="Path to one or more YAML/JSON configs",
+        ),
+    ],
+    prompt: Annotated[str, typer.Option("--prompt", "-p", help="Prompt to send")],
+    output: Annotated[
+        Path | None,
+        typer.Option(
+            "--output",
+            "-o",
+            file_okay=True,
+            dir_okay=False,
+            writable=True,
+            resolve_path=True,
+        ),
+    ] = None,
+    verbose: Annotated[int, typer.Option("--verbose", "-v", count=True)] = 0,
+    unsafe: Annotated[
+        bool, typer.Option("--unsafe", "-u", help="Confirm unsafe configs")
+    ] = False,
+    context: Annotated[
+        str | None, typer.Option("--context", help="Name for saving/reusing context")
+    ] = None,
+    context_dir: Annotated[
+        Path | None,
+        typer.Option(
+            "--context-dir", help="Directory to store context data", resolve_path=True
+        ),
+    ] = None,
+    load_context: Annotated[
+        Path | None,
+        typer.Option(
+            "--load-context",
+            exists=True,
+            file_okay=True,
+            dir_okay=False,
+            resolve_path=True,
+            help="Load context from JSON; imports into named context when provided",
+        ),
+    ] = None,
+    temperature: Annotated[
+        float | None, typer.Option("--temperature", "-t", help="Override temperature")
+    ] = None,
+    allow_rxpy_in_run_mode: Annotated[
+        bool,
+        typer.Option(
+            "--allow-rxpy-in-run-mode",
+            help="Allow RxPy stream routes in run mode (bypass validation)",
+        ),
+    ] = False,
+):
+    """Run the reactive network once with actor-first configs."""
+    app_exec = ReactiveCleverAgentsApp(
+        config_files=config,
+        verbose=verbose,
+        unsafe=unsafe,
+        temperature_override=temperature,
+    )
+
+    try:
+        result: str
+        if load_context and context:
+            ctx_mgr = ContextManager(context, context_dir)
+            ctx_mgr.import_context(load_context)
+            if ctx_mgr.global_context and app_exec.config:
+                app_exec.config.global_context.update(ctx_mgr.global_context)
+            ctx_mgr.add_message("user", prompt)
+            result = typer.run_async(
+                app_exec.run_single_shot(
+                    prompt,
+                    context_manager=ctx_mgr,
+                    allow_rxpy_in_run_mode=allow_rxpy_in_run_mode,
+                )
+            )
+            ctx_mgr.add_message("assistant", result)
+            if app_exec.config:
+                ctx_mgr.save_global_context(app_exec.config.global_context)
+        elif load_context:
+            import json
+
+            with open(load_context, encoding="utf-8") as f:
+                data = json.load(f)
+            if data.get("global_context") and app_exec.config:
+                app_exec.config.global_context.update(data["global_context"])
+            result = typer.run_async(
+                app_exec.run_single_shot(
+                    prompt,
+                    context_manager=None,
+                    allow_rxpy_in_run_mode=allow_rxpy_in_run_mode,
+                )
+            )
+        elif context:
+            ctx_mgr = ContextManager(context, context_dir)
+            if ctx_mgr.exists() and ctx_mgr.global_context and app_exec.config:
+                app_exec.config.global_context.update(ctx_mgr.global_context)
+            ctx_mgr.add_message("user", prompt)
+            result = typer.run_async(
+                app_exec.run_single_shot(
+                    prompt,
+                    context_manager=ctx_mgr,
+                    allow_rxpy_in_run_mode=allow_rxpy_in_run_mode,
+                )
+            )
+            ctx_mgr.add_message("assistant", result)
+            if app_exec.config:
+                ctx_mgr.save_global_context(app_exec.config.global_context)
+        else:
+            result = typer.run_async(
+                app_exec.run_single_shot(
+                    prompt,
+                    context_manager=None,
+                    allow_rxpy_in_run_mode=allow_rxpy_in_run_mode,
+                )
+            )
+    except UnsafeConfigurationError as exc:
+        typer.echo(f"Error: {exc}", err=True)
+        raise typer.Exit(code=1)
+    except CleverAgentsException as exc:
+        typer.echo(f"Error: {exc}", err=True)
+        raise typer.Exit(code=2)
+    except Exception as exc:  # pragma: no cover
+        typer.echo(f"Unexpected error: {exc}", err=True)
+        raise typer.Exit(code=3)
+
+    if output:
+        output.write_text(result)
+        typer.echo(f"Output written to {output}")
+    else:
+        typer.echo(result)
diff --git a/src/cleveragents/cli/main.py b/src/cleveragents/cli/main.py
index 0d702f24a..b1c21e758 100644
--- a/src/cleveragents/cli/main.py
+++ b/src/cleveragents/cli/main.py
@@ -75,8 +75,16 @@ def _register_subcommands() -> None:
     if _subcommands_registered:
         return
 
-    from cleveragents.cli.commands import actor, context, plan, project
-    from cleveragents.cli.commands.auto_debug import app as auto_debug_app
+    try:
+        from cleveragents.cli.commands import actor, context, plan, project
+        from cleveragents.cli.commands.auto_debug import app as auto_debug_app
+    except Exception as exc:  # pragma: no cover
+        import traceback
+
+        err = get_err_console()
+        err.print(f"[red]Failed to register subcommands:[/red] {exc}")
+        err.print(traceback.format_exc())
+        return
 
     app.add_typer(project.app, name="project", help="Project management")
     app.add_typer(context.app, name="context", help="Context management")
@@ -101,6 +109,10 @@ def _register_subcommands() -> None:
     _subcommands_registered = True
 
 
+# Register subcommands eagerly on import so Typer recognizes nested commands
+_register_subcommands()
+
+
 def ensure_cli_commands_registered() -> None:
     """Public helper to register CLI subcommands once."""
     _register_subcommands()
@@ -438,6 +450,7 @@ def main(args: list[str] | None = None) -> int:
             "project",
             "context",
             "plan",
+            "actor",
             "auto-debug",  # Auto-debug commands
             "tell",  # Shortcut for plan tell
             "build",  # Shortcut for plan build
diff --git a/src/cleveragents/config/settings.py b/src/cleveragents/config/settings.py
index 552ae8d96..94e85389d 100644
--- a/src/cleveragents/config/settings.py
+++ b/src/cleveragents/config/settings.py
@@ -8,6 +8,10 @@ from typing import Any, ClassVar
 from pydantic import AliasChoices, Field
 from pydantic_settings import BaseSettings, SettingsConfigDict
 
+# pydantic v2: use string for extra mode
+EXTRA_IGNORE = "ignore"
+STRUCTLOG_ENABLED = False
+
 
 @dataclass(slots=True)
 class ProviderDefaults:
@@ -258,7 +262,10 @@ class Settings(BaseSettings):
     )
 
     def model_post_init(self, __context: Any) -> None:  # type: ignore[override]
-        super().model_post_init(__context)
+        # pydantic v1 compatibility: BaseSettings may not define model_post_init
+        maybe_super = getattr(super(), "model_post_init", None)
+        if callable(maybe_super):
+            maybe_super(__context)
         self._langsmith_validation_errors: list[str] = []
         self._apply_external_env_overrides()
         # Prime LangSmith state so environment mirrors configuration
diff --git a/src/cleveragents/core/exceptions.py b/src/cleveragents/core/exceptions.py
index 96e4e853c..0fccb2e99 100644
--- a/src/cleveragents/core/exceptions.py
+++ b/src/cleveragents/core/exceptions.py
@@ -11,17 +11,16 @@ class CleverAgentsError(Exception):
     """Base exception for all CleverAgents errors."""
 
     def __init__(self, message: str, details: dict[str, Any] | None = None):
-        """Initialize exception with message and optional details.
-
-        Args:
-            message: Human-readable error message
-            details: Optional dictionary with additional error context
-        """
         super().__init__(message)
         self.message = message
         self.details = details or {}
 
 
+# Backward compatibility aliases for v2 code
+CleverAgentsException = CleverAgentsError
+UnsafeConfigurationError = CleverAgentsError
+
+
 # Domain Exceptions
 class DomainError(CleverAgentsError):
     """Base for domain/business logic errors."""
diff --git a/src/cleveragents/reactive/__init__.py b/src/cleveragents/reactive/__init__.py
index 3d445879d..cb357e1bb 100644
--- a/src/cleveragents/reactive/__init__.py
+++ b/src/cleveragents/reactive/__init__.py
@@ -1,12 +1,9 @@
-"""Reactive routing and stream utilities (actor-first).
-
-Ported from v2 reactive stack and adapted to actor-first semantics. Modules:
-- route: unified route models and complexity analysis
-- stream_router: RxPy-based reactive stream router
-- route_bridge: conversion between stream and graph routes
-"""
+"""Reactive routing, context, and execution utilities (actor-first)."""
 
 __all__ = [
+    "application",
+    "config_parser",
+    "context_manager",
     "route",
     "route_bridge",
     "stream_router",
diff --git a/src/cleveragents/reactive/application.py b/src/cleveragents/reactive/application.py
new file mode 100644
index 000000000..6769ff288
--- /dev/null
+++ b/src/cleveragents/reactive/application.py
@@ -0,0 +1,329 @@
+"""Reactive executor ported from v2 ReactiveCleverAgentsApp (actor-first)."""
+
+from __future__ import annotations
+
+import asyncio
+import logging
+from pathlib import Path
+from typing import Any
+
+from rx.scheduler.eventloop import AsyncIOScheduler  # type: ignore[attr-defined]
+
+from cleveragents.core.exceptions import CleverAgentsException, UnsafeConfigurationError
+from cleveragents.reactive.config_parser import ReactiveConfig, ReactiveConfigParser
+from cleveragents.reactive.context_manager import ContextManager
+from cleveragents.reactive.route import RouteType
+from cleveragents.reactive.route_bridge import RouteBridge
+from cleveragents.reactive.stream_router import ReactiveStreamRouter, SimpleToolAgent
+
+logger = logging.getLogger(__name__)
+
+
+class ReactiveCleverAgentsApp:
+    """Minimal reactive executor supporting run_single_shot (actor-first)."""
+
+    def __init__(
+        self,
+        config_files: list[Path] | None = None,
+        verbose: int = 0,
+        unsafe: bool = False,
+        temperature_override: float | None = None,
+    ):
+        self.verbose = verbose
+        self.unsafe = unsafe
+        self.temperature_override = temperature_override
+
+        self._configure_logging(verbose)
+        self.stream_router = ReactiveStreamRouter()
+        self.config_parser = ReactiveConfigParser()
+        self.langgraph_bridge = None
+        self.route_bridge = None
+        self.config: ReactiveConfig | None = None
+
+        if config_files:
+            self.load_configuration(config_files)
+            if self.temperature_override is not None and self.config:
+                self.config.global_context["_temperature_override"] = (
+                    self.temperature_override
+                )
+                logger.info(
+                    "Applied temperature override: %s", self.temperature_override
+                )
+            self._enforce_unsafe_flag()
+
+    def _configure_logging(self, verbose: int) -> None:
+        if verbose == 0:
+            level = logging.CRITICAL
+        elif verbose == 1:
+            level = logging.ERROR
+        elif verbose == 2:
+            level = logging.WARNING
+        elif verbose == 3:
+            level = logging.INFO
+        else:
+            level = logging.DEBUG
+        root_logger = logging.getLogger()
+        root_logger.setLevel(level)
+        if not root_logger.handlers:
+            handler = logging.StreamHandler()
+            handler.setFormatter(logging.Formatter("[%(name)s] %(message)s"))
+            root_logger.addHandler(handler)
+        for handler in root_logger.handlers:
+            handler.setLevel(level)
+
+    def _enforce_unsafe_flag(self) -> None:
+        if (
+            self.config
+            and self.config.global_context.get("unsafe", False)
+            and not self.unsafe
+        ):
+            raise UnsafeConfigurationError(
+                "This configuration requires the '--unsafe' flag because it may "
+                "execute arbitrary code with full privileges."
+            )
+
+    def _register_agents_from_config(self) -> None:
+        if not self.config:
+            return
+        for name, agent_cfg in self.config.agents.items():
+            if name in self.stream_router.agents:
+                continue
+            tools = agent_cfg.config.get("tools", []) if agent_cfg.config else []
+            if tools:
+                self.stream_router.register_agent(name, SimpleToolAgent(tools))
+            else:
+                self.stream_router.register_agent(
+                    name, lambda msg: getattr(msg, "content", msg)
+                )
+        for route in self.config.routes.values():
+            if route.type == RouteType.STREAM:
+                for actor_name in route.agents:
+                    if actor_name not in self.stream_router.agents:
+                        cfg_agent = self.config.agents.get(actor_name)
+                        tools = (
+                            cfg_agent.config.get("tools", [])
+                            if cfg_agent and cfg_agent.config
+                            else []
+                        )
+                        if tools:
+                            self.stream_router.register_agent(
+                                actor_name, SimpleToolAgent(tools)
+                            )
+                        else:
+                            self.stream_router.register_agent(
+                                actor_name, lambda msg: getattr(msg, "content", msg)
+                            )
+                for op in route.operators:
+                    params = op.get("params", {}) if isinstance(op, dict) else {}
+                    actor_name = params.get("actor") or params.get("agent")
+                    if actor_name and actor_name not in self.stream_router.agents:
+                        cfg_agent = self.config.agents.get(actor_name)
+                        tools = (
+                            cfg_agent.config.get("tools", [])
+                            if cfg_agent and cfg_agent.config
+                            else []
+                        )
+                        if tools:
+                            self.stream_router.register_agent(
+                                actor_name, SimpleToolAgent(tools)
+                            )
+                        else:
+                            self.stream_router.register_agent(
+                                actor_name, lambda msg: getattr(msg, "content", msg)
+                            )
+
+                        if tools:
+                            self.stream_router.register_agent(
+                                actor_name, SimpleToolAgent(tools)
+                            )
+                        else:
+                            self.stream_router.register_agent(
+                                actor_name, lambda msg: getattr(msg, "content", msg)
+                            )
+                for op in route.operators:
+                    params = op.get("params", {}) if isinstance(op, dict) else {}
+                    actor_name = params.get("actor") or params.get("agent")
+                    if actor_name and actor_name not in self.stream_router.agents:
+                        cfg_agent = self.config.agents.get(actor_name)
+                        tools = (
+                            cfg_agent.config.get("tools", [])
+                            if cfg_agent and cfg_agent.config
+                            else []
+                        )
+                        if tools:
+                            self.stream_router.register_agent(
+                                actor_name, SimpleToolAgent(tools)
+                            )
+                        else:
+                            self.stream_router.register_agent(
+                                actor_name, lambda msg: getattr(msg, "content", msg)
+                            )
+
+                        if tools:
+                            self.stream_router.register_agent(
+                                actor_name, SimpleToolAgent(tools)
+                            )
+                        else:
+                            self.stream_router.register_agent(
+                                actor_name, lambda msg: getattr(msg, "content", msg)
+                            )
+                for op in route.operators:
+                    params = op.get("params", {}) if isinstance(op, dict) else {}
+                    actor_name = params.get("actor") or params.get("agent")
+                    if actor_name and actor_name not in self.stream_router.agents:
+                        cfg_agent = self.config.agents.get(actor_name)
+                        tools = (
+                            cfg_agent.config.get("tools", [])
+                            if cfg_agent and cfg_agent.config
+                            else []
+                        )
+                        if tools:
+                            self.stream_router.register_agent(
+                                actor_name, SimpleToolAgent(tools)
+                            )
+                        else:
+                            self.stream_router.register_agent(
+                                actor_name, lambda msg: getattr(msg, "content", msg)
+                            )
+
+    def load_configuration(self, config_files: list[Path]) -> None:
+        try:
+            logger.info(
+                "Loading reactive configuration from %d files", len(config_files)
+            )
+            self.config = self.config_parser.parse_files(config_files)
+            self._register_agents_from_config()
+            self._validate_routes()
+            self._build_routes()
+        except Exception as exc:  # pylint: disable=broad-exception-caught
+            raise CleverAgentsException(f"Failed to load configuration: {exc}") from exc
+
+    def _validate_routes(self) -> None:
+        if not self.config:
+            return
+        for route_cfg in self.config.routes.values():
+            if route_cfg.type == RouteType.STREAM and route_cfg.bridge is not None:
+                raise CleverAgentsException(
+                    f"Route '{route_cfg.name}' is stream type but has a bridge configuration"
+                )
+
+    def _build_routes(self) -> None:
+        if not self.config:
+            return
+        self._register_agents_from_config()
+        for route in self.config.routes.values():
+            if route.type == RouteType.STREAM:
+                stream_cfg = self.stream_router._to_stream_config(route)
+                for op in stream_cfg.operators:
+                    params = op.get("params", {}) if isinstance(op, dict) else {}
+                    actor_name = params.get("actor") or params.get("agent")
+                    if actor_name and actor_name not in self.stream_router.agents:
+                        self.stream_router.register_agent(
+                            actor_name, lambda msg: getattr(msg, "content", msg)
+                        )
+                if stream_cfg.name not in self.stream_router.streams:
+                    self.stream_router.create_stream(stream_cfg)
+                if not stream_cfg.subscriptions:
+                    self.stream_router.streams["__input__"].subscribe(
+                        self.stream_router.streams[stream_cfg.name]
+                    )
+                if stream_cfg.name != "__output__":
+                    self.stream_router.observables[stream_cfg.name].subscribe(
+                        self.stream_router.streams["__output__"]
+                    )
+            elif route.type == RouteType.GRAPH:
+                if self.route_bridge is None:
+                    self.route_bridge = RouteBridge(
+                        stream_router=self.stream_router,
+                        agents=self.stream_router.agents,
+                    )
+                self.route_bridge.add_route(route)
+
+        if self.config.merges:
+            for merge in self.config.merges:
+                sources = merge.get("sources", []) if isinstance(merge, dict) else []
+                target = merge.get("target") if isinstance(merge, dict) else None
+                if not target or target not in self.stream_router.streams:
+                    continue
+                for src in sources:
+                    if src in self.stream_router.streams:
+                        self.stream_router.streams[src].subscribe(
+                            lambda msg, tgt=target: self.stream_router.streams[
+                                tgt
+                            ].on_next(msg)
+                        )
+
+    def _is_rxpy_stream_present(self) -> bool:
+        if not self.config:
+            return False
+        return any(r.type == RouteType.STREAM for r in self.config.routes.values())
+
+    async def run_single_shot(
+        self,
+        prompt: str,
+        *,
+        context_manager: ContextManager | None = None,
+        allow_rxpy_in_run_mode: bool = False,
+    ) -> str:
+        if self._is_rxpy_stream_present() and not allow_rxpy_in_run_mode:
+            raise CleverAgentsException(
+                "RxPY stream routes which are only supported in 'run' mode unless allowed. "
+                "Use --allow-rxpy-in-run-mode to bypass."
+            )
+
+        loop = asyncio.get_running_loop()
+        scheduler = AsyncIOScheduler(loop=loop)
+        self.stream_router.scheduler = scheduler
+
+        result_container: list[str] = []
+        error_container: list[str] = []
+
+        def on_next(msg: Any) -> None:
+            result_container.append(str(getattr(msg, "content", msg)))
+
+        def on_error(err: Exception) -> None:
+            error_container.append(str(err))
+
+        self.stream_router.observables["__output__"].subscribe(on_next, on_error)
+        self.stream_router.observables["__error__"].subscribe(on_error)
+
+        if context_manager and self.config:
+            if context_manager.global_context:
+                self.config.global_context.update(context_manager.global_context)
+
+        self.stream_router.streams["__input__"].on_next(prompt)
+        await asyncio.sleep(0)
+
+        if error_container:
+            raise CleverAgentsException("; ".join(error_container))
+
+        if not result_container:
+            return ""
+
+        output = "\n".join(result_container)
+        for prefix in [
+            "DISCOVERY_RESPONSE:",
+            "GOTO_BRAINSTORMING:",
+            "SET_TOPIC:",
+        ]:
+            if output.startswith(prefix):
+                output = output[len(prefix) :]
+        return output
+
+    async def run_with_context(
+        self,
+        prompt: str,
+        *,
+        context_manager: ContextManager,
+        allow_rxpy_in_run_mode: bool = False,
+    ) -> str:
+        context_manager.add_message("user", prompt)
+        result = await self.run_single_shot(
+            prompt,
+            context_manager=context_manager,
+            allow_rxpy_in_run_mode=allow_rxpy_in_run_mode,
+        )
+        context_manager.add_message("assistant", result)
+        if self.config:
+            context_manager.save_global_context(self.config.global_context)
+        return result
diff --git a/src/cleveragents/reactive/config_parser.py b/src/cleveragents/reactive/config_parser.py
index c23e0f63c..569a0ed21 100644
--- a/src/cleveragents/reactive/config_parser.py
+++ b/src/cleveragents/reactive/config_parser.py
@@ -103,7 +103,8 @@ class ReactiveConfigParser:
 
     def _build(self, data: dict[str, Any]) -> ReactiveConfig:
         rc = ReactiveConfig()
-        for name, agent_data in (data.get("agents", {}) or {}).items():
+        agents_data = data.get("agents") or data.get("actors") or {}
+        for name, agent_data in (agents_data or {}).items():
             rc.agents[name] = AgentConfig(
                 name=name,
                 type=agent_data.get("type", "llm"),
diff --git a/src/cleveragents/reactive/context_manager.py b/src/cleveragents/reactive/context_manager.py
new file mode 100644
index 000000000..f87d18a8b
--- /dev/null
+++ b/src/cleveragents/reactive/context_manager.py
@@ -0,0 +1,148 @@
+"""Context manager for actor-first CLI sessions (ported from v2)."""
+
+from __future__ import annotations
+
+import json
+from datetime import datetime
+from pathlib import Path
+from typing import Any
+
+
+class ContextManager:
+    """Manages conversation context for CLI sessions."""
+
+    def __init__(self, context_name: str, context_dir: Path | None = None):
+        self.context_name = context_name
+        if context_dir is None:
+            home_dir = Path.home()
+            self.context_dir = home_dir / ".cleveragents" / "context" / context_name
+        else:
+            self.context_dir = Path(context_dir) / context_name
+        self.context_dir.mkdir(parents=True, exist_ok=True)
+        self.messages_file = self.context_dir / "messages.json"
+        self.metadata_file = self.context_dir / "metadata.json"
+        self.state_file = self.context_dir / "state.json"
+        self.global_context_file = self.context_dir / "global_context.json"
+        self.messages: list[dict[str, Any]] = self._load_messages()
+        self.metadata: dict[str, Any] = self._load_metadata()
+        self.state: dict[str, Any] = self._load_state()
+        self.global_context: dict[str, Any] = self._load_global_context()
+
+    def _load_messages(self) -> list[dict[str, Any]]:
+        if self.messages_file.exists():
+            try:
+                with open(self.messages_file, encoding="utf-8") as f:
+                    return json.load(f)
+            except (OSError, json.JSONDecodeError):
+                return []
+        return []
+
+    def _load_metadata(self) -> dict[str, Any]:
+        if self.metadata_file.exists():
+            try:
+                with open(self.metadata_file, encoding="utf-8") as f:
+                    return json.load(f)
+            except (OSError, json.JSONDecodeError):
+                return {}
+        return {
+            "created_at": datetime.now().isoformat(),
+            "last_updated": datetime.now().isoformat(),
+            "context_name": self.context_name,
+        }
+
+    def _load_state(self) -> dict[str, Any]:
+        if self.state_file.exists():
+            try:
+                with open(self.state_file, encoding="utf-8") as f:
+                    return json.load(f)
+            except (OSError, json.JSONDecodeError):
+                return {}
+        return {}
+
+    def _load_global_context(self) -> dict[str, Any]:
+        if self.global_context_file.exists():
+            try:
+                with open(self.global_context_file, encoding="utf-8") as f:
+                    return json.load(f)
+            except (OSError, json.JSONDecodeError):
+                return {}
+        return {}
+
+    def save(self) -> None:
+        self.metadata["last_updated"] = datetime.now().isoformat()
+        self.metadata["message_count"] = len(self.messages)
+        with open(self.messages_file, "w", encoding="utf-8") as f:
+            json.dump(self.messages, f, indent=2)
+        with open(self.metadata_file, "w", encoding="utf-8") as f:
+            json.dump(self.metadata, f, indent=2)
+        with open(self.state_file, "w", encoding="utf-8") as f:
+            json.dump(self.state, f, indent=2)
+        with open(self.global_context_file, "w", encoding="utf-8") as f:
+            json.dump(self.global_context, f, indent=2)
+
+    def add_message(
+        self, role: str, content: str, metadata: dict[str, Any] | None = None
+    ) -> None:
+        message = {
+            "role": role,
+            "content": content,
+            "timestamp": datetime.now().isoformat(),
+            "metadata": metadata or {},
+        }
+        self.messages.append(message)
+        self.save()
+
+    def get_conversation_history(self) -> list[dict[str, Any]]:
+        return self.messages
+
+    def get_last_n_messages(self, n: int = 10) -> list[dict[str, Any]]:
+        return self.messages[-n:] if self.messages else []
+
+    def clear(self) -> None:
+        self.messages = []
+        self.state = {}
+        self.global_context = {}
+        self.metadata = {
+            "created_at": datetime.now().isoformat(),
+            "last_updated": datetime.now().isoformat(),
+            "context_name": self.context_name,
+        }
+        self.save()
+
+    def delete(self) -> None:
+        import shutil
+
+        if self.context_dir.exists():
+            shutil.rmtree(self.context_dir)
+
+    def update_state(self, key: str, value: Any) -> None:
+        self.state[key] = value
+        self.save()
+
+    def update_metadata(self, updates: dict[str, Any]) -> None:
+        self.metadata.update(updates)
+        self.metadata["last_updated"] = datetime.now().isoformat()
+        self.save()
+
+    def get_state(self, key: str, default: Any = None) -> Any:
+        return self.state.get(key, default)
+
+    def exists(self) -> bool:
+        return self.context_dir.exists() and self.messages_file.exists()
+
+    def save_global_context(self, global_context: dict[str, Any]) -> None:
+        self.global_context = global_context
+        with open(self.global_context_file, "w", encoding="utf-8") as f:
+            json.dump(self.global_context, f, indent=2)
+
+    def get_global_context(self) -> dict[str, Any]:
+        return self.global_context
+
+    def import_context(self, context_file: Path) -> None:
+        with open(context_file, encoding="utf-8") as f:
+            data = json.load(f)
+        self.messages = data.get("messages", [])
+        self.metadata = data.get("metadata", self._load_metadata())
+        self.state = data.get("state", {})
+        self.global_context = data.get("global_context", {})
+        self.save()
diff --git a/src/cleveragents/reactive/route_bridge.py b/src/cleveragents/reactive/route_bridge.py
index 284aaea63..b131c67ed 100644
--- a/src/cleveragents/reactive/route_bridge.py
+++ b/src/cleveragents/reactive/route_bridge.py
@@ -99,6 +99,18 @@ class RouteBridge:
             and not state.metadata.get("conditional_edges_used", False)
         )
 
+    def add_route(self, route_config: RouteConfig) -> None:
+        """Register a graph route for bridging.
+
+        For now we store the route config; LangGraph graph creation is handled
+        when upgrade/downgrade is invoked.
+        """
+        self._active_conversions[route_config.name] = {
+            "type": "graph",
+            "instance": None,
+            "original_config": route_config,
+        }
+
     async def upgrade_stream_to_graph(
         self, route_config: RouteConfig, message: StreamMessage
     ) -> LangGraph:
diff --git a/src/cleveragents/reactive/stream_router.py b/src/cleveragents/reactive/stream_router.py
index 5e82a9cec..e336fff26 100644
--- a/src/cleveragents/reactive/stream_router.py
+++ b/src/cleveragents/reactive/stream_router.py
@@ -1,13 +1,10 @@
-"""RxPy-based reactive stream router (actor-first).
-
+"""
 Ported from v2 reactive.stream_router with minimal adaptations to actor-first
-semantics. Provider/model flags are not used; agents are resolved by name.
+semantics. Provider/model flags are not used; actors are resolved by name.
 """
 
 from __future__ import annotations
 
-import asyncio
-import contextlib
 import logging
 from collections.abc import Callable
 from enum import Enum
@@ -17,12 +14,9 @@ import rx
 from pydantic import BaseModel, Field
 from rx import operators as ops
 from rx.core import Observable as ObservableType  # type: ignore[attr-defined]
-from rx.core import Observer as ObserverType  # type: ignore[attr-defined]
 from rx.scheduler.eventloop import AsyncIOScheduler  # type: ignore[attr-defined]
-from rx.subject import (
-    BehaviorSubject,  # type: ignore[attr-defined]
-    Subject,  # type: ignore[attr-defined]
-)
+from rx.subject.behaviorsubject import BehaviorSubject  # type: ignore[attr-defined]
+from rx.subject.subject import Subject  # type: ignore[attr-defined]
 
 from cleveragents.core.exceptions import StreamRoutingError
 
@@ -44,9 +38,8 @@ class StreamMessage(BaseModel):
     timestamp: float | None = None
 
     def copy_with(self, **kwargs: Any) -> StreamMessage:
-        if "metadata" in kwargs:
-            new_metadata = kwargs["metadata"]
-        else:
+        new_metadata = kwargs.get("metadata")
+        if new_metadata is None:
             new_metadata = {}
             for key, value in self.metadata.items():
                 if key == "context":
@@ -55,7 +48,6 @@ class StreamMessage(BaseModel):
                     new_metadata[key] = (
                         value.copy() if isinstance(value, dict) else value
                     )
-
         data = {
             "content": self.content,
             "metadata": new_metadata,
@@ -80,8 +72,39 @@ class StreamConfig(BaseModel):  # pylint: disable=too-many-instance-attributes
     template_config: dict[str, Any] | None = None
 
 
+class SimpleToolAgent:
+    """Executes inline tool code blocks from agent config."""
+
+    def __init__(self, tools: list[dict[str, Any]] | None = None):
+        self.tools = tools or []
+
+    def process(self, content: Any, metadata: dict[str, Any] | None = None) -> Any:  # type: ignore[override]
+        meta = metadata or {}
+        if not self.tools:
+            return content
+        tool = self.tools[0] if isinstance(self.tools, list) else None
+        code = tool.get("code") if isinstance(tool, dict) else None
+        if not code:
+            return content
+        local_vars: dict[str, Any] = {
+            "input_data": content,
+            "metadata": meta,
+            "result": None,
+        }
+        try:
+            exec(code, {}, local_vars)
+        except Exception:
+            return ""
+        return local_vars.get("result", "")
+
+    def process_message_sync(
+        self, content: Any, metadata: dict[str, Any] | None = None
+    ) -> Any:
+        return self.process(content, metadata)
+
+
 class ReactiveStreamRouter:  # pylint: disable=too-many-instance-attributes
-    """RxPy-based stream router for agent orchestration."""
+    """RxPy-based stream router for actor orchestration."""
 
     def __init__(self, scheduler: AsyncIOScheduler | None = None):
         self.logger = logging.getLogger(__name__)
@@ -94,6 +117,28 @@ class ReactiveStreamRouter:  # pylint: disable=too-many-instance-attributes
         self._langgraph_bridge: Any | None = None
         self._create_builtin_streams()
 
+    def _to_stream_config(self, route_config: Any) -> StreamConfig:
+        """Convert RouteConfig (or dict) to StreamConfig (actor-first)."""
+
+        def _get(obj: Any, key: str, default: Any = None) -> Any:
+            if hasattr(obj, key):
+                return getattr(obj, key)
+            if isinstance(obj, dict):
+                return obj.get(key, default)
+            return default
+
+        return StreamConfig(
+            name=_get(route_config, "name"),
+            type=_get(route_config, "stream_type", StreamType.COLD),
+            operators=_get(route_config, "operators", []) or [],
+            subscriptions=_get(route_config, "subscriptions", []) or [],
+            publications=_get(route_config, "publications", []) or [],
+            agents=_get(route_config, "agents", []) or [],
+            initial_value=_get(route_config, "initial_value"),
+            buffer_size=_get(route_config, "buffer_size", 1),
+            template_config=_get(route_config, "template_config"),
+        )
+
     def _create_builtin_streams(self) -> None:
         input_stream = Subject()
         self.streams["__input__"] = input_stream
@@ -118,7 +163,7 @@ class ReactiveStreamRouter:  # pylint: disable=too-many-instance-attributes
 
     def register_agent(self, name: str, agent: Any) -> None:
         self.agents[name] = agent
-        self.logger.debug("Registered agent: %s", name)
+        self.logger.debug("Registered actor: %s", name)
 
     def create_stream(self, config: StreamConfig | str) -> Any:
         if isinstance(config, str):
@@ -130,7 +175,9 @@ class ReactiveStreamRouter:  # pylint: disable=too-many-instance-attributes
         if config.type == StreamType.HOT:
             stream: Any = BehaviorSubject(config.initial_value)
         elif config.type == StreamType.REPLAY:
-            from rx.subject import ReplaySubject  # type: ignore[attr-defined]
+            from rx.subject.replaysubject import (
+                ReplaySubject,  # type: ignore[attr-defined]
+            )
 
             stream = ReplaySubject(buffer_size=config.buffer_size)
         else:
@@ -175,11 +222,11 @@ class ReactiveStreamRouter:  # pylint: disable=too-many-instance-attributes
             )
 
         if op_type == "map":
-            if "agent" in params:
-                agent_name = params["agent"]
-                agent = self.agents.get(agent_name)
+            actor_name = params.get("actor") or params.get("agent")
+            if actor_name:
+                agent = self.agents.get(actor_name)
                 if not agent:
-                    raise StreamRoutingError(f"Agent '{agent_name}' not found")
+                    raise StreamRoutingError(f"Agent '{actor_name}' not found")
                 return ops.map(self._create_agent_mapper(agent))
             if "function" in params:
                 func_name = params["function"]
@@ -188,7 +235,7 @@ class ReactiveStreamRouter:  # pylint: disable=too-many-instance-attributes
                 transform = params["transform"]
                 return ops.map(lambda x: self._apply_transform(x, transform))
             raise StreamRoutingError(
-                "Map operator requires 'agent', 'function', or 'transform' parameter"
+                "Map operator requires 'actor'/'agent', 'function', or 'transform' parameter"
             )
 
         if op_type == "filter":
@@ -334,11 +381,12 @@ class ReactiveStreamRouter:  # pylint: disable=too-many-instance-attributes
             content = getattr(msg, "content", msg)
             metadata = getattr(msg, "metadata", {}) if hasattr(msg, "metadata") else {}
             try:
-                result = (
-                    agent.process_message_sync(content, metadata)
-                    if hasattr(agent, "process_message_sync")
-                    else agent.process(content, metadata)
-                )  # type: ignore[attr-defined]
+                if hasattr(agent, "process_message_sync"):
+                    result = agent.process_message_sync(content, metadata)
+                elif hasattr(agent, "process"):
+                    result = agent.process(content, metadata)  # type: ignore[attr-defined]
+                else:
+                    result = content
             except Exception:  # pylint: disable=broad-except
                 result = ""
             return StreamMessage(
@@ -372,53 +420,5 @@ class ReactiveStreamRouter:  # pylint: disable=too-many-instance-attributes
         if stream_name not in self.streams:
             raise StreamRoutingError(f"Stream '{stream_name}' not found")
         meta = metadata or {}
-        msg = StreamMessage(
-            content=message,
-            metadata=meta,
-            source_stream=stream_name,
-            timestamp=asyncio.get_event_loop().time(),
-        )
+        msg = StreamMessage(content=message, metadata=meta)
         self.streams[stream_name].on_next(msg)
-
-    def merge_streams(self, sources: list[str], target: str) -> None:
-        if target not in self.streams:
-            self.create_stream(StreamConfig(name=target))
-        observables = [self.streams[s] for s in sources if s in self.streams]
-        merged = rx.merge(*observables)
-        merged.subscribe(self.streams[target])
-
-    def split_stream(self, source: str, conditions: list[dict[str, Any]]) -> None:
-        if source not in self.streams:
-            raise StreamRoutingError(f"Stream '{source}' not found")
-
-        def splitter(msg: StreamMessage) -> None:
-            for condition in conditions:
-                target = condition.get("target")
-                cond = condition.get("condition", {})
-                if (
-                    target
-                    and self._evaluate_condition(msg, cond)
-                    and target in self.streams
-                ):
-                    self.streams[target].on_next(msg)
-
-        self.streams[source].subscribe(splitter)
-
-    def subscribe_to_output(self, observer: ObserverType) -> None:
-        self.streams["__output__"].subscribe(observer)
-
-    def subscribe_to_error(self, observer: ObserverType) -> None:
-        self.streams["__error__"].subscribe(observer)
-
-    def dispose(self) -> None:
-        for sub in self.subscriptions:
-            with contextlib.suppress(Exception):
-                sub.dispose()
-        for stream in self.streams.values():
-            if hasattr(stream, "dispose"):
-                with contextlib.suppress(Exception):
-                    stream.dispose()
-        self.streams.clear()
-        self.observables.clear()
-        self.stream_configs.clear()
-        self.subscriptions.clear()