vibecore 0.5.0__py3-none-any.whl → 0.6.0__py3-none-any.whl

vibecore/agents/default.py

@@ -3,7 +3,7 @@ from typing import TYPE_CHECKING
 from agents import Agent
 from agents.extensions.handoff_prompt import prompt_with_handoff_instructions
 
-from vibecore.context import VibecoreContext
+from vibecore.context import FullVibecoreContext
 from vibecore.settings import settings
 from vibecore.tools.file.tools import edit, multi_edit, read, write
 from vibecore.tools.python.tools import execute_python
@@ -29,7 +29,7 @@ INSTRUCTIONS = (
 )
 
 
-def create_default_agent(mcp_servers: list["MCPServer"] | None = None) -> Agent[VibecoreContext]:
+def create_default_agent(mcp_servers: list["MCPServer"] | None = None) -> Agent[FullVibecoreContext]:
     """Create the general-purpose agent with appropriate tools.
 
     Args:
@@ -58,7 +58,7 @@ def create_default_agent(mcp_servers: list["MCPServer"] | None = None) -> Agent[
 
     instructions = prompt_with_handoff_instructions(instructions)
 
-    return Agent[VibecoreContext](
+    return Agent[FullVibecoreContext](
         name="Vibecore Agent",
         handoff_description="A versatile general-purpose assistant",
         instructions=instructions,

vibecore/agents/task.py

@@ -3,7 +3,7 @@
 from agents import Agent
 from agents.extensions.handoff_prompt import prompt_with_handoff_instructions
 
-from vibecore.context import VibecoreContext
+from vibecore.context import FullVibecoreContext
 from vibecore.settings import settings
 from vibecore.tools.file.tools import edit, multi_edit, read, write
 from vibecore.tools.python.tools import execute_python
@@ -13,7 +13,7 @@ from vibecore.tools.todo.tools import todo_read, todo_write
 from .prompts import COMMON_PROMPT
 
 
-def create_task_agent(prompt: str) -> Agent[VibecoreContext]:
+def create_task_agent(prompt: str) -> Agent[FullVibecoreContext]:
     """Create a task agent with all tools except the Task tool.
 
     This agent is used by the Task tool to execute specific tasks.
@@ -51,7 +51,7 @@ def create_task_agent(prompt: str) -> Agent[VibecoreContext]:
 
     instructions = prompt_with_handoff_instructions(instructions)
 
