drydock-cli 2.4.8__tar.gz → 2.5.0__tar.gz

{drydock_cli-2.4.8 → drydock_cli-2.5.0}/PKG-INFO

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

@@ -157,92 +157,57 @@ def run_cli(args: argparse.Namespace) -> None:
         loaded_session = load_session(args, config)
 
         stdin_prompt = get_prompt_from_stdin()
+
+        # -p flag feeds prompt into the TUI (headless mode removed)
         if args.prompt is not None:
-            # Disable tools that Gemma 4 can't handle
-            gemma_disabled = []
-            try:
-                active = config.get_active_model()
-                if "gemma" in active.name.lower():
-                    gemma_disabled = ["todo", "task_create", "task_update", "task", "invoke_skill", "tool_search"]
-            except Exception:
-                pass
-            config.disabled_tools = [*config.disabled_tools, "ask_user_question", *gemma_disabled]
-            programmatic_prompt = args.prompt or stdin_prompt
-            if not programmatic_prompt:
-                print(
-                    "Error: No prompt provided for programmatic mode", file=sys.stderr
-                )
-                sys.exit(1)
-            output_format = OutputFormat(
-                args.output if hasattr(args, "output") else "text"
-            )
+            if not hasattr(args, 'initial_prompt') or not args.initial_prompt:
+                args.initial_prompt = args.prompt or stdin_prompt
 
-            try:
-                final_response = run_programmatic(
-                    config=config,
-                    prompt=programmatic_prompt,
-                    max_turns=args.max_turns,
-                    max_price=args.max_price,
-                    output_format=output_format,
-                    previous_messages=loaded_session[0] if loaded_session else None,
-                    agent_name=initial_agent_name,
-                )
-                if final_response:
-                    print(final_response)
-                sys.exit(0)
-            except ConversationLimitException as e:
-                print(e, file=sys.stderr)
-                sys.exit(1)
-            except RuntimeError as e:
-                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
-                        "task_create",  # Gemma loops on task management instead of coding
-                        "task_update",  # Gemma sends invalid args, loops 64+ times
-                        "task",  # Subagent delegation — Gemma can't use it properly
-                        "invoke_skill",  # Gemma loads wrong skills, leaks templates
-                        "tool_search",  # Not useful for local models
-                    ]
-            except (ValueError, AttributeError):
-                pass
-
-            # Disable streaming for Gemma 4 — streaming tool call accumulation
-            # produces empty arguments (14 write_file calls → 0 files).
-            # Headless (non-streaming) works perfectly with same model.
-            use_streaming = True
-            try:
-                if "gemma" in config.get_active_model().name.lower():
-                    use_streaming = False
-            except Exception:
-                pass
-
-            agent_loop = AgentLoop(
-                config,
-                agent_name=initial_agent_name,
-                enable_streaming=use_streaming,
-                entrypoint_metadata=EntrypointMetadata(
-                    agent_entrypoint="cli",
-                    agent_version=__version__,
-                    client_name="drydock_cli",
-                    client_version=__version__,
-                ),
-            )
+        # 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",
+                    "todo",
+                    "task_create",
+                    "task_update",
+                    "task",
+                    "invoke_skill",
+                    "tool_search",
+                ]
+        except (ValueError, AttributeError):
+            pass
+
+        # Disable streaming for Gemma 4 — streaming tool call accumulation
+        # produces empty arguments (14 write_file calls → 0 files)
+        use_streaming = True
+        try:
+            if "gemma" in config.get_active_model().name.lower():
+                use_streaming = False
+        except Exception:
+            pass
+
+        agent_loop = AgentLoop(
+            config,
+            agent_name=initial_agent_name,
+            enable_streaming=use_streaming,
+            entrypoint_metadata=EntrypointMetadata(
+                agent_entrypoint="cli",
+                agent_version=__version__,
+                client_name="drydock_cli",
+                client_version=__version__,
+            ),
+        )
 
-            if loaded_session:
-                _resume_previous_session(agent_loop, *loaded_session)
+        if loaded_session:
+            _resume_previous_session(agent_loop, *loaded_session)
 
-            run_textual_ui(
-                agent_loop=agent_loop,
-                initial_prompt=args.initial_prompt or stdin_prompt,
-                teleport_on_start=args.teleport,
+        run_textual_ui(
+            agent_loop=agent_loop,
+            initial_prompt=args.initial_prompt or stdin_prompt,
+            teleport_on_start=args.teleport,
             )
 
     except (KeyboardInterrupt, EOFError):

{drydock_cli-2.4.8 → drydock_cli-2.5.0}/drydock/core/agent_loop.py

@@ -822,6 +822,10 @@ class AgentLoop:
                             "standing by", "waiting for", "please provide",
                             "what would you like", "how can i help",
                             "what should i", "do you want me to",
+                            "ready to begin", "i will start",
+                            "shall i", "would you like me to",
+                            "let me know", "please confirm",
+                            "i am ready", "ready to proceed",
                         ))
                         if is_asking:
                             nudge_text = (

{drydock_cli-2.4.8 → drydock_cli-2.5.0}/drydock/core/tools/builtins/write_file.py

@@ -24,7 +24,7 @@ class WriteFileArgs(BaseModel):
     path: str
     content: str
     overwrite: bool = Field(
-        default=False, description="Must be set to true to overwrite an existing file."
+        default=True, description="Whether to overwrite an existing file."
     )
 
 

{drydock_cli-2.4.8 → drydock_cli-2.5.0}/pyproject.toml

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

{drydock_cli-2.4.8 → drydock_cli-2.5.0}/scripts/tui_test.py

@@ -84,6 +84,11 @@ def run_tui_test(prompt: str, cwd: str = ".", timeout: int = 300):
                     clean = re.sub(r'\x1b\[[0-9;]*[?][0-9]*[a-zA-Z]', '', clean)
                     clean = clean.replace('\r', '')
 
+                    # Auto-approve: press Enter when approval prompt shows
+                    if "Enter select" in clean or "always allow" in clean:
+                        child.send('\r')
+                        time.sleep(0.5)
+
                     # Detect patterns
                     if "Overwritten" in clean or "overwritten" in clean:
                         overwrites += 1