drydock-cli 2.4.0__tar.gz → 2.4.1__tar.gz

{drydock_cli-2.4.0 → drydock_cli-2.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 2.4.0
+Version: 2.4.1
 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.4.0 → drydock_cli-2.4.1}/drydock/cli/cli.py

@@ -189,6 +189,18 @@ def run_cli(args: argparse.Namespace) -> None:
                 print(f"Error: {e}", file=sys.stderr)
                 sys.exit(1)
         else:
+            # Disable problematic tools for models that can't handle complex schemas
+            try:
+                active = config.get_active_model()
+                if "gemma" in active.name.lower():
+                    config.disabled_tools = [
+                        *config.disabled_tools,
+                        "ask_user_question",  # Gemma sends empty {} args
+                        "todo",  # Gemma sends empty {} args
+                    ]
+            except (ValueError, AttributeError):
+                pass
+
             agent_loop = AgentLoop(
                 config,
                 agent_name=initial_agent_name,

{drydock_cli-2.4.0 → drydock_cli-2.4.1}/drydock/cli/textual_ui/app.py

@@ -589,8 +589,35 @@ class VibeApp(App):  # noqa: PLR0904
             )
             return True
 
-        if len(parts) > 1:
-            skill_content = f"{user_input}\n\n{skill_content}"
+        # Strip frontmatter — don't send raw YAML to the model
+        if skill_content.startswith("---"):
+            fm_parts = skill_content.split("---", 2)
+            if len(fm_parts) >= 3:
+                skill_content = fm_parts[2].strip()
+
+        # Substitute arguments ($ARGUMENTS, $0, $1)
+        arguments = parts[1] if len(parts) > 1 else ""
+        if arguments:
+            skill_content = skill_content.replace("$ARGUMENTS", arguments)
+            for i, arg in enumerate(arguments.split()[:10]):
+                skill_content = skill_content.replace(f"$ARGUMENTS[{i}]", arg)
+                skill_content = skill_content.replace(f"${i}", arg)
+        else:
+            # Clean up unreplaced placeholders
+            skill_content = skill_content.replace("$ARGUMENTS", "")
+            import re
+            for i in range(10):
+                skill_content = skill_content.replace(f"$ARGUMENTS[{i}]", "")
+                skill_content = skill_content.replace(f"${i}", "")
+
+        # Wrap as instruction, not raw content
+        skill_content = (
+            f"[SKILL: /{skill_name}] Follow these instructions:\n\n"
+            f"{skill_content}"
+        )
+
+        if arguments:
+            skill_content = f"{arguments}\n\n{skill_content}"
 
         await self._handle_user_message(skill_content)
         return True
@@ -746,7 +773,15 @@ class VibeApp(App):  # noqa: PLR0904
         await loading_area.mount(loading)
 
         try:
-            rendered_prompt = render_path_prompt(prompt, base_dir=Path.cwd())
+            # Limit path embedding to 16KB for local models (default 256KB causes context bloat)
+            max_embed = 16 * 1024
+            try:
+                active_model = self.agent_loop.config.get_active_model()
+                if "gemma" in active_model.name.lower():
+                    max_embed = 8 * 1024  # Even less for Gemma 4
+            except Exception:
+                pass
+            rendered_prompt = render_path_prompt(prompt, base_dir=Path.cwd(), max_embed_bytes=max_embed)
             async for event in self.agent_loop.act(rendered_prompt):
                 if self.event_handler:
                     await self.event_handler.handle_event(

{drydock_cli-2.4.0 → drydock_cli-2.4.1}/drydock/core/agent_loop.py

@@ -1814,7 +1814,12 @@ class AgentLoop:
         """Lightweight auto-context: list project files and key docs.
 
         Kept minimal to avoid bloating context — just filenames, no content.
+        Skip if prompt already has embedded content (TUI path_prompt does this).
         """
+        # Skip if the prompt already contains embedded file content (from render_path_prompt)
+        if "[SKILL:" in user_msg or "```" in user_msg[:500]:
+            return
+
         parts = []
 
         try:

{drydock_cli-2.4.0 → drydock_cli-2.4.1}/pyproject.toml

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