patchpal 0.25.0__tar.gz → 0.25.2__tar.gz

{patchpal-0.25.0/patchpal.egg-info → patchpal-0.25.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: patchpal
-Version: 0.25.0
+Version: 0.25.2
 Summary: An agentic coding and automation assistant, supporting both local and cloud LLMs
 Author: PatchPal Contributors
 License-Expression: Apache-2.0

{patchpal-0.25.0 → patchpal-0.25.2}/patchpal/__init__.py

@@ -1,6 +1,6 @@
 """PatchPal - An open-source Claude Code clone implemented purely in Python."""
 
-__version__ = "0.25.0"
+__version__ = "0.25.2"
 
 from patchpal.agent import create_agent, create_react_agent
 from patchpal.cli.autopilot import autopilot_loop

{patchpal-0.25.0 → patchpal-0.25.2}/patchpal/agent/function_calling.py

@@ -1161,6 +1161,12 @@ Repository root takes priority if both exist."""
             The agent's final response
         """
         # Agent loop
+        # Track consecutive empty responses (no content + no tool calls).
+        # Common with some local models (e.g., GPT-OSS-120B on vLLM) due to
+        # intermittent harmony-format parsing hiccups. A bounded retry usually
+        # recovers since the failure is probabilistic.
+        empty_response_retries = 0
+        empty_response_max_retries = int(os.environ.get("PATCHPAL_EMPTY_RETRY_MAX", "2"))
         for iteration in range(max_iterations):
             # Clear any stale pending images from previous iteration (safety check)
             # Images should already be injected, but this prevents accumulation on error
@@ -1335,6 +1341,8 @@ Repository root takes priority if both exist."""
 
             # Check if there are tool calls
             if hasattr(assistant_message, "tool_calls") and assistant_message.tool_calls:
+                # A non-empty turn succeeded; reset the empty-response retry budget
+                empty_response_retries = 0
                 # Print explanation text before executing tools (render as markdown)
                 if assistant_message.content and assistant_message.content.strip():
                     console = Console()
@@ -1834,9 +1842,25 @@ Repository root takes priority if both exist."""
                 if assistant_message.content:
                     return assistant_message.content
                 else:
-                    # Model returned no content and no tool calls
-                    # This can happen with some local models (e.g., GPT-OSS-120B)
-                    # Using "NO_RESPONSE:" prefix for programmatic detection
+                    # Model returned no content and no tool calls.
+                    # This happens intermittently with some local models
+                    # (e.g., GPT-OSS-120B on vLLM) due to harmony-format parsing
+                    # hiccups. Because the failure is probabilistic, retry the turn
+                    # a bounded number of times before giving up.
+                    if empty_response_retries < empty_response_max_retries:
+                        empty_response_retries += 1
+                        # Drop the empty assistant message so it doesn't pollute history
+                        if self.messages and self.messages[-1] is assistant_msg:
+                            self.messages.pop()
+                        print(
+                            f"\033[2m↻ Empty response from model; retrying "
+                            f"({empty_response_retries}/{empty_response_max_retries})...\033[0m",
+                            flush=True,
+                        )
+                        continue
+
+                    # Retries exhausted: surface the honest failure.
+                    # Using "NO_RESPONSE:" prefix for programmatic detection.
                     return "NO_RESPONSE: Model returned empty response. Try rephrasing your request or type 'continue' to prompt again."
 
         # Max iterations reached

{patchpal-0.25.0 → patchpal-0.25.2}/patchpal/cli/sandbox.py

@@ -106,6 +106,13 @@ def is_interactive_command(patchpal_args):
             return False
 
     # Check for autopilot
+    # NOTE: Only patchpal_args[0] is checked (not a scan of the whole list) by
+    # design. The "--" convention guarantees everything after it is passed to
+    # patchpal, and the autopilot subcommand, when present, is always the first
+    # of those args (e.g. `... -- autopilot --prompt-file task.md`). A later
+    # occurrence of the word "autopilot" would be a value/argument, not the
+    # subcommand, so it must not flip interactivity. Do not "fix" this into a
+    # full-list scan.
     if patchpal_args[0] in ["autopilot", "patchpal-autopilot"]:
         return False
 
@@ -124,6 +131,9 @@ def detect_llm_endpoints_from_env():
     standard_endpoints = {
         "OPENAI_API_KEY": "https://api.openai.com",
         "ANTHROPIC_API_KEY": "https://api.anthropic.com",
+        # Google Gemini: LiteLLM commonly uses GEMINI_API_KEY; GOOGLE_API_KEY is
+        # also supported. Both map to the same generative language endpoint.
+        "GEMINI_API_KEY": "https://generativelanguage.googleapis.com",
         "GOOGLE_API_KEY": "https://generativelanguage.googleapis.com",
         "GROQ_API_KEY": "https://api.groq.com",
         "COHERE_API_KEY": "https://api.cohere.ai",
@@ -574,6 +584,14 @@ def build_container_args(sandbox_args, patchpal_args, env_file_keys=None):
     if sandbox_args.cpus:
         container_args.extend(["--cpus", str(sandbox_args.cpus)])
 
+    # Forward user-specified volume mounts (-v/--volume) and environment
+    # variables (-e/--env). These are passed through verbatim to the container
+    # runtime, mirroring docker/podman's own -v and -e semantics.
+    for volume in getattr(sandbox_args, "volume", []) or []:
+        container_args.extend(["-v", volume])
+    for env_var in getattr(sandbox_args, "env", []) or []:
+        container_args.extend(["-e", env_var])
+
     # Pass through environment variables.
     # WITHOUT --env-file: pass through matching vars from the full host environment.
     # WITH --env-file: isolate from the host, but still forward the vars that were
@@ -788,14 +806,48 @@ def build_container_args(sandbox_args, patchpal_args, env_file_keys=None):
 
     # Add main patchpal command
     if sandbox_args.restrict_network:
-        # Use launch-agent-sandbox pattern: model from env var
-        # Falls back to PATCHPAL_MODEL if MODEL not set
+        # Pass through all patchpal args via "$@" (identical to normal mode) so that
+        # the autopilot subcommand and flags like --prompt-file / --max-iterations are
+        # preserved. The model is included in "$@" when --model was given on the command
+        # line. If no --model was provided, fall back to the MODEL/PATCHPAL_MODEL env var
+        # (launch-agent-sandbox pattern).
+        #
+        # SECURITY: Drop CAP_NET_ADMIN / CAP_NET_RAW before handing control to the
+        # agent. The container runs as root (UID 0) and keeps the capability that
+        # was used to build the iptables firewall. Without dropping it, an agent
+        # that can execute shell commands could simply run `iptables -F OUTPUT`
+        # (or `iptables -P OUTPUT ACCEPT`) and dismantle the very network
+        # restrictions that --restrict-network is supposed to enforce.
+        #
+        # We drop the capabilities from BOTH the inheritable and bounding sets via
+        # setpriv. For a root process this also clears them from the effective and
+        # permitted sets, and removing them from the bounding set means they cannot
+        # be re-raised afterwards. The firewall rules remain in force, but the
+        # agent process can no longer modify netfilter. (setpriv ships with
+        # util-linux and is present in the sandbox image; if it is somehow missing
+        # we fall back to a plain exec and warn loudly.)
+        if model_arg:
+            # --model is already present in the pass-through args
+            model_display = model_arg
+            run_cmd = f'{patchpal_cmd} "$@"'
+        else:
+            # No --model on command line; supply it from the env var fallback
+            model_display = "${MODEL:-$PATCHPAL_MODEL}"
+            run_cmd = f'{patchpal_cmd} --model "${{MODEL:-$PATCHPAL_MODEL}}" "$@"'
         shell_cmd_parts.append(f"""
 echo ""
 echo "=== Starting PatchPal ==="
-echo "Model: ${{MODEL:-$PATCHPAL_MODEL}}"
+echo "Model: {model_display}"
 echo ""
-exec {patchpal_cmd} --model "${{MODEL:-$PATCHPAL_MODEL}}"
+if command -v setpriv >/dev/null 2>&1; then
+    echo "Dropping CAP_NET_ADMIN/CAP_NET_RAW before starting agent (firewall now tamper-resistant)"
+    exec setpriv --inh-caps -net_admin,-net_raw --bounding-set -net_admin,-net_raw \\
+        {run_cmd}
+else
+    echo "⚠️  WARNING: setpriv not found - cannot drop network capabilities."
+    echo "⚠️  The agent runs as root and could tamper with the iptables firewall."
+    exec {run_cmd}
+fi
 """)
     else:
         # Normal mode: use $@ to pass all arguments
@@ -813,13 +865,9 @@ exec {patchpal_cmd} "$@"
     # Add set -e at the beginning to exit on any error
     shell_cmd = "set -e\n" + "\n".join(shell_cmd_parts)
 
-    # Pass arguments differently based on network restrictions
-    if sandbox_args.restrict_network:
-        # With restrictions: model passed as env var, no additional args needed
-        container_args.extend(["bash", "-c", shell_cmd])
-    else:
-        # Without restrictions: pass args after -- separator
-        container_args.extend(["bash", "-c", shell_cmd, "--"] + patchpal_cmd_args)
+    # Pass patchpal args after the "--" separator so they populate "$@" in the
+    # bash script. This applies to both restricted and unrestricted modes.
+    container_args.extend(["bash", "-c", shell_cmd, "--"] + patchpal_cmd_args)
 
     return container_args, runtime
 
@@ -853,14 +901,20 @@ SCRIPT OPTIONS:
     --host-network      Use host network (for local Ollama/vLLM servers on localhost)
     --memory LIMIT      Memory limit (e.g., 2g, 4g) - optional, no limit by default
     --cpus NUM          CPU limit (e.g., 2, 4) - optional, no limit by default
-    --env-file FILE     Load environment variables from .env file
+    --env-file FILE     Load environment variables from .env file (single file)
+    -v, --volume HOST:CONTAINER[:ro]
+                        Mount an additional volume (can be specified multiple times)
+                        Example: -v /path/to/data:/data:ro
+    -e, --env KEY=VALUE Pass an additional environment variable into the container
+                        (can be specified multiple times)
+                        Example: -e MY_VAR=value
     --restrict-network  Enable iptables firewall for network isolation
                         Automatically detects LLM endpoints from environment variables:
                         * OpenAI (OPENAI_API_KEY)
                         * Anthropic (ANTHROPIC_API_KEY)
                         * AWS Bedrock (AWS_REGION + AWS_ACCESS_KEY_ID)
                         * Azure OpenAI (AZURE_OPENAI_KEY + AZURE_OPENAI_RESOURCE)
-                        * Google AI (GOOGLE_API_KEY)
+                        * Google AI (GEMINI_API_KEY or GOOGLE_API_KEY)
                         * Groq, Cohere, Together, Replicate, etc.
                         Custom endpoints also detected from *_BASE_URL env vars
     --allow-url URL     Allow network access to specific URL (can be specified multiple times)
@@ -1126,6 +1180,24 @@ def main():
         action="store_true",
         help="Drop into bash shell instead of running patchpal (for debugging)",
     )
+    parser.add_argument(
+        "-v",
+        "--volume",
+        action="append",
+        default=[],
+        metavar="HOST:CONTAINER[:ro]",
+        help="Mount an additional volume into the container (can be specified multiple times). "
+        "Example: -v /path/to/data:/data:ro",
+    )
+    parser.add_argument(
+        "-e",
+        "--env",
+        action="append",
+        default=[],
+        metavar="KEY=VALUE",
+        help="Pass an additional environment variable into the container "
+        "(can be specified multiple times). Example: -e MY_VAR=value",
+    )
 
     try:
         sandbox_args = parser.parse_args(sandbox_argv)

{patchpal-0.25.0 → patchpal-0.25.2/patchpal.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: patchpal
-Version: 0.25.0
+Version: 0.25.2
 Summary: An agentic coding and automation assistant, supporting both local and cloud LLMs
 Author: PatchPal Contributors
 License-Expression: Apache-2.0