ls fallback: no assume src/

src/deepagents_rl/train/swe_env.py

@@ -392,8 +392,9 @@ class DeepAgentSWEEnv:
         # TRL appends this string to the last user message — force tool use.
         return (
             "\n\nCRITICAL: Use structured tool/function calls only. "
-            "Your first action MUST be a tool call to `ls` or `glob` on the repo. "
-            "Then `read_file`/`grep`, then `edit_file`/`write_file` to fix the issue. "
+            "Your first action MUST be: ls with path='.' (repo root). "
+            "Do NOT call ls on 'src' — that folder often does not exist. "
+            "Then read_file/grep using paths from that listing, then edit_file/write_file. "
             "Do not answer with a text-only plan. When the fix is applied, stop tools and say DONE."
         )
 
@@ -409,17 +410,49 @@ class DeepAgentSWEEnv:
             raise RuntimeError("DeepAgentSWEEnv tool called before reset()")
         return self._backend
 
+    @staticmethod
+    def _norm_path(path: str | None) -> str:
+        p = (path or ".").strip()
+        if p in ("", "/", "./", ".\\"):
+            return "."
+        # virtual_mode often wants leading slash for absolute-in-sandbox paths
+        if p.startswith("./"):
+            p = p[2:]
+        return p or "."
+
+    def _is_missing(self, result_obj: Any, text: str) -> bool:
+        err = getattr(result_obj, "error", None)
+        if err and "path_not_found" in str(err).lower():
+            return True
+        return "path_not_found" in (text or "").lower()
+
+    def _root_listing(self) -> str:
+        backend = self._require_backend()
+        return _result_to_str(backend.ls("."))
+
     @_traced_tool
     def ls(self, path: str = ".") -> str:
-        """List files in a directory inside the sandbox.
+        """List files in a directory inside the sandbox repo root.
 
         Args:
-            path: Directory path relative to the repo root.
+            path: Directory relative to the repo root. Use "." for the root.
+                Do NOT assume a "src/" folder exists — many repos have none.
 
         Returns:
-            Directory listing as text.
+            Directory listing as text (falls back to repo root if path missing).
         """
-        return _result_to_str(self._require_backend().ls(path))
+        backend = self._require_backend()
+        path = self._norm_path(path)
+        result = backend.ls(path)
+        out = _result_to_str(result)
+        if self._is_missing(result, out):
+            root = self._root_listing()
+            return (
+                f"Path '{path}' was not found in this repo sandbox.\n"
+                f"Tip: there is often no 'src/' directory. Start with path='.' (repo root).\n"
+                f"Repo root listing:\n{root}"
+            )
+        return out
 
     @_traced_tool
     def glob(self, pattern: str, path: str = ".") -> str:
@@ -427,12 +460,22 @@ class DeepAgentSWEEnv:
 
         Args:
             pattern: Glob pattern (e.g. '**/*.py').
-            path: Root path for the search.
+            path: Root path for the search (use '.' for repo root).
 
         Returns:
             Matching paths as text.
         """
-        return _result_to_str(self._require_backend().glob(pattern, path))
+        backend = self._require_backend()
+        path = self._norm_path(path)
+        result = backend.glob(pattern, path)
+        out = _result_to_str(result)
+        if self._is_missing(result, out):
+            root = self._root_listing()
+            return (
+                f"Path '{path}' not found for glob. Retry with path='.'.\n"
+                f"Repo root listing:\n{root}"
+            )
+        return out
 
     @_traced_tool
     def grep(self, pattern: str, path: str = ".") -> str:
@@ -440,28 +483,44 @@ class DeepAgentSWEEnv:
 
         Args:
             pattern: Regex pattern to search for.
-            path: Root path for the search.
+            path: Root path for the search (use '.' for repo root).
 
         Returns:
             Matching lines as text.
         """
-        return _result_to_str(self._require_backend().grep(pattern, path))
+        backend = self._require_backend()
+        path = self._norm_path(path)
+        result = backend.grep(pattern, path)
+        out = _result_to_str(result)
+        if self._is_missing(result, out):
+            return (
+                f"Path '{path}' not found for grep. Retry with path='.' (repo root).\n"
+                f"Repo root listing:\n{self._root_listing()}"
+            )
+        return out
 
     @_traced_tool
     def read_file(self, file_path: str, offset: int = 0, limit: int = 200) -> str:
         """Read a text file from the sandbox.
 
         Args:
-            file_path: Path relative to the repo root.
+            file_path: Path relative to the repo root (discover via ls/glob first).
             offset: Starting line offset.
             limit: Max number of lines to return.
 
         Returns:
             File contents as text.
         """
-        return _result_to_str(
-            self._require_backend().read(file_path, offset=offset, limit=limit)
-        )
+        backend = self._require_backend()
+        file_path = self._norm_path(file_path)
+        result = backend.read(file_path, offset=offset, limit=limit)
+        out = _result_to_str(result)
+        if self._is_missing(result, out):
+            return (
+                f"File '{file_path}' not found. Use ls path='.' or glob to discover real paths.\n"
+                f"Repo root listing:\n{self._root_listing()}"
+            )
+        return out
 
     @_traced_tool
     def write_file(self, file_path: str, content: str) -> str: