Fix Phase 1 tests and JSON output integrity

Author: hrabanazviking

mythic_vibe_cli/ai/providers/model_catalog.py

@@ -668,7 +668,7 @@ def list_models(
 #     (for tests) and returns a CatalogFreshness.
 # ---------------------------------------------------------------------------
 
-from datetime import date as _date_type, datetime as _datetime  # noqa: E402
+from datetime import UTC as _UTC, date as _date_type, datetime as _datetime  # noqa: E402
 
 STATIC_LAST_UPDATED = _STATIC_LAST_UPDATED
 
@@ -721,7 +721,7 @@ def evaluate_catalog_freshness(
     passing.
     """
     if today is None:
-        today = _datetime.utcnow().date()
+        today = _datetime.now(_UTC).date()
 
     try:
         parsed = _datetime.strptime(last_updated, "%Y-%m-%d").date()

mythic_vibe_cli/patch/manager.py

@@ -59,17 +59,29 @@ def __init__(self, project_root: str | Path | None = None) -> None:
             self.project_root = Path(project_root).resolve()
 
         self.state_file = self.project_root / ".mythic" / "active_patch.json"
+        self._active_loaded = False
+        self._active: PatchProposal | None = None
 
     def _read_active(self) -> PatchProposal | None:
+        if self._active_loaded:
+            return self._active
         if not self.state_file.exists():
+            self._active_loaded = True
+            self._active = None
             return None
         try:
             data = json.loads(self.state_file.read_text(encoding="utf-8"))
-            return PatchProposal.from_dict(data)
+            self._active = PatchProposal.from_dict(data)
+            self._active_loaded = True
+            return self._active
         except Exception:
+            self._active_loaded = True
+            self._active = None
             return None
 
     def _write_active(self, proposal: PatchProposal | None) -> None:
+        self._active = proposal
+        self._active_loaded = True
         self.state_file.parent.mkdir(parents=True, exist_ok=True)
         if proposal is None:
             if self.state_file.exists():

mythic_vibe_cli/robustness/simulate.py

@@ -36,6 +36,8 @@
 from pathlib import Path
 from typing import Any, Callable
 
+from ..runtime.output_guard import suspend_stdout_guard
+
 
 @dataclass(frozen=True)
 class SimulationOutcome:
@@ -101,7 +103,7 @@ def _run_handler(
     """Invoke a CLI handler with stdout/stderr captured."""
     out = io.StringIO()
     err = io.StringIO()
-    with redirect_stdout(out), redirect_stderr(err):
+    with suspend_stdout_guard(), redirect_stdout(out), redirect_stderr(err):
         exit_code = handler(namespace)
     return exit_code, out.getvalue(), err.getvalue()
 

mythic_vibe_cli/runtime/output_guard.py

@@ -120,6 +120,24 @@ def flush_raw_stdout() -> None:
     target.flush()
 
 
+@contextmanager
+def suspend_stdout_guard() -> Iterator[None]:
+    """Temporarily restore normal stdout while preserving guard state.
+
+    This is for in-process command nesting where the outer command owns a
+    protocol stream, but must capture a child handler's stdout instead of
+    letting :func:`write_raw_stdout` bypass ``redirect_stdout``.
+    """
+    if _state is None:
+        yield
+        return
+    restore_stdout()
+    try:
+        yield
+    finally:
+        take_over_stdout()
+
+
 @contextmanager
 def json_output_guard(active: bool) -> Iterator[None]:
     """Optionally activate the stdout guard for the duration of a ``with`` block.

mythic_vibe_cli/runtime/slash_commands.py

@@ -92,7 +92,6 @@ def to_dict(self) -> dict[str, object]:
     BuiltinSlashCommand(name="help", description="List available slash commands and their sources"),
     BuiltinSlashCommand(name="model", description="Show, list, or set the active shell model/provider"),
     BuiltinSlashCommand(name="reload", description="Reload plugins, skills, prompts, and method cache"),
-    BuiltinSlashCommand(name="tui", description="Launch the interactive Terminal User Interface (TUI)"),
     BuiltinSlashCommand(name="quit", description="Exit the interactive session"),
 
     # --- Project lifecycle ---
@@ -210,6 +209,9 @@ def to_dict(self) -> dict[str, object]:
     # --- Docker scaffolding (PH-12 slice 12.2) ---
     BuiltinSlashCommand(name="docker", description="Docker scaffolding (Dockerfile + .dockerignore + docker-compose.yml)"),
 
+    # --- Patch Proposal System (PH-08) ---
+    BuiltinSlashCommand(name="patch", description="Manage patch proposals: propose a safe file edit for explicit review"),
+
     # --- Release helper (PH-12 slice 12.3) ---
     BuiltinSlashCommand(name="release", description="Semver-aware release helper — version bump + CHANGELOG stub + optional local tag (never pushes)"),
 
@@ -228,11 +230,4 @@ def to_dict(self) -> dict[str, object]:
     # --- Multi-surface access (PH-17) ---
     BuiltinSlashCommand(name="surface", description="Web terminal / SSH-readiness check / chat bridge — multi-surface access"),
 
-    # --- Patch Proposal System (PH-08) ---
-    BuiltinSlashCommand(name="diff", description="View the currently proposed patch/diff"),
-    BuiltinSlashCommand(name="apply", description="Approve and apply the currently proposed patch"),
-    BuiltinSlashCommand(name="reject", description="Reject the currently proposed patch"),
-
-    # --- Test Runner System (PH-09) ---
-    BuiltinSlashCommand(name="test", description="Run the project test suite and feed failures into the model"),
 )

mythic_vibe_cli/tui/app.py

@@ -871,8 +871,7 @@ def on_mount(self) -> None:
         if self.narrow_mode:
             self.sub_title = f"{self.SUB_TITLE}  ·  narrow"
 
-        from .cockpit import CockpitScreen
-        self.push_screen(CockpitScreen(self.root))
+        self.push_screen(StatusScreen(self.root))
 
     def action_cycle_theme(self) -> None:
         """Advance to the next entry in :data:`THEME_CYCLE`. Bound to ``t``

tests/test_cli_kernel.py

@@ -122,6 +122,7 @@ def test_command_registry_preserves_current_commands_and_aliases(self) -> None:
             "ci",
             # PH-12 slice 12.2 — Docker scaffold
             "docker",
+            "patch",
             # PH-12 slice 12.3 — Release helper
             "release",
             # PH-12 slice 12.4 — Rollback summariser

tests/test_json_output_integrity.py

@@ -0,0 +1,39 @@
+"""Regression tests for machine-readable CLI stdout contracts."""
+
+from __future__ import annotations
+
+import io
+import json
+import unittest
+from contextlib import redirect_stderr, redirect_stdout
+from typing import Any
+
+from mythic_vibe_cli import app
+from mythic_vibe_cli.exit_codes import SUCCESS
+
+
+def _parse_single_json_document(text: str) -> dict[str, Any]:
+    decoder = json.JSONDecoder()
+    payload, end = decoder.raw_decode(text)
+    trailing = text[end:].strip()
+    if trailing:
+        raise AssertionError(f"stdout contains extra data after JSON document: {trailing!r}")
+    if not isinstance(payload, dict):
+        raise AssertionError(f"stdout JSON must be an object, got {type(payload).__name__}")
+    return payload
+
+
+class JsonOutputIntegrityTests(unittest.TestCase):
+    def test_simulate_json_emits_one_document(self) -> None:
+        stdout = io.StringIO()
+        stderr = io.StringIO()
+
+        with redirect_stdout(stdout), redirect_stderr(stderr):
+            code = app.main(["simulate", "--json"])
+
+        self.assertEqual(code, SUCCESS)
+        self.assertEqual(stderr.getvalue(), "")
+        payload = _parse_single_json_document(stdout.getvalue())
+        self.assertEqual(payload["command"], "simulate")
+        self.assertTrue(payload["report"]["ok"])
+        self.assertEqual(payload["report"]["total"], 4)

tests/test_output_guard.py

@@ -19,6 +19,7 @@
     is_stdout_taken_over,
     json_output_guard,
     restore_stdout,
+    suspend_stdout_guard,
     take_over_stdout,
     write_raw_stdout,
 )
@@ -151,6 +152,20 @@ def test_json_output_guard_restores_on_exception(self) -> None:
         self.assertFalse(is_stdout_taken_over())
         self.assertIs(sys.stdout, self.fake_stdout)
 
+    def test_suspend_stdout_guard_captures_raw_writes_then_restores(self) -> None:
+        take_over_stdout()
+        nested = io.StringIO()
+
+        with suspend_stdout_guard():
+            self.assertFalse(is_stdout_taken_over())
+            sys.stdout = nested
+            write_raw_stdout("nested payload\n")
+            sys.stdout = self.fake_stdout
+
+        self.assertTrue(is_stdout_taken_over())
+        self.assertEqual(nested.getvalue(), "nested payload\n")
+        self.assertEqual(self.fake_stdout.getvalue(), "")
+
 
 # PH-23.8 — coverage push for output_guard's _ProxyStream
 # property getters + isatty error branches. The existing tests