deepagents-cli 0.0.4__py3-none-any.whl → 0.0.6__py3-none-any.whl

deepagents_cli/agent.py

@@ -79,35 +79,13 @@ def reset_agent(agent_name: str, source_agent: str = None):
     console.print(f"Location: {agent_dir}\n", style=COLORS["dim"])
 
 
-def create_agent_with_config(model, assistant_id: str, tools: list):
-    """Create and configure an agent with the specified model and tools."""
-    shell_middleware = ResumableShellToolMiddleware(
-        workspace_root=os.getcwd(), execution_policy=HostExecutionPolicy()
-    )
+def get_system_prompt() -> str:
+    """Get the base system prompt for the agent.
 
-    # For long-term memory, point to ~/.deepagents/AGENT_NAME/ with /memories/ prefix
-    agent_dir = Path.home() / ".deepagents" / assistant_id
-    agent_dir.mkdir(parents=True, exist_ok=True)
-    agent_md = agent_dir / "agent.md"
-    if not agent_md.exists():
-        source_content = get_default_coding_instructions()
-        agent_md.write_text(source_content)
-
-    # Long-term backend - rooted at agent directory
-    # This handles both /memories/ files and /agent.md
-    long_term_backend = FilesystemBackend(root_dir=agent_dir, virtual_mode=True)
-
-    # Composite backend: current working directory for default, agent directory for /memories/
-    backend = CompositeBackend(
-        default=FilesystemBackend(), routes={"/memories/": long_term_backend}
-    )
-
-    # Use the same backend for agent memory middleware
-    agent_middleware = [
-        AgentMemoryMiddleware(backend=long_term_backend, memory_path="/memories/"),
-        shell_middleware,
-    ]
-    system_prompt = f"""### Current Working Directory
+    Returns:
+        The system prompt string (without agent.md content)
+    """
+    return f"""### Current Working Directory
 
 The filesystem backend is currently operating in: `{Path.cwd()}`
 
