invar-tools 1.8.0__py3-none-any.whl → 1.11.0__py3-none-any.whl

invar/shell/commands/template_sync.py

@@ -70,8 +70,12 @@ def sync_templates(path: Path, config: SyncConfig) -> Result[SyncReport, str]:
     manifest = manifest_result.unwrap()
     report = SyncReport()
 
-    # Build variables for template rendering
-    variables = {**manifest.get("variables", {}), "syntax": config.syntax}
+    # Build variables for template rendering (LX-05: include language)
+    variables = {
+        **manifest.get("variables", {}),
+        "syntax": config.syntax,
+        "language": config.language,
+    }
 
     # Load project additions if enabled
     project_additions = _load_project_additions(path) if config.inject_project_additions else ""
@@ -83,7 +87,12 @@ def sync_templates(path: Path, config: SyncConfig) -> Result[SyncReport, str]:
     for dest_rel, src_rel in fully_managed:
         if should_skip_file(dest_rel, config.skip_patterns):
             continue
-        result = _sync_fully_managed(path, templates_dir, dest_rel, src_rel, config, report)
+        # Get template type from manifest (LX-05: support jinja for fully_managed)
+        template_config = manifest.get("templates", {}).get(dest_rel, {})
+        template_type = template_config.get("type", "copy")
+        result = _sync_fully_managed(
+            path, templates_dir, dest_rel, src_rel, template_type, variables, config, report
+        )
         if isinstance(result, Failure):
             report.errors.append(result.failure())
 
@@ -124,29 +133,44 @@ def _load_project_additions(path: Path) -> str:
     return ""
 
 
-# @shell_complexity: File I/O with multiple existence/content checks
+# @shell_complexity: File I/O with multiple existence/content checks and Jinja rendering
 def _sync_fully_managed(
     path: Path,
     templates_dir: Path,
     dest_rel: str,
     src_rel: str,
+    template_type: str,
+    variables: dict,
     config: SyncConfig,
     report: SyncReport,
 ) -> Result[str, str]:
-    """Sync a fully managed file (direct overwrite)."""
+    """Sync a fully managed file (direct overwrite).
+
+    LX-05: Now supports Jinja templates for composition.
+    """
     dest_file = path / dest_rel
     src_file = templates_dir / src_rel
 
     if not src_file.exists():
         return Failure(f"Template not found: {src_rel}")
 
-    try:
-        new_content = src_file.read_text()
-    except OSError as e:
-        return Failure(f"Failed to read template {src_rel}: {e}")
+    # LX-05: Render Jinja templates, copy plain files
+    if template_type == "jinja":
+        render_result = render_template_file(src_file, variables)
+        if isinstance(render_result, Failure):
+            return render_result
+        new_content = render_result.unwrap()
+    else:
+        try:
+            new_content = src_file.read_text()
+        except OSError as e:
+            return Failure(f"Failed to read template {src_rel}: {e}")
+
+    # Track if file exists BEFORE write (for correct created/updated reporting)
+    file_existed = dest_file.exists()
 
     # Check if update needed
-    if dest_file.exists() and not config.force:
+    if file_existed and not config.force:
         try:
             if dest_file.read_text() == new_content:
                 report.skipped.append(dest_rel)
