handle merge conflicts

Author: NormallyGaussian

libs/deepagents-cli/deepagents_cli/_internal.py

@@ -0,0 +1,15 @@
+"""Shell tool middleware that survives HITL pauses.
+
+This is temporary implementation of ResumableShellToolMiddleware until
+the patch is released in langchain.
+"""
+
+from __future__ import annotations
+
+from langchain.agents.middleware.shell_tool import (
+    ShellToolMiddleware,
+)
+
+ResumableShellToolMiddleware = ShellToolMiddleware
+
+__all__ = ["ResumableShellToolMiddleware"]

libs/deepagents-cli/deepagents_cli/agent.py

@@ -8,7 +8,6 @@
 from deepagents.backends import CompositeBackend
 from deepagents.backends.filesystem import FilesystemBackend
 from deepagents.backends.sandbox import SandboxBackendProtocol
-from deepagents.middleware.resumable_shell import ResumableShellToolMiddleware
 from langchain.agents.middleware import (
     HostExecutionPolicy,
     InterruptOnConfig,
@@ -21,6 +20,7 @@
 from langgraph.pregel import Pregel
 from langgraph.runtime import Runtime
 
+from deepagents_cli._internal import ResumableShellToolMiddleware
 from deepagents_cli.agent_memory import AgentMemoryMiddleware
 from deepagents_cli.config import COLORS, config, console, get_default_coding_instructions
 

libs/deepagents-cli/pyproject.toml

@@ -1,12 +1,12 @@
 [project]
 name = "deepagents-cli"
-version = "0.0.8"
+version = "0.0.9"
 description = "Deepagents CLI"
 readme = "README.md"
 license = { text = "MIT" }
 requires-python = ">=3.11,<4.0"
 dependencies = [
-  "deepagents==0.2.6",
+  "deepagents==0.2.7",
   "requests",
   "rich>=13.0.0",
   "prompt-toolkit>=3.0.52",
@@ -17,6 +17,7 @@ dependencies = [
   "modal>=0.65.0",
   "markdownify>=0.13.0",
   "parallel-web",
+  "langchain>=1.0.7",
 ]
 
 [project.scripts]

libs/deepagents-cli/uv.lock

@@ -1,13 +1,11 @@
 """Middleware for the DeepAgent."""
 
 from deepagents.middleware.filesystem import FilesystemMiddleware
-from deepagents.middleware.resumable_shell import ResumableShellToolMiddleware
 from deepagents.middleware.subagents import CompiledSubAgent, SubAgent, SubAgentMiddleware
 
 __all__ = [
     "CompiledSubAgent",
     "FilesystemMiddleware",
-    "ResumableShellToolMiddleware",
     "SubAgent",
     "SubAgentMiddleware",
 ]

libs/deepagents/deepagents/middleware/__init__.py

@@ -1,6 +1,6 @@
 [project]
 name = "deepagents"
-version = "0.2.6"
+version = "0.2.7"
 description = "General purpose 'deep agent' with sub-agent spawning, todo list capabilities, and mock file system. Built on LangGraph."
 readme = "README.md"
 license = { text = "MIT" }