@@ -159,6 +137,39 @@ When using the write_todos tool:
 
 The todo list is a planning tool - use it judiciously to avoid overwhelming the user with excessive task tracking."""
 
+
+def create_agent_with_config(model, assistant_id: str, tools: list):
+    """Create and configure an agent with the specified model and tools."""
+    shell_middleware = ResumableShellToolMiddleware(
+        workspace_root=os.getcwd(), execution_policy=HostExecutionPolicy()
+    )
+
+    # For long-term memory, point to ~/.deepagents/AGENT_NAME/ with /memories/ prefix
+    agent_dir = Path.home() / ".deepagents" / assistant_id
+    agent_dir.mkdir(parents=True, exist_ok=True)
+    agent_md = agent_dir / "agent.md"
+    if not agent_md.exists():
+        source_content = get_default_coding_instructions()
+        agent_md.write_text(source_content)
+
+    # Long-term backend - rooted at agent directory
+    # This handles both /memories/ files and /agent.md
+    long_term_backend = FilesystemBackend(root_dir=agent_dir, virtual_mode=True)
+
+    # Composite backend: current working directory for default, agent directory for /memories/
+    backend = CompositeBackend(
+        default=FilesystemBackend(), routes={"/memories/": long_term_backend}
+    )
+
+    # Use the same backend for agent memory middleware
+    agent_middleware = [
+        AgentMemoryMiddleware(backend=long_term_backend, memory_path="/memories/"),
+        shell_middleware,
+    ]
+
+    # Get the system prompt
+    system_prompt = get_system_prompt()
+
     # Helper functions for formatting tool descriptions in HITL prompts
     def format_write_file_description(tool_call: dict) -> str:
         """Format write_file tool call for approval prompt."""

deepagents_cli/commands.py

@@ -20,6 +20,9 @@ def handle_command(command: str, agent, token_tracker: TokenTracker) -> str | bo
         # Reset agent conversation state
         agent.checkpointer = InMemorySaver()
 
+        # Reset token tracking to baseline
+        token_tracker.reset()
+
         # Clear screen and show fresh UI
         console.clear()
         console.print(DEEP_AGENTS_ASCII, style=f"bold {COLORS['primary']}")

deepagents_cli/default_agent_prompt.md

@@ -0,0 +1,110 @@
+You are an AI assistant that helps users with various tasks including coding, research, and analysis.
+
+# Core Role
+Your core role and behavior may be updated based on user feedback and instructions. When a user tells you how you should behave or what your role should be, update this memory file immediately to reflect that guidance.
+
+## Memory-First Protocol
+You have access to a persistent memory system. ALWAYS follow this protocol:
+
+**At session start:**
+- Check `ls /memories/` to see what knowledge you have stored
+- If your role description references specific topics, check /memories/ for relevant guides
+
+**Before answering questions:**
+- If asked "what do you know about X?" or "how do I do Y?" → Check `ls /memories/` FIRST
+- If relevant memory files exist → Read them and base your answer on saved knowledge
+- Prefer saved knowledge over general knowledge when available
+
+**When learning new information:**
+- If user teaches you something or asks you to remember → Save to `/memories/[topic].md`
+- Use descriptive filenames: `/memories/deep-agents-guide.md` not `/memories/notes.md`
+- After saving, verify by reading back the key points
+
+**Important:** Your memories persist across sessions. Information stored in /memories/ is more reliable than general knowledge for topics you've specifically studied.
+
+# Tone and Style
+Be concise and direct. Answer in fewer than 4 lines unless the user asks for detail.
+After working on a file, just stop - don't explain what you did unless asked.
+Avoid unnecessary introductions or conclusions.
+
+When you run non-trivial bash commands, briefly explain what they do.
+
+## Proactiveness
+Take action when asked, but don't surprise users with unrequested actions.
+If asked how to approach something, answer first before taking action.
+
+## Following Conventions
+- Check existing code for libraries and frameworks before assuming availability
+- Mimic existing code style, naming conventions, and patterns
+- Never add comments unless asked
+
+## Task Management
+Use write_todos for complex multi-step tasks (3+ steps). Mark tasks in_progress before starting, completed immediately after finishing.
+For simple 1-2 step tasks, just do them without todos.
+
+## File Reading Best Practices
+
+**CRITICAL**: When exploring codebases or reading multiple files, ALWAYS use pagination to prevent context overflow.
+
+**Pattern for codebase exploration:**
+1. First scan: `read_file(path, limit=100)` - See file structure and key sections
+2. Targeted read: `read_file(path, offset=100, limit=200)` - Read specific sections if needed
+3. Full read: Only use `read_file(path)` without limit when necessary for editing
+
+**When to paginate:**
+- Reading any file >500 lines
+- Exploring unfamiliar codebases (always start with limit=100)
+- Reading multiple files in sequence
+- Any research or investigation task
+
+**When full read is OK:**
+- Small files (<500 lines)
+- Files you need to edit immediately after reading
+- After confirming file size with first scan
+
+**Example workflow:**
+```
+Bad:  read_file(/src/large_module.py)  # Floods context with 2000+ lines
+Good: read_file(/src/large_module.py, limit=100)  # Scan structure first
+      read_file(/src/large_module.py, offset=100, limit=100)  # Read relevant section
+```
+
+## Working with Subagents (task tool)
+When delegating to subagents:
+- **Use filesystem for large I/O**: If input instructions are large (>500 words) OR expected output is large, communicate via files
+  - Write input context/instructions to a file, tell subagent to read it
+  - Ask subagent to write their output to a file, then read it after they return
+  - This prevents token bloat and keeps context manageable in both directions
+- **Parallelize independent work**: When tasks are independent, spawn parallel subagents to work simultaneously
+- **Clear specifications**: Tell subagent exactly what format/structure you need in their response or output file
+- **Main agent synthesizes**: Subagents gather/execute, main agent integrates results into final deliverable
+
+## Tools
+
+### execute_bash
+Execute shell commands. Always quote paths with spaces.
+Examples: `pytest /foo/bar/tests` (good), `cd /foo/bar && pytest tests` (bad)
+
+### File Tools
+- read_file: Read file contents (use absolute paths)
+- edit_file: Replace exact strings in files (must read first, provide unique old_string)
+- write_file: Create or overwrite files
+- ls: List directory contents
+- glob: Find files by pattern (e.g., "**/*.py")
+- grep: Search file contents
+
+Always use absolute paths starting with /.
+
+### web_search
+Search for documentation, error solutions, and code examples.
+
+### http_request
+Make HTTP requests to APIs (GET, POST, etc.).
+
+## Code References
+When referencing code, use format: `file_path:line_number`
+
+## Documentation
+- Do NOT create excessive markdown summary/documentation files after completing work
+- Focus on the work itself, not documenting what you did
+- Only create documentation when explicitly requested

deepagents_cli/main.py

@@ -93,7 +93,7 @@ def parse_args():
     return parser.parse_args()
 
 
-async def simple_cli(agent, assistant_id: str | None, session_state):
+async def simple_cli(agent, assistant_id: str | None, session_state, baseline_tokens: int = 0):
     """Main CLI loop."""
     console.clear()
     console.print(DEEP_AGENTS_ASCII, style=f"bold {COLORS['primary']}")
@@ -131,6 +131,7 @@ async def simple_cli(agent, assistant_id: str | None, session_state):
     # Create prompt session and token tracker
     session = create_prompt_session(assistant_id, session_state)
     token_tracker = TokenTracker()
+    token_tracker.set_baseline(baseline_tokens)
 
     while True:
         try:
@@ -181,8 +182,16 @@ async def main(assistant_id: str, session_state):
 
     agent = create_agent_with_config(model, assistant_id, tools)
 
+    # Calculate baseline token count for accurate token tracking
+    from .agent import get_system_prompt
+    from .token_utils import calculate_baseline_tokens
+
+    agent_dir = Path.home() / ".deepagents" / assistant_id
+    system_prompt = get_system_prompt()
+    baseline_tokens = calculate_baseline_tokens(model, agent_dir, system_prompt)
+
     try:
-        await simple_cli(agent, assistant_id, session_state)
+        await simple_cli(agent, assistant_id, session_state, baseline_tokens)
     except Exception as e:
         console.print(f"\n[bold red]❌ Error:[/bold red] {e}\n")
 

deepagents_cli/token_utils.py

@@ -0,0 +1,63 @@
+"""Utilities for accurate token counting using LangChain models."""
+
+from pathlib import Path
+
+from langchain_core.messages import SystemMessage
+
+from .config import console
+
+
+def calculate_baseline_tokens(model, agent_dir: Path, system_prompt: str) -> int:
+    """Calculate baseline context tokens using the model's official tokenizer.
+
+    This uses the model's get_num_tokens_from_messages() method to get
+    accurate token counts for the initial context (system prompt + agent.md).
+
+    Note: Tool definitions cannot be accurately counted before the first API call
+    due to LangChain limitations. They will be included in the total after the
+    first message is sent (~5,000 tokens).
+
+    Args:
+        model: LangChain model instance (ChatAnthropic or ChatOpenAI)
+        agent_dir: Path to agent directory containing agent.md
+        system_prompt: The base system prompt string
+
+    Returns:
+        Token count for system prompt + agent.md (tools not included)
+    """
+    # Load agent.md content
+    agent_md_path = agent_dir / "agent.md"
+    agent_memory = ""
+    if agent_md_path.exists():
+        agent_memory = agent_md_path.read_text()
+
+    # Build the complete system prompt as it will be sent
+    # This mimics what AgentMemoryMiddleware.wrap_model_call() does
+    memory_section = f"<agent_memory>\n{agent_memory}\n</agent_memory>"
+
+    # Get the long-term memory system prompt
+    memory_system_prompt = get_memory_system_prompt()
+
+    # Combine all parts in the same order as the middleware
+    full_system_prompt = memory_section + "\n\n" + system_prompt + "\n\n" + memory_system_prompt
+
+    # Count tokens using the model's official method
+    messages = [SystemMessage(content=full_system_prompt)]
+
+    try:
+        # Note: tools parameter is not supported by LangChain's token counting
+        # Tool tokens will be included in the API response after first message
+        token_count = model.get_num_tokens_from_messages(messages)
+        return token_count
+    except Exception as e:
+        # Fallback if token counting fails
+        console.print(f"[yellow]Warning: Could not calculate baseline tokens: {e}[/yellow]")
+        return 0
+
+
+def get_memory_system_prompt() -> str:
+    """Get the long-term memory system prompt text."""
+    # Import from agent_memory middleware
+    from deepagents.middleware.agent_memory import LONGTERM_MEMORY_SYSTEM_PROMPT
+
+    return LONGTERM_MEMORY_SYSTEM_PROMPT.format(memory_path="/memories/")

deepagents_cli/ui.py

@@ -165,7 +165,22 @@ class TokenTracker:
     """Track token usage across the conversation."""
 
     def __init__(self):
-        self.current_context = 0
+        self.baseline_context = 0  # Baseline system context (system + agent.md + tools)
+        self.current_context = 0   # Total context including messages
+        self.last_output = 0
+
+    def set_baseline(self, tokens: int):
+        """Set the baseline context token count.
+
+        Args:
+            tokens: The baseline token count (system prompt + agent.md + tools)
+        """
+        self.baseline_context = tokens
+        self.current_context = tokens
+
+    def reset(self):
+        """Reset to baseline (for /clear command)."""
+        self.current_context = self.baseline_context
         self.last_output = 0
 
     def add(self, input_tokens: int, output_tokens: int):
@@ -183,12 +198,31 @@ class TokenTracker:
 
     def display_session(self):
         """Display current context size."""
-        if self.current_context:
-            console.print("\n[bold]Token Usage:[/bold]", style=COLORS["primary"])
+        console.print("\n[bold]Token Usage:[/bold]", style=COLORS["primary"])
+
+        # Check if we've had any actual API calls yet (current > baseline means we have conversation)
+        has_conversation = self.current_context > self.baseline_context
+
+        if self.baseline_context > 0:
+            console.print(
+                f"  Baseline: {self.baseline_context:,} tokens [dim](system + agent.md)[/dim]",
+                style=COLORS["dim"],
+            )
+
+            if not has_conversation:
+                # Before first message - warn that tools aren't counted yet
+                console.print(
+                    "  [dim]Note: Tool definitions (~5k tokens) included after first message[/dim]"
+                )
+
+        if has_conversation:
+            tools_and_conversation = self.current_context - self.baseline_context
             console.print(
-                f"  Current context: {self.current_context:,} tokens", style=COLORS["dim"]
+                f"  Tools + conversation: {tools_and_conversation:,} tokens", style=COLORS["dim"]
             )
-            console.print()
+
+        console.print(f"  Total: {self.current_context:,} tokens", style="bold " + COLORS["dim"])
+        console.print()
 
 
 def render_todo_list(todos: list[dict]) -> None:

{deepagents_cli-0.0.4.dist-info → deepagents_cli-0.0.6.dist-info}/METADATA

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: deepagents-cli
-Version: 0.0.4
+Version: 0.0.6
 Summary: Deepagents CLI
 License: MIT
 Requires-Python: <4.0,>=3.11
 Description-Content-Type: text/markdown
-Requires-Dist: deepagents==0.2.2
+Requires-Dist: deepagents==0.2.3
 Requires-Dist: requests
 Requires-Dist: rich>=13.0.0
 Requires-Dist: prompt-toolkit>=3.0.52

deepagents_cli-0.0.6.dist-info/RECORD

@@ -0,0 +1,20 @@
+deepagents_cli/__init__.py,sha256=2W9tHzQianR_Q0ku9hc_ZI3kUYsilXQ6I_kUnpg9bzg,108
+deepagents_cli/__main__.py,sha256=J9-RNZv_zxw4SyjWRI_N7k7m8G4--vclD8vKxYIiXPQ,128
+deepagents_cli/agent.py,sha256=4XCBPb_f-WN4uYCXUYvLath_9-uNYq0_mC2xXFiA4Ho,11087
+deepagents_cli/cli.py,sha256=UE8l9crBCykfYSVb_NN9bhIhc0ECxsKnOjMC6DeoNdM,274
+deepagents_cli/commands.py,sha256=rHsHij1xGs13N_m46YcBP2M2_MRGqRbSlnWaZaMnoco,2606
+deepagents_cli/config.py,sha256=xVVc0JAERIgPKUr77sJ7ZTkT9LRgvZg7i4H6Fy_h8ts,5023
+deepagents_cli/default_agent_prompt.md,sha256=Pi9SvgOAa74qhgDUMexm2-S_OfUO_CTic3zdbUnuB4s,4964
+deepagents_cli/execution.py,sha256=nW_jFWoLJtvDfqeaPCGQJd3c8QwnsNV8SU4Y60eqtKE,27137
+deepagents_cli/file_ops.py,sha256=LQ7NTXPWLwePbiTBDA-22_VHxEGil7NpBltHZx1C7r4,12362
+deepagents_cli/input.py,sha256=B0bEJ_n5oPh6ra09lxOwYpebjko-z-_R4QOpSTX4fUs,9187
+deepagents_cli/main.py,sha256=iaN6FNwUwTwoTMrHOKqRrXtjTjuM0YXthAfPlcz-GeU,7144
+deepagents_cli/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+deepagents_cli/token_utils.py,sha256=45l3DjXgZAGAWgxXCnAx2nkY9t940B4M_rpAQmkLxUw,2460
+deepagents_cli/tools.py,sha256=Av92Luq-vGgUr25DqErGi7aI6y6DdFSXLigffhNLxYk,4287
+deepagents_cli/ui.py,sha256=Sjs40onvNpZP7OLxitlspL0o4SJj96aFboVxw4R_Aos,18668
+deepagents_cli-0.0.6.dist-info/METADATA,sha256=0N3wv8bu63GgE5n_taQUsFbSBIM-KKMjWpTHi-FAWIY,434
+deepagents_cli-0.0.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+deepagents_cli-0.0.6.dist-info/entry_points.txt,sha256=oXSXGkStJ_8zP1gRFiHMU_GozXzWrE_CMIE228_yDHQ,96
+deepagents_cli-0.0.6.dist-info/top_level.txt,sha256=jEtsyDRyzAREUkw_cNOYGJqp72yvMICTBUaMV110w80,15
+deepagents_cli-0.0.6.dist-info/RECORD,,

deepagents_cli-0.0.4.dist-info/RECORD

@@ -1,18 +0,0 @@
-deepagents_cli/__init__.py,sha256=2W9tHzQianR_Q0ku9hc_ZI3kUYsilXQ6I_kUnpg9bzg,108
-deepagents_cli/__main__.py,sha256=J9-RNZv_zxw4SyjWRI_N7k7m8G4--vclD8vKxYIiXPQ,128
-deepagents_cli/agent.py,sha256=uPCJmBXSfEwFMeE6ToQV_DKFh3zA03e5qVkOrQkLUws,10862
-deepagents_cli/cli.py,sha256=UE8l9crBCykfYSVb_NN9bhIhc0ECxsKnOjMC6DeoNdM,274
-deepagents_cli/commands.py,sha256=XE9mgqinwIKy-43Yo2ifcnWOdjRv3Rp1AvaUtkPREJI,2532
-deepagents_cli/config.py,sha256=xVVc0JAERIgPKUr77sJ7ZTkT9LRgvZg7i4H6Fy_h8ts,5023
-deepagents_cli/execution.py,sha256=nW_jFWoLJtvDfqeaPCGQJd3c8QwnsNV8SU4Y60eqtKE,27137
-deepagents_cli/file_ops.py,sha256=LQ7NTXPWLwePbiTBDA-22_VHxEGil7NpBltHZx1C7r4,12362
-deepagents_cli/input.py,sha256=B0bEJ_n5oPh6ra09lxOwYpebjko-z-_R4QOpSTX4fUs,9187
-deepagents_cli/main.py,sha256=ziArDqDESI_eZ9HY7uUWM4cGBxS9b2W0DSZO0ga878s,6710
-deepagents_cli/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-deepagents_cli/tools.py,sha256=Av92Luq-vGgUr25DqErGi7aI6y6DdFSXLigffhNLxYk,4287
-deepagents_cli/ui.py,sha256=8F6PZHguSxxHVuS8IvqIi4u-eSLbiXlpoADoX43G8_k,17281
-deepagents_cli-0.0.4.dist-info/METADATA,sha256=n-I_uEdt8dKtBesxlc2QLOZCa0Ewv20QVJ4D18QaIiY,434
-deepagents_cli-0.0.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-deepagents_cli-0.0.4.dist-info/entry_points.txt,sha256=oXSXGkStJ_8zP1gRFiHMU_GozXzWrE_CMIE228_yDHQ,96
-deepagents_cli-0.0.4.dist-info/top_level.txt,sha256=jEtsyDRyzAREUkw_cNOYGJqp72yvMICTBUaMV110w80,15
-deepagents_cli-0.0.4.dist-info/RECORD,,