fast-agent-mcp 0.0.16__py3-none-any.whl → 0.1.0__py3-none-any.whl

{fast_agent_mcp-0.0.16.dist-info → fast_agent_mcp-0.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fast-agent-mcp
-Version: 0.0.16
+Version: 0.1.0
 Summary: Define, Prompt and Test MCP enabled Agents and Workflows
 Author-email: Shaun Smith <fastagent@llmindset.co.uk>, Sarmad Qadri <sarmad@lastmileai.dev>
 License:                                  Apache License
@@ -235,7 +235,7 @@ Provides-Extra: temporal
 Requires-Dist: temporalio>=1.8.0; extra == 'temporal'
 Description-Content-Type: text/markdown
 
-## FastAgent
+## fast-agent
 
 <p align="center">
 <a href="https://pypi.org/project/fast-agent-mcp/"><img src="https://img.shields.io/pypi/v/fast-agent-mcp?color=%2334D058&label=pypi" /></a>
@@ -415,9 +415,13 @@ Look at the `parallel.py` workflow example for more examples. If you don't speci
 
 `parallel` is also useful to ensemble ideas from different LLMs.
 
+When using `parallel` in other workflows, specify an `instruction` to describe its operation.
+
 ### Evaluator-Optimizer
 
-Evaluator-Optimizers combine 2 agents: one to generate content (the `generator`), and the other to judge that content and provide actionable feedback (the `evaluator`). Messages are sent to the generator first, then the pair run in a loop until either the evaluator is satisfied with the quality, or the maximum number of refinements is reached.
+Evaluator-Optimizers combine 2 agents: one to generate content (the `generator`), and the other to judge that content and provide actionable feedback (the `evaluator`). Messages are sent to the generator first, then the pair run in a loop until either the evaluator is satisfied with the quality, or the maximum number of refinements is reached. The final result from the Generator is returned.
+
+If the Generator has `use_history` off, the previous iteration is returned when asking for improvements - otherwise conversational context is used.
 
 ```python
 @fast.evaluator_optimizer(
@@ -432,6 +436,8 @@ async with fast.run() as agent:
   await agent.researcher.send("produce a report on how to make the perfect espresso")
 ```
 
+When used in a workflow, it returns the last `generator` message as the result.
+
 See the `evaluator.py` workflow example, or `fast-agent bootstrap researcher` for a more complete example.
 
 ### Router
@@ -540,7 +546,7 @@ agent["greeter"].send("Good Evening!")          # Dictionary access is supported
   name="route",                          # name of the router
   agents=["agent1", "agent2", "agent3"], # list of agent names router can delegate to
   model="o3-mini.high",                  # specify routing model
-  use_history=True,                      # router maintains chat history
+  use_history=False,                     # router maintains conversation history
   human_input=False,                     # whether router can request human input
 )
 ```
@@ -570,6 +576,7 @@ agent["greeter"].send("Good Evening!")          # Dictionary access is supported
 
 ### llmindset.co.uk fork:
 
+- Overhaul of Eval/Opt for Conversation Management
 - Remove instructor use for Orchestrator
 - Improved handling of Parallel/Fan-In and respose option
 - XML based generated prompts
@@ -590,9 +597,3 @@ agent["greeter"].send("Good Evening!")          # Dictionary access is supported
 - Numerous defect fixes
 
 ### Features to add.
-
-- Chat History Clear.
-
-```
-
-```

{fast_agent_mcp-0.0.16.dist-info → fast_agent_mcp-0.1.0.dist-info}/RECORD

@@ -11,19 +11,19 @@ mcp_agent/agents/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 mcp_agent/agents/agent.py,sha256=losanPSdZXZzmeiX-J6ctOinLlkhNZsxwi3Swr8lnxA,11482
 mcp_agent/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mcp_agent/cli/__main__.py,sha256=AVZ7tQFhU_sDOGuUGJq8ujgKtcxsYJBJwHbVaaiRDlI,166
-mcp_agent/cli/main.py,sha256=cqRxYTpeZ656lzf9qLR3LPnQXrFVDxlWm5gRuqyzUQg,2456
+mcp_agent/cli/main.py,sha256=DE6EZzspfzHwPK59x8vL4AIDHRQkVQ1Ja70XRGU1IQs,2753
 mcp_agent/cli/terminal.py,sha256=5fqrKlJvIpKEuvpvZ653OueQSYFFktBEbosjr2ucMUc,1026
-mcp_agent/cli/commands/bootstrap.py,sha256=z1wZSy8vO_GZPGLrFGzG3EKFQgAHC08jiIdVyylo-58,10778
+mcp_agent/cli/commands/bootstrap.py,sha256=Rmwbuwl52eHfnya7fnwKk2J7nCsHpSh6irka4mBDEnU,10779
 mcp_agent/cli/commands/config.py,sha256=32YTS5jmsYAs9QzAhjkG70_daAHqOemf4XbZBBSMz6g,204
-mcp_agent/cli/commands/setup.py,sha256=8ofxUAF2nUSu1IarDZSAsTt6_6PoEht3TGbz9N6WSbs,6239
+mcp_agent/cli/commands/setup.py,sha256=_SCpd6_PrixqbSaE72JQ7erIRkZnJGmh_3TvvwSzEiE,6392
 mcp_agent/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mcp_agent/core/agent_app.py,sha256=2gnORb52cpWYGjRDNTJ9lVCEEc11c7Xi874ho7bbYVQ,6097
+mcp_agent/core/agent_app.py,sha256=6U3HLYAJOfyVuUpZVELWT5lOo64-b_sfWp0yn88s7Wo,6085
 mcp_agent/core/agent_types.py,sha256=yKiMbv9QO2dduq4zXmoMZlOZpXJZhM4oNwIq1-134FE,318
 mcp_agent/core/agent_utils.py,sha256=yUJ-qvw5TblqqOsB1vj0Qvcz9mass9awPA6UNNvuw0A,1738
-mcp_agent/core/enhanced_prompt.py,sha256=ka-uuGNW7XggaGzXZQFB9T4azej455VPcgO66Q_7jnY,13008
+mcp_agent/core/enhanced_prompt.py,sha256=XraDKdIMW960KXCiMfCEPKDakbf1wHYgvHwD-9CBDi0,13011
 mcp_agent/core/error_handling.py,sha256=D3HMW5odrbJvaKqcpCGj6eDXrbFcuqYaCZz7fyYiTu4,623
 mcp_agent/core/exceptions.py,sha256=a2-JGRwFFRoQEPuAq0JC5PhAJ5TO3xVJfdS4-VN29cw,2225
-mcp_agent/core/fastagent.py,sha256=MLMdQ4_Cjb2svWyGVWLGf8EzI3dSFCl4BS5qq8UrKgg,56966
+mcp_agent/core/fastagent.py,sha256=CuT50oaexYq7L5-1xHR5HfS7qYKNToH3wmBAeD8kcBY,58234
 mcp_agent/core/proxies.py,sha256=hXDUpsgGO4xBTIjdUeXj6vULPb8sf55vAFVQh6Ybn60,4411
 mcp_agent/core/server_validation.py,sha256=_59cn16nNT4HGPwg19HgxMtHK4MsdWYDUw_CuL-5xek,1696
 mcp_agent/core/types.py,sha256=Zhi9iW7uiOfdpSt9NC0FCtGRFtJPg4mpZPK2aYi7a7M,817
@@ -54,7 +54,8 @@ mcp_agent/mcp/mcp_agent_server.py,sha256=xP09HZTeguJi4Fq0p3fjLBP55uSYe5AdqM90xCg
 mcp_agent/mcp/mcp_aggregator.py,sha256=RVsgNnSJ1IPBkqKgF_Gp-Cpv97FVBIdppPey6FRoHB0,14751
 mcp_agent/mcp/mcp_connection_manager.py,sha256=WLli0w3TVcsszyD9M7zP7vLKPetnQLTf_0PGhvMm9YM,13145
 mcp_agent/mcp/stdio.py,sha256=tW075R5rQ-UlflXWFKIFDgCbWbuhKqxhiYolWvyEkFs,3985
-mcp_agent/resources/examples/data-analysis/analysis.py,sha256=1Ce68epq8j6yjgxkJeTtnLR4l5yq8ANGEZ2k1sIf6dw,2292
+mcp_agent/resources/examples/data-analysis/analysis-campaign.py,sha256=EG-HhaDHltZ4hHAqhgfX_pHM2wem48aYhSIKJxyWHKc,7269
+mcp_agent/resources/examples/data-analysis/analysis.py,sha256=yRwcYob-jaqwR1vdx_gYXpfqtBN4w7creNeNgimOHa4,2443
 mcp_agent/resources/examples/data-analysis/fastagent.config.yaml,sha256=eTKGbjnTHhDTeNRPQvG_fr9OQpEZ5Y9v7X2NyCj0V70,530
 mcp_agent/resources/examples/data-analysis/mount-point/WA_Fn-UseC_-HR-Employee-Attrition.csv,sha256=pcMeOL1_r8m8MziE6xgbBrQbjl5Ijo98yycZn7O-dlk,227977
 mcp_agent/resources/examples/internal/agent.py,sha256=f-jTgYabV3nWCQm0ZP9NtSEWjx3nQbRngzArRufcELg,384
@@ -66,10 +67,10 @@ mcp_agent/resources/examples/researcher/researcher-eval.py,sha256=kNPjIU-JwE0oIB
 mcp_agent/resources/examples/researcher/researcher.py,sha256=jPRafm7jbpHKkX_dQiYGG3Sw-e1Dm86q-JZT-WZDhM0,1425
 mcp_agent/resources/examples/workflows/agent_build.py,sha256=vdjS02rZR88RU53WYzXxPscfFNEFFe_niHYE_i49I8Q,2396
 mcp_agent/resources/examples/workflows/chaining.py,sha256=1G_0XBcFkSJCOXb6N_iXWlSc_oGAlhENR0k_CN1vJKI,1208
-mcp_agent/resources/examples/workflows/evaluator.py,sha256=aUotC9-soTjWgw5GAf9m74BKAHzwxRPBdnSb5ga3lY8,3072
+mcp_agent/resources/examples/workflows/evaluator.py,sha256=3XmW1mjImlaWb0c5FWHYS9yP8nVGTbEdJySAoWXwrDg,3109
 mcp_agent/resources/examples/workflows/fastagent.config.yaml,sha256=k2AiapOcK42uqG2nWDVvnSLqN4okQIQZK0FTbZufBpY,809
 mcp_agent/resources/examples/workflows/human_input.py,sha256=c8cBdLEPbaMXddFwsfN3Z7RFs5PZXsdrjANfvq1VTPM,605
-mcp_agent/resources/examples/workflows/orchestrator.py,sha256=pRJqB-ok79_iEj8aG4FysHyXz6wAHLUX-5tS8khUI7k,2574
+mcp_agent/resources/examples/workflows/orchestrator.py,sha256=5TGFWrRQiTCdYY738cyd_OzZc7vckYkk1Up9VejFXB0,2574
 mcp_agent/resources/examples/workflows/parallel.py,sha256=pLbQrtXfbdYqMVddxtg5dZnBnm5Wo2mXlIa1Vf2F1FQ,3096
 mcp_agent/resources/examples/workflows/router.py,sha256=XT_ewCrxPxdUTMCYQGw34qZQ3GGu8TYY_v5Lige8By4,1707
 mcp_agent/telemetry/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -80,7 +81,7 @@ mcp_agent/workflows/embedding/embedding_base.py,sha256=-c20ggQ8s7XhMxRX-WEhOgHE7
 mcp_agent/workflows/embedding/embedding_cohere.py,sha256=OKTJvKD_uEafd4c2uhR5tBjprea1nyvlJOO-3FDqOnk,1540
 mcp_agent/workflows/embedding/embedding_openai.py,sha256=dntjJ5P-FSMGYuyPZC8MuCU_ehwjXw9wDfzZZuSQN1E,1480
 mcp_agent/workflows/evaluator_optimizer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mcp_agent/workflows/evaluator_optimizer/evaluator_optimizer.py,sha256=NsRaRte0_zbGPrvwAZadvcgSpY3d5ugbfVHooHOcJfc,15706
+mcp_agent/workflows/evaluator_optimizer/evaluator_optimizer.py,sha256=N4HjckQf_boFRxoWJmuvwq1IEnGYW-k8pKtqjpsnLSE,19223
 mcp_agent/workflows/intent_classifier/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mcp_agent/workflows/intent_classifier/intent_classifier_base.py,sha256=zTbOmq6EY_abOlme4zl28HM4RWNNS6bbHl3tF7SshJ0,4004
 mcp_agent/workflows/intent_classifier/intent_classifier_embedding.py,sha256=_bWZGukc_q9LdA_Q18UoAMSzhN8tt4K_bRHNUhy7Crw,3997
@@ -97,7 +98,7 @@ mcp_agent/workflows/llm/llm_selector.py,sha256=G7pIybuBDwtmyxUDov_QrNYH2FoI0qFRu
 mcp_agent/workflows/llm/model_factory.py,sha256=7zTJrO2ReHa_6dfh_gY6xO8dTySqGFCKlOG9-AMJ-i8,6920
 mcp_agent/workflows/llm/prompt_utils.py,sha256=EY3eddqnmc_YDUQJFysPnpTH6hr4r2HneeEmX76P8TQ,4948
 mcp_agent/workflows/orchestrator/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mcp_agent/workflows/orchestrator/orchestrator.py,sha256=dmj7CwTEHj0f8bTakijjvaOfJJ8ShgWwOWaCmFRiX7s,21933
+mcp_agent/workflows/orchestrator/orchestrator.py,sha256=nyn0vTjUz-lea7nIYY-aoVWOKB2ceNNV4x4z92bP3CI,23638
 mcp_agent/workflows/orchestrator/orchestrator_models.py,sha256=xTl2vUIqdLPvDAnqA485Hf_A3DD48TWhAbo-jfGrmRE,7182
 mcp_agent/workflows/orchestrator/orchestrator_prompts.py,sha256=eJSQThfd6Jvr1jTDx104sJI5R684yE55L_edCiWERsQ,6153
 mcp_agent/workflows/parallel/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -114,8 +115,8 @@ mcp_agent/workflows/swarm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 mcp_agent/workflows/swarm/swarm.py,sha256=-lAIeSWDqbGHGRPTvjiP9nIKWvxxy9DAojl9yQzO1Pw,11050
 mcp_agent/workflows/swarm/swarm_anthropic.py,sha256=pW8zFx5baUWGd5Vw3nIDF2oVOOGNorij4qvGJKdYPcs,1624
 mcp_agent/workflows/swarm/swarm_openai.py,sha256=wfteywvAGkT5bLmIxX_StHJq8144whYmCRnJASAjOes,1596
-fast_agent_mcp-0.0.16.dist-info/METADATA,sha256=8lvkk2i0uitUQtc30LcOd7Wdak4uflU0aXO_Ve37X1Y,26857
-fast_agent_mcp-0.0.16.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-fast_agent_mcp-0.0.16.dist-info/entry_points.txt,sha256=2IXtSmDK9XjWN__RWuRIJTgWyW17wJnJ_h-pb0pZAxo,174
-fast_agent_mcp-0.0.16.dist-info/licenses/LICENSE,sha256=cN3FxDURL9XuzE5mhK9L2paZo82LTfjwCYVT7e3j0e4,10939
-fast_agent_mcp-0.0.16.dist-info/RECORD,,
+fast_agent_mcp-0.1.0.dist-info/METADATA,sha256=hN241Foz895Wj3dxkXWKDVeeTuIWmAT1zh7Jvgpo3Bo,27257
+fast_agent_mcp-0.1.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+fast_agent_mcp-0.1.0.dist-info/entry_points.txt,sha256=2IXtSmDK9XjWN__RWuRIJTgWyW17wJnJ_h-pb0pZAxo,174
+fast_agent_mcp-0.1.0.dist-info/licenses/LICENSE,sha256=cN3FxDURL9XuzE5mhK9L2paZo82LTfjwCYVT7e3j0e4,10939
+fast_agent_mcp-0.1.0.dist-info/RECORD,,

mcp_agent/cli/commands/bootstrap.py

@@ -135,7 +135,7 @@ def copy_example_files(
 
 def show_overview():
     """Display an overview of available examples in a nicely formatted table."""
-    console.print("\n[bold cyan]FastAgent Example Applications[/bold cyan]")
+    console.print("\n[bold cyan]fast-agent Example Applications[/bold cyan]")
     console.print("Build agents and compose workflows through practical examples\n")
 
     # Create a table for better organization

mcp_agent/cli/commands/setup.py

@@ -185,7 +185,7 @@ def init(
     # Check for existing .gitignore
     needs_gitignore = not find_gitignore(config_path)
 
-    console.print("\n[bold]FastAgent Setup[/bold]\n")
+    console.print("\n[bold]fast-agent Setup[/bold]\n")
     console.print("This will create the following files:")
     console.print(f"  - {config_path}/fastagent.config.yaml")
     console.print(f"  - {config_path}/fastagent.secrets.yaml")
@@ -227,6 +227,9 @@ def init(
             console.print(
                 "2. Keep fastagent.secrets.yaml secure and never commit it to version control"
             )
+            console.print(
+                "3. Update fastagent.config.yaml to set a default model (currently system default is 'haiku')"
+            )
         console.print("\nTo get started, run:")
         console.print("  uv run agent.py")
     else:

mcp_agent/cli/main.py

@@ -22,7 +22,14 @@ console = Console()
 
 def show_welcome():
     """Show a welcome message with available commands."""
-    console.print("\n[bold]Welcome to MCP Agent![/bold]")
+    from importlib.metadata import version
+
+    try:
+        app_version = version("fast-agent-mcp")
+    except:  # noqa: E722
+        app_version = "unknown"
+
+    console.print(f"\n[bold]fast-agent (fast-agent-mcp) {app_version}[/bold]")
     console.print("Build effective agents using Model Context Protocol (MCP)")
 
     # Create a table for commands
@@ -41,8 +48,11 @@ def show_welcome():
     console.print("\n[bold]Getting Started:[/bold]")
     console.print("1. Set up a new project:")
     console.print("   fastagent setup")
-    console.print("\n2. Try an example workflow:")
-    console.print("   fastagent bootstrap create workflow")
+    console.print("\n2. Create Building Effective Agents  workflow examples:")
+    console.print("   fastagent bootstrap workflow")
+    console.print("\n3. Explore other examples:")
+    console.print("   fastagent bootstrap")
+
     console.print("\nUse --help with any command for more information")
     console.print("Example: fastagent bootstrap --help")
 

mcp_agent/core/agent_app.py

@@ -129,7 +129,7 @@ class AgentApp:
                     continue
 
             result = await self.send(agent, user_input)
-            
+
             # Check if current agent is a chain that should continue with final agent
             if agent_types.get(agent) == "Chain":
                 proxy = self._agents[agent]

mcp_agent/core/enhanced_prompt.py

@@ -52,7 +52,7 @@ class AgentCompleter(Completer):
             "clear": "Clear the screen",
             "agents": "List available agents",
             "STOP": "Stop this prompting session and move to next workflow step",
-            "EXIT": "Exit FastAgent, terminating any running workflows",
+            "EXIT": "Exit fast-agent, terminating any running workflows",
             **(commands or {}),  # Allow custom commands to be passed in
         }
         if is_human_input:
@@ -319,7 +319,7 @@ async def handle_special_commands(command, agent_app=None):
         rich_print("  @agent_name    - Switch to agent")
         rich_print("  STOP           - Return control back to the workflow")
         rich_print(
-            "  EXIT           - Exit FastAgent, terminating any running workflows"
+            "  EXIT           - Exit fast-agent, terminating any running workflows"
         )
         rich_print("\n[bold]Keyboard Shortcuts:[/bold]")
         rich_print(
@@ -338,7 +338,7 @@ async def handle_special_commands(command, agent_app=None):
         return True
 
     elif command == "EXIT":
-        raise PromptExitError("User requested to exit FastAgent session")
+        raise PromptExitError("User requested to exit fast-agent session")
 
     elif command == "LIST_AGENTS":
         if available_agents:

mcp_agent/core/fastagent.py

@@ -89,21 +89,23 @@ class FastAgent(ContextDependent):
             help="Specify the agent to send a message to (used with --message)",
         )
         parser.add_argument(
-            "-m", "--message",
+            "-m",
+            "--message",
             help="Message to send to the specified agent (requires --agent)",
         )
         parser.add_argument(
-            "--quiet", action="store_true",
+            "--quiet",
+            action="store_true",
             help="Disable progress display, tool and message logging for cleaner output",
         )
         self.args = parser.parse_args()
-        
+
         # Quiet mode will be handled in _load_config()
 
         self.name = name
         self.config_path = config_path
         self._load_config()
-        
+
         # Create the MCPApp with the config
         self.app = MCPApp(
             name=name,
@@ -244,10 +246,24 @@ class FastAgent(ContextDependent):
                     if child_data["type"] == AgentType.BASIC.value:
                         # For basic agents, we'll validate LLM config during creation
                         continue
-                    elif not isinstance(child_data["func"], AugmentedLLM):
+                    # Check if it's a workflow type or has LLM capability
+                    # Workflows like EvaluatorOptimizer and Parallel are valid for orchestrator
+                    func = child_data["func"]
+                    workflow_types = [
+                        AgentType.EVALUATOR_OPTIMIZER.value,
+                        AgentType.PARALLEL.value,
+                        AgentType.ROUTER.value,
+                        AgentType.CHAIN.value,
+                    ]
+
+                    if not (
+                        isinstance(func, AugmentedLLM)
+                        or child_data["type"] in workflow_types
+                        or (hasattr(func, "_llm") and func._llm is not None)
+                    ):
                         raise AgentConfigError(
                             f"Agent '{agent_name}' used by orchestrator '{name}' lacks LLM capability",
-                            "All agents used by orchestrators must be LLM-capable",
+                            "All agents used by orchestrators must be LLM-capable (either an AugmentedLLM or have an _llm property)",
                         )
 
             elif agent_type == AgentType.ROUTER.value:
@@ -536,7 +552,7 @@ class FastAgent(ContextDependent):
         Args:
             name: Name of the parallel executing agent
             fan_out: List of parallel execution agents
-            fan_in: Optional name of collecting agent. If not provided, a passthrough agent 
+            fan_in: Optional name of collecting agent. If not provided, a passthrough agent
                     will be created automatically with the name "{name}_fan_in"
             instruction: Optional instruction for the parallel agent
             model: Model specification string
@@ -547,7 +563,7 @@ class FastAgent(ContextDependent):
         # If fan_in is not provided, create a passthrough agent with a derived name
         if fan_in is None:
             passthrough_name = f"{name}_fan_in"
-            
+
             # Register the passthrough agent directly in self.agents
             self.agents[passthrough_name] = {
                 "config": AgentConfig(
@@ -559,10 +575,10 @@ class FastAgent(ContextDependent):
                 "type": AgentType.BASIC.value,  # Using BASIC type since we're just attaching a PassthroughLLM
                 "func": lambda x: x,  # Simple passthrough function (never actually called)
             }
-            
+
             # Use this passthrough as the fan-in
             fan_in = passthrough_name
-        
+
         decorator = self._create_decorator(
             AgentType.PARALLEL,
             default_instruction="",
@@ -589,6 +605,7 @@ class FastAgent(ContextDependent):
         max_refinements: int = 3,
         use_history: bool = True,
         request_params: Optional[Dict] = None,
+        instruction: Optional[str] = None,
     ) -> Callable:
         """
         Decorator to create and register an evaluator-optimizer workflow.
@@ -601,10 +618,11 @@ class FastAgent(ContextDependent):
             max_refinements: Maximum number of refinement iterations
             use_history: Whether to maintain conversation history
             request_params: Additional request parameters for the LLM
+            instruction: Optional instruction for the workflow (if not provided, uses generator's instruction)
         """
         decorator = self._create_decorator(
             AgentType.EVALUATOR_OPTIMIZER,
-            default_instruction="",
+            default_instruction="",  # We'll get instruction from generator or override
             default_servers=[],
             default_use_history=True,
             wrapper_needed=True,
@@ -616,6 +634,7 @@ class FastAgent(ContextDependent):
             max_refinements=max_refinements,
             use_history=use_history,
             request_params=request_params,
+            instruction=instruction,  # Pass through any custom instruction
         )
         return decorator
 
@@ -645,7 +664,7 @@ class FastAgent(ContextDependent):
             AgentType.ROUTER,
             default_instruction="",
             default_servers=[],
-            default_use_history=True,
+            default_use_history=False,
             wrapper_needed=True,
         )(
             name=name,
@@ -708,17 +727,14 @@ class FastAgent(ContextDependent):
             continue_with_final=continue_with_final,
         )
         return decorator
-        
+
     def passthrough(
-        self,
-        name: str = "Passthrough",
-        use_history: bool = True,
-        **kwargs
+        self, name: str = "Passthrough", use_history: bool = True, **kwargs
     ) -> Callable:
         """
         Decorator to create and register a passthrough agent.
         A passthrough agent simply returns any input message without modification.
-        
+
         This is useful for parallel workflows where no fan-in aggregation is needed
         (the fan-in agent can be a passthrough that simply returns the combined outputs).
 
@@ -774,15 +790,17 @@ class FastAgent(ContextDependent):
                 if agent_type == AgentType.BASIC:
                     # Get the agent name for special handling
                     agent_name = agent_data["config"].name
-                    
+
                     # Check if this is an agent that should use the PassthroughLLM
-                    if agent_name.endswith("_fan_in") or agent_name.startswith("passthrough"):
+                    if agent_name.endswith("_fan_in") or agent_name.startswith(
+                        "passthrough"
+                    ):
                         # Import here to avoid circular imports
                         from mcp_agent.workflows.llm.augmented_llm import PassthroughLLM
-                        
+
                         # Create basic agent with configuration
                         agent = Agent(config=config, context=agent_app.context)
-                        
+
                         # Set up a PassthroughLLM directly
                         async with agent:
                             agent._llm = PassthroughLLM(
@@ -791,13 +809,13 @@ class FastAgent(ContextDependent):
                                 agent=agent,
                                 default_request_params=config.default_request_params,
                             )
-                            
+
                         # Store the agent
                         instance = agent
                     else:
                         # Standard basic agent with LLM
                         agent = Agent(config=config, context=agent_app.context)
-    
+
                         # Set up LLM with proper configuration
                         async with agent:
                             llm_factory = self._get_model_factory(
@@ -805,7 +823,7 @@ class FastAgent(ContextDependent):
                                 request_params=config.default_request_params,
                             )
                             agent._llm = await agent.attach_llm(llm_factory)
-    
+
                         # Store the agent
                         instance = agent
 
@@ -885,18 +903,19 @@ class FastAgent(ContextDependent):
                             f"evaluator={agent_data['evaluator']}"
                         )
 
-                    # TODO: Remove legacy - factory usage is only needed for str evaluators
-                    # Later this should only be passed when evaluator is a string
                     optimizer_model = (
                         generator.config.model if isinstance(generator, Agent) else None
                     )
+
                     instance = EvaluatorOptimizerLLM(
+                        name=config.name,  # Pass name from config
                         generator=generator,
                         evaluator=evaluator,
                         min_rating=QualityRating[agent_data["min_rating"]],
                         max_refinements=agent_data["max_refinements"],
                         llm_factory=self._get_model_factory(model=optimizer_model),
                         context=agent_app.context,
+                        instruction=config.instruction,  # Pass any custom instruction
                     )
 
                 elif agent_type == AgentType.ROUTER:
@@ -1249,77 +1268,96 @@ class FastAgent(ContextDependent):
         """
         active_agents = {}
         had_error = False
-        
+
         # Handle quiet mode by disabling logger settings after initialization
         quiet_mode = hasattr(self, "args") and self.args.quiet
-        
+
         try:
             async with self.app.run() as agent_app:
                 # Apply quiet mode directly to the context's config if needed
-                if quiet_mode and hasattr(agent_app.context, "config") and hasattr(agent_app.context.config, "logger"):
+                if (
+                    quiet_mode
+                    and hasattr(agent_app.context, "config")
+                    and hasattr(agent_app.context.config, "logger")
+                ):
                     # Apply after initialization but before agents are created
                     agent_app.context.config.logger.progress_display = False
                     agent_app.context.config.logger.show_chat = False
                     agent_app.context.config.logger.show_tools = False
-                    
+
                     # Directly disable the progress display singleton
                     from mcp_agent.progress_display import progress_display
+
                     progress_display.stop()  # This will stop and hide the display
-                
+
                 # Pre-flight validation
                 self._validate_server_references()
                 self._validate_workflow_references()
 
                 # Create all types of agents in dependency order
+                # First create basic agents
                 active_agents = await self._create_basic_agents(agent_app)
 
-                orchestrators = await self._create_orchestrators(
+                # Create workflow types that don't depend on other workflows first
+                evaluator_optimizers = await self._create_evaluator_optimizers(
                     agent_app, active_agents
                 )
+                active_agents.update(evaluator_optimizers)
+
+                # Create parallel agents next as they might be dependencies
                 parallel_agents = await self._create_parallel_agents(
                     agent_app, active_agents
                 )
-                evaluator_optimizers = await self._create_evaluator_optimizers(
-                    agent_app, active_agents
-                )
+                active_agents.update(parallel_agents)
+
+                # Create routers next
                 routers = await self._create_routers(agent_app, active_agents)
+                active_agents.update(routers)
+
+                # Create chains next
                 chains = await self._create_agents_in_dependency_order(
                     agent_app, active_agents, AgentType.CHAIN
                 )
+                active_agents.update(chains)
 
-                # Merge all agents into active_agents
+                # Create orchestrators last as they might depend on any other agent type
+                orchestrators = await self._create_orchestrators(
+                    agent_app, active_agents
+                )
+
+                # Add orchestrators to active_agents (other types were already added)
                 active_agents.update(orchestrators)
-                active_agents.update(parallel_agents)
-                active_agents.update(evaluator_optimizers)
-                active_agents.update(routers)
-                active_agents.update(chains)
 
                 # Create wrapper with all agents
                 wrapper = AgentApp(agent_app, active_agents)
-                
+
                 # Handle direct message sending if --agent and --message are provided
                 if self.args.agent and self.args.message:
                     agent_name = self.args.agent
                     message = self.args.message
-                    
+
                     if agent_name not in active_agents:
                         available_agents = ", ".join(active_agents.keys())
-                        print(f"\n\nError: Agent '{agent_name}' not found. Available agents: {available_agents}")
+                        print(
+                            f"\n\nError: Agent '{agent_name}' not found. Available agents: {available_agents}"
+                        )
                         raise SystemExit(1)
-                    
+
                     try:
                         # Get response
                         response = await wrapper[agent_name].send(message)
-                        
+
                         # Only print the response in quiet mode
                         if self.args.quiet:
                             print(f"{response}")
-                        
+
                         raise SystemExit(0)
                     except Exception as e:
-                        print(f"\n\nError sending message to agent '{agent_name}': {str(e)}")
+                        print(
+                            f"\n\nError sending message to agent '{agent_name}': {str(e)}"
+                        )
                         raise SystemExit(1)
-                
+
                 yield wrapper
 
         except ServerConfigError as e: