fixos 2.2.26__tar.gz → 2.2.27__tar.gz

{fixos-2.2.26 → fixos-2.2.27}/CHANGELOG.md

@@ -150,6 +150,22 @@ 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.27] - 2026-05-04
+
+### Docs
+- Update README.md
+
+### Other
+- Update docker/docker-compose.yml
+- Update docker/test-scenarios.sh
+- Update docker/validate-scenario.py
+- Update fixos/cli/fix_cmd.py
+- Update fixos/cli/output_formatter.py
+- Update fixos/cli/report_cmd.py
+- Update fixos/cli/scan_cmd.py
+- Update fixos/cli/shared.py
+- Update uv.lock
+
 ## [2.2.26] - 2026-05-04
 
 ### Docs

{fixos-2.2.26 → fixos-2.2.27}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fixos
-Version: 2.2.26
+Version: 2.2.27
 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.26-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-26.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.27-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-26.2h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
 
-- 🤖 **LLM usage:** $7.5000 (125 commits)
-- 👤 **Human dev:** ~$2603 (26.0h @ $100/h, 30min dedup)
+- 🤖 **LLM usage:** $7.5000 (126 commits)
+- 👤 **Human dev:** ~$2620 (26.2h @ $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.26 → fixos-2.2.27}/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.26-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-26.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.27-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-26.2h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
 
-- 🤖 **LLM usage:** $7.5000 (125 commits)
-- 👤 **Human dev:** ~$2603 (26.0h @ $100/h, 30min dedup)
+- 🤖 **LLM usage:** $7.5000 (126 commits)
+- 👤 **Human dev:** ~$2620 (26.2h @ $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.26 → fixos-2.2.27}/docker/docker-compose.yml

@@ -1,4 +1,4 @@
-version: "3.9"
+# docker-compose.yml – fixos test environments
 
 # ═══════════════════════════════════════════════════════════
 #  fixos – środowiska testowe (Docker)
@@ -32,7 +32,6 @@ services:
       context: ..
       dockerfile: docker/base/Dockerfile
     image: fixos-base:latest
-    profiles: ["build-only"]
     command: echo "base image built"
 
   # ── Uszkodzony dźwięk ──────────────────────────────────
@@ -49,9 +48,9 @@ services:
       - FIXOS_TEST_MODE=1
     command: >
       sh -c "
-        echo '=== Scenariusz: broken-audio ===' &&
-        verify-scenario.sh &&
-        python3 -m fixos.diagnostics.system_checks
+        echo '=== Scenariusz: broken-audio ===' >&2 &&
+        verify-scenario.sh >&2 &&
+        python3 -m fixos.cli.main scan --yaml -M audio --no-banner
       "
 
   # ── Uszkodzone thumbnails ──────────────────────────────
@@ -83,9 +82,9 @@ services:
       - FIXOS_TEST_MODE=1
     command: >
       sh -c "
-        echo '=== Scenariusz: broken-network ===' &&
-        verify-scenario.sh &&
-        python3 /usr/local/bin/simulate-network-diag.py
+        echo '=== Scenariusz: broken-network ===' >&2 &&
+        verify-scenario.sh >&2 &&
+        python3 -m fixos.cli.main scan --yaml -M system --no-banner
       "
 
   # ── Pełne uszkodzenie ─────────────────────────────────
@@ -123,8 +122,7 @@ services:
           --cov-report=html:/reports/coverage
           -m 'not real_api'
       "
-    depends_on:
-      - base
+
 
   # ── Unit testy (bez Dockera środowisk) ────────────────
   unit-tests:
@@ -153,6 +151,23 @@ services:
         python -m pytest tests/e2e/test_cli.py tests/e2e/test_executor.py -v --tb=short
       "
 
+  # ── Testy scenariuszy (YAML validation) ────────────────
+  scenario-tests:
+    <<: *common
+    build:
+      context: ..
+      dockerfile: docker/base/Dockerfile
+    container_name: fixos-scenario-tests
+    environment:
+      - FIXOS_TEST_MODE=1
+    command: >
+      sh -c "
+        echo 'Running scenario validation...' &&
+        python3 -m fixos.cli.main scan --yaml -M audio --no-banner |
+          python3 docker/validate-scenario.py broken-audio &&
+        echo 'All scenario tests passed!'
+      "
+
 networks:
   fixos-test:
     driver: bridge

