fixos 2.2.39__tar.gz → 2.2.40__tar.gz

{fixos-2.2.39 → fixos-2.2.40}/CHANGELOG.md

@@ -11,6 +11,18 @@
 
 ### Fixed
 
+- Tryb `fixos cleanup` → „Wybierz pojedyncze” przechodzi teraz kolejno przez
+  wszystkie usługi: bezpieczne, wymagające przeglądu i chronione. Pozycje bez
+  bezpiecznej operacji zbiorczej pokazują komendę podglądu, dane chronione
+  wymagają dodatkowego potwierdzenia, a wykonanie jest przypięte do dokładnie
+  wybranej ścieżki i poziomu ryzyka.
+- Skany cache npm, pnpm, Yarn, Maven i uv obejmują teraz wyłącznie
+  odtwarzalne katalogi. `~/.local/share/uv` (narzędzia, interpretery i
+  credentials) oraz `.tools` pnpm nie są już błędnie liczone jako bezpieczne
+  cache; czyszczenie npm faktycznie obejmuje raportowane `_npx`.
+- Naprawiono scenariusze TestQL i dodano punkt wejścia `python -m fixos`.
+  `cleanup -c <chroniona-usługa> --dry-run` pokazuje bezpieczną komendę
+  diagnostyczną zamiast kończyć się mylącym błędem.
 - Stabilny raport Docker z osobnym rozmiarem aktywnym i odzyskiwalnym oraz
   poprawnym pomiarem przed/po czyszczeniu.
 - Usunięto niebezpieczne zbiorcze komendy kasowania wolumenów Docker i
@@ -19,6 +31,27 @@
   rekurencyjnych skanów `/` oraz `/home` z szybkich kontroli.
 - Czyszczenie cache JetBrains trafia w aktualną ścieżkę i wymaga zamknięcia IDE.
 
+## [2.2.40] - 2026-07-23
+
+### Docs
+- Update CHANGELOG.md
+- Update README.md
+
+### Test
+- Update testql-scenarios/generated-cli-tests.testql.toon.yaml
+- Update testql-scenarios/generated-from-pytests.testql.toon.yaml
+- Update tests/unit/test_cleanup_cmd.py
+- Update tests/unit/test_service_cleanup.py
+- Update tests/unit/test_service_scanner.py
+
+### Other
+- Update fixos/__main__.py
+- Update fixos/cli/cleanup_cmd.py
+- Update fixos/diagnostics/quick_snapshot.py
+- Update fixos/diagnostics/service_cleanup.py
+- Update fixos/diagnostics/service_scanner.py
+- Update uv.lock
+
 ## [2.2.39] - 2026-07-23
 
 ### Docs

{fixos-2.2.39 → fixos-2.2.40}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fixos
-Version: 2.2.39
+Version: 2.2.40
 Summary: AI-powered Linux/Windows diagnostics and repair – audio, hardware, system issues
 Home-page: https://github.com/wronai/fixos
 Author: fixos contributors
@@ -63,11 +63,11 @@ AI-powered OS Diagnostics
 
 ## AI Cost Tracking
 
