Renaming for ensemble agent

Author: shuds13

ensemble_agent/agent.py

@@ -19,9 +19,8 @@
     INTERACTIVE_REVIEW_GOAL,
     build_system_prompt,
 )
-from .scripts import detect_run_script
-from .skills import load_skills
-from .skills.generator import GeneratorSkill
+from .tools import load_tool_providers
+from .tools.generator import GeneratorTools
 
 DEFAULT_PROMPT = """Create six_hump_camel APOSMM scripts:
 - Executable: six_hump_camel/six_hump_camel.x
@@ -33,7 +32,7 @@
 
 
 async def run_agent(config: AgentConfig):
-    """Main entry point: build skills, connect MCP, run the agent loop."""
+    """Main entry point: build tools, connect MCP, run the agent loop."""
 
     # Archive existing output dir before starting fresh
     ArchiveManager.archive_existing_output_dir(config.output_dir)
@@ -47,41 +46,38 @@ async def run_agent(config: AgentConfig):
         log_path = Path(config.output_dir) / "debug_log.txt"
         debug = DebugLogger(log_path, model=config.model)
 
-    # Load skills — drop generator when using existing scripts
-    skill_names = config.skills
-    if config.scripts_dir and "generator" in skill_names:
-        skill_names = ",".join(s for s in skill_names.split(",") if s.strip() != "generator")
-    skills = load_skills(skill_names, config, archive)
-    has_generator = any(isinstance(s, GeneratorSkill) for s in skills)
+    # Load tool providers
+    providers = load_tool_providers(config, archive)
+    has_generator = any(isinstance(p, GeneratorTools) for p in providers)
 
-    # MCP setup for generator skill
+    # MCP setup for generator
     async with AsyncExitStack() as stack:
         if has_generator:
             mcp_server = find_mcp_server(config.mcp_server)
             print(f"Generator MCP: {mcp_server}")
             session = await stack.enter_async_context(connect_mcp(mcp_server))
             print("Connected to MCP server")
 
-            # Get MCP tool schema and inject into generator skill
+            # Get MCP tool schema and inject into generator
             mcp_tools = await session.list_tools()
             mcp_tool = mcp_tools.tools[0]
-            for skill in skills:
-                if isinstance(skill, GeneratorSkill):
-                    skill.set_mcp_session(session)
-                    skill.set_mcp_tool_schema(mcp_tool)
+            for p in providers:
+                if isinstance(p, GeneratorTools):
+                    p.set_mcp_session(session)
+                    p.set_mcp_tool_schema(mcp_tool)
 
-        # Collect tools from all skills
+        # Collect tools from all providers
         tools = []
-        for skill in skills:
-            tools.extend(skill.get_tools())
+        for p in providers:
+            tools.extend(p.get_tools())
 
         # Create LLM and agent
         llm, service = create_llm(config.model, config.temperature, config.base_url)
         agent = create_agent(llm, tools)
         print(f"Agent initialized (model: {config.model}, service: {service})\n")
 
         # Build system prompt
-        system_prompt = build_system_prompt(skills, has_generator)
+        system_prompt = build_system_prompt(providers, has_generator)
         messages = [("system", system_prompt)]
 
         if debug:

ensemble_agent/config.py

@@ -33,9 +33,6 @@
 # UI
 INPUT_MARKER = "[INPUT_REQUESTED]"
 
-# Default skills
-DEFAULT_SKILLS = "file_ops,runner,generator,reference_docs"
-
 
 def _default_model() -> str:
     """Pick default model based on available API keys."""
@@ -66,9 +63,6 @@ class AgentConfig:
         default_factory=lambda: os.environ.get("OPENAI_BASE_URL")
     )
 
-    # Skills
-    skills: str = DEFAULT_SKILLS
-
     # MCP servers
     mcp_server: Optional[str] = None
 
@@ -104,18 +98,16 @@ def parse_args(argv=None) -> AgentConfig:
         formatter_class=argparse.RawDescriptionHelpFormatter,
         epilog="""
 Examples:
-  python -m ensemble_agent --interactive
-  python -m ensemble_agent --scripts tests/scripts_with_errors/
-  python -m ensemble_agent --prompt "Create APOSMM scripts..."
-  python -m ensemble_agent --scripts tests/ --skills file_ops,runner
+  python ensemble_agent.py --interactive
+  python ensemble_agent.py --scripts agentic/tests/scripts_with_errors/
+  python ensemble_agent.py --prompt "Create APOSMM scripts..."
         """,
     )
     parser.add_argument("--interactive", action="store_true", help="Enable interactive chat mode")
     parser.add_argument("--scripts", dest="scripts_dir", help="Use existing scripts from directory")
     parser.add_argument("--prompt", help="Prompt for script generation")
     parser.add_argument("--prompt-file", help="Read prompt from file")
     parser.add_argument("--model", default=None, help="LLM model name")
-    parser.add_argument("--skills", default=DEFAULT_SKILLS, help=f"Comma-separated skills (default: {DEFAULT_SKILLS})")
     parser.add_argument("--mcp-server", help="Path to generator mcp_server.mjs")
     parser.add_argument("--generate-only", action="store_true", help="Only generate scripts, don't run")
     parser.add_argument("--show-prompts", action="store_true", help="Print prompts sent to AI")
@@ -129,7 +121,6 @@ def parse_args(argv=None) -> AgentConfig:
         scripts_dir=args.scripts_dir,
         prompt=args.prompt,
         prompt_file=args.prompt_file,
-        skills=args.skills,
         mcp_server=args.mcp_server,
         show_prompts=args.show_prompts,
         debug=args.debug or bool(os.environ.get("AGENT_DEBUG")),

ensemble_agent/prompts.py

@@ -13,7 +13,7 @@
 - Don't run scripts unless the user explicitly asks you to run them.
 - When reviewing scripts, highlight key configuration: generator bounds/parameters and the objective function.
 
-{skills_context}"""
+{reference_context}"""
 
 GENERATOR_RULES = (
     "- Only use CreateLibEnsembleScripts ONCE to generate initial scripts. NEVER call it again.\n"
@@ -45,19 +45,19 @@
 INTERACTIVE_REVIEW_GOAL = """I have existing scripts. The main script is '{run_script_name}'. Please review them and highlight the key configuration."""
 
 
-def build_system_prompt(skills, has_generator):
-    """Assemble the system prompt from skill fragments."""
+def build_system_prompt(providers, has_generator):
+    """Assemble the system prompt from provider fragments and reference docs."""
     generator_rules = GENERATOR_RULES if has_generator else NO_GENERATOR_RULES
 
     fragments = []
-    for skill in skills:
-        frag = skill.get_prompt_fragment()
+    for p in providers:
+        frag = p.get_prompt_fragment()
         if frag:
             fragments.append(frag)
 
-    skills_context = "\n\n".join(fragments) if fragments else ""
+    reference_context = "\n\n".join(fragments) if fragments else ""
 
     return SYSTEM_PROMPT.format(
         generator_rules=generator_rules,
-        skills_context=skills_context,
+        reference_context=reference_context,
     )

ensemble_agent/skills/docs/aposmm.md ensemble_agent/reference_docs/aposmm.mdensemble_agent/skills/docs/aposmm.md renamed to ensemble_agent/reference_docs/aposmm.md

@@ -0,0 +1,23 @@
+"""Tool provider registry and loader."""
+
+from .base import ToolProvider
+from .file_ops import FileOpsTools
+from .runner import RunnerTools
+from .generator import GeneratorTools
+# from .reference_loader import ReferenceLoader
+
+
+def load_tool_providers(config, archive):
+    """Load tool providers based on config.
+
+    Always loads: file_ops, runner.
+    Loads generator only when not using existing scripts.
+    """
+    providers = [
+        FileOpsTools(config, archive),
+        RunnerTools(config, archive),
+        # ReferenceLoader(config, archive),
+    ]
+    if not config.scripts_dir:
+        providers.append(GeneratorTools(config, archive))
+    return providers