@@ -162,7 +186,11 @@ def _sync_fully_managed(
         except OSError as e:
             return Failure(f"Failed to write {dest_rel}: {e}")
 
-    report.updated.append(dest_rel) if dest_file.exists() else report.created.append(dest_rel)
+    # Report based on pre-write existence
+    if file_existed:
+        report.updated.append(dest_rel)
+    else:
+        report.created.append(dest_rel)
     return Success("synced")
 
 
@@ -341,6 +369,14 @@ def _merge_region_content(
 
     else:
         # Missing: no Invar markers - preserve entire content as user content
+        # Handle empty content - just return fresh template
+        if not existing_content.strip():
+            if dest_rel == "CLAUDE.md" and project_additions:
+                parsed = parse_invar_regions(new_content)
+                if "project" in parsed.regions:
+                    return reconstruct_file(parsed, {"project": project_additions})
+            return new_content
+
         preserved = format_preserved_content(existing_content, date.today().isoformat())
         parsed = parse_invar_regions(new_content)
         if user_region in parsed.regions:
@@ -371,7 +407,8 @@ def _sync_create_only(
         report.skipped.append(dest_rel)
         return Success("skipped")
 
-    if not src_file.exists():
+    # LX-05: Skip existence check for copy_dir_lang (has {language} placeholder)
+    if template_type != "copy_dir_lang" and not src_file.exists():
         return Failure(f"Template not found: {src_rel}")
 
     try:
@@ -386,9 +423,24 @@ def _sync_create_only(
             dest_file.write_text(result.unwrap())
         elif template_type == "copy_dir":
             if src_file.is_dir():
-                shutil.copytree(src_file, dest_file)
+                # Ignore Python bytecode and cache directories
+                ignore = shutil.ignore_patterns("__pycache__", "*.pyc", "*.pyo")
+                shutil.copytree(src_file, dest_file, ignore=ignore)
             else:
                 return Failure(f"Expected directory: {src_rel}")
+        elif template_type == "copy_dir_lang":
+            # LX-05 hotfix: Language-aware directory copy
+            lang = variables.get("language", "python")
+            lang_src_rel = src_rel.replace("{language}", lang)
+            lang_src_file = templates_dir / lang_src_rel
+            if not lang_src_file.exists():
+                return Failure(f"Language-specific template not found: {lang_src_rel}")
+            if lang_src_file.is_dir():
+                # Ignore Python bytecode and cache directories
+                ignore = shutil.ignore_patterns("__pycache__", "*.pyc", "*.pyo")
+                shutil.copytree(lang_src_file, dest_file, ignore=ignore)
+            else:
+                return Failure(f"Expected directory: {lang_src_rel}")
 
         report.created.append(dest_rel)
         return Success("created")

invar/shell/commands/uninstall.py

@@ -16,6 +16,7 @@ import typer
 from rich.console import Console
 
 from invar.shell.claude_hooks import is_invar_hook
+from invar.shell.skill_manager import CORE_SKILLS, has_user_extensions
 
 console = Console()
 
@@ -199,13 +200,19 @@ def remove_hooks_from_settings(path: Path) -> tuple[bool, str]:
 
 
 # @shell_complexity: Multi-file type detection requires comprehensive branching
-def collect_removal_targets(path: Path) -> dict:
-    """Collect files and directories to remove/modify."""
+def collect_removal_targets(path: Path, remove_extensions: bool = False) -> dict:
+    """Collect files and directories to remove/modify.
+
+    Args:
+        path: Project root path
+        remove_extensions: If True, also remove extension skills
+    """
     targets = {
         "delete_dirs": [],
         "delete_files": [],
         "modify_files": [],
         "skip": [],
+        "extensions_preserved": [],  # Extension skills that will be kept
     }
 
     # Directories to delete entirely
@@ -222,21 +229,45 @@ def collect_removal_targets(path: Path) -> dict:
         if file_path.exists():
             targets["delete_files"].append((file_name, description))
 
-    # Skills with _invar marker
+    # Skills - distinguish core vs extension
     skills_dir = path / ".claude" / "skills"
     if skills_dir.exists():
         for skill_dir in skills_dir.iterdir():
             if skill_dir.is_dir():
+                skill_name = skill_dir.name
                 skill_file = skill_dir / "SKILL.md"
-                if skill_file.exists():
-                    if has_invar_marker(skill_file):
+
+                if not skill_file.exists():
+                    continue
+
+                # Core skills are always removed
+                if skill_name in CORE_SKILLS:
+                    targets["delete_dirs"].append(
+                        (f".claude/skills/{skill_name}/", "core skill")
+                    )
+                elif has_invar_marker(skill_file):
+                    # Extension skill with Invar marker
+                    if remove_extensions:
+                        has_custom = has_user_extensions(skill_dir)
+                        desc = "extension skill"
+                        if has_custom:
+                            desc += " (has custom content)"
                         targets["delete_dirs"].append(
-                            (f".claude/skills/{skill_dir.name}/", "skill, has _invar marker")
+                            (f".claude/skills/{skill_name}/", desc)
                         )
                     else:
-                        targets["skip"].append(
-                            (f".claude/skills/{skill_dir.name}/", "no _invar marker")
+                        # Preserve extension skill
+                        has_custom = has_user_extensions(skill_dir)
+                        desc = "extension skill"
+                        if has_custom:
+                            desc += ", has custom content"
+                        targets["extensions_preserved"].append(
+                            (f".claude/skills/{skill_name}/", desc)
                         )
+                else:
+                    targets["skip"].append(
+                        (f".claude/skills/{skill_name}/", "no _invar marker")
+                    )
 
     # Commands with _invar marker
     commands_dir = path / ".claude" / "commands"
@@ -358,6 +389,14 @@ def show_preview(targets: dict) -> None:
         for item, desc in targets["modify_files"]:
             console.print(f"  {item:40} ({desc})")
 
+    if targets.get("extensions_preserved"):
+        console.print("\n[cyan]Will PRESERVE (extension skills):[/cyan]")
+        for item, desc in targets["extensions_preserved"]:
+            console.print(f"  {item:40} ({desc})")
+        console.print(
+            "\n[dim]Use --remove-extensions to also remove extension skills[/dim]"
+        )
+
     if targets["skip"]:
         console.print("\n[dim]Will SKIP:[/dim]")
         for item, desc in targets["skip"]:
@@ -446,16 +485,25 @@ def uninstall(
         "-f",
         help="Skip confirmation prompt",
     ),
+    remove_extensions: bool = typer.Option(
+        False,
+        "--remove-extensions",
+        help="Also remove extension skills (security, acceptance, etc.)",
+    ),
 ) -> None:
     """Remove Invar from a project.
 
     Safely removes Invar-generated files and configurations while
     preserving user content. Uses marker-based detection.
 
+    By default, extension skills are preserved. Use --remove-extensions
+    to also remove them.
+
     Examples:
-        invar uninstall --dry-run    # Preview changes
-        invar uninstall              # Remove with confirmation
-        invar uninstall --force      # Remove without confirmation
+        invar uninstall --dry-run           # Preview changes
+        invar uninstall                     # Remove with confirmation
+        invar uninstall --force             # Remove without confirmation
+        invar uninstall --remove-extensions # Also remove extension skills
     """
     # Check if this is an Invar project
     invar_toml = path / "invar.toml"
@@ -468,7 +516,7 @@ def uninstall(
         raise typer.Exit(1)
 
     # Collect targets
-    targets = collect_removal_targets(path)
+    targets = collect_removal_targets(path, remove_extensions=remove_extensions)
 
     # Check if there's anything to do
     if not any([targets["delete_dirs"], targets["delete_files"], targets["modify_files"]]):

invar/shell/commands/update.py

@@ -19,9 +19,7 @@ console = Console()
 
 def update(
     path: Path = typer.Argument(Path(), help="Project root directory"),
-    check: bool = typer.Option(False, "--check", help="Preview changes"),
-    force: bool = typer.Option(False, "--force", "-f", help="Update even if current"),
-    yes: bool = typer.Option(False, "--yes", "-y", help="Accept defaults without prompting"),
+    preview: bool = typer.Option(False, "--preview", "--check", help="Preview changes (dry run)"),
 ) -> None:
     """
     Alias for 'invar init' (DX-55).
@@ -29,20 +27,14 @@ def update(
     Maintained for backwards compatibility.
     Both commands are now idempotent and do the same thing.
 
-    Use 'invar init --check' to preview changes.
-    Use 'invar init --force' to refresh even if current.
+    Use 'invar init --preview' to preview changes.
     """
     console.print("[dim]Note: 'update' is now an alias for 'init'[/dim]")
-    # Pass all init parameters with explicit defaults to avoid typer.Option object issues
+    # Call init with matching parameters (DX-70 signature)
     return init_command(
         path=path,
         claude=False,
-        mcp_method=None,
-        dirs=None,
-        hooks=True,
-        skills=True,
-        yes=yes,
-        check=check,
-        force=force,
-        reset=False,
+        pi=False,
+        language=None,
+        preview=preview,
     )

invar/shell/contract_coverage.py

@@ -266,6 +266,7 @@ def detect_batch_creation(
         return Success(None)
 
 
+# @shell_orchestration: Report formatting for CLI output display
 # @shell_complexity: Report formatting with multiple conditional sections
 def format_contract_coverage_report(report: ContractCoverageReport) -> str:
     """Format coverage report for human-readable output."""