pdd-cli 0.0.45__py3-none-any.whl → 0.0.90__py3-none-any.whl

pdd/sync_main.py

@@ -1,7 +1,7 @@
 import re
 import time
 from pathlib import Path
-from typing import Any, Dict, List, Tuple
+from typing import Any, Dict, List, Optional, Tuple
 
 import click
 from rich.console import Console
@@ -79,12 +79,12 @@ def _detect_languages(basename: str, prompts_dir: Path) -> List[str]:
 def sync_main(
     ctx: click.Context,
     basename: str,
-    max_attempts: int,
-    budget: float,
+    max_attempts: Optional[int],
+    budget: Optional[float],
     skip_verify: bool,
     skip_tests: bool,
     target_coverage: float,
-    log: bool,
+    dry_run: bool,
 ) -> Tuple[Dict[str, Any], float, str]:
     """
     CLI wrapper for the sync command. Handles parameter validation, path construction,
@@ -93,12 +93,12 @@ def sync_main(
     Args:
         ctx: The Click context object.
         basename: The base name for the prompt file.
-        max_attempts: Maximum number of fix attempts.
-        budget: Maximum total cost for the sync process.
+        max_attempts: Maximum number of fix attempts. If None, uses .pddrc value or default (3).
+        budget: Maximum total cost for the sync process. If None, uses .pddrc value or default (20.0).
         skip_verify: Skip the functional verification step.
         skip_tests: Skip unit test generation and fixing.
         target_coverage: Desired code coverage percentage.
-        log: If True, display sync logs instead of running the sync.
+        dry_run: If True, analyze sync state without executing operations.
 
     Returns:
         A tuple containing the results dictionary, total cost, and primary model name.
@@ -118,15 +118,19 @@ def sync_main(
     local = ctx.obj.get("local", False)
     context_override = ctx.obj.get("context", None)
 
-    # 2. Validate inputs
+    # Default values for max_attempts and budget when not specified via CLI or .pddrc
+    DEFAULT_MAX_ATTEMPTS = 3
+    DEFAULT_BUDGET = 20.0
+
+    # 2. Validate inputs (basename only - budget/max_attempts validated after config resolution)
     _validate_basename(basename)
-    if budget <= 0:
-        raise click.BadParameter("Budget must be a positive number.", param_hint="--budget")
-    if max_attempts <= 0:
-        raise click.BadParameter("Max attempts must be a positive integer.", param_hint="--max-attempts")
 
-    if not quiet and budget < 1.0:
-        console.log(f"[yellow]Warning:[/] Budget of ${budget:.2f} is low. Complex operations may exceed this limit.")
+    # Validate CLI-specified values if provided (not None)
+    # Note: max_attempts=0 is valid (skips LLM loop, goes straight to agentic mode)
+    if budget is not None and budget <= 0:
+        raise click.BadParameter("Budget must be a positive number.", param_hint="--budget")
+    if max_attempts is not None and max_attempts < 0:
+        raise click.BadParameter("Max attempts must be a non-negative integer.", param_hint="--max-attempts")
 
     # 3. Use construct_paths in 'discovery' mode to find the prompts directory.
     try:
@@ -151,10 +155,10 @@ def sync_main(
             f"Expected files with format: '{basename}_<language>.prompt'"
         )
 
-    # 5. Handle --log mode separately
-    if log:
+    # 5. Handle --dry-run mode separately
+    if dry_run:
         if not quiet:
-            rprint(Panel(f"Displaying sync logs for [bold cyan]{basename}[/bold cyan]", title="PDD Sync Log", expand=False))
+            rprint(Panel(f"Displaying sync analysis for [bold cyan]{basename}[/bold cyan]", title="PDD Sync Dry Run", expand=False))
 
         for lang in languages:
             if not quiet:
@@ -189,19 +193,27 @@ def sync_main(
                 code_dir=str(code_dir),
                 examples_dir=str(examples_dir),
                 tests_dir=str(tests_dir),
-                log=True,
+                dry_run=True,
                 verbose=verbose,
                 quiet=quiet,
+                context_override=context_override,
             )
         return {}, 0.0, ""
 
     # 6. Main Sync Workflow
+    # Determine display values for summary panel (use CLI values or defaults for display)
+    display_budget = budget if budget is not None else DEFAULT_BUDGET
+    display_max_attempts = max_attempts if max_attempts is not None else DEFAULT_MAX_ATTEMPTS
+
+    if not quiet and display_budget < 1.0:
+        console.log(f"[yellow]Warning:[/] Budget of ${display_budget:.2f} is low. Complex operations may exceed this limit.")
+
     if not quiet:
         summary_panel = Panel(
             f"Basename: [bold cyan]{basename}[/bold cyan]\n"
             f"Languages: [bold green]{', '.join(languages)}[/bold green]\n"
-            f"Budget: [bold yellow]${budget:.2f}[/bold yellow]\n"
-            f"Max Attempts: [bold blue]{max_attempts}[/bold blue]",
+            f"Budget: [bold yellow]${display_budget:.2f}[/bold yellow]\n"
+            f"Max Attempts: [bold blue]{display_max_attempts}[/bold blue]",
             title="PDD Sync Starting",
             expand=False,
         )
@@ -211,13 +223,15 @@ def sync_main(
     total_cost = 0.0
     primary_model = ""
     overall_success = True
-    remaining_budget = budget
+    # remaining_budget will be set from resolved config on first language iteration
+    remaining_budget: Optional[float] = None
 
     for lang in languages:
         if not quiet:
             rprint(f"\n[bold]🚀 Syncing for language: [green]{lang}[/green]...[/bold]")
 
-        if remaining_budget <= 0:
+        # Check budget exhaustion (after first iteration when remaining_budget is set)
+        if remaining_budget is not None and remaining_budget <= 0:
             if not quiet:
                 rprint(f"[yellow]Budget exhausted. Skipping sync for '{lang}'.[/yellow]")
             overall_success = False
@@ -231,17 +245,25 @@ def sync_main(
             command_options = {
                 "basename": basename,
                 "language": lang,
-                "max_attempts": max_attempts,
-                "budget": budget,
                 "target_coverage": target_coverage,
-                "strength": strength,
-                "temperature": temperature,
                 "time": time_param,
             }
-
+            # Only pass values if explicitly set by user (not CLI defaults)
+            # This allows .pddrc values to take precedence when user doesn't pass CLI flags
+            if max_attempts is not None:
+                command_options["max_attempts"] = max_attempts
+            if budget is not None:
+                command_options["budget"] = budget
+            if strength != DEFAULT_STRENGTH:
+                command_options["strength"] = strength
+            if temperature != 0.0:  # 0.0 is the CLI default for temperature
+                command_options["temperature"] = temperature
+
+            # Use force=True for path discovery - actual file writes happen in sync_orchestration
+            # which will handle confirmations via the TUI's confirm_callback
             resolved_config, _, _, resolved_language = construct_paths(
                 input_file_paths={"prompt_file": str(prompt_file_path)},
-                force=force,
+                force=True,  # Always force during path discovery
                 quiet=True,
                 command="sync",
                 command_options=command_options,
@@ -249,11 +271,38 @@ def sync_main(
             )
 
             # Extract all parameters directly from the resolved configuration
+            # Priority: CLI value > .pddrc value > hardcoded default
             final_strength = resolved_config.get("strength", strength)
             final_temp = resolved_config.get("temperature", temperature)
-            final_max_attempts = resolved_config.get("max_attempts", max_attempts)
             final_target_coverage = resolved_config.get("target_coverage", target_coverage)
-            
+
+            # For max_attempts and budget: CLI > .pddrc > hardcoded default
+            # If CLI value is provided (not None), use it. Otherwise, use .pddrc or default.
+            if max_attempts is not None:
+                final_max_attempts = max_attempts
+            else:
+                final_max_attempts = resolved_config.get("max_attempts") or DEFAULT_MAX_ATTEMPTS
+
+            if budget is not None:
+                final_budget = budget
+            else:
+                final_budget = resolved_config.get("budget") or DEFAULT_BUDGET
+
+            # Validate the resolved values
+            # Note: max_attempts=0 is valid (skips LLM loop, goes straight to agentic mode)
+            if final_budget <= 0:
+                raise click.BadParameter("Budget must be a positive number.", param_hint="--budget")
+            if final_max_attempts < 0:
+                raise click.BadParameter("Max attempts must be a non-negative integer.", param_hint="--max-attempts")
+
+            # Initialize remaining_budget from first resolved config if not set yet
+            if remaining_budget is None:
+                remaining_budget = final_budget
+
+            # Update ctx.obj with resolved values so sub-commands inherit them
+            ctx.obj["strength"] = final_strength
+            ctx.obj["temperature"] = final_temp
+
             code_dir = resolved_config.get("code_dir", "src")
             tests_dir = resolved_config.get("tests_dir", "tests")
             examples_dir = resolved_config.get("examples_dir", "examples")
@@ -280,6 +329,7 @@ def sync_main(
                 review_examples=review_examples,
                 local=local,
                 context_config=resolved_config,
+                context_override=context_override,
             )
 
             lang_cost = sync_result.get("total_cost", 0.0)
@@ -330,4 +380,4 @@ def sync_main(
     aggregated_results["total_cost"] = total_cost
     aggregated_results["primary_model"] = primary_model
 
-    return aggregated_results, total_cost, primary_model
+    return aggregated_results, total_cost, primary_model