fixos 2.2.24__tar.gz → 2.2.26__tar.gz

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

@@ -150,6 +150,35 @@ 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.26] - 2026-05-04
+
+### Docs
+- Update README.md
+
+### Test
+- Update tests/e2e/test_anonymization_layers.py
+
+### Other
+- Update uv.lock
+
+## [2.2.25] - 2026-05-04
+
+### Docs
+- Update README.md
+- Update REFACTORING_PROGRESS.md
+
+### Test
+- Update tests/unit/test_core.py
+
+### Other
+- Update fixos/agent/autonomous_session.py
+- Update fixos/agent/hitl_session.py
+- Update fixos/agent/session_handlers.py
+- Update fixos/platform_utils.py
+- Update fixos/utils/__init__.py
+- Update fixos/utils/anonymizer.py
+- Update uv.lock
+
 ## [2.2.24] - 2026-05-04
 
 ### Docs

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fixos
-Version: 2.2.24
+Version: 2.2.26
 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.24-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-25.4h-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.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)
 
-- 🤖 **LLM usage:** $7.5000 (123 commits)
-- 👤 **Human dev:** ~$2539 (25.4h @ $100/h, 30min dedup)
+- 🤖 **LLM usage:** $7.5000 (125 commits)
+- 👤 **Human dev:** ~$2603 (26.0h @ $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.24 → fixos-2.2.26}/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.24-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-25.4h-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.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)
 
-- 🤖 **LLM usage:** $7.5000 (123 commits)
-- 👤 **Human dev:** ~$2539 (25.4h @ $100/h, 30min dedup)
+- 🤖 **LLM usage:** $7.5000 (125 commits)
+- 👤 **Human dev:** ~$2603 (26.0h @ $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.24 → fixos-2.2.26}/fixos/__init__.py

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

{fixos-2.2.24 → fixos-2.2.26}/fixos/agent/autonomous_session.py

@@ -11,7 +11,7 @@ from dataclasses import dataclass, field
 from typing import Optional, List, Dict, Any
 
 from ..providers.llm import LLMClient, LLMError
-from ..utils.anonymizer import anonymize, display_anonymized_preview
+from ..utils.anonymizer import anonymize, deanonymize, display_anonymized_preview
 from ..utils.web_search import search_all, format_results_for_llm
 from ..config import FixOsConfig
 from ..utils.timeout import SessionTimeout
@@ -297,7 +297,8 @@ class AutonomousSession:
             })
             return False
 
-        cmd = self._add_sudo(cmd_raw)
+        cmd = deanonymize(cmd_raw)
+        cmd = self._add_sudo(cmd)
         print(f"  ▶️  Wykonuję: {cmd}")
 
         ok, out = self._execute_command(cmd)

{fixos-2.2.24 → fixos-2.2.26}/fixos/agent/hitl_session.py

@@ -7,7 +7,7 @@ import time
 from typing import Dict, Any, List, Tuple
 
 from ..providers.llm import LLMClient, LLMError
