methodproof 0.7.19__tar.gz → 0.7.21__tar.gz

{methodproof-0.7.19 → methodproof-0.7.21}/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [0.7.20] — 2026-04-11
+
+### Fixed
+- **TUI init layout** — toggle rows now use `height: auto` so long capture descriptions don't clip; `width: 1fr` on `.row-label` overrides the 24-char truncation from base CSS; Switch widgets widened from 4→6 for correct rendering; Full Spectrum status no longer cut off at 1 line
+- **TUI consent layout** — Switch widgets widened from 4→6 (same fix as init)
+- **TUI status markup** — `_token_expiry()` was returning Rich markup strings into `Text.append()`, which treats input as plain text; tags now rendered literally (e.g. `[#d93326]expires soon[/#d93326]`). Fixed to return `(text, style)` tuple and apply styles at call site
+- **Session complete timeout** — `mp push` was using 15s for the final `/complete` call, which times out on large sessions while the server drains the ingest queue and materializes stats. Raised to 90s. Timeout is now a configurable parameter on internal request helpers
+
 ## [0.7.6] — 2026-04-08
 
 ### Added

{methodproof-0.7.19 → methodproof-0.7.21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: methodproof
-Version: 0.7.19
+Version: 0.7.21
 Summary: See how you code. Capture and visualize your engineering process.
 License-Expression: Apache-2.0
 License-File: LICENSE

{methodproof-0.7.19 → methodproof-0.7.21}/methodproof/__init__.py

@@ -1,3 +1,3 @@
 """MethodProof — see how you code."""
 
-__version__ = "0.7.19"
+__version__ = "0.7.21"

{methodproof-0.7.19 → methodproof-0.7.21}/methodproof/cli.py

@@ -334,62 +334,74 @@ def _run_consent_detailed(cfg: dict) -> dict:
 def cmd_init(args: argparse.Namespace) -> None:
     config.ensure_dirs()
     cfg = config.load()
+    yes = getattr(args, "yes", False)
     if getattr(args, "force", False):
         for key in ("consent_acknowledged", "auto_update_offered", "alias_offered", "local_ai_ports_offered", "ui_mode_offered"):
             cfg.pop(key, None)
         config.save(cfg)
 
-    # TUI wizard — runs when nothing is set up yet, or on --force, or when ui_mode is on
-    needs_setup = not cfg.get("consent_acknowledged")
-    use_ui = needs_setup or _resolve_ui(args, cfg)
-    if use_ui:
-        from methodproof.tui.init import run as tui_init
-        tui_init(cfg)
-        return
-
     if not cfg.get("consent_acknowledged"):
-        cfg = _run_consent(cfg)
-        config.save(cfg)
-        if cfg.get("token"):
-            cfg["_pending_research_sync"] = True
+        if yes:
+            from methodproof import config as cfg_mod
+            cfg["capture"] = dict(cfg_mod._DEFAULTS["capture"])
+            cfg["publish_redact"] = dict(cfg_mod._DEFAULTS["publish_redact"])
+            cfg["consent_acknowledged"] = True
             config.save(cfg)
-            from methodproof.sync import sync_research_consent
-            sync_research_consent(cfg["token"], cfg["api_url"])
-        print()
+            print("Capture: all defaults accepted")
+        else:
+            cfg = _run_consent(cfg)
+            config.save(cfg)
+            if cfg.get("token"):
+                cfg["_pending_research_sync"] = True
+                config.save(cfg)
+                from methodproof.sync import sync_research_consent
+                sync_research_consent(cfg["token"], cfg["api_url"])
+            print()
 
     capture = cfg.get("capture", {})
     store.init_db()
 
     # Offer auto-update (recommended)
     if not cfg.get("auto_update_offered"):
-        answer = input("Enable auto-update (recommended)? [Y/n]: ").strip().lower()
-        cfg["auto_update_offered"] = True
-        cfg["auto_update"] = answer != "n"
-        print(f"Auto-update: {'ON — updates install before each session' if cfg['auto_update'] else 'OFF — toggle with: mp update --auto'}")
+        if yes:
+            cfg["auto_update_offered"] = True
+            cfg["auto_update"] = True
+            print("Auto-update: ON")
+        else:
+            answer = input("Enable auto-update (recommended)? [Y/n]: ").strip().lower()
+            cfg["auto_update_offered"] = True
+            cfg["auto_update"] = answer != "n"
+            print(f"Auto-update: {'ON — updates install before each session' if cfg['auto_update'] else 'OFF — toggle with: mp update --auto'}")
         config.save(cfg)
 
     # Offer mp alias
     if not cfg.get("alias_offered"):
-        answer = input("Install `mp` as a shorthand alias? [Y/n]: ").strip().lower()
-        cfg["alias_offered"] = True
-        if answer != "n":
+        if yes:
             _install_alias()
+            cfg["alias_offered"] = True
             cfg["alias_installed"] = True
             print("Alias: mp -> methodproof")
         else:
-            print("Alias: skipped")
+            answer = input("Install `mp` as a shorthand alias? [Y/n]: ").strip().lower()
+            cfg["alias_offered"] = True
+            if answer != "n":
+                _install_alias()
+                cfg["alias_installed"] = True
+                print("Alias: mp -> methodproof")
+            else:
+                print("Alias: skipped")
         config.save(cfg)
 
     # Offer classic CLI mode (TUI is default)
     if not cfg.get("ui_mode_offered"):
         cfg["ui_mode_offered"] = True
-        answer = input("Prefer classic terminal output instead of the rich TUI? [y/N]: ").strip().lower()
-        if answer == "y":
-            cfg["ui_mode"] = False
-            print("Output mode: classic  (toggle anytime with: mp ui on/off)")
-        else:
+        if yes:
             cfg["ui_mode"] = True
-            print("Output mode: rich TUI  (toggle anytime with: mp ui off)")
+            print("Output mode: rich TUI")
+        else:
+            answer = input("Prefer classic terminal output instead of the rich TUI? [y/N]: ").strip().lower()
+            cfg["ui_mode"] = answer != "y"
+            print(f"Output mode: {'classic  (toggle anytime with: mp ui on/off)' if not cfg['ui_mode'] else 'rich TUI  (toggle anytime with: mp ui off)'}")
         config.save(cfg)
 
     # Shell hook — needed for terminal commands
@@ -440,19 +452,23 @@ def cmd_init(args: argparse.Namespace) -> None:
 
     # Local AI ports — capture traffic from local LLM servers
     if ai_enabled and not cfg.get("local_ai_ports_offered"):
-        answer = input("Run any local AI models (Ollama, LM Studio, vLLM, etc.)? [y/N]: ").strip().lower()
         cfg["local_ai_ports_offered"] = True
-        if answer == "y":
-            raw = input("Enter ports (comma-separated, e.g. 8080,5000,7860): ").strip()
-            ports = [int(p.strip()) for p in raw.split(",") if p.strip().isdigit()]
-            cfg["local_ai_ports"] = ports
-            if ports:
-                print(f"Local AI ports: {', '.join(str(p) for p in ports)} (proxy will decode these)")
-            else:
-                print("Local AI ports: none added")
-        else:
+        if yes:
             cfg["local_ai_ports"] = []
-            print("Local AI ports: skipped (built-in: Ollama 11434, Jan 1234)")
+            print("Local AI ports: using defaults (Ollama 11434, Jan 1234)")
+        else:
+            answer = input("Run any local AI models (Ollama, LM Studio, vLLM, etc.)? [y/N]: ").strip().lower()
+            if answer == "y":
+                raw = input("Enter ports (comma-separated, e.g. 8080,5000,7860): ").strip()
+                ports = [int(p.strip()) for p in raw.split(",") if p.strip().isdigit()]
+                cfg["local_ai_ports"] = ports
+                if ports:
+                    print(f"Local AI ports: {', '.join(str(p) for p in ports)} (proxy will decode these)")
+                else:
+                    print("Local AI ports: none added")
+            else:
+                cfg["local_ai_ports"] = []
+                print("Local AI ports: skipped (built-in: Ollama 11434, Jan 1234)")
         config.save(cfg)
 
     # Signing keypair for attestation
@@ -1398,7 +1414,6 @@ def cmd_log(args: argparse.Namespace) -> None:
             return
         print(f"Found {len(empty)} empty session{'s' if len(empty) != 1 else ''}:")
         for s in empty:
-            from datetime import datetime, UTC
             dt = datetime.fromtimestamp(s["created_at"], tz=UTC).strftime("%Y-%m-%d %H:%M")
             print(f"  {s['id'][:8]}  {dt}  {s.get('watch_dir', '?')}")
         answer = input(f"\nDelete {len(empty)} empty session{'s' if len(empty) != 1 else ''}? [y/N]: ").strip().lower()
@@ -2116,6 +2131,7 @@ def main() -> None:
 
     s = sub.add_parser("init", help="Install shell hook")
     s.add_argument("--force", action="store_true", help="Re-run all setup prompts from scratch")
+    s.add_argument("-y", "--yes", action="store_true", help="Accept all defaults, no prompts")
     _add_ui_flags(s)
     sub.add_parser("shell-hook", help="Print shell hook for eval (activates without restart)")
     s = sub.add_parser("start", help="Start recording")

{methodproof-0.7.19 → methodproof-0.7.21}/methodproof/tui/consent.py

@@ -53,7 +53,7 @@ _CSS = BASE_CSS + f"""
 }}
 .toggle-row Switch {{
     margin: 0 1 0 0;
-    width: 4;
+    width: 6;
 }}
 .pro-row .row-label {{
     color: {PURPLE};

{methodproof-0.7.19 → methodproof-0.7.21}/methodproof/tui/init.py

@@ -8,7 +8,7 @@ from textual.screen import Screen
 from textual.widgets import Button, Footer, Header, Label, RichLog, Rule, Static, Switch
 
 from methodproof import config as cfg_mod
-from methodproof.tui.theme import BASE_CSS, BORDER, DIM, GOLD, GREEN, PURPLE, RED, TEXT
+from methodproof.tui.theme import BASE_CSS, BG, BORDER, DIM, GOLD, GREEN, PURPLE, RED, TEXT
 
 _REDACTABLE = [
     ("command_output", "Terminal output"),
@@ -33,15 +33,31 @@ PrefsScreen {{
     color: {DIM};
     margin: 0 0 1 0;
 }}
+Switch {{
+    border: none;
+    height: 1;
+    width: 10;
+    background: {BORDER};
+    padding: 0 1;
+}}
+Switch.-on {{
+    background: {GREEN};
+}}
+Switch .switch--slider {{
+    color: {TEXT};
+    background: {DIM};
+}}
+Switch.-on .switch--slider {{
+    color: {BG};
+    background: {TEXT};
+}}
 .toggle-row {{
-    height: 2;
+    height: 1;
     align: left middle;
-}}
-.toggle-row Switch {{
-    margin: 0 1 0 0;
-    width: 4;
+    margin: 0 0 1 0;
 }}
 .row-label {{
+    width: 1fr;
     color: {TEXT};
 }}
 .pro-row .row-label {{
@@ -55,16 +71,13 @@ PrefsScreen {{
     width: 5;
 }}
 .opt-row {{
-    height: 2;
+    height: 1;
     align: left middle;
-}}
-.opt-row Switch {{
-    margin: 0 1 0 0;
-    width: 4;
+    margin: 0 0 1 0;
 }}
 #fs-status {{
     color: {DIM};
-    height: 1;
+    height: auto;
     margin: 1 0 0 0;
 }}
 #fs-status.full {{

{methodproof-0.7.19 → methodproof-0.7.21}/methodproof/tui/status.py

@@ -19,15 +19,16 @@ def _tier_color(tier: str) -> str:
     return {"free": DIM, "basic": TEXT, "pro": GOLD, "team": PURPLE}.get(tier.lower(), TEXT)
 
 
-def _token_expiry(cfg: dict) -> str:
+def _token_expiry(cfg: dict) -> tuple[str, str]:
+    """Return (text, style) for token expiry display."""
     last_auth = cfg.get("last_auth_at", 0)
     if not last_auth:
-        return "unknown"
+        return "unknown", DIM
     age_h = (time.time() - last_auth) / 3600
     remaining_h = max(0, 24 - age_h)
     if remaining_h < 1:
-        return f"[{RED}]expires soon[/{RED}]"
-    return f"[{DIM}]expires in {int(remaining_h)}h[/{DIM}]"
+        return "expires soon", RED
+    return f"expires in {int(remaining_h)}h", DIM
 
 
 def run(cfg: dict) -> None:
@@ -52,7 +53,8 @@ def run(cfg: dict) -> None:
     acct_lines.append("  ·  ", style=DIM)
     acct_lines.append(tier, style=_tier_color(tier))
     acct_lines.append("\n")
-    acct_lines.append(_token_expiry(cfg), style=DIM)
+    expiry_text, expiry_style = _token_expiry(cfg)
+    acct_lines.append(expiry_text, style=expiry_style)
 
     console.print(Panel(
         acct_lines,

{methodproof-0.7.19 → methodproof-0.7.21}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "methodproof"
-version = "0.7.19"
+version = "0.7.21"
 description = "See how you code. Capture and visualize your engineering process."
 requires-python = ">=3.11"
 dependencies = ["watchdog>=4.0", "websocket-client>=1.7", "cryptography>=43.0", "keyring>=25.0", "textual>=0.59", "rich>=13.7"]

{methodproof-0.7.19 → methodproof-0.7.21}/tests/conftest.py

@@ -27,7 +27,8 @@ def isolate_fs(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> Path:
     monkeypatch.setattr(config, "CONFIG", mp_dir / "config.json")
     monkeypatch.setattr(config, "DB_PATH", mp_dir / "methodproof.db")
     monkeypatch.setattr(config, "CMD_LOG", mp_dir / "commands.jsonl")
-    (mp_dir / "config.json").write_text(json.dumps(dict(config._DEFAULTS), indent=2))
+    defaults = {**config._DEFAULTS, "ui_mode": False}
+    (mp_dir / "config.json").write_text(json.dumps(defaults, indent=2))
     monkeypatch.setattr(store, "_conn", None)
     store.init_db()
     return tmp_path

{methodproof-0.7.19 → methodproof-0.7.21}/tests/test_cli_auth.py

@@ -215,7 +215,7 @@ def test_login_happy_path(mock_req, mock_sleep, mock_browser, mock_key, mock_con
     assert cfg["account_id"] == "new-user"
     mock_browser.assert_called_once()
     out = capsys.readouterr().out
-    assert "Logged in" in out
+    assert "Logged In" in out
 
 
 @patch("methodproof.sync._request")

{methodproof-0.7.19 → methodproof-0.7.21}/tests/test_cli_share.py

@@ -98,7 +98,7 @@ def test_review_shows_breakdown(make_session, cli_args, capsys):
     out = capsys.readouterr().out
     assert "5" in out
     assert "events" in out
-    assert "fields:" in out
+    assert "fields" in out
 
 
 # ── cmd_view ──

{methodproof-0.7.19 → methodproof-0.7.21}/tests/test_cli_start.py

@@ -427,21 +427,11 @@ def test_consent_detailed_redaction_toggle():
 # ── cmd_init ──
 
 
-@patch("methodproof.integrity.has_keypair", return_value=True)
-@patch("methodproof.sync.sync_research_consent")
-@patch("methodproof.hooks.wrappers.install", return_value=[])
-@patch("methodproof.mcp.register_with_claude", return_value="registered")
-@patch("methodproof.hooks.install.install", return_value="installed")
-@patch("methodproof.hooks.openclaw_install.install", return_value="installed")
-@patch("methodproof.hook.install", return_value="hook installed")
-def test_init_first_run(mock_hook, mock_oc, mock_claude, mock_mcp, mock_wrap, mock_consent,
-                         mock_keypair, cli_args, capsys):
-    # input() calls: auto-update, alias, local AI ports
-    with patch("methodproof.cli._run_consent", return_value=config.load()) as mock_run_consent, \
-         patch("builtins.input", side_effect=["N", "N", "N"]):
-        cli.cmd_init(cli_args())
-    mock_run_consent.assert_called_once()
-    mock_hook.assert_called_once()
+@patch("methodproof.tui.init.run")
+def test_init_first_run(mock_tui_init, cli_args):
+    # First run: consent_acknowledged=False forces TUI regardless of ui_mode
+    cli.cmd_init(cli_args())
+    mock_tui_init.assert_called_once()
 
 
 @patch("methodproof.integrity.has_keypair", return_value=True)
@@ -450,7 +440,7 @@ def test_init_already_configured(mock_hook, mock_keypair, cli_args, capsys):
     cfg = config.load()
     cfg["consent_acknowledged"] = True
     config.save(cfg)
-    # input() calls: auto-update, alias, local AI ports
-    with patch("builtins.input", side_effect=["N", "N", "N"]):
+    # input() calls: auto-update, alias, ui-mode, local AI ports
+    with patch("builtins.input", side_effect=["N", "N", "N", "N"]):
         cli.cmd_init(cli_args())
     mock_hook.assert_called_once()