fixos-2.2.27/docker/test-scenarios.sh

@@ -0,0 +1,147 @@
+#!/usr/bin/env bash
+# ═══════════════════════════════════════════════════════════
+#  fixos – Docker Scenario Test Harness
+#
+#  Builds and runs each broken-* scenario container,
+#  captures YAML output from `fixos scan --yaml`,
+#  and validates results with validate-scenario.py.
+#
+#  Usage:
+#    ./test-scenarios.sh              # all scenarios
+#    ./test-scenarios.sh broken-audio # single scenario
+# ═══════════════════════════════════════════════════════════
+
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+PROJECT_ROOT="$(dirname "$SCRIPT_DIR")"
+VALIDATOR="$SCRIPT_DIR/validate-scenario.py"
+REPORTS_DIR="${REPORTS_DIR:-/tmp/fixos-test-reports}"
+
+# Colors
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+CYAN='\033[0;36m'
+NC='\033[0m'
+
+# Scenarios: service name → modules to scan
+declare -A SCENARIO_MODULES=(
+    ["broken-audio"]="audio"
+    ["broken-thumbnails"]="thumbnails"
+    ["broken-network"]="system"
+    ["broken-full"]="audio,thumbnails,system"
+)
+
+PASSED=0
+FAILED=0
+ERRORS=()
+
+log() { echo -e "${CYAN}[fixos-test]${NC} $*"; }
+ok()  { echo -e "  ${GREEN}✓${NC} $*"; }
+err() { echo -e "  ${RED}✗${NC} $*"; }
+warn() { echo -e "  ${YELLOW}⚠${NC} $*"; }
+
+# ── Build base image ──────────────────────────────────────
+build_base() {
+    log "Building base image..."
+    docker compose -f "$SCRIPT_DIR/docker-compose.yml" build base 2>&1 | tail -5
+    ok "fixos-base:latest built"
+}
+
+# ── Run scenario ──────────────────────────────────────────
+run_scenario() {
+    local scenario="$1"
+    local modules="${SCENARIO_MODULES[$scenario]:-system}"
+    local output_file="$REPORTS_DIR/${scenario}.yml"
+
+    log "━━━ Scenario: ${YELLOW}${scenario}${NC} (modules: $modules) ━━━"
+
+    # Build scenario image
+    log "  Building $scenario..."
+    if ! docker compose -f "$SCRIPT_DIR/docker-compose.yml" build "$scenario" 2>&1 | tail -3; then
+        err "Build failed for $scenario"
+        ERRORS+=("$scenario: build failed")
+        ((FAILED++))
+        return 1
+    fi
+
+    # Run fixos scan --yaml inside container
+    log "  Running fixos scan --yaml -M $modules..."
+    mkdir -p "$REPORTS_DIR"
+
+    local exit_code=0
+    docker compose -f "$SCRIPT_DIR/docker-compose.yml" run --rm \
+        --no-deps \
+        -e FIXOS_TEST_MODE=1 \
+        "$scenario" \
+        python3 -m fixos.cli.main scan --yaml -M "$modules" --no-banner \
+        > "$output_file" 2>/dev/null || exit_code=$?
+
+    # Check we got output
+    if [ ! -s "$output_file" ]; then
+        err "No YAML output from $scenario"
+        ERRORS+=("$scenario: no output")
+        ((FAILED++))
+        return 1
+    fi
+
+    ok "YAML captured: $output_file ($(wc -l < "$output_file") lines)"
+
+    # Validate with validate-scenario.py
+    if python3 "$VALIDATOR" "$scenario" < "$output_file"; then
+        ok "$scenario PASSED"
+        ((PASSED++))
+    else
+        err "$scenario FAILED validation"
+        ERRORS+=("$scenario: validation failed")
+        ((FAILED++))
+    fi
+
+    echo ""
+}
+
+# ── Main ──────────────────────────────────────────────────
+main() {
+    log "fixOS Docker Scenario Test Harness"
+    log "═══════════════════════════════════"
+
+    # Build base first
+    build_base
+
+    # Determine which scenarios to run
+    local scenarios=()
+    if [ $# -gt 0 ]; then
+        scenarios=("$@")
+    else
+        scenarios=("broken-audio" "broken-thumbnails" "broken-network" "broken-full")
+    fi
+
+    # Run each scenario
+    for scenario in "${scenarios[@]}"; do
+        if [ -z "${SCENARIO_MODULES[$scenario]+x}" ]; then
+            warn "Unknown scenario: $scenario (skipping)"
+            continue
+        fi
+        run_scenario "$scenario" || true
+    done
+
+    # Summary
+    echo ""
+    log "═══════════════════════════════════"
+    log "  SUMMARY"
+    log "═══════════════════════════════════"
+    ok "Passed: $PASSED"
+    if [ $FAILED -gt 0 ]; then
+        err "Failed: $FAILED"
+        for e in "${ERRORS[@]}"; do
+            err "  $e"
+        done
+        exit 1
+    else
+        ok "All scenarios passed!"
+        exit 0
+    fi
+}
+
+main "$@"

fixos-2.2.27/docker/validate-scenario.py

@@ -0,0 +1,158 @@
+#!/usr/bin/env python3
+"""
+Validates fixOS scan YAML output against expected scenario conditions.
+
+Usage:
+  fixos scan --yaml --modules audio | python3 validate-scenario.py broken-audio
+  cat scan-output.yml | python3 validate-scenario.py broken-full
+
+Exit codes:
+  0  – all expectations met
+  1  – validation failures
+  2  – invalid input / unknown scenario
+"""
+
+from __future__ import annotations
+
+import sys
+from typing import Any
+
+import yaml
+
+
+# ── Scenario expectations ─────────────────────────────────
+
+SCENARIOS: dict[str, list[dict[str, Any]]] = {
+    "broken-audio": [
+        {
+            "path": "diagnostics.audio.alsa_cards",
+            "contains": "no soundcards",
+            "desc": "ALSA powinno zgłaszać brak kart dźwiękowych",
+        },
+        {
+            "path": "diagnostics.audio.sof_firmware",
+            "contains_any": ["No such file", "not installed", "ERR"],
+            "desc": "SOF firmware powinno być niedostępne",
+        },
+    ],
+    "broken-thumbnails": [
+        {
+            "path": "diagnostics.thumbnails.thumbnail_cache_count",
+            "equals": "0",
+            "desc": "Cache miniaturek powinien być pusty",
+        },
+        {
+            "path": "diagnostics.thumbnails.ffmpegthumbnailer",
+            "contains": "nie zainstalowany",
+            "desc": "ffmpegthumbnailer powinien być niezainstalowany",
+        },
+    ],
+    "broken-network": [
+        {
+            "path": "diagnostics.system.systemctl_failed",
+            "contains": "NetworkManager",
+            "desc": "NetworkManager powinien być w stanie failed",
+        },
+    ],
+    "broken-full": [
+        {
+            "path": "diagnostics.audio.alsa_cards",
+            "contains": "no soundcards",
+            "desc": "ALSA: brak kart dźwiękowych",
+        },
+        {
+            "path": "diagnostics.thumbnails.ffmpegthumbnailer",
+            "contains": "nie zainstalowany",
+            "desc": "ffmpegthumbnailer niezainstalowany",
+        },
+    ],
+}
+
+
+def _get_nested(data: dict, path: str) -> Any:
+    """Get a nested value from a dict using dot notation."""
+    keys = path.split(".")
+    current = data
+    for key in keys:
+        if isinstance(current, dict) and key in current:
+            current = current[key]
+        else:
+            return None
+    return current
+
+
+def validate(data: dict, scenario: str) -> list[str]:
+    """Validate data against scenario expectations. Returns list of failures."""
+    expectations = SCENARIOS.get(scenario)
+    if expectations is None:
+        return [f"Nieznany scenariusz: '{scenario}'. Dostępne: {', '.join(SCENARIOS.keys())}"]
+
+    failures = []
+    for exp in expectations:
+        path = exp["path"]
+        desc = exp.get("desc", path)
+        value = _get_nested(data, path)
+
+        if value is None:
+            failures.append(f"  ✗ BRAK KLUCZA: {path} — {desc}")
+            continue
+
+        value_str = str(value)
+
+        if "equals" in exp:
+            if value_str.strip() != str(exp["equals"]).strip():
+                failures.append(f"  ✗ {desc}: oczekiwano '{exp['equals']}', otrzymano '{value_str[:80]}'")
+
+        if "contains" in exp:
+            if exp["contains"].lower() not in value_str.lower():
+                failures.append(f"  ✗ {desc}: brak '{exp['contains']}' w '{value_str[:80]}'")
+
+        if "contains_any" in exp:
+            if not any(term.lower() in value_str.lower() for term in exp["contains_any"]):
+                failures.append(
+                    f"  ✗ {desc}: brak żadnego z {exp['contains_any']} w '{value_str[:80]}'"
+                )
+
+    return failures
+
+
+def main() -> None:
+    if len(sys.argv) < 2:
+        print(f"Użycie: {sys.argv[0]} <scenario>", file=sys.stderr)
+        print(f"Dostępne scenariusze: {', '.join(SCENARIOS.keys())}", file=sys.stderr)
+        sys.exit(2)
+
+    scenario = sys.argv[1]
+    if scenario not in SCENARIOS:
+        print(f"✗ Nieznany scenariusz: '{scenario}'", file=sys.stderr)
+        print(f"  Dostępne: {', '.join(SCENARIOS.keys())}", file=sys.stderr)
+        sys.exit(2)
+
+    # Read YAML from stdin
+    try:
+        raw = sys.stdin.read()
+        data = yaml.safe_load(raw)
+    except yaml.YAMLError as e:
+        print(f"✗ Błąd parsowania YAML: {e}", file=sys.stderr)
+        sys.exit(2)
+
+    if not isinstance(data, dict):
+        print(f"✗ Oczekiwano dict, otrzymano: {type(data).__name__}", file=sys.stderr)
+        sys.exit(2)
+
+    # Validate
+    failures = validate(data, scenario)
+
+    if failures:
+        print(f"✗ Scenariusz '{scenario}' — {len(failures)} błędów:", file=sys.stderr)
+        for f in failures:
+            print(f, file=sys.stderr)
+        sys.exit(1)
+    else:
+        expectations_count = len(SCENARIOS[scenario])
+        print(f"✓ Scenariusz '{scenario}' — {expectations_count}/{expectations_count} OK", file=sys.stderr)
+        sys.exit(0)
+
+
+if __name__ == "__main__":
+    main()

{fixos-2.2.26 → fixos-2.2.27}/fixos/__init__.py

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

{fixos-2.2.26 → fixos-2.2.27}/fixos/cli/fix_cmd.py

@@ -9,6 +9,7 @@ from typing import Dict, Any, List
 import click
 
 from fixos.cli.shared import add_common_options, add_shared_options, BANNER
+from fixos.cli.output_formatter import OutputFormatter
 from fixos.config import FixOsConfig, interactive_provider_setup
 from fixos.agent.hitl import run_hitl_session
 from fixos.agent.autonomous import run_autonomous_session
@@ -19,22 +20,20 @@ from fixos.constants import (
 )
 
 
-def _collect_diagnostics(modules: str, disc: bool, json_output: bool, output: str) -> dict:
+def _collect_diagnostics(modules: str, disc: bool, fmt: OutputFormatter, output: str) -> dict:
     """Run diagnostics collection and optionally disk analysis. Returns data dict."""
     selected_modules = modules.split(",") if modules else None
 
     if disc and not modules:
         data: dict = {}
     else:
-        click.echo(click.style("\nZbieranie diagnostyki...", fg="yellow"))
-        def progress(name, desc) -> None:
-            click.echo(f"  → {desc}...")
+        fmt.status("\nZbieranie diagnostyki...", fg="yellow")
         from fixos.diagnostics import get_full_diagnostics
-        data = get_full_diagnostics(selected_modules, progress_callback=progress)
+        data = get_full_diagnostics(selected_modules, progress_callback=fmt.progress)
 
     if disc:
         from fixos.cli.scan_cmd import _run_disk_analysis
-        _run_disk_analysis(data, json_output=json_output, is_fix_mode=True)
+        _run_disk_analysis(data, fmt=fmt, is_fix_mode=True)
 
     if output:
         from fixos.utils.anonymizer import anonymize
@@ -44,9 +43,9 @@ def _collect_diagnostics(modules: str, disc: bool, json_output: bool, output: st
                 json.dumps({"anonymized": anon_str, "raw": data}, ensure_ascii=False, indent=2, default=str),
                 encoding="utf-8"
             )
-            click.echo(click.style(f"Raport: {output}", fg="green"))
+            fmt.status(f"Raport: {output}", fg="green")
         except Exception as e:
-            click.echo(f"Błąd zapisu: {e}")
+            fmt.status(f"Błąd zapisu: {e}")
 
     return data
 
@@ -83,7 +82,7 @@ def _run_agent_session(cfg, data: dict, max_fixes: int) -> None:
               help="Maksymalna liczba napraw w sesji")
 @add_shared_options
 def fix(provider, token, model, no_banner, mode, timeout, modules, no_show_data, output, max_fixes,
-        disc, dry_run, interactive, json_output, llm_fallback, show_raw) -> None:
+        disc, dry_run, interactive, json_output, yaml_output, llm_fallback, show_raw) -> None:
     """
     Przeprowadza pełną diagnostykę i uruchamia sesję naprawczą z LLM.
 
@@ -92,12 +91,17 @@ def fix(provider, token, model, no_banner, mode, timeout, modules, no_show_data,
       hitl        – Human-in-the-Loop (pyta o każdą akcję) [domyślny]
       autonomous  – Agent sam wykonuje komendy (UWAGA: wymaga potwierdzenia)
 
+    \b
+    Pipeline (synchroniczny, bez interakcji):
+      fixos fix --yaml --no-interactive       # diagnostyka → YAML
+      fixos fix --yaml --no-interactive --disc # diagnostyka + dysk → YAML
+
     \b
     Opcje dyskowe:
       --disc      – Analiza zajętości dysku + grupowanie przyczyn
       --dry-run   – Symulacja bez wykonywania akcji
-      --interactive – Tryb interaktywny (domyślnie włączony)
       --json      – Wyjście w formacie JSON
+      --yaml      – Wyjście w formacie YAML (pipe-safe)
       --llm-fallback – Użyj LLM gdy heurystyki nie wystarczą
 
     \b
@@ -107,11 +111,24 @@ def fix(provider, token, model, no_banner, mode, timeout, modules, no_show_data,
       fixos fix --disc --dry-run             # analiza dysku bez wykonywania
       fixos fix --mode autonomous            # tryb autonomiczny
       fixos fix --modules audio,thumbnails   # tylko audio i thumbnails
+      fixos fix --yaml --no-interactive      # pipeline mode → YAML
       fixos fix --provider openai --token sk-...
     """