-from ..utils.anonymizer import anonymize, display_anonymized_preview
+from ..utils.anonymizer import anonymize, deanonymize, display_anonymized_preview
 from ..utils.web_search import search_all, format_results_for_llm
 from ..config import FixOsConfig
 from ..constants import (
@@ -150,7 +150,8 @@ class HITLSession:
         io.clear_thinking()
 
         io.print_llm_reply(reply)
-        self.last_fixes = extract_fixes(reply)
+        raw_fixes = extract_fixes(reply)
+        self.last_fixes = [(deanonymize(cmd), comment) for cmd, comment in raw_fixes]
 
         if self._check_low_confidence(reply):
             return True

{fixos-2.2.24 → fixos-2.2.26}/fixos/agent/session_handlers.py

@@ -18,7 +18,7 @@ from ..constants import (
 from ..platform_utils import (
     is_dangerous, is_interactive_blocker, elevate_cmd, run_command,
 )
-from ..utils.anonymizer import anonymize
+from ..utils.anonymizer import anonymize, deanonymize
 from ..utils.web_search import search_all, format_results_for_llm
 from . import session_io as io
 from .session_core import CmdResult, extract_fixes
@@ -223,6 +223,7 @@ def handle_free_text(user_in: str, messages: list) -> bool:
 
 def run_single_command(cmd: str, comment: str) -> CmdResult:
     """Run a command with full transparency and safety checks."""
+    cmd = deanonymize(cmd)
     cmd = elevate_cmd(cmd)
     
     # Check for dangerous commands

{fixos-2.2.24 → fixos-2.2.26}/fixos/platform_utils.py

@@ -95,7 +95,7 @@ def is_interactive_blocker(cmd: str) -> Optional[str]:
         (r"\bnewgrp\b", "newgrp replaces the shell and waits for input"),
         (r"\bsu\s+-(\s+|$)", "su - starts a new login shell"),
         (r"\bexec\s+bash\b", "exec replaces the process"),
-        (r"\btop\b(?!.*\b-b\b)", "top is interactive unless run in batch mode (-b)"),
+        (r"\btop\b(?!.*\s-b(?:\s|$))", "top is interactive unless run in batch mode (-b)"),
         (r"\bvim?\b", "editors require terminal interaction"),
         (r"\bnano\b", "editors require terminal interaction"),
         (r"\bless\b", "pagers require terminal interaction"),

fixos-2.2.26/fixos/utils/__init__.py

@@ -0,0 +1,3 @@
+from .anonymizer import anonymize, deanonymize, display_anonymized_preview, AnonymizationReport
+from .web_search import search_all, format_results_for_llm
+__all__ = ["anonymize", "deanonymize", "display_anonymized_preview", "AnonymizationReport", "search_all", "format_results_for_llm"]

{fixos-2.2.24 → fixos-2.2.26}/fixos/utils/anonymizer.py

@@ -116,6 +116,33 @@ def anonymize(data_str: str) -> tuple[str, AnonymizationReport]:
     return data_str, report
 
 
+def deanonymize(text: str) -> str:
+    """
+    Reverses anonymization placeholders back to real values for execution.
+    Handles [USER], [HOSTNAME], and [HOME].
+    """
+    if not isinstance(text, str):
+        return text
+        
+    sensitive = _get_sensitive()
+    
+    # 1. Hostname
+    if sensitive.get("hostname"):
+        text = text.replace("[HOSTNAME]", sensitive["hostname"])
+        
+    # 2. Home directory
+    if sensitive.get("home"):
+        text = text.replace("[HOME]", sensitive["home"])
+        # Some LLMs might use /home/[USER] literally
+        # We replace [USER] next, which covers /home/[USER]
+        
+    # 3. Username
+    if sensitive.get("username"):
+        text = text.replace("[USER]", sensitive["username"])
+        
+    return text
+
+
 def display_anonymized_preview(data_str: str, report: AnonymizationReport, max_lines: int = 80):
     """
     Wyświetla użytkownikowi zanonimizowane dane przed wysłaniem do LLM.

{fixos-2.2.24 → fixos-2.2.26}/fixos.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fixos
-Version: 2.2.24
+Version: 2.2.26
 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.24-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-25.4h-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.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)
 
-- 🤖 **LLM usage:** $7.5000 (123 commits)
-- 👤 **Human dev:** ~$2539 (25.4h @ $100/h, 30min dedup)
+- 🤖 **LLM usage:** $7.5000 (125 commits)
+- 👤 **Human dev:** ~$2603 (26.0h @ $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.24 → fixos-2.2.26}/pyproject.toml

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

{fixos-2.2.24 → fixos-2.2.26}/setup.py

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

{fixos-2.2.24 → fixos-2.2.26}/tests/e2e/test_anonymization_layers.py

@@ -589,3 +589,113 @@ def _make_sensitive_string() -> str:
         "sk-abc123def456ghi789jkl012mno345pqr password=mysecretpass123 "
         "UUID=a1b2c3d4-e5f6-7890-abcd-ef1234567890"
     )
+
+# ══════════════════════════════════════════════════════════
+#  WARSTWA 7: Deanonimizacja (LLM → wykonanie)
+# ══════════════════════════════════════════════════════════
+
+class TestDeanonymizationLayer:
+    """Testy odwracania anonimizacji dla komend z LLM."""
+
+    def test_deanonymize_base_function(self):
+        from fixos.utils.anonymizer import deanonymize
+        
+        cmd = "ping [HOSTNAME]"
+        assert deanonymize(cmd) == f"ping {REAL_HOSTNAME}"
+        
+        cmd = "ls /home/[USER]/.cache"
+        assert deanonymize(cmd) == f"ls /home/{REAL_USER}/.cache"
+        
+        cmd = "chown [USER]:[USER] [HOME]/file"
+        res = deanonymize(cmd)
+        assert REAL_USER in res
+        assert REAL_HOME in res
+        assert "[USER]" not in res
+        assert "[HOME]" not in res
+
+    @patch("fixos.providers.llm.openai")
+    def test_hitl_deanonymize_extracted_fixes(self, mock_openai, mock_cfg):
+        from fixos.agent.hitl_session import HITLSession
+        
+        def capture(**kwargs):
+            resp = MagicMock()
+            resp.choices[0].message.content = (
+                "**Komenda:** `rm -rf /home/[USER]/tmp`\n"
+                "**Co robi:** clean\n"
+            )
+            resp.usage.total_tokens = 10
+            return resp
+
+        mock_openai.OpenAI.return_value.chat.completions.create.side_effect = capture
+        
+        session = HITLSession(diagnostics={}, config=mock_cfg, show_data=False)
+        # Mock _initialize_messages and inputs
+        session._initialize_messages = MagicMock(return_value=True)
+        session.web_search_count = 0
+        
+        with patch("fixos.agent.session_io.get_user_input", return_value="q"), \
+             patch("fixos.agent.session_io.ask_execute_prompt", return_value="n"), \
+             patch("fixos.agent.session_handlers.run_single_command") as mock_run:
+            
+            session.run()
+            
+        assert len(session.last_fixes) == 1
+        cmd, comment = session.last_fixes[0]
+        assert cmd == f"rm -rf /home/{REAL_USER}/tmp"
+        assert "[USER]" not in cmd
+
+    @patch("fixos.providers.llm.openai")
+    @patch("fixos.agent.autonomous_session.subprocess.run")
+    def test_autonomous_deanonymize_exec(self, mock_subproc, mock_openai, mock_cfg):
+        from fixos.agent.autonomous import run_autonomous_session
+        
+        def capture(**kwargs):
+            resp = MagicMock()
+            resp.choices[0].message.content = json.dumps({
+                "analysis": "test",
+                "severity": "low",
+                "action": "EXEC",
+                "command": "echo [HOSTNAME] [USER] [HOME]",
+                "reason": "test",
+                "next_step": "done",
+            })
+            resp.usage.total_tokens = 50
+            return resp
+
+        mock_openai.OpenAI.return_value.chat.completions.create.side_effect = capture
+        
+        # Mock subprocess.run to avoid actual execution
+        mock_proc = MagicMock()
+        mock_proc.returncode = 0
+        mock_proc.stdout = "ok"
+        mock_proc.stderr = ""
+        mock_subproc.return_value = mock_proc
+        
+        with patch("builtins.input", return_value="yes"):
+            report = run_autonomous_session(
+                diagnostics={},
+                config=mock_cfg,
+                show_data=False,
+                max_fixes=1,
+            )
+            
+        assert len(report.fixes_applied) == 1
+        executed_cmd = report.fixes_applied[0].command
+        assert REAL_HOSTNAME in executed_cmd
+        assert REAL_USER in executed_cmd
+        assert "[HOSTNAME]" not in executed_cmd
+        assert "[USER]" not in executed_cmd
+        
+    @patch("fixos.agent.session_handlers.run_command")
+    def test_run_single_command_deanonymizes(self, mock_run):
+        from fixos.agent.session_handlers import run_single_command
+        
+        mock_run.return_value = (True, "ok", "", 0)
+        
+        with patch("fixos.agent.session_io.ask_execute_prompt", return_value="y"):
+            run_single_command("ls /home/[USER]", "test comment")
+            
+        # run_command is called with the deanonymized command
+        args, kwargs = mock_run.call_args
+        assert args[0] == f"ls /home/{REAL_USER}"
+        assert "[USER]" not in args[0]

{fixos-2.2.24 → fixos-2.2.26}/tests/unit/test_core.py

@@ -122,3 +122,88 @@ class TestWebSearch:
         from fixos.utils.web_search import _http_get
         result = _http_get("http://240.0.0.1/nonexistent", timeout=1)
         assert result is None
+
+
+class TestSortFixesByPriority:
+    def test_cleanup_before_upgrade(self):
+        from fixos.agent.session_handlers import _sort_fixes_by_priority
+        fixes = [
+            ("sudo dnf upgrade -y", "upgrade"),
+            ("sudo journalctl --vacuum-size=200M", "clean logs"),
+        ]
+        result = _sort_fixes_by_priority(fixes)
+        assert result[0][0] == "sudo journalctl --vacuum-size=200M"
+        assert result[1][0] == "sudo dnf upgrade -y"
+
+    def test_disk_hungry_sorted_to_end(self):
+        from fixos.agent.session_handlers import _sort_fixes_by_priority
+        fixes = [
+            ("sudo dnf upgrade -y", "upgrade"),
+            ("sudo apt full-upgrade -y", "upgrade"),
+            ("sudo dnf remove oldkernel", "remove"),
+            ("sudo rm -rf /var/cache", "clean cache"),
+        ]
+        result = _sort_fixes_by_priority(fixes)
+        # Both remove and rm are cleanup (score 0), upgrades are score 2.
+        # Stable sort preserves original order among equal scores.
+        assert result[0][0] == "sudo dnf remove oldkernel"
+        assert result[1][0] == "sudo rm -rf /var/cache"
+        assert result[2][0] == "sudo dnf upgrade -y"
+        assert result[3][0] == "sudo apt full-upgrade -y"
+
+    def test_unknown_commands_mid_priority(self):
+        from fixos.agent.session_handlers import _sort_fixes_by_priority
+        fixes = [
+            ("sudo dnf upgrade -y", "upgrade"),
+            ("echo 'restart service'", "info"),
+        ]
+        result = _sort_fixes_by_priority(fixes)
+        assert result[0][0] == "echo 'restart service'"
+        assert result[1][0] == "sudo dnf upgrade -y"
+
+
+class TestDiagnosticOnlyCommand:
+    def test_simple_diagnostic_is_filtered(self):
+        from fixos.agent.session_core import _is_diagnostic_only_command
+        assert _is_diagnostic_only_command("df -h") is True
+        assert _is_diagnostic_only_command("free -h") is True
+        assert _is_diagnostic_only_command("systemctl status auditd") is True
+
+    def test_repair_command_is_not_diagnostic(self):
+        from fixos.agent.session_core import _is_diagnostic_only_command
+        assert _is_diagnostic_only_command("sudo systemctl restart auditd") is False
+        assert _is_diagnostic_only_command("dnf upgrade -y") is False
+        assert _is_diagnostic_only_command("rm -rf /var/cache") is False
+
+    def test_journalctl_vacuum_is_not_diagnostic(self):
+        from fixos.agent.session_core import _is_diagnostic_only_command
+        assert _is_diagnostic_only_command("journalctl --vacuum-size=200M") is False
+        assert _is_diagnostic_only_command("journalctl --flush") is False
+
+    def test_compound_command_any_repair_keeps_all(self):
+        from fixos.agent.session_core import _is_diagnostic_only_command
+        # Compound with both diagnostic and repair → not filtered
+        assert _is_diagnostic_only_command("df -h && sudo dnf remove kernel") is False
+        assert _is_diagnostic_only_command("cat /etc/fstab || systemctl restart auditd") is False
+
+    def test_compound_all_diagnostic_is_filtered(self):
+        from fixos.agent.session_core import _is_diagnostic_only_command
+        assert _is_diagnostic_only_command("df -h && free -h") is True
+
+
+class TestInteractiveBlocker:
+    def test_newgrp_blocked(self):
+        from fixos.platform_utils import is_interactive_blocker
+        assert is_interactive_blocker("sudo usermod -aG video $USER && newgrp video") is not None
+
+    def test_su_dash_blocked(self):
+        from fixos.platform_utils import is_interactive_blocker
+        assert is_interactive_blocker("su - tom") is not None
+
+    def test_top_not_blocked_if_batch(self):
+        from fixos.platform_utils import is_interactive_blocker
+        assert is_interactive_blocker("top -b -n1") is None
+
+    def test_regular_command_not_blocked(self):
+        from fixos.platform_utils import is_interactive_blocker
+        assert is_interactive_blocker("dnf upgrade -y") is None

fixos-2.2.24/fixos/utils/__init__.py

@@ -1,3 +0,0 @@
-from .anonymizer import anonymize, display_anonymized_preview, AnonymizationReport
-from .web_search import search_all, format_results_for_llm
-__all__ = ["anonymize", "display_anonymized_preview", "AnonymizationReport", "search_all", "format_results_for_llm"]