-    return Agent[VibecoreContext](
+    return Agent[FullVibecoreContext](
         name="Task Agent",
         handoff_description="A task-specific agent",
         instructions=instructions,

vibecore/cli.py

@@ -1,17 +1,21 @@
 """Vibecore CLI interface using typer."""
 
 import asyncio
+import contextlib
+import datetime
 import logging
+import sys
 from importlib.metadata import version
 from pathlib import Path
 
 import typer
+from agents.result import RunResultBase
 from textual.logging import TextualHandler
 
 from vibecore.agents.default import create_default_agent
-from vibecore.context import VibecoreContext
-from vibecore.main import VibecoreApp
+from vibecore.flow import AppIsExiting, Vibecore, VibecoreRunner
 from vibecore.mcp import MCPManager
+from vibecore.session import JSONLSession
 from vibecore.settings import settings
 
 app = typer.Typer()
@@ -110,49 +114,70 @@ def main(
     logger = logging.getLogger("openai.agents")
     logger.addHandler(TextualHandler())
 
-    # Create context
-    vibecore_ctx = VibecoreContext()
-
-    # Initialize MCP manager if configured
-    mcp_servers = []
-    if settings.mcp_servers:
-        # Create MCP manager
-        mcp_manager = MCPManager(settings.mcp_servers)
-        vibecore_ctx.mcp_manager = mcp_manager
-
-        # Get the MCP servers from the manager
-        mcp_servers = mcp_manager.servers
+    asyncio.run(
+        async_main(continue_session=continue_session, session_id=session_id, prompt=prompt, print_mode=print_mode)
+    )
 
-    # Create agent with MCP servers
-    agent = create_default_agent(mcp_servers=mcp_servers)
 
-    # Determine session to use
-    session_to_load = None
-    if continue_session:
-        session_to_load = find_latest_session()
-        if not session_to_load:
-            typer.echo("No existing sessions found for this project.")
-            raise typer.Exit(1)
-        typer.echo(f"Continuing session: {session_to_load}")
-    elif session_id:
-        session_to_load = session_id
-        typer.echo(f"Loading session: {session_to_load}")
-
-    # Create app
-    app_instance = VibecoreApp(vibecore_ctx, agent, session_id=session_to_load, print_mode=print_mode)
-
-    if print_mode:
-        # Run in print mode
-        import asyncio
-
-        # Use provided prompt or None to read from stdin
-        result = asyncio.run(app_instance.run_print(prompt))
-        # Print raw output to stdout
-        if result:
-            print(result)
-    else:
-        # Run normal TUI mode
-        app_instance.run()
+async def async_main(continue_session: bool, session_id: str | None, prompt: str | None, print_mode: bool):
+    # Create MCP manager
+    async with MCPManager(settings.mcp_servers) as mcp_manager:
+        # Create agent with MCP servers
+        agent = create_default_agent(mcp_servers=mcp_manager.servers)
+
+        # Create Vibecore instance
+        from vibecore.context import FullVibecoreContext
+
+        vibecore = Vibecore[FullVibecoreContext, RunResultBase](disable_user_input=False)
+
+        # Determine session to use
+        session_to_load = None
+        if continue_session:
+            session_to_load = find_latest_session()
+            if not session_to_load:
+                typer.echo("No existing sessions found for this project.")
+                raise typer.Exit(1)
+            typer.echo(f"Continuing session: {session_to_load}")
+        elif session_id:
+            session_to_load = session_id
+            typer.echo(f"Loading session: {session_to_load}")
+
+        if session_to_load is None:
+            # Generate a new session ID based on current date/time
+            session_to_load = f"chat-{datetime.datetime.now().strftime('%Y%m%d-%H%M%S')}"
+
+        session = JSONLSession(
+            session_id=session_to_load,
+            project_path=None,  # Will use current working directory
+            base_dir=settings.session.base_dir,
+        )
+
+        # Define workflow logic
+        @vibecore.workflow()
+        async def workflow(
+            runner: VibecoreRunner[FullVibecoreContext, RunResultBase],
+            user_message: str,
+        ) -> RunResultBase:
+            # Run the agent with the input
+            return await runner.run_agent(
+                agent,
+                input=user_message,
+                context=runner.context,
+                max_turns=settings.max_turns,
+                session=runner.session,
+            )
+
+        if print_mode:
+            # Use static runner for print mode - pass empty input since we get it in workflow
+            input_text = prompt.strip() if prompt else sys.stdin.read().strip()
+            result = await vibecore.run(input_text)
+            # Print raw output to stdout
+            print(result.final_output_as(str))
+        else:
+            # Run in TUI mode
+            with contextlib.suppress(AppIsExiting):
+                result = await vibecore.run_textual(prompt, session=session)
+                print(result)
 
 
 @auth_app.command("login")

vibecore/context.py

@@ -1,29 +1,61 @@
 from dataclasses import dataclass, field
 from pathlib import Path
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING, Optional, Protocol, runtime_checkable
 
 from vibecore.tools.python.manager import PythonExecutionManager
 from vibecore.tools.todo.manager import TodoManager
 
 if TYPE_CHECKING:
     from vibecore.main import VibecoreApp
-    from vibecore.mcp import MCPManager
     from vibecore.tools.path_validator import PathValidator
 
 
+@runtime_checkable
+class TodoToolContext(Protocol):
+    """Context required by todo tools."""
+
+    todo_manager: TodoManager
+
+
+@runtime_checkable
+class PythonToolContext(Protocol):
+    """Context required by Python execution tools."""
+
+    python_manager: PythonExecutionManager
+
+
+@runtime_checkable
+class PathValidatorContext(Protocol):
+    """Context that provides a path validator for file-system tools."""
+
+    path_validator: "PathValidator"
+
+
+@runtime_checkable
+class AppAwareContext(Protocol):
+    """Context that exposes the optional Textual app for streaming updates."""
+
+    app: Optional["VibecoreApp"]
+
+
+@runtime_checkable
+class FullVibecoreContext(TodoToolContext, PythonToolContext, PathValidatorContext, AppAwareContext, Protocol):
+    """Protocol describing the full context required by Vibecore agents."""
+
+    ...
+
+
 @dataclass
-class VibecoreContext:
+class DefaultVibecoreContext:
     todo_manager: TodoManager = field(default_factory=TodoManager)
     python_manager: PythonExecutionManager = field(default_factory=PythonExecutionManager)
     app: Optional["VibecoreApp"] = None
-    context_fullness: float = 0.0
-    mcp_manager: Optional["MCPManager"] = None
 
     # Path confinement configuration
     allowed_directories: list[Path] = field(default_factory=list)
     path_validator: "PathValidator" = field(init=False)  # Always initialized, never None
 
-    def __post_init__(self):
+    def __post_init__(self) -> None:
         """Initialize path validator with allowed directories."""
         from vibecore.tools.path_validator import PathValidator
 
@@ -49,13 +81,7 @@ class VibecoreContext:
 
         self.path_validator = PathValidator(self.allowed_directories)
 
-    def reset_state(self) -> None:
-        """Reset all context state for a new session."""
-        self.todo_manager = TodoManager()
-        self.python_manager = PythonExecutionManager()
-        self.context_fullness = 0.0
-        # Preserve allowed_directories across resets
-        # Re-initialize validator in case directories changed
-        from vibecore.tools.path_validator import PathValidator
 
-        self.path_validator = PathValidator(self.allowed_directories)
+if TYPE_CHECKING:
+    # Ensure DefaultVibecoreContext conforms to the VibecoreContext protocol for static analyzers
+    _default_context: FullVibecoreContext = DefaultVibecoreContext()