+    fmt = OutputFormatter.from_flags(yaml_output=yaml_output, json_output=json_output)
+
     if not no_banner:
-        click.echo(click.style(BANNER, fg="cyan"))
+        fmt.banner(BANNER)
+
+    # ── Pipeline mode: --yaml/--json + --no-interactive ──────
+    if fmt.is_machine and not interactive:
+        fmt.status("Pipeline mode: diagnostyka → structured output", fg="cyan")
+        data = _collect_diagnostics(modules, disc, fmt, output)
+        fmt.status("Diagnostyka gotowa.", fg="green")
+        content = fmt.format_diagnostics(data)
+        click.echo(content)
+        return
 
+    # ── Interactive / LLM mode ────────────────────────────────
     cfg = FixOsConfig.load(
         provider=provider,
         api_key=token,
@@ -138,15 +155,15 @@ def fix(provider, token, model, no_banner, mode, timeout, modules, no_show_data,
                 click.echo(click.style(f"{err}", fg="red"))
             sys.exit(1)
 
-    click.echo(click.style("\nKonfiguracja:", fg="cyan"))
+    fmt.status("\nKonfiguracja:", fg="cyan")
     click.echo(cfg.summary())
     if dry_run:
-        click.echo(click.style("  Tryb: DRY-RUN (komendy nie będą wykonywane)", fg="yellow"))
+        fmt.status("  Tryb: DRY-RUN (komendy nie będą wykonywane)", fg="yellow")
     if disc:
-        click.echo(click.style("  Analiza dysku: Włączona", fg="blue"))
+        fmt.status("  Analiza dysku: Włączona", fg="blue")
 
-    data = _collect_diagnostics(modules, disc, json_output, output)
-    click.echo(click.style("Diagnostyka gotowa.\n", fg="green"))
+    data = _collect_diagnostics(modules, disc, fmt, output)
+    fmt.status("Diagnostyka gotowa.\n", fg="green")
 
     if disc and "disk_analysis" in data:
         return handle_disk_cleanup_mode(data["disk_analysis"], cfg, dry_run, interactive, json_output, llm_fallback)