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

pdd/code_generator_main.py

@@ -1,10 +1,12 @@
 import os
-import asyncio
+import re
 import json
 import pathlib
 import shlex
 import subprocess
 import requests
+import tempfile
+import sys
 from typing import Optional, Tuple, Dict, Any, List
 
 import click
@@ -18,19 +20,37 @@ from .construct_paths import construct_paths
 from .preprocess import preprocess as pdd_preprocess
 from .code_generator import code_generator as local_code_generator_func
 from .incremental_code_generator import incremental_code_generator as incremental_code_generator_func
-from .get_jwt_token import get_jwt_token, AuthError, NetworkError, TokenError, UserCancelledError, RateLimitError
+from .core.cloud import CloudConfig
+from .python_env_detector import detect_host_python_executable
+from .architecture_sync import (
+    get_architecture_entry_for_prompt,
+    has_pdd_tags,
+    generate_tags_from_architecture,
+)
 
-# Environment variable names for Firebase/GitHub auth
-FIREBASE_API_KEY_ENV_VAR = "NEXT_PUBLIC_FIREBASE_API_KEY" 
-GITHUB_CLIENT_ID_ENV_VAR = "GITHUB_CLIENT_ID"
-PDD_APP_NAME = "PDD Code Generator"
-
-# Cloud function URL
-CLOUD_GENERATE_URL = "https://us-central1-prompt-driven-development.cloudfunctions.net/generateCode"
+# Cloud request timeout
 CLOUD_REQUEST_TIMEOUT = 400  # seconds
 
 console = Console()
 
+# --- Helper Functions ---
+def _parse_llm_bool(value: str) -> bool:
+    """Parse LLM boolean value from string."""
+    if not value:
+        return True
+    llm_str = str(value).strip().lower()
+    if llm_str in {"0", "false", "no", "off"}:
+        return False
+    else:
+        return llm_str in {"1", "true", "yes", "on"}
+
+def _env_flag_enabled(name: str) -> bool:
+    """Return True when an env var is set to a truthy value."""
+    value = os.environ.get(name)
+    if value is None:
+        return False
+    return str(value).strip().lower() in {"1", "true", "yes", "on"}
+
 # --- Git Helper Functions ---
 def _run_git_command(command: List[str], cwd: Optional[str] = None) -> Tuple[int, str, str]:
     """Runs a git command and returns (return_code, stdout, stderr)."""
@@ -59,6 +79,102 @@ def is_git_repository(path: Optional[str] = None) -> bool:
     return False
 
 
+def _expand_vars(text: str, vars_map: Optional[Dict[str, str]]) -> str:
+    """Replace $KEY and ${KEY} in text when KEY exists in vars_map. Leave others unchanged."""
+    if not text or not vars_map:
+        return text
+
+    def repl_braced(m: re.Match) -> str:
+        key = m.group(1)
+        return vars_map.get(key, m.group(0))
+
+    def repl_simple(m: re.Match) -> str:
+        key = m.group(1)
+        return vars_map.get(key, m.group(0))
+
+    # Replace ${KEY} first, then $KEY
+    text = re.sub(r"\$\{([A-Za-z_][A-Za-z0-9_]*)\}", repl_braced, text)
+    text = re.sub(r"\$([A-Za-z_][A-Za-z0-9_]*)", repl_simple, text)
+    return text
+
+
+def _parse_front_matter(text: str) -> Tuple[Optional[Dict[str, Any]], str]:
+    """Parse YAML front matter at the start of a prompt and return (meta, body)."""
+    try:
+        if not text.startswith("---\n"):
+            return None, text
+        end_idx = text.find("\n---", 4)
+        if end_idx == -1:
+            return None, text
+        fm_body = text[4:end_idx]
+        rest = text[end_idx + len("\n---"):]
+        if rest.startswith("\n"):
+            rest = rest[1:]
+        import yaml as _yaml
+        meta = _yaml.safe_load(fm_body) or {}
+        if not isinstance(meta, dict):
+            meta = {}
+        return meta, rest
+    except Exception:
+        return None, text
+
+
+def _is_architecture_template(meta: Optional[Dict[str, Any]]) -> bool:
+    """Detect the packaged architecture JSON template via its front matter name."""
+    return isinstance(meta, dict) and meta.get("name") == "architecture/architecture_json"
+
+
+def _repair_architecture_interface_types(payload: Any) -> Tuple[Any, bool]:
+    """
+    Patch common LLM slip-ups for the architecture template where interface.type
+    occasionally returns an unsupported value like "object". Only normalizes the
+    interface.type field and leaves other schema issues untouched so validation
+    still fails for genuinely malformed outputs.
+    """
+    allowed_types = {
+        "component",
+        "page",
+        "module",
+        "api",
+        "graphql",
+        "cli",
+        "job",
+        "message",
+        "config",
+    }
+    changed = False
+    if not isinstance(payload, list):
+        return payload, changed
+
+    for entry in payload:
+        if not isinstance(entry, dict):
+            continue
+        interface = entry.get("interface")
+        if not isinstance(interface, dict):
+            continue
+        raw_type = interface.get("type")
+        normalized = raw_type.lower() if isinstance(raw_type, str) else None
+        if normalized in allowed_types:
+            if normalized != raw_type:
+                interface["type"] = normalized
+                changed = True
+            continue
+
+        inferred_type = None
+        for key in ("page", "component", "module", "api", "graphql", "cli", "job", "message", "config"):
+            if isinstance(interface.get(key), dict):
+                inferred_type = key
+                break
+        if inferred_type is None:
+            inferred_type = "module"
+
+        if raw_type != inferred_type:
+            interface["type"] = inferred_type
+            changed = True
+
+    return payload, changed
+
+
 def get_git_content_at_ref(file_path: str, git_ref: str = "HEAD") -> Optional[str]:
     """Gets the content of the file as it was at the specified git_ref."""
     abs_file_path = pathlib.Path(file_path).resolve()
