fixos 2.2.16__tar.gz → 2.2.18__tar.gz

{fixos-2.2.16 → fixos-2.2.18}/CHANGELOG.md

@@ -150,6 +150,34 @@ fix(goal): code analysis engine
 - **refactor(cli):** Usunięto zduplikowany kod ujednolicając funkcje analizy dysku do wspólnego helpera `_run_disk_analysis`.
 - **refactor(ui):** Usunięto ikony Unicode z CLI i sformatowano wyjście `stderr` oraz standardowego logowania na czysty kod Markdown dla poprawy czytelności w oknach terminalowych.
 
+## [2.2.18] - 2026-05-04
+
+### Docs
+- Update README.md
+
+### Other
+- Update uv.lock
+
+## [2.2.17] - 2026-05-04
+
+### Docs
+- Update README.md
+- Update project/README.md
+- Update project/context.md
+
+### Other
+- Update fixos/orchestrator/executor.py
+- Update project/analysis.toon.yaml
+- Update project/calls.mmd
+- Update project/calls.png
+- Update project/calls.toon.yaml
+- Update project/calls.yaml
+- Update project/compact_flow.mmd
+- Update project/compact_flow.png
+- Update project/duplication.toon.yaml
+- Update project/evolution.toon.yaml
+- ... and 8 more files
+
 ## [2.2.16] - 2026-05-04
 
 ### Docs

