drydock-cli 2.3.4__tar.gz → 2.3.6__tar.gz

{drydock_cli-2.3.4 → drydock_cli-2.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 2.3.4
+Version: 2.3.6
 Summary: Drydock — nautical CLI coding agent
 Project-URL: Homepage, https://github.com/fbobe321/drydock
 Project-URL: Repository, https://github.com/fbobe321/drydock

{drydock_cli-2.3.4 → drydock_cli-2.3.6}/drydock/core/agent_loop.py

@@ -544,12 +544,21 @@ class AgentLoop:
                 except (RuntimeError, AgentLoopLLMResponseError) as e:
                     api_error_count += 1
                     if api_error_count > MAX_API_ERRORS:
-                        # Don't stop — reset and let the user know
+                        # Track total error rounds — stop after 3 rounds
+                        if not hasattr(self, '_total_error_rounds'):
+                            self._total_error_rounds = 0
+                        self._total_error_rounds += 1
+                        if self._total_error_rounds >= 3:
+                            yield AssistantEvent(
+                                content=f"\n\n[Stopping: {self._total_error_rounds * MAX_API_ERRORS}+ API errors. The model cannot process this request. Try /compact or /clear to free context.]\n",
+                            )
+                            return
+
                         import asyncio as _aio
                         yield AssistantEvent(
-                            content=f"\n\n[{api_error_count} consecutive API errors. Waiting 10s then retrying. Last error: {str(e)[:200]}]\n",
+                            content=f"\n\n[{api_error_count} consecutive API errors (round {self._total_error_rounds}/3). Compacting and retrying. Last error: {str(e)[:200]}]\n",
                         )
-                        await _aio.sleep(10)
+                        await _aio.sleep(5)
                         api_error_count = 0  # Reset — give it another chance
                         continue
                     # Check if the error is about invalid function/tool name
@@ -563,19 +572,30 @@ class AgentLoop:
                             f"Use one of these exact tool names. "
                             f"For subagent delegation, use 'task'. For file search, use 'grep'."
                         )
-                    elif "context length" in error_str.lower() or "maximum context" in error_str.lower():
-                        # Context limit hit — truncate old tool results to free space
+                    elif ("context length" in error_str.lower()
+                          or "maximum context" in error_str.lower()
+                          or "400 bad request" in error_str.lower()
+                          or "status: 400" in error_str.lower()):
+                        # Context limit or malformed request — aggressively compact
                         try:
+                            compacted = 0
                             for i, msg in enumerate(self.messages):
-                                if i >= len(self.messages) - 6:
-                                    break  # Keep recent messages intact
+                                if i >= len(self.messages) - 4:
+                                    break  # Keep last 4 messages
                                 if msg.role == Role.tool and hasattr(msg, 'content'):
+                                    content = str(msg.content) if msg.content else ""
+                                    if len(content) > 200:
+                                        msg.content = content[:100] + "\n[truncated]\n" + content[-50:]
+                                        compacted += 1
+                                elif msg.role == Role.assistant and hasattr(msg, 'content'):
                                     content = str(msg.content) if msg.content else ""
                                     if len(content) > 500:
-                                        msg.content = content[:200] + "\n[truncated]\n" + content[-100:]
+                                        msg.content = content[:200] + "\n[truncated]"
+                                        compacted += 1
+                            logger.info("Emergency compaction: truncated %d messages", compacted)
                         except Exception:
                             pass
-                        error_text = "Context limit approached — compacted old messages. Continue with your task."
+                        error_text = "Context compacted due to API error. Continue with your task."
                     else:
                         error_text = f"API error occurred: {e}. Please continue with your task."
                     self._inject_system_note(error_text)
@@ -1843,29 +1863,9 @@ class AgentLoop:
         except Exception:
             pass
 
-        # 2. Detect task type and inject skill content
-        skill_name = None
-        if any(kw in msg_lower for kw in ("review", "audit", "check the code", "code quality")):
-            skill_name = "review"
-        elif any(kw in msg_lower for kw in ("investigate", "debug", "why does", "why is", "broken", "failing")):
-            skill_name = "investigate"
-        elif any(kw in msg_lower for kw in ("ship", "commit and push", "create a pr", "open pr", "deploy")):
-            skill_name = "ship"
-        elif any(kw in msg_lower for kw in ("simplify", "clean up", "refactor", "reduce complexity")):
-            skill_name = "simplify"
-
-        if skill_name:
-            skill_info = self.skill_manager.get_skill(skill_name)
-            if skill_info and skill_info.skill_path:
-                try:
-                    content = skill_info.skill_path.read_text(encoding="utf-8")
-                    if content.startswith("---"):
-                        end = content.find("---", 3)
-                        if end > 0:
-                            content = content[end + 3:].strip()
-                    parts.append(f"FOLLOW THIS WORKFLOW ({skill_name} skill):\n{content[:2000]}")
-                except Exception:
-                    pass
+        # Skill routing removed — handled by _build_auto_context description injection
+        # The model discovers skills from the auto-context skill list and
+        # invokes them via invoke_skill when relevant
 
         # 3. Also list non-Python files of interest
         try:

{drydock_cli-2.3.4 → drydock_cli-2.3.6}/drydock/core/tools/builtins/invoke_skill.py

@@ -28,13 +28,18 @@ from drydock.core.types import ToolStreamEvent, ToolResultEvent
 
 def _substitute_arguments(content: str, arguments: str, skill_dir: str = "") -> str:
     """Replace $ARGUMENTS, $0, $1, ${SKILL_DIR} in skill content."""
-    if not arguments:
-        return content
-    content = content.replace("$ARGUMENTS", arguments)
-    arg_parts = arguments.split()
-    for i, arg in enumerate(arg_parts[:10]):
-        content = content.replace(f"$ARGUMENTS[{i}]", arg)
-        content = content.replace(f"${i}", arg)
+    if arguments:
+        content = content.replace("$ARGUMENTS", arguments)
+        arg_parts = arguments.split()
+        for i, arg in enumerate(arg_parts[:10]):
+            content = content.replace(f"$ARGUMENTS[{i}]", arg)
+            content = content.replace(f"${i}", arg)
+    else:
+        # No arguments — clean up unreplaced placeholders
+        content = content.replace("$ARGUMENTS", "(no arguments provided)")
+        for i in range(10):
+            content = content.replace(f"$ARGUMENTS[{i}]", "")
+            content = content.replace(f"${i}", "")
     if skill_dir:
         content = content.replace("${SKILL_DIR}", skill_dir)
     return content

{drydock_cli-2.3.4 → drydock_cli-2.3.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "drydock-cli"
-version = "2.3.4"
+version = "2.3.6"
 description = "Drydock — nautical CLI coding agent"
 readme = "README.md"
 requires-python = ">=3.12"