refactor: grand clean-up

examples/templates/competitive_intel_agent/__main__.py

@@ -121,10 +121,10 @@ def tui(verbose: bool, debug: bool) -> None:
         sys.exit(1)
 
     from framework.llm import LiteLLMProvider
-    from framework.runner.tool_registry import ToolRegistry
-    from framework.runtime.agent_runtime import create_agent_runtime
-    from framework.runtime.event_bus import EventBus
-    from framework.runtime.execution_stream import EntryPointSpec
+    from framework.loader.tool_registry import ToolRegistry
+    from framework.host.agent_host import create_agent_runtime
+    from framework.host.event_bus import EventBus
+    from framework.host.execution_manager import EntryPointSpec
 
     async def run_with_tui() -> None:
         agent = CompetitiveIntelAgent()

examples/templates/competitive_intel_agent/agent.py

@@ -1,7 +1,7 @@
 """Agent graph construction for Competitive Intelligence Agent."""
 
 from typing import Any, TYPE_CHECKING
-from framework.graph import (
+from framework.orchestrator import (
     EdgeSpec,
     EdgeCondition,
     Goal,
@@ -9,12 +9,12 @@ from framework.graph import (
     Constraint,
     NodeSpec,
 )
-from framework.graph.edge import GraphSpec
-from framework.graph.executor import ExecutionResult, GraphExecutor
-from framework.runtime.event_bus import EventBus
-from framework.runtime.core import Runtime
+from framework.orchestrator.edge import GraphSpec
+from framework.orchestrator.orchestrator import ExecutionResult, Orchestrator
+from framework.host.event_bus import EventBus
+from framework.tracker.decision_tracker import DecisionTracker as Runtime
 from framework.llm import LiteLLMProvider
-from framework.runner.tool_registry import ToolRegistry
+from framework.loader.tool_registry import ToolRegistry
 
 from .config import default_config, metadata, RuntimeConfig
 from .nodes import (
@@ -188,7 +188,7 @@ class CompetitiveIntelAgent:
         self.entry_points = entry_points
         self.pause_nodes = pause_nodes
         self.terminal_nodes = terminal_nodes
-        self._executor: GraphExecutor | None = None
+        self._executor: Orchestrator | None = None
         self._graph: GraphSpec | None = None
         self._event_bus: EventBus | None = None
         self._tool_registry: ToolRegistry | None = None
@@ -219,12 +219,12 @@ class CompetitiveIntelAgent:
             },
         )
 
-    def _setup(self) -> GraphExecutor:
+    def _setup(self) -> Orchestrator:
         """
         Set up the executor with all components (runtime, LLM, tools).
 
         Returns:
-            An initialized GraphExecutor instance.
+            An initialized Orchestrator instance.
         """
         from pathlib import Path
 
@@ -250,7 +250,7 @@ class CompetitiveIntelAgent:
         self._graph = self._build_graph()
         runtime = Runtime(storage_path)
 
-        self._executor = GraphExecutor(
+        self._executor = Orchestrator(
             runtime=runtime,
             llm=llm,
             tools=tools,

examples/templates/competitive_intel_agent/nodes/__init__.py

@@ -1,6 +1,6 @@
 """Node definitions for Competitive Intelligence Agent."""
 
-from framework.graph import NodeSpec
+from framework.orchestrator import NodeSpec
 
 # Node 1: Intake (client-facing)
 intake_node: NodeSpec = NodeSpec(

examples/templates/deep_research_agent/__main__.py

@@ -74,10 +74,10 @@ def tui(verbose, debug):
     from pathlib import Path
 
     from framework.llm import LiteLLMProvider
-    from framework.runner.tool_registry import ToolRegistry
-    from framework.runtime.agent_runtime import create_agent_runtime
-    from framework.runtime.event_bus import EventBus
-    from framework.runtime.execution_stream import EntryPointSpec
+    from framework.loader.tool_registry import ToolRegistry
+    from framework.host.agent_host import create_agent_runtime
+    from framework.host.event_bus import EventBus
+    from framework.host.execution_manager import EntryPointSpec
 
     async def run_with_tui():
         agent = DeepResearchAgent()

examples/templates/deep_research_agent/agent.py

@@ -2,14 +2,14 @@
 
 from pathlib import Path
 
-from framework.graph import EdgeSpec, EdgeCondition, Goal, SuccessCriterion, Constraint
-from framework.graph.edge import GraphSpec
-from framework.graph.executor import ExecutionResult
-from framework.graph.checkpoint_config import CheckpointConfig
+from framework.orchestrator import EdgeSpec, EdgeCondition, Goal, SuccessCriterion, Constraint
+from framework.orchestrator.edge import GraphSpec
+from framework.orchestrator.orchestrator import ExecutionResult
+from framework.orchestrator.checkpoint_config import CheckpointConfig
 from framework.llm import LiteLLMProvider
-from framework.runner.tool_registry import ToolRegistry
-from framework.runtime.agent_runtime import AgentRuntime, create_agent_runtime
-from framework.runtime.execution_stream import EntryPointSpec
+from framework.loader.tool_registry import ToolRegistry
+from framework.host.agent_host import AgentHost, create_agent_runtime
+from framework.host.execution_manager import EntryPointSpec
 
 from .config import default_config, metadata
 from .nodes import (

examples/templates/deep_research_agent/nodes/__init__.py

@@ -1,6 +1,6 @@
 """Node definitions for Deep Research Agent."""
 
-from framework.graph import NodeSpec
+from framework.orchestrator import NodeSpec
 
 # Node 1: Intake (client-facing)
 # Brief conversation to clarify what the user wants researched.

examples/templates/email_inbox_management/__main__.py

@@ -83,10 +83,10 @@ def tui(mock, verbose, debug):
     from pathlib import Path
 
     from framework.llm import LiteLLMProvider
-    from framework.runner.tool_registry import ToolRegistry
-    from framework.runtime.agent_runtime import create_agent_runtime
-    from framework.runtime.event_bus import EventBus
-    from framework.runtime.execution_stream import EntryPointSpec
+    from framework.loader.tool_registry import ToolRegistry
+    from framework.host.agent_host import create_agent_runtime
+    from framework.host.event_bus import EventBus
+    from framework.host.execution_manager import EntryPointSpec
 
     async def run_with_tui():
         agent = InboxManagementAgent()

examples/templates/email_inbox_management/agent.py

@@ -2,15 +2,15 @@
 
 from pathlib import Path
 
-from framework.graph import EdgeCondition, EdgeSpec, Goal, SuccessCriterion, Constraint
-from framework.graph.checkpoint_config import CheckpointConfig
-from framework.graph.edge import GraphSpec
-from framework.graph.executor import ExecutionResult, GraphExecutor
+from framework.orchestrator import EdgeCondition, EdgeSpec, Goal, SuccessCriterion, Constraint
+from framework.orchestrator.checkpoint_config import CheckpointConfig
+from framework.orchestrator.edge import GraphSpec
+from framework.orchestrator.orchestrator import ExecutionResult, Orchestrator
 from framework.llm import LiteLLMProvider
-from framework.runner.tool_registry import ToolRegistry
-from framework.runtime.agent_runtime import create_agent_runtime
-from framework.runtime.event_bus import EventBus
-from framework.runtime.execution_stream import EntryPointSpec
+from framework.loader.tool_registry import ToolRegistry
+from framework.host.agent_host import create_agent_runtime
+from framework.host.event_bus import EventBus
+from framework.host.execution_manager import EntryPointSpec
 
 from .config import default_config, metadata
 from .nodes import (
@@ -190,7 +190,7 @@ class EmailInboxManagementAgent:
         self.entry_points = entry_points
         self.pause_nodes = pause_nodes
         self.terminal_nodes = terminal_nodes
-        self._executor: GraphExecutor | None = None
+        self._executor: Orchestrator | None = None
         self._graph: GraphSpec | None = None
         self._event_bus: EventBus | None = None
         self._tool_registry: ToolRegistry | None = None

examples/templates/email_inbox_management/nodes/__init__.py

@@ -1,6 +1,6 @@
 """Node definitions for Inbox Management Agent."""
 
-from framework.graph import NodeSpec
+from framework.orchestrator import NodeSpec
 
 # Node 1: Intake (client-facing)
 # Receives user rules and max_emails, confirms understanding with user.

examples/templates/email_inbox_management/tools.py

@@ -15,7 +15,7 @@ from pathlib import Path
 import httpx
 
 from framework.llm.provider import Tool, ToolResult, ToolUse
-from framework.runner.tool_registry import _execution_context
+from framework.loader.tool_registry import _execution_context
 
 logger = logging.getLogger(__name__)
 
@@ -102,7 +102,7 @@ def _get_data_dir() -> str:
     ctx = _execution_context.get()
     if not ctx or "data_dir" not in ctx:
         raise RuntimeError(
-            "data_dir not set in execution context. Is the tool running inside a GraphExecutor?"
+            "data_dir not set in execution context. Is the tool running inside a Orchestrator?"
         )
     return ctx["data_dir"]
 

examples/templates/email_reply_agent/__main__.py

@@ -51,9 +51,9 @@ def tui():
 
     from framework.tui.app import AdenTUI
     from framework.llm import LiteLLMProvider
-    from framework.runner.tool_registry import ToolRegistry
-    from framework.runtime.agent_runtime import create_agent_runtime
-    from framework.runtime.execution_stream import EntryPointSpec
+    from framework.loader.tool_registry import ToolRegistry
+    from framework.host.agent_host import create_agent_runtime
+    from framework.host.execution_manager import EntryPointSpec
 
     async def run_tui():
         agent = EmailReplyAgent()

examples/templates/email_reply_agent/agent.py

@@ -2,14 +2,14 @@
 
 from pathlib import Path
 
-from framework.graph import EdgeSpec, EdgeCondition, Goal, SuccessCriterion, Constraint
-from framework.graph.edge import GraphSpec
-from framework.graph.executor import ExecutionResult
-from framework.graph.checkpoint_config import CheckpointConfig
+from framework.orchestrator import EdgeSpec, EdgeCondition, Goal, SuccessCriterion, Constraint
+from framework.orchestrator.edge import GraphSpec
+from framework.orchestrator.orchestrator import ExecutionResult
+from framework.orchestrator.checkpoint_config import CheckpointConfig
 from framework.llm import LiteLLMProvider
-from framework.runner.tool_registry import ToolRegistry
-from framework.runtime.agent_runtime import create_agent_runtime
-from framework.runtime.execution_stream import EntryPointSpec
+from framework.loader.tool_registry import ToolRegistry
+from framework.host.agent_host import create_agent_runtime
+from framework.host.execution_manager import EntryPointSpec
 
 from .config import default_config, metadata
 from .nodes import intake_node, search_node, confirm_draft_node
@@ -101,7 +101,7 @@ entry_points = {"start": "intake"}
 pause_nodes = []
 terminal_nodes = []
 
-# Module-level vars read by AgentRunner.load()
+# Module-level vars read by AgentLoader.load()
 conversation_mode = "continuous"
 identity_prompt = "You are a helpful email reply assistant that filters unreplied emails and sends personalized responses."
 loop_config = {

examples/templates/email_reply_agent/nodes/__init__.py

@@ -1,6 +1,6 @@
 """Node definitions for Email Reply Agent."""
 
-from framework.graph import NodeSpec
+from framework.orchestrator import NodeSpec
 
 # Node 1: Intake (client-facing)
 intake_node = NodeSpec(

examples/templates/email_reply_agent/tests/conftest.py

@@ -25,6 +25,6 @@ def agent_module():
 @pytest.fixture(scope="session")
 def runner_loaded():
     """Load the agent through AgentRunner (structural only, no LLM needed)."""
-    from framework.runner.runner import AgentRunner
+    from framework.loader.agent_loader import AgentLoader
 
-    return AgentRunner.load(AGENT_PATH)
+    return AgentLoader.load(AGENT_PATH)

examples/templates/email_reply_agent/tests/test_email_reply_agent.py

@@ -77,7 +77,7 @@ class TestRunnerLoad:
     """Test AgentRunner can load the agent."""
 
     def test_runner_load_succeeds(self, runner_loaded):
-        """AgentRunner.load() succeeds."""
+        """AgentLoader.load() succeeds."""
         assert runner_loaded is not None
 
     def test_runner_has_goal(self, runner_loaded):

examples/templates/job_hunter/__main__.py

@@ -75,10 +75,10 @@ def tui(mock, verbose, debug):
     from pathlib import Path
 
     from framework.llm import LiteLLMProvider
-    from framework.runner.tool_registry import ToolRegistry
-    from framework.runtime.agent_runtime import create_agent_runtime
-    from framework.runtime.event_bus import EventBus
-    from framework.runtime.execution_stream import EntryPointSpec
+    from framework.loader.tool_registry import ToolRegistry
+    from framework.host.agent_host import create_agent_runtime
+    from framework.host.event_bus import EventBus
+    from framework.host.execution_manager import EntryPointSpec
 
     async def run_with_tui():
         agent = JobHunterAgent()

examples/templates/job_hunter/agent.py

@@ -2,14 +2,14 @@
 
 from pathlib import Path
 
-from framework.graph import EdgeSpec, EdgeCondition, Goal, SuccessCriterion, Constraint
-from framework.graph.edge import GraphSpec
-from framework.graph.executor import ExecutionResult
-from framework.graph.checkpoint_config import CheckpointConfig
+from framework.orchestrator import EdgeSpec, EdgeCondition, Goal, SuccessCriterion, Constraint
+from framework.orchestrator.edge import GraphSpec
+from framework.orchestrator.orchestrator import ExecutionResult
+from framework.orchestrator.checkpoint_config import CheckpointConfig
 from framework.llm import LiteLLMProvider
-from framework.runner.tool_registry import ToolRegistry
-from framework.runtime.agent_runtime import AgentRuntime, create_agent_runtime
-from framework.runtime.execution_stream import EntryPointSpec
+from framework.loader.tool_registry import ToolRegistry
+from framework.host.agent_host import AgentHost, create_agent_runtime
+from framework.host.execution_manager import EntryPointSpec
 
 from .config import default_config
 from .nodes import (

examples/templates/job_hunter/nodes/__init__.py

@@ -1,6 +1,6 @@
 """Node definitions for Job Hunter Agent."""
 
-from framework.graph import NodeSpec
+from framework.orchestrator import NodeSpec
 
 # Node 1: Intake (simple)
 # Collect resume and identify strongest role types.

examples/templates/local_business_extractor/agent.py

@@ -1,14 +1,14 @@
 """Agent graph construction for Local Business Extractor."""
 
 from pathlib import Path
-from framework.graph import EdgeSpec, EdgeCondition, Goal, SuccessCriterion, Constraint
-from framework.graph.edge import GraphSpec
-from framework.graph.executor import ExecutionResult
-from framework.graph.checkpoint_config import CheckpointConfig
+from framework.orchestrator import EdgeSpec, EdgeCondition, Goal, SuccessCriterion, Constraint
+from framework.orchestrator.edge import GraphSpec
+from framework.orchestrator.orchestrator import ExecutionResult
+from framework.orchestrator.checkpoint_config import CheckpointConfig
 from framework.llm import LiteLLMProvider
-from framework.runner.tool_registry import ToolRegistry
-from framework.runtime.agent_runtime import create_agent_runtime
-from framework.runtime.execution_stream import EntryPointSpec
+from framework.loader.tool_registry import ToolRegistry
+from framework.host.agent_host import create_agent_runtime
+from framework.host.execution_manager import EntryPointSpec
 
 from .config import default_config, metadata
 from .nodes import map_search_gcu, extract_contacts_node, sheets_sync_node

examples/templates/local_business_extractor/nodes/__init__.py

@@ -1,6 +1,6 @@
 """Node definitions for Local Business Extractor."""
 
-from framework.graph import NodeSpec
+from framework.orchestrator import NodeSpec
 
 # GCU Subagent for Google Maps
 map_search_gcu = NodeSpec(

examples/templates/meeting_scheduler/__main__.py

@@ -54,9 +54,9 @@ def tui():
     from pathlib import Path
     from framework.tui.app import AdenTUI
     from framework.llm import LiteLLMProvider
-    from framework.runner.tool_registry import ToolRegistry
-    from framework.runtime.agent_runtime import create_agent_runtime
-    from framework.runtime.execution_stream import EntryPointSpec
+    from framework.loader.tool_registry import ToolRegistry
+    from framework.host.agent_host import create_agent_runtime
+    from framework.host.execution_manager import EntryPointSpec
 
     async def run_tui():
         agent = MeetingScheduler()

examples/templates/meeting_scheduler/agent.py

@@ -2,14 +2,14 @@
 
 from pathlib import Path
 
-from framework.graph import EdgeSpec, EdgeCondition, Goal, SuccessCriterion, Constraint
-from framework.graph.edge import GraphSpec
-from framework.graph.executor import ExecutionResult
-from framework.graph.checkpoint_config import CheckpointConfig
+from framework.orchestrator import EdgeSpec, EdgeCondition, Goal, SuccessCriterion, Constraint
+from framework.orchestrator.edge import GraphSpec
+from framework.orchestrator.orchestrator import ExecutionResult
+from framework.orchestrator.checkpoint_config import CheckpointConfig
 from framework.llm import LiteLLMProvider
-from framework.runner.tool_registry import ToolRegistry
-from framework.runtime.agent_runtime import create_agent_runtime
-from framework.runtime.execution_stream import EntryPointSpec
+from framework.loader.tool_registry import ToolRegistry
+from framework.host.agent_host import create_agent_runtime
+from framework.host.execution_manager import EntryPointSpec
 
 from .config import default_config, metadata
 from .nodes import intake_node, schedule_node, confirm_node
@@ -107,7 +107,7 @@ entry_points = {"start": "intake"}
 pause_nodes = []
 terminal_nodes = []  # Forever-alive
 
-# Module-level vars read by AgentRunner.load()
+# Module-level vars read by AgentLoader.load()
 conversation_mode = "continuous"
 identity_prompt = "You are a helpful meeting scheduler assistant that manages calendar availability and sends confirmations."
 loop_config = {

examples/templates/meeting_scheduler/nodes/__init__.py

@@ -1,6 +1,6 @@
 """Node definitions for Meeting Scheduler."""
 
-from framework.graph import NodeSpec
+from framework.orchestrator import NodeSpec
 
 # Node 1: Intake (client-facing)
 intake_node = NodeSpec(

examples/templates/meeting_scheduler/tests/conftest.py

@@ -25,10 +25,10 @@ def agent_module():
 @pytest.fixture(scope="session")
 def runner_loaded():
     """Load the agent through AgentRunner (structural only, no LLM needed)."""
-    from framework.runner.runner import AgentRunner
+    from framework.loader.agent_loader import AgentLoader
     from framework.credentials.models import CredentialError
 
     try:
-        return AgentRunner.load(AGENT_PATH)
+        return AgentLoader.load(AGENT_PATH)
     except CredentialError:
         pytest.skip("Google OAuth credentials not configured")

examples/templates/sdr_agent/agent.py

@@ -2,14 +2,14 @@
 
 from pathlib import Path
 
-from framework.graph import EdgeSpec, EdgeCondition, Goal, SuccessCriterion, Constraint
-from framework.graph.checkpoint_config import CheckpointConfig
-from framework.graph.edge import AsyncEntryPointSpec, GraphSpec
-from framework.graph.executor import ExecutionResult
+from framework.orchestrator import EdgeSpec, EdgeCondition, Goal, SuccessCriterion, Constraint
+from framework.orchestrator.checkpoint_config import CheckpointConfig
+from framework.orchestrator.edge import AsyncEntryPointSpec, GraphSpec
+from framework.orchestrator.orchestrator import ExecutionResult
 from framework.llm import LiteLLMProvider
-from framework.runner.tool_registry import ToolRegistry
-from framework.runtime.agent_runtime import AgentRuntime, create_agent_runtime
-from framework.runtime.execution_stream import EntryPointSpec
+from framework.loader.tool_registry import ToolRegistry
+from framework.host.agent_host import AgentHost, create_agent_runtime
+from framework.host.execution_manager import EntryPointSpec
 
 from .config import default_config, metadata
 from .nodes import (

examples/templates/sdr_agent/nodes/__init__.py

@@ -1,6 +1,6 @@
 """Node definitions for SDR Agent."""
 
-from framework.graph import NodeSpec
+from framework.orchestrator import NodeSpec
 
 # Node 1: Intake (client-facing)
 # Receives contact list and outreach goal, confirms with user before proceeding.

examples/templates/sdr_agent/tools.py

@@ -15,7 +15,7 @@ from __future__ import annotations
 import json
 
 from framework.llm.provider import Tool, ToolResult, ToolUse
-from framework.runner.tool_registry import _execution_context
+from framework.loader.tool_registry import _execution_context
 
 # ---------------------------------------------------------------------------
 # Tool definitions (auto-discovered by ToolRegistry.discover_from_module)
@@ -56,7 +56,7 @@ def _get_data_dir() -> str:
     ctx = _execution_context.get()
     if not ctx or "data_dir" not in ctx:
         raise RuntimeError(
-            "data_dir not set in execution context. Is the tool running inside a GraphExecutor?"
+            "data_dir not set in execution context. Is the tool running inside a Orchestrator?"
         )
     return ctx["data_dir"]
 

examples/templates/tech_news_reporter/__main__.py

@@ -73,10 +73,10 @@ def tui(verbose, debug):
     from pathlib import Path
 
     from framework.llm import LiteLLMProvider
-    from framework.runner.tool_registry import ToolRegistry
-    from framework.runtime.agent_runtime import create_agent_runtime
-    from framework.runtime.event_bus import EventBus
-    from framework.runtime.execution_stream import EntryPointSpec
+    from framework.loader.tool_registry import ToolRegistry
+    from framework.host.agent_host import create_agent_runtime
+    from framework.host.event_bus import EventBus
+    from framework.host.execution_manager import EntryPointSpec
 
     async def run_with_tui():
         agent = TechNewsReporterAgent()

examples/templates/tech_news_reporter/agent.py

@@ -1,12 +1,12 @@
 """Agent graph construction for Tech & AI News Reporter."""
 
-from framework.graph import EdgeSpec, EdgeCondition, Goal, SuccessCriterion, Constraint
-from framework.graph.edge import GraphSpec
-from framework.graph.executor import ExecutionResult, GraphExecutor
-from framework.runtime.event_bus import EventBus
-from framework.runtime.core import Runtime
+from framework.orchestrator import EdgeSpec, EdgeCondition, Goal, SuccessCriterion, Constraint
+from framework.orchestrator.edge import GraphSpec
+from framework.orchestrator.orchestrator import ExecutionResult, Orchestrator
+from framework.host.event_bus import EventBus
+from framework.tracker.decision_tracker import DecisionTracker as Runtime
 from framework.llm import LiteLLMProvider
-from framework.runner.tool_registry import ToolRegistry
+from framework.loader.tool_registry import ToolRegistry
 
 from .config import default_config, metadata
 from .nodes import (
@@ -131,7 +131,7 @@ class TechNewsReporterAgent:
         self.entry_points = entry_points
         self.pause_nodes = pause_nodes
         self.terminal_nodes = terminal_nodes
-        self._executor: GraphExecutor | None = None
+        self._executor: Orchestrator | None = None
         self._graph: GraphSpec | None = None
         self._event_bus: EventBus | None = None
         self._tool_registry: ToolRegistry | None = None
@@ -157,7 +157,7 @@ class TechNewsReporterAgent:
             },
         )
 
-    def _setup(self) -> GraphExecutor:
+    def _setup(self) -> Orchestrator:
         """Set up the executor with all components."""
         from pathlib import Path
 
@@ -183,7 +183,7 @@ class TechNewsReporterAgent:
         self._graph = self._build_graph()
         runtime = Runtime(storage_path)
 
-        self._executor = GraphExecutor(
+        self._executor = Orchestrator(
             runtime=runtime,
             llm=llm,
             tools=tools,

examples/templates/tech_news_reporter/nodes/__init__.py

@@ -1,6 +1,6 @@
 """Node definitions for Tech & AI News Reporter."""
 
-from framework.graph import NodeSpec
+from framework.orchestrator import NodeSpec
 
 # Node 1: Intake (client-facing)
 # Brief conversation to understand what topics the user cares about.

examples/templates/twitter_news_agent/agent.py

@@ -2,14 +2,14 @@
 
 from pathlib import Path
 
-from framework.graph import EdgeSpec, EdgeCondition, Goal, SuccessCriterion, Constraint
-from framework.graph.edge import GraphSpec
-from framework.graph.executor import ExecutionResult
-from framework.graph.checkpoint_config import CheckpointConfig
+from framework.orchestrator import EdgeSpec, EdgeCondition, Goal, SuccessCriterion, Constraint
+from framework.orchestrator.edge import GraphSpec
+from framework.orchestrator.orchestrator import ExecutionResult
+from framework.orchestrator.checkpoint_config import CheckpointConfig
 from framework.llm import LiteLLMProvider
-from framework.runner.tool_registry import ToolRegistry
-from framework.runtime.agent_runtime import create_agent_runtime
-from framework.runtime.execution_stream import EntryPointSpec
+from framework.loader.tool_registry import ToolRegistry
+from framework.host.agent_host import create_agent_runtime
+from framework.host.execution_manager import EntryPointSpec
 
 from .config import default_config, metadata
 from .nodes import fetch_node, process_node, review_node
@@ -91,7 +91,7 @@ entry_points = {"start": "process-news"}
 pause_nodes = []
 terminal_nodes = []  # Forever-alive
 
-# Module-level vars read by AgentRunner.load()
+# Module-level vars read by AgentLoader.load()
 conversation_mode = "continuous"
 identity_prompt = "You are a professional news analyst and researcher."
 loop_config = {

examples/templates/twitter_news_agent/nodes/__init__.py

@@ -1,6 +1,6 @@
 """Node definitions for Twitter News Digest."""
 
-from framework.graph import NodeSpec
+from framework.orchestrator import NodeSpec
 
 # Node 1: Browser subagent (GCU) to fetch tweets
 fetch_node = NodeSpec(

examples/templates/vulnerability_assessment/__main__.py

@@ -76,10 +76,10 @@ def tui(mock, verbose, debug):
     from pathlib import Path
 
     from framework.llm import LiteLLMProvider
-    from framework.runner.tool_registry import ToolRegistry
-    from framework.runtime.agent_runtime import create_agent_runtime
-    from framework.runtime.event_bus import EventBus
-    from framework.runtime.execution_stream import EntryPointSpec
+    from framework.loader.tool_registry import ToolRegistry
+    from framework.host.agent_host import create_agent_runtime
+    from framework.host.event_bus import EventBus
+    from framework.host.execution_manager import EntryPointSpec
 
     async def run_with_tui():
         agent = VulnerabilityResearcherAgent()

examples/templates/vulnerability_assessment/agent.py

@@ -1,12 +1,12 @@
 """Agent graph construction for Passive Website Vulnerability Assessment."""
 
-from framework.graph import EdgeSpec, EdgeCondition, Goal, SuccessCriterion, Constraint
-from framework.graph.edge import GraphSpec
-from framework.graph.executor import ExecutionResult, GraphExecutor
-from framework.runtime.event_bus import EventBus
-from framework.runtime.core import Runtime
+from framework.orchestrator import EdgeSpec, EdgeCondition, Goal, SuccessCriterion, Constraint
+from framework.orchestrator.edge import GraphSpec
+from framework.orchestrator.orchestrator import ExecutionResult, Orchestrator
+from framework.host.event_bus import EventBus
+from framework.tracker.decision_tracker import DecisionTracker as Runtime
 from framework.llm import LiteLLMProvider
-from framework.runner.tool_registry import ToolRegistry
+from framework.loader.tool_registry import ToolRegistry
 
 from .config import default_config, metadata
 from .nodes import (
@@ -186,7 +186,7 @@ class VulnerabilityResearcherAgent:
         self.entry_points = entry_points
         self.pause_nodes = pause_nodes
         self.terminal_nodes = terminal_nodes
-        self._executor: GraphExecutor | None = None
+        self._executor: Orchestrator | None = None
         self._graph: GraphSpec | None = None
         self._event_bus: EventBus | None = None
         self._tool_registry: ToolRegistry | None = None
@@ -219,7 +219,7 @@ class VulnerabilityResearcherAgent:
             ),
         )
 
-    def _setup(self, mock_mode=False) -> GraphExecutor:
+    def _setup(self, mock_mode=False) -> Orchestrator:
         """Set up the executor with all components."""
         from pathlib import Path
 
@@ -247,7 +247,7 @@ class VulnerabilityResearcherAgent:
         self._graph = self._build_graph()
         runtime = Runtime(storage_path)
 
-        self._executor = GraphExecutor(
+        self._executor = Orchestrator(
             runtime=runtime,
             llm=llm,
             tools=tools,

examples/templates/vulnerability_assessment/nodes/__init__.py

@@ -1,6 +1,6 @@
 """Node definitions for Passive Website Vulnerability Assessment."""
 
-from framework.graph import NodeSpec
+from framework.orchestrator import NodeSpec
 
 # Node 1: Intake (client-facing)
 # Collect the target domain and confirm scanning scope.