stirrup 0.1.1__tar.gz → 0.1.2__tar.gz

{stirrup-0.1.1 → stirrup-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: stirrup
-Version: 0.1.1
+Version: 0.1.2
 Summary: The lightweight foundation for building agents
 Keywords: ai,agent,llm,openai,anthropic,tools,framework
 Author: Artificial Analysis, Inc.
@@ -54,7 +54,7 @@ Requires-Dist: e2b-code-interpreter>=2.3.0 ; extra == 'e2b'
 Requires-Dist: litellm>=1.79.3 ; extra == 'litellm'
 Requires-Dist: mcp>=1.9.0 ; extra == 'mcp'
 Requires-Python: >=3.12
-Project-URL: Documentation, https://artificialanalysis.github.io/Stirrup
+Project-URL: Documentation, https://stirrup.artificialanalysis.ai
 Project-URL: Homepage, https://github.com/ArtificialAnalysis/Stirrup
 Project-URL: Repository, https://github.com/ArtificialAnalysis/Stirrup
 Provides-Extra: all
@@ -65,7 +65,7 @@ Provides-Extra: mcp
 Description-Content-Type: text/markdown
 
 <div align="center">
-  <a href="">
+  <a href="https://stirrup.artificialanalysis.ai">
     <picture>
         <img alt="Stirrup" src="https://github.com/ArtificialAnalysis/Stirrup/blob/048653717d8662b0b81d152a037995af1c926afc/assets/stirrup-banner.png?raw=true" width="700">
     </picture>
@@ -79,7 +79,7 @@ Description-Content-Type: text/markdown
 <p align="center">
   <a href="https://pypi.python.org/pypi/stirrup"><img src="https://img.shields.io/pypi/v/stirrup" alt="PyPI version" /></a>&nbsp;<!--
   --><a href="https://github.com/ArtificialAnalysis/Stirrup/blob/main/LICENSE"><img src="https://img.shields.io/github/license/ArtificialAnalysis/Stirrup" alt="License" /></a>&nbsp;<!--
-  --><a href="https://artificialanalysis.github.io/Stirrup"><img src="https://img.shields.io/badge/MkDocs-4F46E5?logo=materialformkdocs&logoColor=fff" alt="MkDocs" /></a>
+  --><a href="https://stirrup.artificialanalysis.ai"><img src="https://img.shields.io/badge/MkDocs-4F46E5?logo=materialformkdocs&logoColor=fff" alt="MkDocs" /></a>
 </p>
 
 
@@ -96,6 +96,7 @@ Stirrup is a lightweight framework, or starting point template, for building age
   - Code execution (local, Docker container, E2B sandbox)
   - MCP client
   - Document input and output
+- **Skills system:** Extend agent capabilities with modular, domain-specific instruction packages
 - **Flexible tool execution:** A generic `Tool` class allows easy tool definition and extension
 - **Context management:** Automatically summarizes conversation history when approaching context limits
 - **Flexible provider support:** Pre-built support for OpenAI-compatible APIs and LiteLLM, or bring your own client
@@ -105,16 +106,16 @@ Stirrup is a lightweight framework, or starting point template, for building age
 
 ```bash
 # Core framework
-uv pip install stirrup      # or: uv add stirrup
+pip install stirrup      # or: uv add stirrup
 
 # With all optional components
-uv pip install stirrup[all]  # or: uv add stirrup[all]
+pip install 'stirrup[all]'  # or: uv add 'stirrup[all]'
 
 # Individual extras
-uv pip install stirrup[litellm]  # or: uv add stirrup[litellm]
-uv pip install stirrup[docker]   # or: uv add stirrup[docker]
-uv pip install stirrup[e2b]      # or: uv add stirrup[e2b]
-uv pip install stirrup[mcp]      # or: uv add stirrup[mcp]
+pip install 'stirrup[litellm]'  # or: uv add 'stirrup[litellm]'
+pip install 'stirrup[docker]'   # or: uv add 'stirrup[docker]'
+pip install 'stirrup[e2b]'      # or: uv add 'stirrup[e2b]'
+pip install 'stirrup[mcp]'      # or: uv add 'stirrup[mcp]'
 ```
 
 ## Quick Start
@@ -160,6 +161,24 @@ if __name__ == "__main__":
 
 > **Note:** This example uses OpenRouter. Set `OPENROUTER_API_KEY` in your environment before running. Web search requires a `BRAVE_API_KEY`. The agent will still work without it, but web search will be unavailable.
 
+## Full Customization
+
+For using Stirrup as a foundation for your own fully customized agent, you can clone and import Stirrup locally:
+
+```bash
+# Clone the repository
+git clone https://github.com/ArtificialAnalysis/Stirrup.git
+cd stirrup
+
+# Install in editable mode
+pip install -e .      # or: uv venv && uv pip install -e .
+
+# Or with all optional dependencies
+pip install -e '.[all]'  # or: uv venv && uv pip install -e '.[all]'
+```
+
+See the [Full Customization guide](https://stirrup.artificialanalysis.ai/extending/full-customization/) for more details.
+
 ## How It Works
 
 - **`Agent`** - Configures and runs the agent loop until a finish tool is called or max turns reached
@@ -188,6 +207,7 @@ agent = Agent(client=client, name="deepseek_agent")
 ### LiteLLM (Anthropic, Google, etc.)
 
 ```python
+# Ensure LiteLLM is added with: pip install 'stirrup[litellm]'  # or: uv add 'stirrup[litellm]'
 # Create LiteLLM client for Anthropic Claude
 # See https://docs.litellm.ai/docs/providers for all supported providers
 client = LiteLLMClient(
@@ -202,7 +222,7 @@ agent = Agent(
 )
 ```
 
-See [LiteLLM Example](https://artificialanalysis.github.io/Stirrup/examples/#litellm-multi-provider-support) or [Deepseek Example](https://artificialanalysis.github.io/Stirrup/examples/#openai-compatible-apis-deepseek-vllm-ollama) for complete examples.
+See [LiteLLM Example](https://stirrup.artificialanalysis.ai/examples/#litellm-multi-provider-support) or [Deepseek Example](https://stirrup.artificialanalysis.ai/examples/#openai-compatible-apis-deepseek-vllm-ollama) for complete examples.
 
 ## Default Tools
 
@@ -285,14 +305,14 @@ agent = Agent(
 
 ## Next Steps
 
-- [Getting Started](https://artificialanalysis.github.io/Stirrup/getting-started/) - Installation and first agent tutorial
-- [Core Concepts](https://artificialanalysis.github.io/Stirrup/concepts/) - Understand Agent, Tools, and Sessions
-- [Examples](https://artificialanalysis.github.io/Stirrup/examples/) - Working examples for common patterns
-- [Creating Tools](https://artificialanalysis.github.io/Stirrup/guides/tools/) - Build your own tools
+- [Getting Started](https://stirrup.artificialanalysis.ai/getting-started/) - Installation and first agent tutorial
+- [Core Concepts](https://stirrup.artificialanalysis.ai/concepts/) - Understand Agent, Tools, and Sessions
+- [Examples](https://stirrup.artificialanalysis.ai/examples/) - Working examples for common patterns
+- [Creating Tools](https://stirrup.artificialanalysis.ai/guides/tools/) - Build your own tools
 
 ## Documentation
 
-Full documentation: [artificialanalysis.github.io/Stirrup](https://artificialanalysis.github.io/Stirrup)
+Full documentation: [artificialanalysis.github.io/Stirrup](https://stirrup.artificialanalysis.ai)
 
 Build and serve locally:
 

{stirrup-0.1.1 → stirrup-0.1.2}/README.md

@@ -1,5 +1,5 @@
 <div align="center">
-  <a href="">
+  <a href="https://stirrup.artificialanalysis.ai">
     <picture>
         <img alt="Stirrup" src="https://github.com/ArtificialAnalysis/Stirrup/blob/048653717d8662b0b81d152a037995af1c926afc/assets/stirrup-banner.png?raw=true" width="700">
     </picture>
@@ -13,7 +13,7 @@
 <p align="center">
   <a href="https://pypi.python.org/pypi/stirrup"><img src="https://img.shields.io/pypi/v/stirrup" alt="PyPI version" /></a>&nbsp;<!--
   --><a href="https://github.com/ArtificialAnalysis/Stirrup/blob/main/LICENSE"><img src="https://img.shields.io/github/license/ArtificialAnalysis/Stirrup" alt="License" /></a>&nbsp;<!--
-  --><a href="https://artificialanalysis.github.io/Stirrup"><img src="https://img.shields.io/badge/MkDocs-4F46E5?logo=materialformkdocs&logoColor=fff" alt="MkDocs" /></a>
+  --><a href="https://stirrup.artificialanalysis.ai"><img src="https://img.shields.io/badge/MkDocs-4F46E5?logo=materialformkdocs&logoColor=fff" alt="MkDocs" /></a>
 </p>
 
 
@@ -30,6 +30,7 @@ Stirrup is a lightweight framework, or starting point template, for building age
   - Code execution (local, Docker container, E2B sandbox)
   - MCP client
   - Document input and output
+- **Skills system:** Extend agent capabilities with modular, domain-specific instruction packages
 - **Flexible tool execution:** A generic `Tool` class allows easy tool definition and extension
 - **Context management:** Automatically summarizes conversation history when approaching context limits
 - **Flexible provider support:** Pre-built support for OpenAI-compatible APIs and LiteLLM, or bring your own client
@@ -39,16 +40,16 @@ Stirrup is a lightweight framework, or starting point template, for building age
 
 ```bash
 # Core framework
-uv pip install stirrup      # or: uv add stirrup
+pip install stirrup      # or: uv add stirrup
 
 # With all optional components
-uv pip install stirrup[all]  # or: uv add stirrup[all]
+pip install 'stirrup[all]'  # or: uv add 'stirrup[all]'
 
 # Individual extras
-uv pip install stirrup[litellm]  # or: uv add stirrup[litellm]
-uv pip install stirrup[docker]   # or: uv add stirrup[docker]
-uv pip install stirrup[e2b]      # or: uv add stirrup[e2b]
-uv pip install stirrup[mcp]      # or: uv add stirrup[mcp]
+pip install 'stirrup[litellm]'  # or: uv add 'stirrup[litellm]'
+pip install 'stirrup[docker]'   # or: uv add 'stirrup[docker]'
+pip install 'stirrup[e2b]'      # or: uv add 'stirrup[e2b]'
+pip install 'stirrup[mcp]'      # or: uv add 'stirrup[mcp]'
 ```
 
 ## Quick Start
@@ -94,6 +95,24 @@ if __name__ == "__main__":
 
 > **Note:** This example uses OpenRouter. Set `OPENROUTER_API_KEY` in your environment before running. Web search requires a `BRAVE_API_KEY`. The agent will still work without it, but web search will be unavailable.
 
+## Full Customization
+
+For using Stirrup as a foundation for your own fully customized agent, you can clone and import Stirrup locally:
+
+```bash
+# Clone the repository
+git clone https://github.com/ArtificialAnalysis/Stirrup.git
+cd stirrup
+
+# Install in editable mode
+pip install -e .      # or: uv venv && uv pip install -e .
+
+# Or with all optional dependencies
+pip install -e '.[all]'  # or: uv venv && uv pip install -e '.[all]'
+```
+
+See the [Full Customization guide](https://stirrup.artificialanalysis.ai/extending/full-customization/) for more details.
+
 ## How It Works
 
 - **`Agent`** - Configures and runs the agent loop until a finish tool is called or max turns reached
@@ -122,6 +141,7 @@ agent = Agent(client=client, name="deepseek_agent")
 ### LiteLLM (Anthropic, Google, etc.)
 
 ```python
+# Ensure LiteLLM is added with: pip install 'stirrup[litellm]'  # or: uv add 'stirrup[litellm]'
 # Create LiteLLM client for Anthropic Claude
 # See https://docs.litellm.ai/docs/providers for all supported providers
 client = LiteLLMClient(
@@ -136,7 +156,7 @@ agent = Agent(
 )
 ```
 
-See [LiteLLM Example](https://artificialanalysis.github.io/Stirrup/examples/#litellm-multi-provider-support) or [Deepseek Example](https://artificialanalysis.github.io/Stirrup/examples/#openai-compatible-apis-deepseek-vllm-ollama) for complete examples.
+See [LiteLLM Example](https://stirrup.artificialanalysis.ai/examples/#litellm-multi-provider-support) or [Deepseek Example](https://stirrup.artificialanalysis.ai/examples/#openai-compatible-apis-deepseek-vllm-ollama) for complete examples.
 
 ## Default Tools
 
@@ -219,14 +239,14 @@ agent = Agent(
 
 ## Next Steps
 
-- [Getting Started](https://artificialanalysis.github.io/Stirrup/getting-started/) - Installation and first agent tutorial
-- [Core Concepts](https://artificialanalysis.github.io/Stirrup/concepts/) - Understand Agent, Tools, and Sessions
-- [Examples](https://artificialanalysis.github.io/Stirrup/examples/) - Working examples for common patterns
-- [Creating Tools](https://artificialanalysis.github.io/Stirrup/guides/tools/) - Build your own tools
+- [Getting Started](https://stirrup.artificialanalysis.ai/getting-started/) - Installation and first agent tutorial
+- [Core Concepts](https://stirrup.artificialanalysis.ai/concepts/) - Understand Agent, Tools, and Sessions
+- [Examples](https://stirrup.artificialanalysis.ai/examples/) - Working examples for common patterns
+- [Creating Tools](https://stirrup.artificialanalysis.ai/guides/tools/) - Build your own tools
 
 ## Documentation
 
-Full documentation: [artificialanalysis.github.io/Stirrup](https://artificialanalysis.github.io/Stirrup)
+Full documentation: [artificialanalysis.github.io/Stirrup](https://stirrup.artificialanalysis.ai)
 
 Build and serve locally:
 

{stirrup-0.1.1 → stirrup-0.1.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "stirrup"
-version = "0.1.1"
+version = "0.1.2"
 description = "The lightweight foundation for building agents"
 readme = "README.md"
 license = { file = "LICENSE" }
@@ -45,7 +45,7 @@ all = ["stirrup[litellm,e2b,docker,mcp]"]
 
 [project.urls]
 Homepage = "https://github.com/ArtificialAnalysis/Stirrup"
-Documentation = "https://artificialanalysis.github.io/Stirrup"
+Documentation = "https://stirrup.artificialanalysis.ai"
 Repository = "https://github.com/ArtificialAnalysis/Stirrup"
 
 [build-system]

{stirrup-0.1.1 → stirrup-0.1.2}/src/stirrup/core/agent.py

@@ -36,6 +36,7 @@ from stirrup.core.models import (
     UserMessage,
 )
 from stirrup.prompts import MESSAGE_SUMMARIZER, MESSAGE_SUMMARIZER_BRIDGE_TEMPLATE
+from stirrup.skills import SkillMetadata, format_skills_section, load_skills_metadata
 from stirrup.tools import DEFAULT_TOOLS
 from stirrup.tools.code_backends.base import CodeExecToolProvider
 from stirrup.tools.code_backends.local import LocalCodeExecToolProvider
@@ -70,6 +71,7 @@ class SessionState:
     parent_exec_env: CodeExecToolProvider | None = None
     depth: int = 0
     uploaded_file_paths: list[str] = field(default_factory=list)  # Paths of files uploaded to exec_env
+    skills_metadata: list[SkillMetadata] = field(default_factory=list)  # Loaded skills metadata
 
 
 _SESSION_STATE: contextvars.ContextVar[SessionState] = contextvars.ContextVar("session_state")
@@ -222,6 +224,7 @@ class Agent[FinishParams: BaseModel, FinishMeta]:
         # Session configuration (set during session(), used in __aenter__)
         self._pending_output_dir: Path | None = None
         self._pending_input_files: str | Path | list[str | Path] | None = None
+        self._pending_skills_dir: Path | None = None
 
         # Instance-scoped state (populated during __aenter__, isolated per agent instance)
         self._active_tools: dict[str, Tool] = {}
@@ -258,6 +261,7 @@ class Agent[FinishParams: BaseModel, FinishMeta]:
         self,
         output_dir: Path | str | None = None,
         input_files: str | Path | list[str | Path] | None = None,
+        skills_dir: Path | str | None = None,
     ) -> Self:
         """Configure a session and return self for use as async context manager.
 
@@ -270,6 +274,9 @@ class Agent[FinishParams: BaseModel, FinishMeta]:
                         - Glob patterns (e.g., "data/*.csv", "**/*.py")
                         Raises ValueError if no CodeExecToolProvider is configured
                         or if a glob pattern matches no files.
+            skills_dir: Directory containing skill definitions to load and make available
+                       to the agent. Skills are uploaded to the execution environment
+                       and their metadata is included in the system prompt.
 
         Returns:
             Self, for use with `async with agent.session(...) as session:`
@@ -285,6 +292,7 @@ class Agent[FinishParams: BaseModel, FinishMeta]:
         """
         self._pending_output_dir = Path(output_dir) if output_dir else None
         self._pending_input_files = input_files
+        self._pending_skills_dir = Path(skills_dir) if skills_dir else None
         return self
 
     def _resolve_input_files(self, input_files: str | Path | list[str | Path]) -> list[Path]:
@@ -410,6 +418,12 @@ class Agent[FinishParams: BaseModel, FinishMeta]:
                 files_section += f"\n- {file_path}"
             parts.append(files_section)
 
+        # Skills section (if skills were loaded)
+        if state and state.skills_metadata:
+            skills_section = format_skills_section(state.skills_metadata)
+            if skills_section:
+                parts.append(f"\n\n{skills_section}")
+
         # User's custom system prompt (if provided)
         if self._system_prompt:
             parts.append(f"\n\nFollow these instructions from the User:\n{self._system_prompt}")
@@ -588,6 +602,18 @@ class Agent[FinishParams: BaseModel, FinishMeta]:
                     raise RuntimeError(f"Failed to upload files: {result.failed}")
             self._pending_input_files = None  # Clear pending state
 
+            # Upload skills directory if it exists and load metadata
+            if self._pending_skills_dir:
+                skills_path = self._pending_skills_dir
+                if skills_path.exists() and skills_path.is_dir():
+                    if state.exec_env:
+                        logger.debug("[%s __aenter__] Uploading skills directory: %s", self._name, skills_path)
+                        await state.exec_env.upload_files(skills_path, dest_dir="skills")
+                    # Load skills metadata (even if no exec_env, for system prompt)
+                    state.skills_metadata = load_skills_metadata(skills_path)
+                    logger.debug("[%s __aenter__] Loaded %d skills", self._name, len(state.skills_metadata))
+                self._pending_skills_dir = None  # Clear pending state
+
             # Configure and enter logger context
             self._logger.name = self._name
             self._logger.model = self._client.model_slug

{stirrup-0.1.1 → stirrup-0.1.2}/src/stirrup/core/models.py

@@ -430,6 +430,7 @@ class Tool[P: BaseModel, M](BaseModel):
     (setup/teardown, resource pooling), use a ToolProvider instead.
 
     Example with parameters:
+        ```python
         class CalcParams(BaseModel):
             expression: str
 
@@ -439,13 +440,16 @@ class Tool[P: BaseModel, M](BaseModel):
             parameters=CalcParams,
             executor=lambda p: ToolResult(content=str(eval(p.expression))),
         )
+        ```
 
     Example without parameters:
+        ```python
         time_tool = Tool[None, None](
             name="time",
             description="Get current time",
             executor=lambda _: ToolResult(content=datetime.now().isoformat()),
         )
+        ```
     """
 
     name: str

stirrup-0.1.2/src/stirrup/skills/__init__.py

@@ -0,0 +1,24 @@
+"""Skills module for agent capabilities.
+
+This module provides functionality for loading and managing agent skills.
+Skills are modular packages with instructions and resources that agents
+can discover and use dynamically.
+
+Example usage:
+    from stirrup.skills import load_skills_metadata, format_skills_section
+    from pathlib import Path
+
+    # Load skills from directory
+    skills = load_skills_metadata(Path("skills"))
+
+    # Format for system prompt
+    prompt_section = format_skills_section(skills)
+"""
+
+from stirrup.skills.skills import SkillMetadata, format_skills_section, load_skills_metadata
+
+__all__ = [
+    "SkillMetadata",
+    "format_skills_section",
+    "load_skills_metadata",
+]

stirrup-0.1.2/src/stirrup/skills/skills.py

@@ -0,0 +1,145 @@
+"""Skills loader for agent capabilities.
+
+Skills are modular packages that extend agent capabilities with instructions,
+scripts, and resources. Each skill is a directory containing a SKILL.md file
+with YAML frontmatter (name, description) and detailed instructions.
+
+Based on: https://www.anthropic.com/engineering/equipping-agents-for-the-real-world-with-agent-skills
+"""
+
+import logging
+import re
+from dataclasses import dataclass
+from pathlib import Path
+
+logger = logging.getLogger(__name__)
+
+
+@dataclass
+class SkillMetadata:
+    """Metadata extracted from a skill's SKILL.md frontmatter."""
+
+    name: str
+    description: str
+    path: str  # Relative path like "skills/data_analysis"
+
+
+def parse_frontmatter(content: str) -> dict[str, str]:
+    """Parse YAML frontmatter from markdown content.
+
+    Extracts metadata between --- markers at the start of the file.
+
+    Args:
+        content: Markdown content with optional YAML frontmatter
+
+    Returns:
+        Dictionary of frontmatter key-value pairs, empty if no frontmatter found
+
+    """
+    # Match YAML frontmatter between --- markers
+    pattern = r"^---\s*\n(.*?)\n---"
+    match = re.match(pattern, content, re.DOTALL)
+
+    if not match:
+        return {}
+
+    frontmatter_text = match.group(1)
+    result: dict[str, str] = {}
+
+    # Simple YAML parsing for key: value pairs
+    for line in frontmatter_text.strip().split("\n"):
+        line = line.strip()
+        if ":" in line:
+            key, value = line.split(":", 1)
+            result[key.strip()] = value.strip()
+
+    return result
+
+
+def load_skills_metadata(skills_dir: Path) -> list[SkillMetadata]:
+    """Scan skills directory for SKILL.md files and extract metadata.
+
+    Args:
+        skills_dir: Path to the skills directory
+
+    Returns:
+        List of SkillMetadata for each valid skill found.
+        Returns empty list if skills_dir doesn't exist or has no skills.
+
+    """
+    if not skills_dir.exists():
+        logger.debug("Skills directory does not exist: %s", skills_dir)
+        return []
+
+    if not skills_dir.is_dir():
+        logger.warning("Skills path is not a directory: %s", skills_dir)
+        return []
+
+    skills: list[SkillMetadata] = []
+
+    for skill_path in skills_dir.iterdir():
+        if not skill_path.is_dir():
+            continue
+
+        skill_md = skill_path / "SKILL.md"
+        if not skill_md.exists():
+            logger.debug("Skill directory missing SKILL.md: %s", skill_path)
+            continue
+
+        try:
+            content = skill_md.read_text(encoding="utf-8")
+            metadata = parse_frontmatter(content)
+
+            name = metadata.get("name")
+            description = metadata.get("description")
+
+            if not name or not description:
+                logger.warning(
+                    "Skill %s missing required frontmatter (name, description)",
+                    skill_path.name,
+                )
+                continue
+
+            skills.append(
+                SkillMetadata(
+                    name=name,
+                    description=description,
+                    path=f"skills/{skill_path.name}",
+                )
+            )
+            logger.debug("Loaded skill: %s", name)
+
+        except Exception as e:
+            logger.warning("Failed to load skill %s: %s", skill_path.name, e)
+
+    return skills
+
+
+def format_skills_section(skills: list[SkillMetadata]) -> str:
+    """Format skills metadata as a system prompt section.
+
+    Args:
+        skills: List of skill metadata to include
+
+    Returns:
+        Formatted string for inclusion in system prompt.
+        Returns empty string if no skills provided.
+
+    """
+    if not skills:
+        return ""
+
+    lines = [
+        "## Available Skills",
+        "",
+        "You have access to the following skills located in the `skills/` directory. "
+        "Each skill contains a SKILL.md file with detailed instructions and potentially bundled scripts.",
+        "",
+        "To use a skill:",
+        "1. Read the full instructions: `cat <skill_path>/SKILL.md`",
+        "2. Follow the instructions and use any bundled resources as described",
+        "",
+    ]
+    lines.extend([f"- **{skill.name}**: {skill.description} (`{skill.path}/SKILL.md`)" for skill in skills])
+
+    return "\n".join(lines)

{stirrup-0.1.1 → stirrup-0.1.2}/src/stirrup/tools/code_backends/docker.py

@@ -330,7 +330,7 @@ class DockerCodeExecToolProvider(CodeExecToolProvider):
             context_path = self._dockerfile_context.resolve() if self._dockerfile_context else dockerfile_path.parent
 
             # Generate unique tag based on dockerfile path
-            tag = f"agent001-exec-env-{hashlib.md5(str(dockerfile_path).encode()).hexdigest()[:8]}"
+            tag = f"stirrup-exec-env-{hashlib.md5(str(dockerfile_path).encode()).hexdigest()[:8]}"
 
             logger.info("Building image from %s with tag %s", dockerfile_path, tag)
 
@@ -710,8 +710,20 @@ class DockerCodeExecToolProvider(CodeExecToolProvider):
                     logger.debug("Uploaded file: %s -> %s", source, container_path)
 
                 elif source.is_dir():
-                    dest = dest_base / source.name
-                    shutil.copytree(source, dest, dirs_exist_ok=True)
+                    # If dest_dir was explicitly provided, copy contents directly to dest_base
+                    # Otherwise, create a subdirectory with the source's name
+                    if dest_dir:
+                        dest = dest_base
+                        # Copy contents of source directory into dest_base
+                        for item in source.iterdir():
+                            item_dest = dest / item.name
+                            if item.is_file():
+                                shutil.copy2(item, item_dest)
+                            else:
+                                shutil.copytree(item, item_dest, dirs_exist_ok=True)
+                    else:
+                        dest = dest_base / source.name
+                        shutil.copytree(source, dest, dirs_exist_ok=True)
                     # Track all individual files uploaded
                     for file_path in source.rglob("*"):
                         if file_path.is_file():
@@ -725,7 +737,7 @@ class DockerCodeExecToolProvider(CodeExecToolProvider):
                                     size=file_path.stat().st_size,
                                 ),
                             )
-                    logger.debug("Uploaded directory: %s -> %s/%s", source, self._working_dir, source.name)
+                    logger.debug("Uploaded directory: %s -> %s", source, dest)
 
             except Exception as exc:
                 result.failed[str(source)] = str(exc)

{stirrup-0.1.1 → stirrup-0.1.2}/src/stirrup/tools/code_backends/e2b.py

@@ -320,10 +320,12 @@ class E2BCodeExecToolProvider(CodeExecToolProvider):
 
                 elif source.is_dir():
                     # Upload all files in directory recursively
+                    # If dest_dir was explicitly provided, copy contents directly to dest_base
+                    # Otherwise, create a subdirectory with the source's name
                     for file_path in source.rglob("*"):
                         if file_path.is_file():
                             relative = file_path.relative_to(source)
-                            dest = f"{dest_base}/{source.name}/{relative}"
+                            dest = f"{dest_base}/{relative}" if dest_dir else f"{dest_base}/{source.name}/{relative}"
                             content = file_path.read_bytes()
                             await self._sbx.files.write(dest, content)
                             result.uploaded.append(
@@ -333,7 +335,10 @@ class E2BCodeExecToolProvider(CodeExecToolProvider):
                                     size=len(content),
                                 ),
                             )
-                    logger.debug("Uploaded directory: %s -> %s/%s", source, dest_base, source.name)
+                    if dest_dir:
+                        logger.debug("Uploaded directory contents: %s -> %s", source, dest_base)
+                    else:
+                        logger.debug("Uploaded directory: %s -> %s/%s", source, dest_base, source.name)
 
             except Exception as exc:
                 result.failed[str(source)] = str(exc)

{stirrup-0.1.1 → stirrup-0.1.2}/src/stirrup/tools/code_backends/local.py

@@ -440,8 +440,20 @@ class LocalCodeExecToolProvider(CodeExecToolProvider):
                     logger.debug("Uploaded file: %s -> %s", source, dest)
 
                 elif source.is_dir():
-                    dest = dest_base / source.name
-                    shutil.copytree(source, dest, dirs_exist_ok=True)
+                    # If dest_dir was explicitly provided, copy contents directly to dest_base
+                    # Otherwise, create a subdirectory with the source's name
+                    if dest_dir:
+                        dest = dest_base
+                        # Copy contents of source directory into dest_base
+                        for item in source.iterdir():
+                            item_dest = dest / item.name
+                            if item.is_file():
+                                shutil.copy2(item, item_dest)
+                            else:
+                                shutil.copytree(item, item_dest, dirs_exist_ok=True)
+                    else:
+                        dest = dest_base / source.name
+                        shutil.copytree(source, dest, dirs_exist_ok=True)
                     # Track all individual files uploaded
                     for file_path in source.rglob("*"):
                         if file_path.is_file():