-![PyPI](https://img.shields.io/badge/pypi-costs-blue) ![Version](https://img.shields.io/badge/version-2.2.39-blue) ![Python](https://img.shields.io/badge/python-3.9+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
-![AI Cost](https://img.shields.io/badge/AI%20Cost-$4.76-orange) ![Human Time](https://img.shields.io/badge/Human%20Time-38.0h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
+![PyPI](https://img.shields.io/badge/pypi-costs-blue) ![Version](https://img.shields.io/badge/version-2.2.40-blue) ![Python](https://img.shields.io/badge/python-3.9+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
+![AI Cost](https://img.shields.io/badge/AI%20Cost-$4.85-orange) ![Human Time](https://img.shields.io/badge/Human%20Time-38.2h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
 
-- 🤖 **LLM usage:** $4.7645 (146 commits)
-- 👤 **Human dev:** ~$3795 (38.0h @ $100/h, 30min dedup)
+- 🤖 **LLM usage:** $4.8451 (147 commits)
+- 👤 **Human dev:** ~$3817 (38.2h @ $100/h, 30min dedup)
 
 Generated on 2026-07-23 using [openrouter/qwen/qwen3-coder-next](https://openrouter.ai/qwen/qwen3-coder-next)
 

{fixos-2.2.39 → fixos-2.2.40}/README.md

@@ -19,11 +19,11 @@ AI-powered OS Diagnostics
 
 ## AI Cost Tracking
 
-![PyPI](https://img.shields.io/badge/pypi-costs-blue) ![Version](https://img.shields.io/badge/version-2.2.39-blue) ![Python](https://img.shields.io/badge/python-3.9+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
-![AI Cost](https://img.shields.io/badge/AI%20Cost-$4.76-orange) ![Human Time](https://img.shields.io/badge/Human%20Time-38.0h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
+![PyPI](https://img.shields.io/badge/pypi-costs-blue) ![Version](https://img.shields.io/badge/version-2.2.40-blue) ![Python](https://img.shields.io/badge/python-3.9+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
+![AI Cost](https://img.shields.io/badge/AI%20Cost-$4.85-orange) ![Human Time](https://img.shields.io/badge/Human%20Time-38.2h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
 
-- 🤖 **LLM usage:** $4.7645 (146 commits)
-- 👤 **Human dev:** ~$3795 (38.0h @ $100/h, 30min dedup)
+- 🤖 **LLM usage:** $4.8451 (147 commits)
+- 👤 **Human dev:** ~$3817 (38.2h @ $100/h, 30min dedup)
 
 Generated on 2026-07-23 using [openrouter/qwen/qwen3-coder-next](https://openrouter.ai/qwen/qwen3-coder-next)
 

{fixos-2.2.39 → fixos-2.2.40}/fixos/__init__.py

@@ -1,3 +1,3 @@
 """fixos – AI-powered Linux/Windows diagnostics and repair."""
 
-__version__ = "2.2.39"
+__version__ = "2.2.40"

fixos-2.2.40/fixos/__main__.py

@@ -0,0 +1,7 @@
+"""Allow running fixOS as ``python -m fixos``."""
+
+from fixos.cli import main
+
+
+if __name__ == "__main__":
+    main()

{fixos-2.2.39 → fixos-2.2.40}/fixos/cli/cleanup_cmd.py

@@ -79,9 +79,7 @@ def _display_service_item(svc: dict) -> None:
     risk = svc.get("risk_level") or ("safe" if svc["safe_to_cleanup"] else "review")
     safe_text, safe_color = _RISK_LABELS.get(risk, _RISK_LABELS["review"])
 
-    click.echo(
-        f"  {click.style(svc['name'], fg='yellow', bold=True)} - {size_str}"
-    )
+    click.echo(f"  {click.style(svc['name'], fg='yellow', bold=True)} - {size_str}")
     click.echo(f"   {svc['description']}")
     paths = svc.get("details", {}).get("paths") or [svc["path"]]
     if len(paths) > 1:
@@ -90,7 +88,9 @@ def _display_service_item(svc: dict) -> None:
             click.echo(f"     • {path}")
     else:
         click.echo(f"   Ścieżka: {svc['path']}")
-    click.echo(f"   {click.style(safe_text, fg=safe_color, bold=(risk == 'dangerous'))}")
+    click.echo(
+        f"   {click.style(safe_text, fg=safe_color, bold=(risk == 'dangerous'))}"
+    )
 
     # Show details for specific services
     if svc.get("details"):
@@ -134,7 +134,11 @@ def _execute_safe_cleanup(services: list, scanner) -> float:
     for svc in services:
         svc_type = svc["service_type"]
         click.echo(f"Czyszczenie {svc_type}...")
-        result = scanner.cleanup_service(svc_type, dry_run=False)
+        result = scanner.cleanup_service(
+            svc_type,
+            dry_run=False,
+            planned_service=svc,
+        )
         if result["success"]:
             freed = result.get("space_freed_gb", 0)
             total_freed += freed
@@ -327,7 +331,9 @@ def _cleanup_single_service(
                 bold=True,
             )
         )
-        click.echo(f"   Podgląd bez usuwania: fixos cleanup -c {service_name} --dry-run")
+        click.echo(
+            f"   Podgląd bez usuwania: fixos cleanup -c {service_name} --dry-run"
+        )
         if not click.confirm(f"Na pewno usunąć dane usługi {service_name}?"):
             click.echo("Anulowano.")
             return
@@ -340,7 +346,9 @@ def _cleanup_single_service(
 
     if result["success"]:
         if dry_run:
-            click.echo(click.style(f"Symulacja dla {service_name} zakończona", fg="green"))
+            click.echo(
+                click.style(f"Symulacja dla {service_name} zakończona", fg="green")
+            )
             if result.get("output"):
                 click.echo(f"  {result['output']}")
             if result["space_freed_gb"] > 0:
@@ -349,7 +357,9 @@ def _cleanup_single_service(
                     f"{result['space_freed_gb']:.2f} GB"
                 )
         else:
-            click.echo(click.style(f"Zakończono czyszczenie {service_name}", fg="green"))
+            click.echo(
+                click.style(f"Zakończono czyszczenie {service_name}", fg="green")
+            )
             if result["space_freed_gb"] > 0:
                 click.echo(f"  Zwolniono: {result['space_freed_gb']:.2f} GB")
     else:
@@ -362,11 +372,15 @@ def _cleanup_single_service(
 
 
 def _size_str(svc: dict) -> str:
-    return f"{svc['size_gb']:.2f} GB" if svc["size_gb"] >= 1 else f"{svc['size_mb']:.0f} MB"
+    return (
+        f"{svc['size_gb']:.2f} GB"
+        if svc["size_gb"] >= 1
+        else f"{svc['size_mb']:.0f} MB"
+    )
 
 
-def _select_safe_services(safe_services: list) -> list:
-    """Ask what to clean from the safe tier: all of it, hand-picked items, or none."""
+def _select_safe_services(safe_services: list) -> tuple[str, list]:
+    """Choose bulk-safe cleanup, full individual selection, or no cleanup."""
     click.echo(click.style("Bezpieczne do wyczyszczenia:", fg="green"))
     for svc in safe_services:
         click.echo(f"  • {svc['name']}: {_size_str(svc)}")
@@ -375,28 +389,112 @@ def _select_safe_services(safe_services: list) -> list:
     click.echo()
     click.echo("Co wyczyścić?")
     click.echo(f"  [1] Wszystkie bezpieczne (zwolni {safe_total:.2f} GB)")
-    click.echo("  [2] Wybierz pojedyncze usługi")
+    click.echo("  [2] Wybierz pojedyncze spośród wszystkich usług")
     click.echo("  [0] Nic — pomiń")
     choice = click.prompt(
         "Wybór", type=click.Choice(["0", "1", "2"]), default="1", show_choices=False
     )
 
     if choice == "0":
-        return []
+        return "none", []
     if choice == "1":
-        return safe_services
+        return "safe", safe_services
+    return "individual", []
 
-    click.echo(click.style("Wybierz usługi do wyczyszczenia:", fg="cyan"))
-    return [svc for svc in safe_services if click.confirm(f"  {svc['name']} ({_size_str(svc)})")]
+
+def _selection_description(svc: dict) -> str:
+    risk = svc.get("risk_level", "review")
+    labels = {
+        "safe": "bezpieczne cache",
+        "review": "do rozważenia",
+        "dangerous": "CHRONIONE/mieszane",
+    }
+    description = labels.get(risk, "do rozważenia")
+    if risk == "dangerous" and svc["service_type"] == "docker":
+        reclaimable = svc.get("details", {}).get("usage", {}).get("Build Cache", {})
+        reclaimable_gb = float(reclaimable.get("reclaimable_gb", 0))
+        if reclaimable_gb:
+            description += f"; komenda dotyczy do {reclaimable_gb:.2f} GB cache buildów"
+    return description
+
+
+def _select_individual_services(services: list) -> list:
+    """Offer every scanned, executable entry in its displayed order."""
+    click.echo(
+        click.style(
+            "Wybierz kolejno spośród wszystkich możliwych usług:",
+            fg="cyan",
+        )
+    )
+    selected = []
+    for svc in services:
+        label = (
+            f"  {svc['name']} ({_size_str(svc)}) " f"[{_selection_description(svc)}]"
+        )
+        if not svc.get("can_cleanup") or not svc.get("cleanup_command", "").strip():
+            click.echo(f"{label} — brak bezpiecznej operacji zbiorczej")
+            preview = svc.get("preview_command")
+            if preview:
+                click.echo(f"    Podgląd: {preview}")
+            continue
+        if click.confirm(label, default=False):
+            selected.append(svc)
+    return selected
+
+
+def _execute_individual_cleanup(services: list, scanner) -> float:
+    """Execute hand-picked entries with an extra gate for protected data."""
+    total_freed = 0.0
+    for svc in services:
+        risk = svc.get("risk_level", "review")
+        if risk == "dangerous":
+            click.echo(
+                click.style(
+                    f"⚠️  {svc['name']} zawiera dane chronione lub mieszane. "
+                    "Operacji nie da się automatycznie cofnąć.",
+                    fg="red",
+                    bold=True,
+                )
+            )
+            if not click.confirm(
+                f"Potwierdź wykonanie dokładnie dla: {svc['name']}",
+                default=False,
+            ):
+                click.echo(f"  Pominięto {svc['name']}.")
+                continue
+
+        click.echo(f"Czyszczenie {svc['name']}...")
+        result = scanner.cleanup_service(
+            svc["service_type"],
+            dry_run=False,
+            planned_service=svc,
+        )
+        if result["success"]:
+            freed = float(result.get("space_freed_gb", 0))
+            total_freed += freed
+            click.echo(click.style(f"  Zwolniono {freed:.2f} GB", fg="green"))
+        else:
+            click.echo(click.style(f"  Błąd: {_error_message(result)}", fg="red"))
+    return total_freed
 
 
 def _run_interactive_cleanup(plan: dict, list_only: bool, scanner) -> None:
     """Offer interactive safe cleanup and display unsafe services."""
-    if not list_only and plan["safe_to_cleanup"]:
-        selected = _select_safe_services(plan["safe_to_cleanup"])
+    if not list_only and plan["services"]:
+        if plan["safe_to_cleanup"]:
+            mode, selected = _select_safe_services(plan["safe_to_cleanup"])
+        else:
+            mode, selected = "individual", []
+        if mode == "individual":
+            selected = _select_individual_services(plan["services"])
+            if selected:
+                _execute_individual_cleanup(selected, scanner)
+            else:
+                click.echo(click.style("Pominięto czyszczenie.", fg="yellow"))
+            return
         if selected:
             _execute_safe_cleanup(selected, scanner)
-        else:
+        elif mode == "none":
             click.echo(click.style("Pominięto czyszczenie.", fg="yellow"))
     if plan["requires_review"] and not list_only:
         _display_unsafe_services(plan["requires_review"])

{fixos-2.2.39 → fixos-2.2.40}/fixos/diagnostics/quick_snapshot.py

@@ -61,10 +61,14 @@ CACHE_RULES: tuple[CacheRule, ...] = (
         (
             "~/.npm/_cacache",
             "~/.npm/_npx",
+            "~/.npm/_prebuilds",
             "~/AppData/Local/npm-cache/_cacache",
             "~/AppData/Local/npm-cache/_npx",
         ),
-        "npm cache clean --force",
+        (
+            "npm cache clean --force 2>/dev/null || true; "
+            "rm -rf ~/.npm/_npx ~/.npm/_prebuilds"
+        ),
         stack="node",
     ),
     CacheRule(

{fixos-2.2.39 → fixos-2.2.40}/fixos/diagnostics/service_cleanup.py

@@ -6,6 +6,7 @@ Handles planning and execution of service data cleanup operations.
 import os
 import shlex
 import subprocess
+from types import SimpleNamespace
 from typing import Dict, Any, List
 from ..constants import (
     DEFAULT_COMMAND_TIMEOUT,
@@ -47,10 +48,7 @@ class ServiceCleaner:
             "requires_review_gb": round(sum(s.size_gb for s in review_services), 2),
             "dangerous_gb": round(sum(s.size_gb for s in dangerous_services), 2),
             "manager_reported_reclaimable_gb": round(
-                sum(
-                    float(s.details.get("reclaimable_size_gb", 0.0))
-                    for s in services
-                ),
+                sum(float(s.details.get("reclaimable_size_gb", 0.0)) for s in services),
                 2,
             ),
             "services": [self._service_to_dict(s) for s in services],
@@ -62,9 +60,19 @@ class ServiceCleaner:
         return plan
 
     def cleanup_service(
-        self, service_type: str, dry_run: bool = False
+        self,
+        service_type: str,
+        dry_run: bool = False,
+        planned_service: Dict[str, Any] | None = None,
     ) -> Dict[str, Any]:
-        """Execute cleanup for a specific service."""
+        """Execute cleanup for a specific service or exact planned entry.
+
+        One service type can have entries in multiple risk tiers (for example
+        VS Code cache and VS Code extensions).  Re-scanning and blindly taking
+        the largest entry could therefore execute a different cleanup than the
+        one selected in the CLI.  ``planned_service`` pins execution to the
+        displayed path, command and risk entry.
+        """
         from .service_scanner import ServiceType
 
         result = {
@@ -78,16 +86,38 @@ class ServiceCleaner:
 
         try:
             service_enum = ServiceType(service_type)
-            services = self.scanner.scan_service(service_enum)
-
-            if not services:
-                result["error"] = f"No {service_type} data found above threshold"
-                return result
-
-            service = services[0]  # Take first (largest)
+            if planned_service is not None:
+                if planned_service.get("service_type") != service_type:
+                    result["error"] = "Selected cleanup entry does not match service"
+                    return result
+                service = SimpleNamespace(
+                    service_type=service_enum,
+                    name=planned_service.get("name", service_type),
+                    path=planned_service.get("path", ""),
+                    size_gb=float(planned_service.get("size_gb", 0)),
+                    can_cleanup=bool(planned_service.get("can_cleanup")),
+                    cleanup_command=planned_service.get("cleanup_command", ""),
+                    preview_command=planned_service.get("preview_command", ""),
+                    details=planned_service.get("details") or {},
+                )
+            else:
+                services = self.scanner.scan_service(service_enum)
+                if not services:
+                    result["error"] = f"No {service_type} data found above threshold"
+                    return result
+                service = services[0]  # Backward-compatible single-service mode.
             initial_size = service.size_gb
 
             if not service.can_cleanup or not service.cleanup_command.strip():
+                if dry_run:
+                    preview = getattr(service, "preview_command", "")
+                    result["success"] = True
+                    result["requires_item_selection"] = True
+                    result["output"] = (
+                        "[DRY RUN] Zbiorcze czyszczenie jest wyłączone. "
+                        f"Bezpieczny podgląd: {preview or 'brak komendy podglądu'}"
+                    )
+                    return result
                 result["error"] = (
                     f"{service.name}: wybierz konkretne elementy do usunięcia; "
                     "zbiorcze czyszczenie jest wyłączone, aby chronić dane"
@@ -113,12 +143,15 @@ class ServiceCleaner:
 
             # Check new size
             measure = getattr(self.scanner, "measure_service_size_mb", None)
+            planned_paths = service.details.get("paths") or [service.path]
             if callable(measure):
-                new_size_mb = measure(
-                    service_enum, service.path, refresh=True
+                new_size_mb = sum(
+                    measure(service_enum, path, refresh=True) for path in planned_paths
                 )
             else:
-                new_size_mb = self.scanner._get_path_size_mb(service.path)
+                new_size_mb = sum(
+                    self.scanner._get_path_size_mb(path) for path in planned_paths
+                )
             new_size_gb = new_size_mb / 1024
             freed_gb = max(0, initial_size - new_size_gb)
 
@@ -492,7 +525,7 @@ class ServiceCleaner:
             # Python
             ServiceType.PIP: "Python pip cache",
             ServiceType.CONDA: "Conda package cache (pkgs directories)",
-            ServiceType.POETRY: "Poetry virtual environments and cache",
+            ServiceType.POETRY: "Poetry package cache",
             # Java
             ServiceType.GRADLE: "Gradle build cache",
             ServiceType.MAVEN: "Maven repository cache",
@@ -578,12 +611,15 @@ class ServiceCleaner:
             ServiceType.CONTAINERD: "sudo rm -rf /var/lib/containerd",
             ServiceType.PODMAN: "podman system prune -af --volumes",
             # JS/Node
-            ServiceType.NPM: "npm cache clean --force",
+            ServiceType.NPM: (
+                "npm cache clean --force 2>/dev/null || true; "
+                "rm -rf ~/.npm/_npx ~/.npm/_prebuilds"
+            ),
             ServiceType.YARN: "yarn cache clean --all",
             ServiceType.PNPM: "pnpm store prune",
             # Python
             ServiceType.PIP: "pip cache purge || rm -rf ~/.cache/pip/*",
-            ServiceType.CONDA: "conda clean --all -y || rm -rf ~/.conda/envs/*/pkgs",
+            ServiceType.CONDA: "conda clean --all -y",
             ServiceType.POETRY: "poetry cache clear --all pypi || rm -rf ~/.cache/pypoetry",
             # Java
             ServiceType.GRADLE: "rm -rf ~/.gradle/caches ~/.gradle/daemon ~/.gradle/wrapper",
@@ -641,7 +677,7 @@ class ServiceCleaner:
             ServiceType.TRASH: "rm -rf ~/.local/share/Trash/* ~/.Trash/*",
             ServiceType.LOGS: "find ~/.cache/log ~/.local/state -name '*.log' -mtime +7 -delete 2>/dev/null; journalctl --vacuum-time=7d 2>/dev/null || true",
             ServiceType.NVIDIA: "rm -rf ~/.cache/nvidia ~/.nv/ComputeCache ~/.cache/mesa_shader_cache",
-            ServiceType.UV: "uv cache clean || rm -rf ~/.cache/uv ~/.local/share/uv",
+            ServiceType.UV: "uv cache clean",
             ServiceType.TORCH: "rm -rf ~/.cache/torch ~/.torch",
             ServiceType.BUN: "rm -rf ~/.bun/install/cache",
             ServiceType.PLAYWRIGHT: "rm -rf ~/.cache/ms-playwright ~/.cache/puppeteer",
@@ -730,9 +766,15 @@ class ServiceCleaner:
             ServiceType.CONTAINERD: "sudo ls -la /var/lib/containerd 2>/dev/null || echo 'Requires sudo access'",
             ServiceType.PODMAN: "podman system df -v || podman images",
             # JS/Node
-            ServiceType.NPM: "npm cache ls 2>/dev/null || du -sh ~/.npm",
+            ServiceType.NPM: (
+                "npm cache ls 2>/dev/null; "
+                "du -sh ~/.npm/_cacache ~/.npm/_npx ~/.npm/_prebuilds 2>/dev/null"
+            ),
             ServiceType.YARN: "yarn cache list 2>/dev/null || du -sh ~/.cache/yarn",
-            ServiceType.PNPM: "pnpm store status 2>/dev/null || du -sh ~/.pnpm-store",
+            ServiceType.PNPM: (
+                "pnpm store status 2>/dev/null || "
+                "du -sh ~/.pnpm-store ~/.local/share/pnpm/store 2>/dev/null"
+            ),
             # Python
             ServiceType.PIP: "pip cache dir && pip cache info 2>/dev/null || du -sh ~/.cache/pip",
             ServiceType.CONDA: "conda info --envs 2>/dev/null && conda list 2>/dev/null | head -20 || du -sh ~/miniconda3",

{fixos-2.2.39 → fixos-2.2.40}/fixos/diagnostics/service_scanner.py

@@ -146,9 +146,14 @@ class ServiceDataScanner:
         ],
         ServiceType.CONTAINERD: ["/var/lib/containerd", "/run/containerd"],
         ServiceType.PODMAN: ["~/.local/share/containers", "~/.config/containers"],
-        ServiceType.NPM: ["~/.npm", "~/.cache/npm"],
-        ServiceType.YARN: ["~/.cache/yarn", "~/.yarn", "~/.config/yarn"],
-        ServiceType.PNPM: ["~/.pnpm-store", "~/.local/share/pnpm"],
+        ServiceType.NPM: [
+            "~/.npm/_cacache",
+            "~/.npm/_npx",
+            "~/.npm/_prebuilds",
+            "~/.cache/npm",
+        ],
+        ServiceType.YARN: ["~/.cache/yarn", "~/.yarn/berry/cache"],
+        ServiceType.PNPM: ["~/.pnpm-store", "~/.local/share/pnpm/store"],
         ServiceType.PIP: ["~/.cache/pip"],
         ServiceType.CONDA: [
             "~/miniconda3/pkgs",
@@ -159,7 +164,7 @@ class ServiceDataScanner:
         ],
         ServiceType.POETRY: ["~/.cache/pypoetry"],
         ServiceType.GRADLE: ["~/.gradle", "~/.cache/gradle"],
-        ServiceType.MAVEN: ["~/.m2"],
+        ServiceType.MAVEN: ["~/.m2/repository"],
         ServiceType.CARGO: ["~/.cargo/registry", "~/.cargo/git"],
         ServiceType.GO: ["~/go/pkg", "~/.go/pkg"],
         ServiceType.FLUTTER: ["~/.flutter-sdk", "~/flutter", "~/.pub-cache"],
@@ -224,7 +229,7 @@ class ServiceDataScanner:
             "~/.nv/ComputeCache",
             "~/.cache/mesa_shader_cache",
         ],
-        ServiceType.UV: ["~/.cache/uv", "~/.local/share/uv"],
+        ServiceType.UV: ["~/.cache/uv"],
         ServiceType.TORCH: ["~/.cache/torch", "~/.torch"],
         ServiceType.BUN: ["~/.bun/install/cache"],
         ServiceType.PLAYWRIGHT: ["~/.cache/ms-playwright", "~/.cache/puppeteer"],
@@ -644,10 +649,17 @@ class ServiceDataScanner:
         return self._cleaner.get_cleanup_plan(selected_services)
 
     def cleanup_service(
-        self, service_type: str, dry_run: bool = False
+        self,
+        service_type: str,
+        dry_run: bool = False,
+        planned_service: Dict[str, Any] | None = None,
     ) -> Dict[str, Any]:
         """Execute cleanup for a specific service."""
-        return self._cleaner.cleanup_service(service_type, dry_run)
+        return self._cleaner.cleanup_service(
+            service_type,
+            dry_run,
+            planned_service=planned_service,
+        )
 
 
 def main():

{fixos-2.2.39 → fixos-2.2.40}/fixos.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fixos
-Version: 2.2.39
+Version: 2.2.40
 Summary: AI-powered Linux/Windows diagnostics and repair – audio, hardware, system issues
 Home-page: https://github.com/wronai/fixos
 Author: fixos contributors
@@ -63,11 +63,11 @@ AI-powered OS Diagnostics
 
 ## AI Cost Tracking
 
-![PyPI](https://img.shields.io/badge/pypi-costs-blue) ![Version](https://img.shields.io/badge/version-2.2.39-blue) ![Python](https://img.shields.io/badge/python-3.9+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
-![AI Cost](https://img.shields.io/badge/AI%20Cost-$4.76-orange) ![Human Time](https://img.shields.io/badge/Human%20Time-38.0h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
+![PyPI](https://img.shields.io/badge/pypi-costs-blue) ![Version](https://img.shields.io/badge/version-2.2.40-blue) ![Python](https://img.shields.io/badge/python-3.9+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
+![AI Cost](https://img.shields.io/badge/AI%20Cost-$4.85-orange) ![Human Time](https://img.shields.io/badge/Human%20Time-38.2h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
 
-- 🤖 **LLM usage:** $4.7645 (146 commits)
-- 👤 **Human dev:** ~$3795 (38.0h @ $100/h, 30min dedup)
+- 🤖 **LLM usage:** $4.8451 (147 commits)
+- 👤 **Human dev:** ~$3817 (38.2h @ $100/h, 30min dedup)
 
 Generated on 2026-07-23 using [openrouter/qwen/qwen3-coder-next](https://openrouter.ai/qwen/qwen3-coder-next)
 

{fixos-2.2.39 → fixos-2.2.40}/fixos.egg-info/SOURCES.txt

@@ -29,6 +29,7 @@ docker/ubuntu/Dockerfile
 docs/examples/advanced_usage.py
 docs/examples/quickstart.py
 fixos/__init__.py
+fixos/__main__.py
 fixos/anonymizer.py
 fixos/cli.py
 fixos/config.py
@@ -158,6 +159,7 @@ tests/e2e/test_thumbnails_broken.py
 tests/unit/__init__.py
 tests/unit/test_anonymizer.py
 tests/unit/test_cache_discovery.py
+tests/unit/test_cleanup_cmd.py
 tests/unit/test_core.py
 tests/unit/test_dev_project_analyzer.py
 tests/unit/test_executor.py

{fixos-2.2.39 → fixos-2.2.40}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "fixos"
-version = "2.2.39"
+version = "2.2.40"
 description = "AI-powered Linux/Windows diagnostics and repair – audio, hardware, system issues"
 readme = "README.md"
 requires-python = ">=3.10"

{fixos-2.2.39 → fixos-2.2.40}/setup.py

@@ -5,7 +5,7 @@ long_description = (Path(__file__).parent / "README.md").read_text(encoding="utf
 
 setup(
     name="fixos",
-    version="2.2.39",
+    version="2.2.40",
     description="AI-powered Linux/Windows diagnostics and repair with anonymization",
     long_description=long_description,
     long_description_content_type="text/markdown",