methodproof 0.7.20__tar.gz → 0.7.22__tar.gz

{methodproof-0.7.20 → methodproof-0.7.22}/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [0.7.22] — 2026-04-11
+
+### Added
+- **Username in session output** — `mp start` banner shows `Account: @username` (falls back to email). `mp stop` summary shows the same. Username fetched from `/auth/me` on login and stored in config profile.
+
+### Fixed
+- **`eval "$(methodproof shell-hook)"` missing `mp` alias** — `shell-hook` now emits both the command-logging hooks and `alias mp="methodproof"`, so eval fully activates the CLI without a shell restart.
+
 ## [0.7.20] — 2026-04-11
 
 ### Fixed

{methodproof-0.7.20 → methodproof-0.7.22}/PKG-INFO

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

{methodproof-0.7.20 → methodproof-0.7.22}/methodproof/__init__.py

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

{methodproof-0.7.20 → methodproof-0.7.22}/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
@@ -475,7 +491,8 @@ def cmd_init(args: argparse.Namespace) -> None:
 def cmd_shell_hook(_args: argparse.Namespace) -> None:
     """Print the shell hook text for the current shell (for eval)."""
     _, hook_text = hook.get_shell_rc()
-    print(hook_text.strip())
+    alias = 'Set-Alias mp methodproof' if sys.platform == "win32" else 'alias mp="methodproof"'
+    print(hook_text.strip() + "\n" + alias)
 
 
 # ── TUI mode helpers ──────────────────────────────────────────────────────────
@@ -1187,8 +1204,11 @@ def cmd_start(args: argparse.Namespace) -> None:
         config.save(cfg)
 
     active = [k for k, v in capture.items() if v]
+    username = cfg.get("username")
+    account_label = f"@{username}" if username else (cfg.get("email") or cfg.get("account_id", "")[:8])
     print(f"\n{_banner()}")
     print(f"Recording: {sid[:8]}")
+    print(f"Account:   {account_label}")
     print(f"Watching:  {watch_dir}")
     if repo_url:
         print(f"Repo:      {repo_url}")
@@ -1381,7 +1401,7 @@ def cmd_stop(args: argparse.Namespace) -> None:
     session = store.get_session(sid)
     cfg["active_session"] = None
     config.save(cfg)
-    _print_summary(session, stats)
+    _print_summary(session, stats, cfg)
 
 
 def cmd_view(args: argparse.Namespace) -> None:
@@ -1689,6 +1709,13 @@ def cmd_login(args: argparse.Namespace) -> None:
                 cfg["account_id"] = claims.get("user_id", "")
                 cfg["last_auth_at"] = time.time()
                 cfg["master_key_fingerprint"] = ""  # clear stale fingerprint from previous account
+                # Fetch profile to store email and username
+                try:
+                    profile = _request("GET", "/auth/me", api, poll["token"])
+                    cfg["email"] = profile.get("email", "")
+                    cfg["username"] = profile.get("username") or ""
+                except Exception as exc:
+                    _log_debug("auth.profile_fetch_failed", error=str(exc))
                 config.save(cfg)
                 config.save_active_profile(cfg)
                 print(" done.\n")
@@ -1698,7 +1725,7 @@ def cmd_login(args: argparse.Namespace) -> None:
                 sync_research_consent(cfg["token"], cfg["api_url"])
                 from methodproof.tui.login_success import run as show_success
                 show_success(
-                    display_name=cfg.get("email") or cfg.get("account_id", "")[:8],
+                    display_name=cfg.get("username") or cfg.get("email") or cfg.get("account_id", "")[:8],
                     email=cfg.get("email", ""),
                     account_count=len(cfg.get("profiles", {})),
                     added=getattr(args, "add", False),
@@ -1995,11 +2022,16 @@ def _duration(s: dict) -> str:
     return f"{secs // 60}:{secs % 60:02d}"
 
 
-def _print_summary(session: dict | None, stats: dict) -> None:
+def _print_summary(session: dict | None, stats: dict, cfg: dict | None = None) -> None:
     if not session:
         return
+    cfg = cfg or {}
+    username = cfg.get("username")
+    account_label = f"@{username}" if username else (cfg.get("email") or cfg.get("account_id", "")[:8])
     print(f"\n{_banner()}")
     print(f"Session:  {session['id'][:8]}")
+    if account_label:
+        print(f"  Account:  {account_label}")
     print(f"  Events:   {session['total_events']}")
     print(f"  Duration: {_duration(session)}")
     print(f"  Graph:    {stats['next']} links, {stats['causal']} causal")
@@ -2115,6 +2147,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.20 → methodproof-0.7.22}/methodproof/config.py

@@ -42,6 +42,7 @@ _DEFAULTS: dict[str, Any] = {
     "e2e_fingerprint": "",
     "auto_update": False,
     "account_id": "",
+    "username": "",
     "last_auth_at": 0,
     "local_ai_ports": [],  # user-configured localhost ports for local LLM capture
     "publish_redact": {
@@ -161,7 +162,7 @@ def save(cfg: dict[str, Any]) -> None:
 # --- Multi-account profiles ---
 
 _PROFILE_KEYS = [
-    "token", "refresh_token", "email", "account_id",
+    "token", "refresh_token", "email", "account_id", "username",
     "last_auth_at", "master_key_fingerprint",
     "e2e_mode", "e2e_fingerprint",
     "journal_mode", "journal_credits",

{methodproof-0.7.20 → methodproof-0.7.22}/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,29 @@ 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: auto;
+    height: 1;
     align: left middle;
     margin: 0 0 1 0;
 }}
-.toggle-row Switch {{
-    margin: 0 1 0 0;
-    width: 6;
-}}
 .row-label {{
     width: 1fr;
     color: {TEXT};
@@ -57,14 +71,10 @@ PrefsScreen {{
     width: 5;
 }}
 .opt-row {{
-    height: auto;
+    height: 1;
     align: left middle;
     margin: 0 0 1 0;
 }}
-.opt-row Switch {{
-    margin: 0 1 0 0;
-    width: 6;
-}}
 #fs-status {{
     color: {DIM};
     height: auto;

{methodproof-0.7.20 → methodproof-0.7.22}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "methodproof"
-version = "0.7.20"
+version = "0.7.22"
 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.20 → methodproof-0.7.22}/tests/conftest.py

@@ -125,7 +125,7 @@ def cli_args():
             "verbose": False, "streaming": False, "force": False,
             "local": False, "api_url": None, "no_key": False, "auto": None,
             "account": None, "purge": False, "keep_sessions": False,
-            "anonymous": False,
+            "anonymous": False, "yes": False,
         }
         defaults.update(kwargs)
         return argparse.Namespace(**defaults)

{methodproof-0.7.20 → methodproof-0.7.22}/tests/test_cli_start.py

@@ -427,11 +427,13 @@ def test_consent_detailed_redaction_toggle():
 # ── cmd_init ──
 
 
-@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.hook.install", return_value="hook installed")
+@patch("methodproof.integrity.has_keypair", return_value=True)
+def test_init_first_run(mock_keypair, mock_hook, cli_args, capsys):
+    # First run with --yes: all prompts auto-accepted, no stdin required
+    cli.cmd_init(cli_args(yes=True))
+    out = capsys.readouterr().out
+    assert "METHODPROOF" in out or "Recording" in out or "mp start" in out
 
 
 @patch("methodproof.integrity.has_keypair", return_value=True)