{fixos-2.2.16 → fixos-2.2.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fixos
-Version: 2.2.16
+Version: 2.2.18
 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.16-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-$7.50-orange) ![Human Time](https://img.shields.io/badge/Human%20Time-20.5h-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.18-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-$7.50-orange) ![Human Time](https://img.shields.io/badge/Human%20Time-22.1h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
 
-- 🤖 **LLM usage:** $7.5000 (113 commits)
-- 👤 **Human dev:** ~$2047 (20.5h @ $100/h, 30min dedup)
+- 🤖 **LLM usage:** $7.5000 (117 commits)
+- 👤 **Human dev:** ~$2210 (22.1h @ $100/h, 30min dedup)
 
 Generated on 2026-05-04 using [openrouter/qwen/qwen3-coder-next](https://openrouter.ai/qwen/qwen3-coder-next)
 

{fixos-2.2.16 → fixos-2.2.18}/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.16-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-$7.50-orange) ![Human Time](https://img.shields.io/badge/Human%20Time-20.5h-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.18-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-$7.50-orange) ![Human Time](https://img.shields.io/badge/Human%20Time-22.1h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
 
-- 🤖 **LLM usage:** $7.5000 (113 commits)
-- 👤 **Human dev:** ~$2047 (20.5h @ $100/h, 30min dedup)
+- 🤖 **LLM usage:** $7.5000 (117 commits)
+- 👤 **Human dev:** ~$2210 (22.1h @ $100/h, 30min dedup)
 
 Generated on 2026-05-04 using [openrouter/qwen/qwen3-coder-next](https://openrouter.ai/qwen/qwen3-coder-next)
 

{fixos-2.2.16 → fixos-2.2.18}/fixos/__init__.py

@@ -1,2 +1,2 @@
 """fixos – AI-powered Linux/Windows diagnostics and repair."""
-__version__ = "2.2.16"
+__version__ = "2.2.18"

{fixos-2.2.16 → fixos-2.2.18}/fixos/agent/session_core.py

@@ -8,9 +8,7 @@ from dataclasses import dataclass, field
 from typing import List, Tuple
 
 from ..constants import (
-    COMMAND_PREFIX_LENGTH,
-    MAX_OUTPUT_LINES,
-    CLEANUP_TIMEOUT_ESTIMATE,
+    MAX_SUMMARY_LENGTH,
 )
 
 
@@ -32,7 +30,7 @@ SYSTEM_PROMPT = """You are an expert Linux/Windows/macOS system diagnostics assi
 You receive anonymized diagnostic data OR a user-described problem. Your tasks:
 
 1. DIAGNOSE – identify ALL problems (🔴 critical → 🟡 important → 🟢 minor)
-2. SOLUTIONS – for each problem provide a CONCRETE command with a brief explanation
+2. SOLUTIONS – for each problem provide an ACTIONABLE repair command with a brief explanation
 3. FORMAT – always use this exact format:
 
 ━━━ DIAGNOZA ━━━
@@ -44,6 +42,12 @@ You receive anonymized diagnostic data OR a user-described problem. Your tasks:
    **Komenda:** `command`
    **Co robi:** explanation
 
+IMPORTANT RULES:
+- Commands in the action list must change/fix something, not only inspect state.
+- Do NOT use read-only diagnostics as fixes (e.g. `df -h`, `free -h`, `ls`, `cat`, `grep`, `systemctl status`).
+- If needed, mention diagnostics in explanation, but propose executable repair steps in `Komenda`.
+- For package upgrades and heavy operations, provide the real fix command (e.g. `dnf upgrade -y`).
+
 Always end with:
 ━━━ DOSTĘPNE AKCJE ━━━
 [1] Fix problem 1 – `command`
@@ -57,6 +61,36 @@ IMPORTANT: Adapt commands to the detected OS (Linux/Windows/macOS).
 """
 
 
+def _is_diagnostic_only_command(cmd: str) -> bool:
+    """Return True if command is read-only and not a repair action."""
+    normalized = cmd.strip().lower()
+    if normalized.startswith("sudo "):
+        normalized = normalized[5:].strip()
+
+    diagnostic_prefixes = (
+        "df ",
+        "free ",
+        "ls ",
+        "cat ",
+        "grep ",
+        "find ",
+        "which ",
+        "whereis ",
+        "journalctl",
+        "dmesg",
+        "uptime",
+        "top ",
+        "ps ",
+        "systemctl status",
+        "dnf check-update",
+        "apt list --upgradable",
+        "pacman -qu",
+        "flatpak list",
+        "snap list",
+    )
+    return normalized.startswith(diagnostic_prefixes)
+
+
 def extract_fixes(reply: str) -> List[Tuple[str, str]]:
     """Extract (command, comment) pairs from LLM reply."""
     fixes: List[Tuple[str, str]] = []
@@ -76,7 +110,10 @@ def extract_fixes(reply: str) -> List[Tuple[str, str]]:
     if not fixes:
         for m in re.finditer(r"EXEC:\s*`([^`]+)`", reply, re.IGNORECASE):
             fixes.append((m.group(1).strip(), ""))
-    return fixes
+
+    # Keep only actionable commands in menu; diagnostic-only commands are noise.
+    filtered = [(cmd, comment) for cmd, comment in fixes if not _is_diagnostic_only_command(cmd)]
+    return filtered
 
 
 def extract_search_topic(llm_reply: str) -> str:

{fixos-2.2.16 → fixos-2.2.18}/fixos/agent/session_handlers.py

@@ -3,9 +3,15 @@ Command handlers for HITL session.
 Each handler processes a specific user command type.
 """
 
+import re
 from typing import TYPE_CHECKING, Tuple
 
-from ..constants import CLEANUP_TIMEOUT_ESTIMATE
+from ..constants import (
+    CLEANUP_TIMEOUT_ESTIMATE,
+    DEFAULT_COMMAND_TIMEOUT,
+    FAST_COMMAND_TIMEOUT,
+    LONG_COMMAND_TIMEOUT,
+)
 from ..platform_utils import (
     is_dangerous, elevate_cmd, run_command,
 )
@@ -19,6 +25,37 @@ if TYPE_CHECKING:
     from ..config import FixOsConfig
 
 
+def _resolve_command_timeout(cmd: str) -> int:
+    """Choose timeout based on command type to avoid premature failures."""
+    normalized = cmd.strip().lower()
+
+    long_running_patterns = (
+        r"\bdnf\s+(update|upgrade|distro-sync|system-upgrade)\b",
+        r"\bapt(-get)?\s+(update|upgrade|dist-upgrade|full-upgrade)\b",
+        r"\bpacman\s+-S(y|yu|yyu)\b",
+        r"\bzypper\s+(refresh|update|dup)\b",
+        r"\bflatpak\s+update\b",
+        r"\bsnap\s+refresh\b",
+    )
+    if any(re.search(pattern, normalized) for pattern in long_running_patterns):
+        return LONG_COMMAND_TIMEOUT
+
+    fast_read_only_patterns = (
+        r"\bdf\b",
+        r"\bfree\b",
+        r"\bls\b",
+        r"\bcat\b",
+        r"\bgrep\b",
+        r"\bsystemctl\s+status\b",
+    )
+    if any(re.search(pattern, normalized) for pattern in fast_read_only_patterns):
+        return FAST_COMMAND_TIMEOUT
+
+    if CLEANUP_TIMEOUT_ESTIMATE > DEFAULT_COMMAND_TIMEOUT:
+        return CLEANUP_TIMEOUT_ESTIMATE
+    return DEFAULT_COMMAND_TIMEOUT
+
+
 def handle_quit() -> bool:
     """Handle [Q] Quit command. Returns False to exit loop."""
     io.print_session_ended()
@@ -167,8 +204,9 @@ def run_single_command(cmd: str, comment: str) -> CmdResult:
         return CmdResult(cmd=cmd, comment=comment, ok=False,
                          stdout="", stderr="Pominięto.", returncode=-1, skipped=True)
     
+    timeout = _resolve_command_timeout(cmd)
     io.console.print("  [dim]⏳ Wykonuję...[/dim]", end="")
-    ok, stdout, stderr, rc = run_command(cmd, timeout=CLEANUP_TIMEOUT_ESTIMATE)
+    ok, stdout, stderr, rc = run_command(cmd, timeout=timeout)
     io.console.print("\r" + " " * 30 + "\r", end="")
     result = CmdResult(cmd=cmd, comment=comment, ok=ok,
                        stdout=stdout, stderr=stderr, returncode=rc)

{fixos-2.2.16 → fixos-2.2.18}/fixos/cli/ask_cmd.py

@@ -28,10 +28,26 @@ _ACTION_KEYWORDS = {
 }
 
 
+_OBJECT_KEYWORDS: list[tuple[list[str], tuple]] = [
+    (["docker", "kontener", "container"], ("docker", ["ps", "-aq"])),
+    (["audio", "dzwięk", "sound"],        ("fixos", ["fix", "--modules", "audio"])),
+    (["siec", "network", "internet"],     ("fixos", ["scan", "--modules", "system"])),
+    (["bezpieczenstwo", "security"],      ("fixos", ["scan", "--modules", "security"])),
+]
+
+
+def _object_based_match(prompt_lower: str):
+    """Fallback object-based matching when no action keyword is found."""
+    for keywords, cmd in _OBJECT_KEYWORDS:
+        if any(kw in prompt_lower for kw in keywords):
+            return cmd
+    return None
+
+
 def _match_heuristic_command(prompt_lower: str) -> object:
     """
     Match user prompt against heuristic keyword mappings.
-    
+
     Returns:
         - str: Direct shell command
         - tuple: (program, args) for subprocess
@@ -41,21 +57,9 @@ def _match_heuristic_command(prompt_lower: str) -> object:
         if any(kw in prompt_lower for kw in keywords):
             if cmd is not None:
                 return cmd
-            # For "lista" - check if it's docker-related
             if "docker" in prompt_lower or "kontener" in prompt_lower:
                 return ("docker", ["ps", "-a"])
-    
-    # Object-based matching (no action keyword found)
-    if "docker" in prompt_lower or "kontener" in prompt_lower or "container" in prompt_lower:
-        return ("docker", ["ps", "-aq"])
-    elif "audio" in prompt_lower or "dzwięk" in prompt_lower or "sound" in prompt_lower:
-        return ("fixos", ["fix", "--modules", "audio"])
-    elif "siec" in prompt_lower or "network" in prompt_lower or "internet" in prompt_lower:
-        return ("fixos", ["scan", "--modules", "system"])
-    elif "bezpieczenstwo" in prompt_lower or "security" in prompt_lower:
-        return ("fixos", ["scan", "--modules", "security"])
-    
-    return None
+    return _object_based_match(prompt_lower)
 
 
 def _format_command(matched_cmd) -> str:

{fixos-2.2.16 → fixos-2.2.18}/fixos/cli/cleanup_cmd.py

@@ -21,6 +21,21 @@ CONSTANT_500 = 500
 CONSTANT_1024 = 1024
 
 
+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"]:
+        safe_total = sum(s['size_gb'] for s in plan["safe_to_cleanup"])
+        click.echo(click.style("Bezpieczne do wyczyszczenia:", fg="green"))
+        for svc in plan["safe_to_cleanup"]:
+            size_str = f"{svc['size_gb']:.2f} GB" if svc['size_gb'] >= 1 else f"{svc['size_mb']:.0f} MB"
+            click.echo(f"  • {svc['name']}: {size_str}")
+        click.echo()
+        if click.confirm(f"Wyczyścić bezpieczne usługi? (zwolni {safe_total:.2f} GB)"):
+            _execute_safe_cleanup(plan["safe_to_cleanup"], scanner)
+    if plan["requires_review"] and not list_only:
+        _display_unsafe_services(plan["requires_review"])
+
+
 @click.command("cleanup")
 @click.option("--threshold", "-t", default=CONSTANT_500, type=int,
               help="Próg wielkości w MB (domyślnie 500MB)")
@@ -55,56 +70,35 @@ def cleanup_services(threshold, services, json_output, cleanup, dry_run, list_on
       fixos cleanup -c docker --dry-run  # symulacja czyszczenia Dockera
       fixos cleanup --full              # pełna analiza systemu
     """
-    # Full system analysis
     if full_analysis:
         _cleanup_full_system(json_output, dry_run)
         return
-    
+
     scanner = ServiceDataScanner(threshold_mb=threshold)
 
-    # Handle single service cleanup
     if cleanup:
         if cleanup == "flatpak":
             _cleanup_flatpak_detailed(scanner, json_output, dry_run)
-            return
-        
-        _cleanup_single_service(cleanup, scanner, json_output, dry_run)
+        else:
+            _cleanup_single_service(cleanup, scanner, json_output, dry_run)
         return
 
-    # Parse services filter
     service_filter = services.split(",") if services else None
     plan = scanner.get_cleanup_plan(selected_services=service_filter)
 
-    # JSON output mode
     if json_output:
         import json
         click.echo(json.dumps(plan, indent=2, default=str))
         return
 
-    # Display results
     _display_cleanup_summary(plan, threshold)
-    
     if plan["services_found"] == 0:
         return
 
     for svc in plan["services"]:
         _display_service_item(svc)
 
-    # Interactive cleanup mode
-    if not list_only and plan["safe_to_cleanup"]:
-        safe_total = sum(s['size_gb'] for s in plan["safe_to_cleanup"])
-        click.echo(click.style("Bezpieczne do wyczyszczenia:", fg="green"))
-        for svc in plan["safe_to_cleanup"]:
-            size_str = f"{svc['size_gb']:.2f} GB" if svc['size_gb'] >= 1 else f"{svc['size_mb']:.0f} MB"
-            click.echo(f"  • {svc['name']}: {size_str}")
-
-        click.echo()
-        if click.confirm(f"Wyczyścić bezpieczne usługi? (zwolni {safe_total:.2f} GB)"):
-            _execute_safe_cleanup(plan["safe_to_cleanup"], scanner)
-
-    # Show unsafe services
-    if plan["requires_review"] and not list_only:
-        _display_unsafe_services(plan["requires_review"])
+    _run_interactive_cleanup(plan, list_only, scanner)
 
 
 def _display_cleanup_summary(plan: dict, threshold: int) -> None:
@@ -647,19 +641,11 @@ def _snap_remove_packages(packages_to_remove: list) -> None:
             click.echo(click.style(f"  ❌ Błąd: {e}", fg="red"))
 
 
-def _handle_snap_management(analyzer, dry_run: bool) -> None:
-    """Handle Snap package management selection."""
-    snap_packages = _snap_fetch_packages(analyzer)
+_SNAP_CORE_PACKAGES = {'core', 'core18', 'core20', 'core22', 'snapd'}
 
-    if not snap_packages:
-        click.echo(click.style("\n❌ Brak zainstalowanych pakietów Snap lub snapd niedostępny.", fg="red"))
-        return
-
-    active_packages = [p for p in snap_packages if not p.get('disabled', False)]
-    if not active_packages:
-        click.echo(click.style("\n❌ Brak aktywnych pakietów Snap do odinstalowania.", fg="red"))
-        return
 
+def _snap_display_packages(active_packages: list) -> None:
+    """Print numbered list of active snap packages."""
     click.echo(f"\n{click.style('📦 ZAINSTALOWANE PAKIETY SNAP:', fg='magenta', bold=True)}")
     click.echo(click.style("Wybierz numery pakietów do odinstalowania", fg="white"))
     for i, pkg in enumerate(active_packages, 1):
@@ -667,30 +653,53 @@ def _handle_snap_management(analyzer, dry_run: bool) -> None:
         click.echo(f"  [{i:3d}] {click.style(pkg['name'], fg='yellow')} (v{pkg['version']}, rev {pkg['rev']}): {size_str}")
     click.echo(f"\n  💰 Łącznie pakietów: {len(active_packages)}")
 
+
+def _snap_select_packages(active_packages: list) -> list:
+    """Prompt user to select packages; return list to remove or empty."""
     nums = click.prompt(click.style("\nWybierz numery do odinstalowania (np. 1,3,5-10)", fg="cyan"), default="")
     if not nums.strip():
         click.echo(click.style("⏭️ Nie wybrano żadnych pakietów.", fg="yellow"))
-        return
-
+        return []
     selected_indices = _parse_numeric_range_set(nums)
     packages_to_remove = [active_packages[i - 1] for i in selected_indices if 1 <= i <= len(active_packages)]
-
     if not packages_to_remove:
         click.echo(click.style("❌ Nie wybrano żadnych pakietów.", fg="red"))
-        return
+    return packages_to_remove
 
-    click.echo(f"\n{click.style('📦 WYBRANE PAKIETY DO ODINSTALOWANIA:', fg='red', bold=True)}")
-    for i, pkg in enumerate(packages_to_remove, 1):
-        click.echo(f"  {i:3d}. {click.style(pkg['name'], fg='yellow')} (v{pkg['version']})")
 
-    core_packages = ['core', 'core18', 'core20', 'core22', 'snapd']
-    dangerous = [p for p in packages_to_remove if p['name'] in core_packages]
+def _snap_warn_dangerous(packages_to_remove: list) -> None:
+    """Warn if any selected package is a core snap component."""
+    dangerous = [p for p in packages_to_remove if p['name'] in _SNAP_CORE_PACKAGES]
     if dangerous:
         click.echo(click.style("\n⚠️ UWAGA: Wybrane pakiety zawierają komponenty systemowe:", fg="red", bold=True))
         for pkg in dangerous:
             click.echo(f"  • {pkg['name']}")
         click.echo(click.style("Ich usunięcie może wpłynąć na działanie innych pakietów Snap!", fg="red"))
 
+
+def _handle_snap_management(analyzer, dry_run: bool) -> None:
+    """Handle Snap package management selection."""
+    snap_packages = _snap_fetch_packages(analyzer)
+    if not snap_packages:
+        click.echo(click.style("\n❌ Brak zainstalowanych pakietów Snap lub snapd niedostępny.", fg="red"))
+        return
+
+    active_packages = [p for p in snap_packages if not p.get('disabled', False)]
+    if not active_packages:
+        click.echo(click.style("\n❌ Brak aktywnych pakietów Snap do odinstalowania.", fg="red"))
+        return
+
+    _snap_display_packages(active_packages)
+    packages_to_remove = _snap_select_packages(active_packages)
+    if not packages_to_remove:
+        return
+
+    click.echo(f"\n{click.style('📦 WYBRANE PAKIETY DO ODINSTALOWANIA:', fg='red', bold=True)}")
+    for i, pkg in enumerate(packages_to_remove, 1):
+        click.echo(f"  {i:3d}. {click.style(pkg['name'], fg='yellow')} (v{pkg['version']})")
+
+    _snap_warn_dangerous(packages_to_remove)
+
     if dry_run:
         click.echo(click.style("\n[DRY-RUN] - symulacja, nic nie zostanie usunięte", fg="cyan"))
         return
@@ -1049,32 +1058,37 @@ def _filter_by_prefix_type(selection: str, analyzer) -> list:
     return items
 
 
+def _filter_large(analyzer, threshold_bytes: int, label: str) -> list:
+    """Filter items above threshold_bytes and print summary."""
+    items = [item for item in analyzer.items if item.size_bytes > threshold_bytes]
+    click.echo(click.style(f"\n🔴 {label}: {len(items)} sztuk, {_format_bytes(sum(i.size_bytes for i in items))}", fg="red"))
+    return items
+
+
+_FILTER_PREFIX_DISPATCH = {
+    'top:':      _filter_by_prefix_top,
+    'category:': _filter_by_prefix_category,
+    'type:':     _filter_by_prefix_type,
+}
+
+
 def _select_cleanup_items_by_filter(selection: str, analyzer, safe_items: list) -> list:
     """Map a filter keyword to a list of items from the analyzer."""
-    # Simple keyword dispatch
     if selection == 'safe':
         return safe_items
     if selection == 'all':
         return analyzer.items
     if selection == 'large':
-        items = [item for item in analyzer.items if item.size_bytes > CONSTANT_1024 ** CONSTANT_3]
-        click.echo(click.style(f"\n🔴 Duże elementy (>1 GB): {len(items)} sztuk, {_format_bytes(sum(i.size_bytes for i in items))}", fg="red"))
-        return items
+        return _filter_large(analyzer, CONSTANT_1024 ** CONSTANT_3, "Duże elementy (>1 GB)")
     if selection == 'huge':
-        items = [item for item in analyzer.items if item.size_bytes > CONSTANT_5 * CONSTANT_1024 ** CONSTANT_3]
-        click.echo(click.style(f"\n🔴 Bardzo duże elementy (>5 GB): {len(items)} sztuk, {_format_bytes(sum(i.size_bytes for i in items))}", fg="red"))
-        return items
+        return _filter_large(analyzer, CONSTANT_5 * CONSTANT_1024 ** CONSTANT_3, "Bardzo duże elementy (>5 GB)")
     if selection == 'old':
         return _filter_by_age(analyzer, CONSTANT_30, "Stare elementy")
     if selection == 'stale':
         return _filter_by_age(analyzer, CONSTANT_90, "Bardzo stare elementy")
-    # Prefix dispatch
-    if selection.startswith('top:'):
-        return _filter_by_prefix_top(selection, analyzer)
-    if selection.startswith('category:'):
-        return _filter_by_prefix_category(selection, analyzer)
-    if selection.startswith('type:'):
-        return _filter_by_prefix_type(selection, analyzer)
+    for prefix, handler in _FILTER_PREFIX_DISPATCH.items():
+        if selection.startswith(prefix):
+            return handler(selection, analyzer)
     return []
 
 
@@ -1125,6 +1139,38 @@ def _execute_full_cleanup(items_to_clean: list, dry_run: bool) -> None:
     click.echo(click.style("="*CONSTANT_60 + "\n", fg="cyan"))
 
 
+def _show_dep_types(analyzer) -> None:
+    """Display detailed breakdown of dev project dependency types."""
+    dev_items = [item for item in analyzer.items if item.category == 'dev_projects']
+    dep_types = _build_dep_types(dev_items)
+    click.echo(f"\n{click.style('📦 SZCZEGÓŁY TYPÓW:', fg='magenta', bold=True)}")
+    for dep_type, data in sorted(dep_types.items(), key=lambda x: -x[1]["total"]):
+        click.echo(f"\n{click.style(dep_type, fg='yellow', bold=True)}: {len(data['items'])} folderów, {_format_bytes(data['total'])}")
+        for item in data["items"][:CONSTANT_5]:
+            click.echo(f"  • {item.path}: {_format_bytes(item.size_bytes)}")
+        if len(data['items']) > CONSTANT_5:
+            click.echo(f"  ... i {len(data['items']) - CONSTANT_5} więcej")
+
+
+def _dispatch_system_selection(selection: str, analyzer, safe_items: list, dry_run: bool) -> None:
+    """Route a system menu selection to the appropriate handler."""
+    if selection == 'types':
+        _show_dep_types(analyzer)
+        return
+    if selection == 'snap':
+        _handle_snap_management(analyzer, dry_run)
+        return
+    if selection == 'home':
+        _handle_home_analysis(analyzer, dry_run)
+        return
+    if selection == 'select':
+        items_to_clean = _handle_interactive_select(analyzer, dry_run)
+    else:
+        items_to_clean = _select_cleanup_items_by_filter(selection, analyzer, safe_items)
+    if items_to_clean:
+        _execute_full_cleanup(items_to_clean, dry_run)
+
+
 def _cleanup_full_system(json_output: bool, dry_run: bool) -> None:
     """
     Full system storage analysis and cleanup.
@@ -1155,33 +1201,7 @@ def _cleanup_full_system(json_output: bool, dry_run: bool) -> None:
         click.echo(click.style("\n⏭️ Nie wybrano żadnych akcji.", fg="yellow"))
         return
 
-    if selection == 'types':
-        dev_items = [item for item in analyzer.items if item.category == 'dev_projects']
-        dep_types = _build_dep_types(dev_items)
-        click.echo(f"\n{click.style('📦 SZCZEGÓŁY TYPÓW:', fg='magenta', bold=True)}")
-        for dep_type, data in sorted(dep_types.items(), key=lambda x: -x[1]["total"]):
-            click.echo(f"\n{click.style(dep_type, fg='yellow', bold=True)}: {len(data['items'])} folderów, {_format_bytes(data['total'])}")
-            for item in data["items"][:CONSTANT_5]:
-                click.echo(f"  • {item.path}: {_format_bytes(item.size_bytes)}")
-            if len(data['items']) > CONSTANT_5:
-                click.echo(f"  ... i {len(data['items']) - CONSTANT_5} więcej")
-        return
-
-    if selection == 'snap':
-        _handle_snap_management(analyzer, dry_run)
-        return
-
-    if selection == 'home':
-        _handle_home_analysis(analyzer, dry_run)
-        return
-
-    if selection == 'select':
-        items_to_clean = _handle_interactive_select(analyzer, dry_run)
-    else:
-        items_to_clean = _select_cleanup_items_by_filter(selection, analyzer, safe_items)
-
-    if items_to_clean:
-        _execute_full_cleanup(items_to_clean, dry_run)
+    _dispatch_system_selection(selection, analyzer, safe_items, dry_run)
 
 
 def _parse_size_to_gb(size_str: str) -> float:

{fixos-2.2.16 → fixos-2.2.18}/fixos/cli/features_cmd.py

@@ -50,6 +50,36 @@ def features_audit(profile: Optional[str], json_output: bool) -> None:
         FeatureRenderer.render_audit(result)
 
 
+def _show_install_plan(to_install: list, yes: bool, dry_run: bool) -> bool:
+    """Display install plan and ask for confirmation. Returns False to abort."""
+    console.print()
+    console.print(f"[bold]Zostaną zainstalowane {len(to_install)} pakiety:[/bold]")
+    for pkg in to_install[:10]:
+        console.print(f"  • {pkg.id} - {pkg.description[:40]}")
+    if len(to_install) > 10:
+        console.print(f"  ... i {len(to_install) - 10} więcej")
+    console.print()
+    if not yes and not dry_run:
+        if not click.confirm("Kontynuować instalację?"):
+            console.print("[yellow]Anulowano.[/yellow]")
+            return False
+    return True
+
+
+def _show_install_results(install_result: dict) -> None:
+    """Display installation results summary."""
+    console.print()
+    if install_result["installed"]:
+        console.print(f"[green]✅ Zainstalowano: {len(install_result['installed'])}[/green]")
+    if install_result["failed"]:
+        console.print(f"[red]❌ Nie udało się: {len(install_result['failed'])}[/red]")
+        for pkg_id in install_result["failed"][:5]:
+            console.print(f"   - {pkg_id}")
+    if install_result["skipped"]:
+        console.print(f"[yellow]⏭️ Pominięto: {len(install_result['skipped'])}[/yellow]")
+    console.print()
+
+
 @features.command("install")
 @click.option("--profile", "-p", required=True, help="Profil użytkownika")
 @click.option("--dry-run", is_flag=True, help="Symulacja bez instalacji")
@@ -78,34 +108,11 @@ def features_install(profile: str, dry_run: bool, yes: bool, category: tuple) ->
         console.print("[green]✅ Wszystkie pakiety z profilu są zainstalowane![/green]")
         return
 
-    # Show what will be installed
-    console.print()
-    console.print(f"[bold]Zostaną zainstalowane {len(to_install)} pakiety:[/bold]")
-    for pkg in to_install[:10]:
-        console.print(f"  • {pkg.id} - {pkg.description[:40]}")
-    if len(to_install) > 10:
-        console.print(f"  ... i {len(to_install) - 10} więcej")
-    console.print()
-
-    if not yes and not dry_run:
-        if not click.confirm("Kontynuować instalację?"):
-            console.print("[yellow]Anulowano.[/yellow]")
-            return
+    if not _show_install_plan(to_install, yes, dry_run):
+        return
 
     installer = FeatureInstaller(system, dry_run=dry_run)
-    install_result = installer.install(to_install)
-
-    # Show results
-    console.print()
-    if install_result["installed"]:
-        console.print(f"[green]✅ Zainstalowano: {len(install_result['installed'])}[/green]")
-    if install_result["failed"]:
-        console.print(f"[red]❌ Nie udało się: {len(install_result['failed'])}[/red]")
-        for pkg_id in install_result["failed"][:5]:
-            console.print(f"   - {pkg_id}")
-    if install_result["skipped"]:
-        console.print(f"[yellow]⏭️ Pominięto: {len(install_result['skipped'])}[/yellow]")
-    console.print()
+    _show_install_results(installer.install(to_install))
 
 
 @features.command("profiles")

{fixos-2.2.16 → fixos-2.2.18}/fixos/constants.py

@@ -7,6 +7,9 @@ DEFAULT_SESSION_TIMEOUT = 300  # 5 minutes
 HITL_TIMEOUT_BUFFER = 80  # Buffer time for HITL session (seconds)
 AUTONOMOU_TIMEOUT_BUFFER = 40  # Buffer time for autonomous session
 CLEANUP_TIMEOUT_ESTIMATE = 120  # Estimated cleanup timeout
+DEFAULT_COMMAND_TIMEOUT = 300  # Default command timeout in HITL session
+LONG_COMMAND_TIMEOUT = 1800  # Long-running operations like system updates
+FAST_COMMAND_TIMEOUT = 60  # Read-only and quick diagnostic commands
 
 # String lengths / limits
 MAX_COMMAND_LENGTH = 200  # Maximum length for command display
@@ -25,3 +28,4 @@ DEFAULT_HISTORY_LIMIT = 20  # Default history items to show
 
 # Text formatting
 COMMAND_PREFIX_LENGTH = 80  # Max length for command prefix in output
+MAX_SUMMARY_LENGTH = 200  # Max summary chars for derived search topic