@@ -124,6 +240,28 @@ def git_add_files(file_paths: List[str], verbose: bool = False) -> bool:
         return False
 # --- End Git Helper Functions ---
 
+def _find_default_test_files(tests_dir: Optional[str], code_file_path: Optional[str]) -> List[str]:
+    """Find default test files for a given code file in the tests directory."""
+    if not tests_dir or not code_file_path:
+        return []
+
+    tests_path = pathlib.Path(tests_dir)
+    code_path = pathlib.Path(code_file_path)
+
+    if not tests_path.exists() or not tests_path.is_dir():
+        return []
+
+    code_stem = code_path.stem
+    code_suffix = code_path.suffix
+
+    # Look for files starting with test_{code_stem}
+    # We look for test_{code_stem}*.{code_suffix}
+    # e.g., hello.py -> test_hello.py, test_hello_1.py
+    pattern = f"test_{code_stem}*{code_suffix}"
+    found_files = list(tests_path.glob(pattern))
+
+    return [str(p) for p in sorted(found_files)]
+
 
 def code_generator_main(
     ctx: click.Context,
@@ -131,6 +269,9 @@ def code_generator_main(
     output: Optional[str],
     original_prompt_file_path: Optional[str],
     force_incremental_flag: bool,
+    env_vars: Optional[Dict[str, str]] = None,
+    unit_test_file: Optional[str] = None,
+    exclude_tests: bool = False,
 ) -> Tuple[str, bool, float, str]:
     """
     CLI wrapper for generating code from prompts. Handles full and incremental generation,
@@ -157,20 +298,97 @@ def code_generator_main(
     command_options: Dict[str, Any] = {"output": output}
 
     try:
+        # Read prompt content once to determine LLM state and for construct_paths
+        with open(prompt_file, 'r', encoding='utf-8') as f:
+            raw_prompt_content = f.read()
+        
+        # Phase-2 templates: parse front matter metadata
+        fm_meta, body = _parse_front_matter(raw_prompt_content)
+        if fm_meta:
+            prompt_content = body
+        else:
+            prompt_content = raw_prompt_content
+        
+        # Determine LLM state early to avoid unnecessary overwrite prompts
+        llm_enabled: bool = True
+        env_llm_raw = None
+        try:
+            if env_vars and 'llm' in env_vars:
+                env_llm_raw = str(env_vars.get('llm'))
+            elif os.environ.get('llm') is not None:
+                env_llm_raw = os.environ.get('llm')
+            elif os.environ.get('LLM') is not None:
+                env_llm_raw = os.environ.get('LLM')
+        except Exception:
+            env_llm_raw = None
+
+        # Environment variables should override front matter
+        if env_llm_raw is not None:
+            llm_enabled = _parse_llm_bool(env_llm_raw)
+        elif fm_meta and isinstance(fm_meta, dict) and 'llm' in fm_meta:
+            llm_enabled = bool(fm_meta.get('llm', True))
+        # else: keep default True
+        
+        # If LLM is disabled, we're only doing post-processing, so skip overwrite confirmation
+        effective_force = force_overwrite or not llm_enabled
+        
         resolved_config, input_strings, output_file_paths, language = construct_paths(
             input_file_paths=input_file_paths_dict,
-            force=force_overwrite,
+            force=effective_force,
             quiet=quiet,
             command="generate",
             command_options=command_options,
+            context_override=ctx.obj.get('context'),
+            confirm_callback=cli_params.get('confirm_callback')
         )
-        prompt_content = input_strings["prompt_file"]
-        # Prioritize orchestration output path over construct_paths result
-        output_path = output or output_file_paths.get("output")
+        # Determine final output path: if user passed a directory, use resolved file path
+        resolved_output = output_file_paths.get("output")
+        if output is None:
+            output_path = resolved_output
+        else:
+            try:
+                is_dir_hint = output.endswith(os.path.sep) or output.endswith("/")
+            except Exception:
+                is_dir_hint = False
+            if is_dir_hint or os.path.isdir(output):
+                output_path = resolved_output
+            else:
+                output_path = output
+
+        # --- Unit Test Inclusion Logic ---
+        test_files_to_include: List[str] = []
+        if unit_test_file:
+            test_files_to_include.append(unit_test_file)
+        elif not exclude_tests:
+            # Try to find default test files
+            tests_dir = resolved_config.get("tests_dir")
+            found_tests = _find_default_test_files(tests_dir, output_path)
+            if found_tests:
+                if verbose:
+                    console.print(f"[info]Found default test files: {', '.join(found_tests)}[/info]")
+                test_files_to_include.extend(found_tests)
+        
+        if test_files_to_include:
+            prompt_content += "\n\n<unit_test_content>\n"
+            prompt_content += "The following is the unit test content that the generated code must pass:\n"
+            for tf in test_files_to_include:
+                try:
+                    with open(tf, 'r', encoding='utf-8') as f:
+                        content = f.read()
+                    # If multiple files, label them? Or just concat?
+                    # Using code block with file path comment is safer for context.
+                    prompt_content += f"\nFile: {pathlib.Path(tf).name}\n```python\n{content}\n```\n"
+                except Exception as e:
+                    console.print(f"[yellow]Warning: Could not read unit test file {tf}: {e}[/yellow]")
+            prompt_content += "</unit_test_content>\n"
+        # ---------------------------------
 
     except FileNotFoundError as e:
         console.print(f"[red]Error: Input file not found: {e.filename}[/red]")
         return "", False, 0.0, "error"
+    except click.Abort:
+        # User cancelled - re-raise to stop the sync loop
+        raise
     except Exception as e:
         console.print(f"[red]Error during path construction: {e}[/red]")
         return "", False, 0.0, "error"
@@ -179,6 +397,108 @@ def code_generator_main(
     existing_code_content: Optional[str] = None
     original_prompt_content_for_incremental: Optional[str] = None
 
+    # Merge -e vars with front-matter defaults; validate required
+    if env_vars is None:
+        env_vars = {}
+    if fm_meta and isinstance(fm_meta.get("variables"), dict):
+        for k, spec in (fm_meta["variables"].items()):
+            if isinstance(spec, dict):
+                if k not in env_vars and "default" in spec:
+                    env_vars[k] = str(spec["default"])
+            # if scalar default allowed, ignore for now
+        missing = [k for k, spec in fm_meta["variables"].items() if isinstance(spec, dict) and spec.get("required") and k not in env_vars]
+        if missing:
+            console.print(f"[error]Missing required variables: {', '.join(missing)}")
+            return "", False, 0.0, "error"
+
+    # Execute optional discovery from front matter to populate env_vars without overriding explicit -e values
+    def _run_discovery(discover_cfg: Dict[str, Any]) -> Dict[str, str]:
+        results: Dict[str, str] = {}
+        try:
+            if not discover_cfg:
+                return results
+            enabled = discover_cfg.get("enabled", False)
+            if not enabled:
+                return results
+            root = discover_cfg.get("root", ".")
+            patterns = discover_cfg.get("patterns", []) or []
+            exclude = discover_cfg.get("exclude", []) or []
+            max_per = int(discover_cfg.get("max_per_pattern", 0) or 0)
+            max_total = int(discover_cfg.get("max_total", 0) or 0)
+            root_path = pathlib.Path(root).resolve()
+            seen: List[str] = []
+            def _match_one(patterns_list: List[str]) -> List[str]:
+                matches: List[str] = []
+                for pat in patterns_list:
+                    globbed = list(root_path.rglob(pat))
+                    for p in globbed:
+                        if any(p.match(ex) for ex in exclude):
+                            continue
+                        sp = str(p.resolve())
+                        if sp not in matches:
+                            matches.append(sp)
+                    if max_per and len(matches) >= max_per:
+                        matches = matches[:max_per]
+                        break
+                return matches
+            # If a mapping 'set' is provided, compute per-variable results
+            set_map = discover_cfg.get("set") or {}
+            if isinstance(set_map, dict) and set_map:
+                for var_name, spec in set_map.items():
+                    if var_name in env_vars:
+                        continue  # don't override explicit -e
+                    v_patterns = spec.get("patterns", []) if isinstance(spec, dict) else []
+                    v_exclude = spec.get("exclude", []) if isinstance(spec, dict) else []
+                    save_exclude = exclude
+                    try:
+                        if v_exclude:
+                            exclude = v_exclude
+                        matches = _match_one(v_patterns or patterns)
+                    finally:
+                        exclude = save_exclude
+                    if matches:
+                        results[var_name] = ",".join(matches)
+                        seen.extend(matches)
+            # Fallback: populate SCAN_FILES and SCAN metadata
+            if not results:
+                files = _match_one(patterns)
+                if max_total and len(files) > max_total:
+                    files = files[:max_total]
+                if files:
+                    results["SCAN_FILES"] = ",".join(files)
+            # Always set root/patterns helpers
+            if root:
+                results.setdefault("SCAN_ROOT", str(root_path))
+            if patterns:
+                results.setdefault("SCAN_PATTERNS", ",".join(patterns))
+        except Exception as e:
+            if verbose and not quiet:
+                console.print(f"[yellow]Discovery skipped due to error: {e}[/yellow]")
+        return results
+
+    if fm_meta and isinstance(fm_meta.get("discover"), dict):
+        discovered = _run_discovery(fm_meta.get("discover") or {})
+        for k, v in discovered.items():
+            if k not in env_vars:
+                env_vars[k] = v
+
+    # Expand variables in output path if provided
+    if output_path:
+        output_path = _expand_vars(output_path, env_vars)
+
+    # Honor front-matter output when CLI did not pass --output
+    if output is None and fm_meta and isinstance(fm_meta.get("output"), str):
+        try:
+            meta_out = _expand_vars(fm_meta["output"], env_vars)
+            if meta_out:
+                output_path = str(pathlib.Path(meta_out).resolve())
+        except Exception:
+            pass
+
+    # Honor front-matter language if provided (overrides detection for both local and cloud)
+    if fm_meta and isinstance(fm_meta.get("language"), str) and fm_meta.get("language"):
+        language = fm_meta.get("language")
+
     if output_path and pathlib.Path(output_path).exists():
         try:
             existing_code_content = pathlib.Path(output_path).read_text(encoding="utf-8")
@@ -303,7 +623,96 @@ def code_generator_main(
         can_attempt_incremental = False
 
     try:
-        if can_attempt_incremental and existing_code_content is not None and original_prompt_content_for_incremental is not None:
+        # Resolve post-process script from env/CLI override, then front matter, then sensible default per template
+        post_process_script: Optional[str] = None
+        prompt_body_for_script: str = prompt_content
+        
+        if verbose:
+            console.print(f"[blue]LLM enabled:[/blue] {llm_enabled}")
+        try:
+            post_process_script = None
+            script_override = None
+            if env_vars:
+                script_override = env_vars.get('POST_PROCESS_PYTHON') or env_vars.get('post_process_python')
+            if not script_override:
+                script_override = os.environ.get('POST_PROCESS_PYTHON') or os.environ.get('post_process_python')
+            if script_override and str(script_override).strip():
+                expanded = _expand_vars(str(script_override), env_vars)
+                pkg_dir = pathlib.Path(__file__).parent.resolve()
+                repo_root = pathlib.Path.cwd().resolve()
+                repo_pdd_dir = (repo_root / 'pdd').resolve()
+                candidate = pathlib.Path(expanded)
+                if not candidate.is_absolute():
+                    # 1) As provided, relative to CWD
+                    as_is = (repo_root / candidate)
+                    # 2) Under repo pdd/
+                    under_repo_pdd = (repo_pdd_dir / candidate.name) if not as_is.exists() else as_is
+                    # 3) Under installed package dir
+                    under_pkg = (pkg_dir / candidate.name) if not as_is.exists() and not under_repo_pdd.exists() else as_is
+                    if as_is.exists():
+                        candidate = as_is
+                    elif under_repo_pdd.exists():
+                        candidate = under_repo_pdd
+                    elif under_pkg.exists():
+                        candidate = under_pkg
+                    else:
+                        candidate = as_is  # will fail later with not found
+                post_process_script = str(candidate.resolve())
+            elif fm_meta and isinstance(fm_meta, dict):
+                raw_script = fm_meta.get('post_process_python')
+                if isinstance(raw_script, str) and raw_script.strip():
+                    # Expand variables like $VAR and ${VAR}
+                    expanded = _expand_vars(raw_script, env_vars)
+                    pkg_dir = pathlib.Path(__file__).parent.resolve()
+                    repo_root = pathlib.Path.cwd().resolve()
+                    repo_pdd_dir = (repo_root / 'pdd').resolve()
+                    candidate = pathlib.Path(expanded)
+                    if not candidate.is_absolute():
+                        as_is = (repo_root / candidate)
+                        under_repo_pdd = (repo_pdd_dir / candidate.name) if not as_is.exists() else as_is
+                        under_pkg = (pkg_dir / candidate.name) if not as_is.exists() and not under_repo_pdd.exists() else as_is
+                        if as_is.exists():
+                            candidate = as_is
+                        elif under_repo_pdd.exists():
+                            candidate = under_repo_pdd
+                        elif under_pkg.exists():
+                            candidate = under_pkg
+                        else:
+                            candidate = as_is
+                    post_process_script = str(candidate.resolve())
+            # Fallback default: for architecture template, use built-in render_mermaid.py
+            if not post_process_script:
+                try:
+                    prompt_str = str(prompt_file)
+                    looks_like_arch_template = (
+                        (isinstance(prompt_file, str) and (
+                            prompt_str.endswith("architecture/architecture_json.prompt") or
+                            prompt_str.endswith("architecture/architecture_json") or
+                            "architecture_json.prompt" in prompt_str or
+                            "architecture/architecture_json" in prompt_str
+                        ))
+                    )
+                    looks_like_arch_output = (
+                        bool(output_path) and pathlib.Path(str(output_path)).name == 'architecture.json'
+                    )
+                    if looks_like_arch_template or looks_like_arch_output:
+                        pkg_dir = pathlib.Path(__file__).parent
+                        repo_pdd_dir = pathlib.Path.cwd() / 'pdd'
+                        if (pkg_dir / 'render_mermaid.py').exists():
+                            post_process_script = str((pkg_dir / 'render_mermaid.py').resolve())
+                        elif (repo_pdd_dir / 'render_mermaid.py').exists():
+                            post_process_script = str((repo_pdd_dir / 'render_mermaid.py').resolve())
+                except Exception:
+                    post_process_script = None
+            if verbose:
+                console.print(f"[blue]Post-process script resolved to:[/blue] {post_process_script if post_process_script else 'None'}")
+        except Exception:
+            post_process_script = None
+        # If LLM is disabled but no post-process script is provided, surface a helpful error
+        if not llm_enabled and not post_process_script:
+            console.print("[red]Error: llm: false requires 'post_process_python' to be specified in front matter.[/red]")
+            return "", was_incremental_operation, total_cost, "error"
+        if llm_enabled and can_attempt_incremental and existing_code_content is not None and original_prompt_content_for_incremental is not None:
             if verbose:
                 console.print(Panel("Attempting incremental code generation...", title="[blue]Mode[/blue]", expand=False))
 
@@ -326,9 +735,18 @@ def code_generator_main(
                 if files_to_stage_for_rollback:
                     git_add_files(files_to_stage_for_rollback, verbose=verbose)
             
+            # Preprocess both prompts: expand includes, substitute vars, then double
+            orig_proc = pdd_preprocess(original_prompt_content_for_incremental, recursive=True, double_curly_brackets=False)
+            orig_proc = _expand_vars(orig_proc, env_vars)
+            orig_proc = pdd_preprocess(orig_proc, recursive=False, double_curly_brackets=True)
+
+            new_proc = pdd_preprocess(prompt_content, recursive=True, double_curly_brackets=False)
+            new_proc = _expand_vars(new_proc, env_vars)
+            new_proc = pdd_preprocess(new_proc, recursive=False, double_curly_brackets=True)
+
             generated_code_content, was_incremental_operation, total_cost, model_name = incremental_code_generator_func(
-                original_prompt=original_prompt_content_for_incremental,
-                new_prompt=prompt_content,
+                original_prompt=orig_proc,
+                new_prompt=new_proc,
                 existing_code=existing_code_content,
                 language=language,
                 strength=strength,
@@ -336,7 +754,7 @@ def code_generator_main(
                 time=time_budget,
                 force_incremental=force_incremental_flag,
                 verbose=verbose,
-                preprocess_prompt=True
+                preprocess_prompt=False
             )
 
             if not was_incremental_operation:
@@ -345,43 +763,37 @@ def code_generator_main(
             elif verbose:
                 console.print(Panel(f"Incremental update successful. Model: {model_name}, Cost: ${total_cost:.6f}", title="[green]Incremental Success[/green]", expand=False))
 
-        if not was_incremental_operation: # Full generation path
+        if llm_enabled and not was_incremental_operation: # Full generation path
             if verbose:
                 console.print(Panel("Performing full code generation...", title="[blue]Mode[/blue]", expand=False))
             
-            current_execution_is_local = is_local_execution_preferred
+            cloud_only = _env_flag_enabled("PDD_CLOUD_ONLY") or _env_flag_enabled("PDD_NO_LOCAL_FALLBACK")
+            current_execution_is_local = is_local_execution_preferred and not cloud_only
             
             if not current_execution_is_local:
                 if verbose: console.print("Attempting cloud code generation...")
-                
-                processed_prompt_for_cloud = pdd_preprocess(prompt_content, recursive=True, double_curly_brackets=True, exclude_keys=[])
+                # Expand includes, substitute vars, then double
+                processed_prompt_for_cloud = pdd_preprocess(prompt_content, recursive=True, double_curly_brackets=False, exclude_keys=[])
+                processed_prompt_for_cloud = _expand_vars(processed_prompt_for_cloud, env_vars)
+                processed_prompt_for_cloud = pdd_preprocess(processed_prompt_for_cloud, recursive=False, double_curly_brackets=True, exclude_keys=[])
                 if verbose: console.print(Panel(Text(processed_prompt_for_cloud, overflow="fold"), title="[cyan]Preprocessed Prompt for Cloud[/cyan]", expand=False))
                 
-                jwt_token: Optional[str] = None
-                try:
-                    firebase_api_key_val = os.environ.get(FIREBASE_API_KEY_ENV_VAR)
-                    github_client_id_val = os.environ.get(GITHUB_CLIENT_ID_ENV_VAR)
-
-                    if not firebase_api_key_val: raise AuthError(f"{FIREBASE_API_KEY_ENV_VAR} not set.")
-                    if not github_client_id_val: raise AuthError(f"{GITHUB_CLIENT_ID_ENV_VAR} not set.")
-
-                    jwt_token = asyncio.run(get_jwt_token(
-                        firebase_api_key=firebase_api_key_val,
-                        github_client_id=github_client_id_val,
-                        app_name=PDD_APP_NAME
-                    ))
-                except (AuthError, NetworkError, TokenError, UserCancelledError, RateLimitError) as e:
-                    console.print(f"[yellow]Cloud authentication/token error: {e}. Falling back to local execution.[/yellow]")
-                    current_execution_is_local = True
-                except Exception as e:
-                    console.print(f"[yellow]Unexpected error during cloud authentication: {e}. Falling back to local execution.[/yellow]")
+                # Get JWT token via CloudConfig (handles both injected tokens and device flow)
+                jwt_token = CloudConfig.get_jwt_token(verbose=verbose)
+
+                if not jwt_token:
+                    if cloud_only:
+                        console.print("[red]Cloud authentication failed.[/red]")
+                        raise click.UsageError("Cloud authentication failed")
+                    console.print("[yellow]Cloud authentication failed. Falling back to local execution.[/yellow]")
                     current_execution_is_local = True
 
                 if jwt_token and not current_execution_is_local:
                     payload = {"promptContent": processed_prompt_for_cloud, "language": language, "strength": strength, "temperature": temperature, "verbose": verbose}
                     headers = {"Authorization": f"Bearer {jwt_token}", "Content-Type": "application/json"}
+                    cloud_url = CloudConfig.get_endpoint_url("generateCode")
                     try:
-                        response = requests.post(CLOUD_GENERATE_URL, json=payload, headers=headers, timeout=CLOUD_REQUEST_TIMEOUT)
+                        response = requests.post(cloud_url, json=payload, headers=headers, timeout=CLOUD_REQUEST_TIMEOUT)
                         response.raise_for_status()
                         
                         response_data = response.json()
@@ -389,57 +801,378 @@ def code_generator_main(
                         total_cost = float(response_data.get("totalCost", 0.0))
                         model_name = response_data.get("modelName", "cloud_model")
 
-                        if generated_code_content is None:
+                        # Strip markdown code fences if present (cloud API returns fenced JSON)
+                        if generated_code_content and isinstance(language, str) and language.strip().lower() == "json":
+                            cleaned = generated_code_content.strip()
+                            if cleaned.startswith("```json"):
+                                cleaned = cleaned[7:]
+                            elif cleaned.startswith("```"):
+                                cleaned = cleaned[3:]
+                            if cleaned.endswith("```"):
+                                cleaned = cleaned[:-3]
+                            generated_code_content = cleaned.strip()
+
+                        if not generated_code_content:
+                            if cloud_only:
+                                console.print("[red]Cloud execution returned no code.[/red]")
+                                raise click.UsageError("Cloud execution returned no code")
                             console.print("[yellow]Cloud execution returned no code. Falling back to local.[/yellow]")
                             current_execution_is_local = True
                         elif verbose:
                              console.print(Panel(f"Cloud generation successful. Model: {model_name}, Cost: ${total_cost:.6f}", title="[green]Cloud Success[/green]", expand=False))
                     except requests.exceptions.Timeout:
+                        if cloud_only:
+                            console.print(f"[red]Cloud execution timed out ({CLOUD_REQUEST_TIMEOUT}s).[/red]")
+                            raise click.UsageError("Cloud execution timed out")
                         console.print(f"[yellow]Cloud execution timed out ({CLOUD_REQUEST_TIMEOUT}s). Falling back to local.[/yellow]")
                         current_execution_is_local = True
                     except requests.exceptions.HTTPError as e:
+                        status_code = e.response.status_code if e.response else 0
                         err_content = e.response.text[:200] if e.response else "No response content"
-                        console.print(f"[yellow]Cloud HTTP error ({e.response.status_code}): {err_content}. Falling back to local.[/yellow]")
-                        current_execution_is_local = True
+
+                        # Non-recoverable errors: do NOT fall back to local
+                        if status_code == 402:  # Insufficient credits
+                            try:
+                                error_data = e.response.json()
+                                current_balance = error_data.get("currentBalance", "unknown")
+                                estimated_cost = error_data.get("estimatedCost", "unknown")
+                                console.print(f"[red]Insufficient credits. Current balance: {current_balance}, estimated cost: {estimated_cost}[/red]")
+                            except Exception:
+                                console.print(f"[red]Insufficient credits: {err_content}[/red]")
+                            raise click.UsageError("Insufficient credits for cloud code generation")
+                        elif status_code == 401:  # Authentication error
+                            console.print(f"[red]Authentication failed: {err_content}[/red]")
+                            raise click.UsageError("Cloud authentication failed")
+                        elif status_code == 403:  # Authorization error (not approved)
+                            console.print(f"[red]Access denied: {err_content}[/red]")
+                            raise click.UsageError("Access denied - user not approved")
+                        elif status_code == 400:  # Validation error (e.g., empty prompt)
+                            console.print(f"[red]Invalid request: {err_content}[/red]")
+                            raise click.UsageError(f"Invalid request: {err_content}")
+                        else:
+                            # Recoverable errors (5xx, unexpected errors): fall back to local
+                            if cloud_only:
+                                console.print(f"[red]Cloud HTTP error ({status_code}): {err_content}[/red]")
+                                raise click.UsageError(f"Cloud HTTP error ({status_code}): {err_content}")
+                            console.print(f"[yellow]Cloud HTTP error ({status_code}): {err_content}. Falling back to local.[/yellow]")
+                            current_execution_is_local = True
                     except requests.exceptions.RequestException as e:
+                        if cloud_only:
+                            console.print(f"[red]Cloud network error: {e}[/red]")
+                            raise click.UsageError(f"Cloud network error: {e}")
                         console.print(f"[yellow]Cloud network error: {e}. Falling back to local.[/yellow]")
                         current_execution_is_local = True
                     except json.JSONDecodeError:
+                        if cloud_only:
+                            console.print("[red]Cloud returned invalid JSON.[/red]")
+                            raise click.UsageError("Cloud returned invalid JSON")
                         console.print("[yellow]Cloud returned invalid JSON. Falling back to local.[/yellow]")
                         current_execution_is_local = True
             
             if current_execution_is_local:
                 if verbose: console.print("Executing code generator locally...")
+                # Expand includes, substitute vars, then double; pass to local generator with preprocess_prompt=False
+                local_prompt = pdd_preprocess(prompt_content, recursive=True, double_curly_brackets=False, exclude_keys=[])
+                local_prompt = _expand_vars(local_prompt, env_vars)
+                local_prompt = pdd_preprocess(local_prompt, recursive=False, double_curly_brackets=True, exclude_keys=[])
+                # Language already resolved (front matter overrides detection if present)
+                gen_language = language
+                
+                # Extract output schema from front matter if available
+                output_schema = fm_meta.get("output_schema") if fm_meta else None
+                
                 generated_code_content, total_cost, model_name = local_code_generator_func(
-                    prompt=prompt_content,
-                    language=language,
+                    prompt=local_prompt,
+                    language=gen_language,
                     strength=strength,
                     temperature=temperature,
                     time=time_budget,
                     verbose=verbose,
-                    preprocess_prompt=True
+                    preprocess_prompt=False,
+                    output_schema=output_schema,
                 )
                 was_incremental_operation = False
                 if verbose:
                     console.print(Panel(f"Full generation successful. Model: {model_name}, Cost: ${total_cost:.6f}", title="[green]Local Success[/green]", expand=False))
-        
+
+        # Optional post-process Python hook (runs after LLM when enabled, or standalone when LLM is disabled)
+        if post_process_script:
+            try:
+                python_executable = detect_host_python_executable()
+                # Choose stdin for the script: LLM output if available and enabled, else prompt body
+                stdin_payload = generated_code_content if (llm_enabled and generated_code_content is not None) else prompt_body_for_script
+                env = os.environ.copy()
+                env['PDD_LANGUAGE'] = str(language or '')
+                env['PDD_OUTPUT_PATH'] = str(output_path or '')
+                env['PDD_PROMPT_FILE'] = str(pathlib.Path(prompt_file).resolve())
+                env['PDD_LLM'] = '1' if llm_enabled else '0'
+                try:
+                    env['PDD_ENV_VARS'] = json.dumps(env_vars or {})
+                except Exception:
+                    env['PDD_ENV_VARS'] = '{}'
+                # If front matter provides args, run in argv mode with a temp input file
+                fm_args = None
+                try:
+                    # Env/CLI override for args (comma-separated or JSON list)
+                    raw_args_env = None
+                    if env_vars:
+                        raw_args_env = env_vars.get('POST_PROCESS_ARGS') or env_vars.get('post_process_args')
+                    if not raw_args_env:
+                        raw_args_env = os.environ.get('POST_PROCESS_ARGS') or os.environ.get('post_process_args')
+                    if raw_args_env:
+                        s = str(raw_args_env).strip()
+                        parsed_list = None
+                        if s.startswith('[') and s.endswith(']'):
+                            try:
+                                parsed = json.loads(s)
+                                if isinstance(parsed, list):
+                                    parsed_list = [str(a) for a in parsed]
+                            except Exception:
+                                parsed_list = None
+                        if parsed_list is None:
+                            if ',' in s:
+                                parsed_list = [part.strip() for part in s.split(',') if part.strip()]
+                            else:
+                                parsed_list = [part for part in s.split() if part]
+                        fm_args = parsed_list or None
+                    if fm_args is None:
+                        raw_args = fm_meta.get('post_process_args') if isinstance(fm_meta, dict) else None
+                        if isinstance(raw_args, list):
+                            fm_args = [str(a) for a in raw_args]
+                except Exception:
+                    fm_args = None
+                proc = None
+                temp_input_path = None
+                try:
+                    if fm_args is None:
+                        # Provide sensible default args for architecture template with render_mermaid.py
+                        try:
+                            if post_process_script and pathlib.Path(post_process_script).name == 'render_mermaid.py':
+                                if isinstance(prompt_file, str) and prompt_file.endswith('architecture/architecture_json.prompt'):
+                                    fm_args = ["{INPUT_FILE}", "{APP_NAME}", "{OUTPUT_HTML}"]
+                        except Exception:
+                            pass
+                    if fm_args:
+                        # When LLM is disabled, use the existing output file instead of creating a temp file
+                        if not llm_enabled and output_path and pathlib.Path(output_path).exists():
+                            temp_input_path = str(pathlib.Path(output_path).resolve())
+                            env['PDD_POSTPROCESS_INPUT_FILE'] = temp_input_path
+                        else:
+                            # Write payload to a temp file for scripts expecting a file path input
+                            suffix = '.json' if (isinstance(language, str) and str(language).lower().strip() == 'json') or (output_path and str(output_path).lower().endswith('.json')) else '.txt'
+                            if output_path and llm_enabled:
+                                temp_input_path = str(pathlib.Path(output_path).resolve())
+                                pathlib.Path(temp_input_path).parent.mkdir(parents=True, exist_ok=True)
+                                with open(temp_input_path, 'w', encoding='utf-8') as f:
+                                    f.write(stdin_payload or '')
+                            else:
+                                with tempfile.NamedTemporaryFile(mode='w', delete=False, suffix=suffix, encoding='utf-8') as tf:
+                                    tf.write(stdin_payload or '')
+                                    temp_input_path = tf.name
+                            env['PDD_POSTPROCESS_INPUT_FILE'] = temp_input_path
+                        # Compute placeholder values
+                        app_name_val = (env_vars or {}).get('APP_NAME') if env_vars else None
+                        if not app_name_val:
+                            app_name_val = 'System Architecture'
+                        output_html_default = None
+                        if output_path and str(output_path).lower().endswith('.json'):
+                            output_html_default = str(pathlib.Path(output_path).with_name(f"{pathlib.Path(output_path).stem}_diagram.html").resolve())
+                        placeholder_map = {
+                            'INPUT_FILE': temp_input_path or '',
+                            'OUTPUT': str(output_path or ''),
+                            'PROMPT_FILE': str(pathlib.Path(prompt_file).resolve()),
+                            'APP_NAME': str(app_name_val),
+                            'OUTPUT_HTML': str(output_html_default or ''),
+                        }
+                        def _subst_arg(arg: str) -> str:
+                            # First expand $VARS using existing helper, then {TOKENS}
+                            expanded = _expand_vars(arg, env_vars)
+                            for key, val in placeholder_map.items():
+                                expanded = expanded.replace('{' + key + '}', val)
+                            return expanded
+                        args_list = [_subst_arg(a) for a in fm_args]
+                        if verbose:
+                            console.print(Panel(f"Post-process hook (argv)\nScript: {post_process_script}\nArgs: {args_list}", title="[blue]Post-process[/blue]", expand=False))
+                        proc = subprocess.run(
+                            [python_executable, post_process_script] + args_list,
+                            text=True,
+                            capture_output=True,
+                            timeout=300,
+                            cwd=str(pathlib.Path(post_process_script).parent),
+                            env=env
+                        )
+                    else:
+                        # Run the script with stdin payload, capture stdout as final content
+                        if verbose:
+                            console.print(Panel(f"Post-process hook (stdin)\nScript: {post_process_script}", title="[blue]Post-process[/blue]", expand=False))
+                        proc = subprocess.run(
+                            [python_executable, post_process_script],
+                            input=stdin_payload or '',
+                            text=True,
+                            capture_output=True,
+                            timeout=300,
+                            cwd=str(pathlib.Path(post_process_script).parent),
+                            env=env
+                        )
+                finally:
+                    if temp_input_path:
+                        try:
+                            # Only delete temp files, not the actual output file when llm=false
+                            if llm_enabled or not (output_path and pathlib.Path(output_path).exists() and temp_input_path == str(pathlib.Path(output_path).resolve())):
+                                os.unlink(temp_input_path)
+                        except Exception:
+                            pass
+                if proc and proc.returncode == 0:
+                    if verbose:
+                        console.print(Panel(f"Post-process success (rc=0)\nstdout: {proc.stdout[:150]}\nstderr: {proc.stderr[:150]}", title="[green]Post-process[/green]", expand=False))
+                    # Do not modify generated_code_content to preserve architecture.json
+                else:
+                    rc = getattr(proc, 'returncode', 'N/A')
+                    err = getattr(proc, 'stderr', '')
+                    console.print(f"[yellow]Post-process failed (rc={rc}). Stderr:\n{err[:500]}[/yellow]")
+            except FileNotFoundError:
+                console.print(f"[yellow]Post-process script not found: {post_process_script}. Skipping.[/yellow]")
+            except subprocess.TimeoutExpired:
+                console.print("[yellow]Post-process script timed out. Skipping.[/yellow]")
+            except Exception as e:
+                console.print(f"[yellow]Post-process script error: {e}. Skipping.[/yellow]")
         if generated_code_content is not None:
+            # Optional output_schema JSON validation before writing (only when LLM ran)
+            if llm_enabled:
+                try:
+                    if fm_meta and isinstance(fm_meta.get("output_schema"), dict):
+                        is_json_output = False
+                        if isinstance(language, str) and str(language).lower().strip() == "json":
+                            is_json_output = True
+                        elif output_path and str(output_path).lower().endswith(".json"):
+                            is_json_output = True
+                        if is_json_output:
+                            # Check if the generated content is an error message from llm_invoke
+                            if generated_code_content.strip().startswith("ERROR:"):
+                                raise click.UsageError(f"LLM generation failed: {generated_code_content}")
+                                
+                            parsed = json.loads(generated_code_content)
+
+                            # Fix common LLM mistake: unwrap arrays wrapped in objects
+                            # LLMs often return {"items": [...]} or {"type": "array", "items": [...]}
+                            # when the schema expects a plain array [...]
+                            output_schema = fm_meta.get("output_schema", {})
+                            if output_schema.get("type") == "array" and isinstance(parsed, dict):
+                                # Check for common wrapper patterns
+                                if "items" in parsed and isinstance(parsed["items"], list):
+                                    parsed = parsed["items"]
+                                    generated_code_content = json.dumps(parsed, indent=2)
+                                elif "data" in parsed and isinstance(parsed["data"], list):
+                                    parsed = parsed["data"]
+                                    generated_code_content = json.dumps(parsed, indent=2)
+                                elif "results" in parsed and isinstance(parsed["results"], list):
+                                    parsed = parsed["results"]
+                                    generated_code_content = json.dumps(parsed, indent=2)
+
+                            if _is_architecture_template(fm_meta):
+                                parsed, repaired = _repair_architecture_interface_types(parsed)
+                                if repaired:
+                                    generated_code_content = json.dumps(parsed, indent=2)
+                            try:
+                                import jsonschema
+                                jsonschema.validate(instance=parsed, schema=fm_meta.get("output_schema"))
+                            except ModuleNotFoundError:
+                                if verbose and not quiet:
+                                    console.print("[yellow]jsonschema not installed; skipping schema validation.[/yellow]")
+                            except Exception as ve:
+                                raise click.UsageError(f"Generated JSON does not match output_schema: {ve}")
+                except json.JSONDecodeError as jde:
+                    raise click.UsageError(f"Generated output is not valid JSON: {jde}")
+
             if output_path:
                 p_output = pathlib.Path(output_path)
                 p_output.parent.mkdir(parents=True, exist_ok=True)
-                p_output.write_text(generated_code_content, encoding="utf-8")
+
+                # Inject architecture metadata tags for .prompt files (reverse sync)
+                final_content = generated_code_content
+                if p_output.suffix == '.prompt':
+                    try:
+                        # Check if this prompt has an architecture entry
+                        arch_entry = get_architecture_entry_for_prompt(p_output.name)
+
+                        # Only inject tags if:
+                        # 1. Architecture entry exists
+                        # 2. Content doesn't already have PDD tags (preserve manual edits)
+                        if arch_entry and not has_pdd_tags(generated_code_content):
+                            tags = generate_tags_from_architecture(arch_entry)
+                            if tags:
+                                # Prepend tags to the generated content
+                                final_content = tags + '\n\n' + generated_code_content
+                                if verbose:
+                                    console.print("[info]Injected architecture metadata tags from architecture.json[/info]")
+                    except Exception as e:
+                        # Don't fail generation if tag injection fails
+                        if verbose:
+                            console.print(f"[yellow]Warning: Could not inject architecture tags: {e}[/yellow]")
+
+                p_output.write_text(final_content, encoding="utf-8")
                 if verbose or not quiet:
                     console.print(f"Generated code saved to: [green]{p_output.resolve()}[/green]")
-            elif not quiet: # No output path, print to console if not quiet
-                console.print(Panel(Text(generated_code_content, overflow="fold"), title="[cyan]Generated Code[/cyan]", expand=True))
+                # Safety net: ensure architecture HTML is generated post-write if applicable
+                try:
+                    # Prefer resolved script if available; else default for architecture outputs
+                    script_path2 = post_process_script
+                    if not script_path2:
+                        looks_like_arch_output2 = pathlib.Path(str(p_output)).name == 'architecture.json'
+                        if looks_like_arch_output2:
+                            pkg_dir2 = pathlib.Path(__file__).parent
+                            repo_pdd_dir2 = pathlib.Path.cwd() / 'pdd'
+                            if (pkg_dir2 / 'render_mermaid.py').exists():
+                                script_path2 = str((pkg_dir2 / 'render_mermaid.py').resolve())
+                            elif (repo_pdd_dir2 / 'render_mermaid.py').exists():
+                                script_path2 = str((repo_pdd_dir2 / 'render_mermaid.py').resolve())
+                    if script_path2 and pathlib.Path(script_path2).exists():
+                        app_name2 = os.environ.get('APP_NAME') or (env_vars or {}).get('APP_NAME') or 'System Architecture'
+                        out_html2 = os.environ.get('POST_PROCESS_OUTPUT') or str(p_output.with_name(f"{p_output.stem}_diagram.html").resolve())
+                        html_missing = not pathlib.Path(out_html2).exists()
+                        always_run_for_arch = pathlib.Path(str(p_output)).name == 'architecture.json'
+                        if always_run_for_arch or html_missing:
+                            try:
+                                py_exec2 = detect_host_python_executable()
+                            except Exception:
+                                py_exec2 = sys.executable
+                            if verbose:
+                                console.print(Panel(f"Safety net post-process\nScript: {script_path2}\nArgs: {[str(p_output.resolve()), app_name2, out_html2]}", title="[blue]Post-process[/blue]", expand=False))
+                            sp2 = subprocess.run([py_exec2, script_path2, str(p_output.resolve()), app_name2, out_html2],
+                                                 capture_output=True, text=True, cwd=str(pathlib.Path(script_path2).parent))
+                            if sp2.returncode == 0 and not quiet:
+                                print(f"✅ Generated: {out_html2}")
+                            elif verbose:
+                                console.print(f"[yellow]Safety net failed (rc={sp2.returncode}). stderr:\n{sp2.stderr[:300]}[/yellow]")
+                except Exception:
+                    pass
+                # Post-step now runs regardless of LLM value via the general post-process hook above.
+            elif not quiet:
+                # No destination resolved; surface the generated code directly to the console.
+                console.print(Panel(Text(generated_code_content, overflow="fold"), title="[cyan]Generated Code[/cyan]", expand=False))
+                console.print("[yellow]No output path resolved; skipping file write and stdout print.[/yellow]")
         else:
-            console.print("[red]Error: Code generation failed. No code was produced.[/red]")
-            return "", was_incremental_operation, total_cost, model_name or "error"
+            # If LLM was disabled and post-process ran, that's a success (no error)
+            if not llm_enabled and post_process_script:
+                if verbose or not quiet:
+                    console.print("[green]Post-process completed successfully (LLM was disabled).[/green]")
+            else:
+                console.print("[red]Error: Code generation failed. No code was produced.[/red]")
+                return "", was_incremental_operation, total_cost, model_name or "error"
 
+    except click.Abort:
+        # User cancelled - re-raise to stop the sync loop
+        raise
     except Exception as e:
-        console.print(f"[red]An unexpected error occurred: {e}[/red]")
-        import traceback
-        if verbose: console.print(traceback.format_exc())
-        return "", was_incremental_operation, total_cost, "error"
+        if isinstance(e, click.UsageError):
+            raise
+
+        # For any other unexpected error, we should fail hard so the CLI exits non-zero
+        # Log the detailed traceback first if verbose
+        if verbose:
+            import traceback
+            console.print(traceback.format_exc())
+
+        raise click.UsageError(f"An unexpected error occurred: {e}")
         
-    return generated_code_content or "", was_incremental_operation, total_cost, model_name
+    return generated_code_content or "", was_incremental_operation, total_cost, model_name