methodproof 0.7.27__tar.gz → 0.7.29__tar.gz

{methodproof-0.7.27 → methodproof-0.7.29}/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## [0.7.29] — 2026-04-12
+
+### Changed
+- **Journal mode output is now tier-aware** — Pro/Team/Admin/Superadmin users see "Unlimited journal entries (Pro plan)" everywhere journal credits are displayed (`mp journal on`, `mp journal status`, `mp start --journal`, session mode line, consent flow). Basic users get a live credit count fetched from `GET /auth/me` (falls back to local cache if offline). Free users see their local credit count as before. Credit deduction on `--journal` is skipped for unlimited tiers.
+
+## [0.7.28] — 2026-04-12
+
+### Added
+- **`cwd` in terminal events** — shell hook (bash/zsh/PowerShell) now writes working directory to `commands.jsonl`; terminal agent reads it into `terminal_cmd` metadata. Requires re-running `mp init` to update the installed hook.
+- **Git commit enrichment** — `git_commit` events now include `author`, `author_email`, `committed_at` (ISO 8601), `parent_hash`, and `body` (full commit message body when it differs from subject). Single `git log` call instead of multiple.
+- **`language` on `file_delete`** — was always empty string; now extracted from file extension same as `file_create`.
+- **`skipped` count in `test_run`** — pytest, jest, and go test output now parsed for skipped test count.
+
+### Fixed
+- **`agent_complete.last_message_preview` not journal-gated** — preview of agent's final message leaked content when journal mode was off. Now stripped with other content fields.
+- **`git_commit.body` not journal-gated** — full commit body (multi-line messages) added to journal gate.
+
 ## [0.7.27] — 2026-04-12
 
 ### Fixed

{methodproof-0.7.27 → methodproof-0.7.29}/PKG-INFO

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

{methodproof-0.7.27 → methodproof-0.7.29}/methodproof/agents/terminal.py

@@ -22,8 +22,8 @@ TEST_FRAMEWORKS = {
     "cargo_test": re.compile(r"\bcargo test\b"),
 }
 
-_PYTEST_RE = re.compile(r"(\d+) passed(?:.*?(\d+) failed)?")
-_JEST_RE = re.compile(r"Tests:\s+(?:(\d+) failed,\s+)?(\d+) passed")
+_PYTEST_RE = re.compile(r"(\d+) passed(?:.*?(\d+) failed)?(?:.*?(\d+) skipped)?")
+_JEST_RE = re.compile(r"Tests:\s+(?:(\d+) failed,\s+)?(\d+) passed(?:,\s+(\d+) skipped)?")
 _CARGO_RE = re.compile(r"(\d+) passed.*?(\d+) failed")
 
 
@@ -34,26 +34,25 @@ def _detect_test(command: str) -> str | None:
     return None
 
 
-def _parse_test_results(output: str, framework: str, exit_code: int) -> tuple[int, int]:
-    """Extract pass/fail counts from test output. Falls back to exit code heuristic."""
+def _parse_test_results(output: str, framework: str, exit_code: int) -> tuple[int, int, int]:
+    """Extract pass/fail/skipped counts from test output. Falls back to exit code heuristic."""
     if framework == "pytest":
         m = _PYTEST_RE.search(output)
         if m:
-            return int(m.group(1)), int(m.group(2) or 0)
+            return int(m.group(1)), int(m.group(2) or 0), int(m.group(3) or 0)
     elif framework == "jest":
         m = _JEST_RE.search(output)
         if m:
-            return int(m.group(2) or 0), int(m.group(1) or 0)
+            return int(m.group(2) or 0), int(m.group(1) or 0), int(m.group(3) or 0)
     elif framework == "go_test":
-        return output.count("--- PASS"), output.count("--- FAIL")
+        return output.count("--- PASS"), output.count("--- FAIL"), output.count("--- SKIP")
     elif framework == "cargo_test":
         m = _CARGO_RE.search(output)
         if m:
-            return int(m.group(1)), int(m.group(2))
-    # Fallback: exit code 0 = all passed, non-zero = at least 1 failure
+            return int(m.group(1)), int(m.group(2)), 0
     if exit_code == 0:
-        return 1, 0
-    return 0, 1
+        return 1, 0, 0
+    return 0, 1, 0
 
 
 def start(stop: threading.Event) -> None:
@@ -93,19 +92,22 @@ def _process(line: str) -> None:
     exit_code = entry.get("exit_code", 0)
     duration = entry.get("duration_ms", 0)
     output = entry.get("output", "")[:500]
-    # Redact output if it contains secrets
     if SENSITIVE.search(output):
         output = "[redacted — contains sensitive content]"
+    cwd = entry.get("cwd", "")
 
-    base.emit("terminal_cmd", {
+    meta: dict = {
         "command": command, "exit_code": exit_code,
         "output_snippet": output, "duration_ms": duration,
-    })
+    }
+    if cwd:
+        meta["cwd"] = cwd
+    base.emit("terminal_cmd", meta)
 
     framework = _detect_test(command)
     if framework:
-        passed, failed = _parse_test_results(output, framework, exit_code)
+        passed, failed, skipped = _parse_test_results(output, framework, exit_code)
         base.emit("test_run", {
             "framework": framework, "passed": passed, "failed": failed,
-            "duration_ms": duration,
+            "skipped": skipped, "duration_ms": duration,
         })

{methodproof-0.7.27 → methodproof-0.7.29}/methodproof/agents/watcher.py

@@ -139,7 +139,8 @@ class _Handler(FileSystemEventHandler):
             return
         path = self._relpath(event.src_path)
         self._hashes.pop(path, None)
-        base.emit("file_delete", {"path": path})
+        lang = Path(event.src_path).suffix.lstrip(".")
+        base.emit("file_delete", {"path": path, "language": lang})
 
 
 def _poll_git(watch_dir: str, stop: threading.Event) -> None:
@@ -164,17 +165,33 @@ def _poll_git(watch_dir: str, stop: threading.Event) -> None:
 
 def _log_commit(watch_dir: str, sha: str) -> None:
     try:
-        msg = subprocess.run(
-            ["git", "-C", watch_dir, "log", "-1", "--format=%s", sha],
+        # Single git call: subject\x00author\x00email\x00iso_date\x00parent_hash\x00full_body
+        fmt = subprocess.run(
+            ["git", "-C", watch_dir, "log", "-1",
+             "--format=%s%x00%an%x00%ae%x00%ai%x00%P%x00%B", sha],
             capture_output=True, text=True, timeout=5,
-        ).stdout.strip()
+        ).stdout
+        parts = fmt.split("\x00", 5)
+        subject = parts[0].strip() if len(parts) > 0 else ""
+        author = parts[1].strip() if len(parts) > 1 else ""
+        author_email = parts[2].strip() if len(parts) > 2 else ""
+        committed_at = parts[3].strip() if len(parts) > 3 else ""
+        parent_hash = parts[4].strip()[:7] if len(parts) > 4 else ""
+        body = parts[5].strip() if len(parts) > 5 else ""
         files = subprocess.run(
             ["git", "-C", watch_dir, "diff-tree", "--no-commit-id", "-r", "--name-only", sha],
             capture_output=True, text=True, timeout=5,
         ).stdout.strip().splitlines()
     except Exception:
-        msg, files = "", []
-    meta: dict[str, object] = {"hash": sha[:7], "message": msg, "files_changed": files}
+        subject, author, author_email, committed_at, parent_hash, body, files = "", "", "", "", "", "", []
+    meta: dict[str, object] = {
+        "hash": sha[:7], "message": subject, "files_changed": files,
+        "author": author, "author_email": author_email, "committed_at": committed_at,
+    }
+    if parent_hash:
+        meta["parent_hash"] = parent_hash
+    if body and body != subject:
+        meta["body"] = body[:2000]
     diff = _git_show_diff(watch_dir, sha)
     if diff:
         meta["diff"] = diff

{methodproof-0.7.27 → methodproof-0.7.29}/methodproof/cli.py

@@ -156,13 +156,50 @@ def _install_alias() -> None:
         f.write(alias)
 
 
-def _print_journal_intro(credits: int) -> None:
-    """Show journal mode introduction with remaining credits."""
+_PRO_TIERS = {"pro", "team", "admin", "superadmin"}
+
+
+def _journal_entitlement(cfg: dict) -> str | int:
+    """Return 'unlimited' for Pro+ users, or an int credit count for others.
+
+    For Basic users, fetches live credit count from the platform; falls back
+    to the locally cached value if the request fails (e.g. offline).
+    """
+    token = cfg.get("token", "")
+    claims = _decode_jwt_claims(token) if token else {}
+    account_type = claims.get("account_type", "free").lower()
+
+    if account_type in _PRO_TIERS:
+        return "unlimited"
+
+    if account_type == "basic":
+        try:
+            profile = _request("GET", "/auth/me", cfg.get("api_url", config.LOCAL_API_URL), token)
+            server_credits = profile.get("journal_credits")
+            if server_credits is not None:
+                cfg["journal_credits"] = int(server_credits)
+                config.save(cfg)
+        except Exception:
+            pass  # offline — use local cache
+
+    return int(cfg.get("journal_credits", 0))
+
+
+def _journal_credits_line(entitlement: str | int) -> str:
+    if entitlement == "unlimited":
+        return "Unlimited journal entries (Pro plan)"
+    n = int(entitlement)
+    label = f"{n} free journal credit{'s' if n != 1 else ''}"
+    return f"{label} (up to {config.FREE_JOURNAL_MAX_HOURS}h per session)"
+
+
+def _print_journal_intro(cfg: dict) -> None:
+    """Show journal mode introduction with tier-aware credit status."""
+    entitlement = _journal_entitlement(cfg)
     print("  ┌─────────────────────────────────────────────────────┐")
     print("  │  Journal Mode — full content capture                │")
     print("  └─────────────────────────────────────────────────────┘")
-    print(f"  You have {credits} free journal credit{'s' if credits != 1 else ''} "
-          f"(sessions up to {config.FREE_JOURNAL_MAX_HOURS}h each).")
+    print(f"  {_journal_credits_line(entitlement)}")
     print()
     print("  By default, MethodProof captures structural metadata only —")
     print("  file paths, line counts, timing, tool names. Journal mode")
@@ -199,9 +236,8 @@ def _run_consent(cfg: dict) -> dict:
         cfg["research_consent"] = False
         cfg["publish_redact"] = dict(config._DEFAULTS["publish_redact"])
         cfg["consent_acknowledged"] = True
-        credits = cfg.get("journal_credits", config._DEFAULTS["journal_credits"])
         print("\n  Minimal capture enabled (file changes + git commits).\n")
-        _print_journal_intro(credits)
+        _print_journal_intro(cfg)
         print("  Customize anytime: `methodproof consent`\n")
         return cfg
 
@@ -210,9 +246,8 @@ def _run_consent(cfg: dict) -> dict:
     cfg["research_consent"] = False
     cfg["publish_redact"] = dict(config._DEFAULTS["publish_redact"])
     cfg["consent_acknowledged"] = True
-    credits = cfg.get("journal_credits", config._DEFAULTS["journal_credits"])
     print(f"\n  {_rainbow('Full Spectrum')} enabled — free live streaming unlocked.\n")
-    _print_journal_intro(credits)
+    _print_journal_intro(cfg)
     print("  Customize anytime: `methodproof consent`\n")
     return cfg
 
@@ -873,7 +908,8 @@ def cmd_journal(args: argparse.Namespace) -> None:
     """Journal mode — full content capture."""
     subcmd = getattr(args, "journal_cmd", None)
     cfg = config.load()
-    credits = cfg.get("journal_credits", 0)
+    entitlement = _journal_entitlement(cfg)
+    is_unlimited = entitlement == "unlimited"
 
     if subcmd == "on":
         print("Journal Mode — Full Content Capture\n")
@@ -884,12 +920,9 @@ def cmd_journal(args: argparse.Namespace) -> None:
         print("  • Terminal output (not just commands)")
         print("  • Tool call parameters and results\n")
         print("All content is encrypted (AES-256-GCM) and subject to your consent settings.\n")
-        if credits > 0:
-            print(f"You have {credits} free journal credit{'s' if credits != 1 else ''} "
-                  f"(sessions up to {config.FREE_JOURNAL_MAX_HOURS}h each).")
-            print("After credits are used, journal mode requires a Pro plan.\n")
-        else:
-            print("Journal mode requires a Pro plan (or free credits if available).\n")
+        print(f"  {_journal_credits_line(entitlement)}\n")
+        if not is_unlimited and int(entitlement) == 0:
+            print("You have no credits remaining. Upgrade to Pro for unlimited journal entries.\n")
         answer = input("Enable journal mode? [y/N] ").strip().lower()
         if answer != "y":
             print("Journal mode not enabled.")
@@ -913,9 +946,7 @@ def cmd_journal(args: argparse.Namespace) -> None:
             print("Journal mode: OFF (structural only)")
             print("  Only metadata captured: lengths, types, timing, file paths.")
             print("  Enable with: methodproof journal on")
-        if credits > 0:
-            print(f"  Free journal credits: {credits} "
-                  f"(up to {config.FREE_JOURNAL_MAX_HOURS}h per session)")
+        print(f"  {_journal_credits_line(entitlement)}")
 
     else:
         print("Usage: methodproof journal [on|off|status]")
@@ -1196,12 +1227,17 @@ def cmd_start(args: argparse.Namespace) -> None:
     # Journal mode
     if getattr(args, "journal", False):
         cfg["journal_mode"] = True
-        credits = cfg.get("journal_credits", 0)
-        if credits > 0:
-            cfg["journal_credits"] = credits - 1
-            print(f"Journal mode ON (free credit used — {credits - 1} remaining, {config.FREE_JOURNAL_MAX_HOURS}h cap).")
+        entitlement = _journal_entitlement(cfg)
+        if entitlement == "unlimited":
+            print("Journal mode ON (full content capture).")
         else:
-            print("Journal mode ON for this session (full content capture).")
+            credits = int(entitlement)
+            if credits > 0:
+                cfg["journal_credits"] = credits - 1
+                remaining = credits - 1
+                print(f"Journal mode ON (free credit used — {remaining} remaining, {config.FREE_JOURNAL_MAX_HOURS}h cap).")
+            else:
+                print("Journal mode ON for this session (full content capture).")
         config.save(cfg)
 
     # E2E mode
@@ -1558,8 +1594,8 @@ def cmd_status(args: argparse.Namespace) -> None:
     # Modes
     modes = []
     if cfg.get("journal_mode"):
-        credits = cfg.get("journal_credits", 0)
-        modes.append(f"journal ({credits} credits)")
+        ent = _journal_entitlement(cfg)
+        modes.append("journal (unlimited)" if ent == "unlimited" else f"journal ({ent} credits)")
     if cfg.get("e2e_mode"):
         fp = cfg.get("e2e_fingerprint", "")
         modes.append(f"e2e ({fp[:8]})" if fp else "e2e")

{methodproof-0.7.27 → methodproof-0.7.29}/methodproof/config.py

@@ -118,6 +118,9 @@ JOURNAL_CONTENT_FIELDS: list[tuple[str, str]] = [
     ("user_prompt", "prompt_text"),
     ("tool_call", "tool_input_preview"),
     ("tool_result", "result_preview"),
+    # Agent final message and commit body reveal content
+    ("agent_complete", "last_message_preview"),
+    ("git_commit", "body"),
 ]
 
 

{methodproof-0.7.27 → methodproof-0.7.29}/methodproof/hook.py

@@ -10,10 +10,11 @@ _BASH = '''
 # methodproof-hook
 _mp_pre() { _MP_CMD="$BASH_COMMAND"; _MP_T=$SECONDS; }
 _mp_post() {
-  local ec=$? cmd="$_MP_CMD" dur=$(( (SECONDS - ${_MP_T:-$SECONDS}) * 1000 ))
+  local ec=$? cmd="$_MP_CMD" dur=$(( (SECONDS - ${_MP_T:-$SECONDS}) * 1000 )) cwd
   [ -z "$cmd" ] && return
   cmd="${cmd//\\\\/\\\\\\\\}"; cmd="${cmd//\\"/\\\\\\"}"
-  echo "{\\"command\\":\\"$cmd\\",\\"exit_code\\":$ec,\\"duration_ms\\":$dur}" >> ~/.methodproof/commands.jsonl
+  cwd="$(pwd)"; cwd="${cwd//\\\\/\\\\\\\\}"; cwd="${cwd//\\"/\\\\\\"}"
+  echo "{\\"command\\":\\"$cmd\\",\\"exit_code\\":$ec,\\"duration_ms\\":$dur,\\"cwd\\":\\"$cwd\\"}" >> ~/.methodproof/commands.jsonl
   unset _MP_CMD
 }
 trap '_mp_pre' DEBUG
@@ -24,10 +25,11 @@ _ZSH = '''
 # methodproof-hook
 _mp_pre() { _MP_CMD="$1"; _MP_T=$SECONDS; }
 _mp_post() {
-  local ec=$? cmd="$_MP_CMD" dur=$(( (SECONDS - ${_MP_T:-$SECONDS}) * 1000 ))
+  local ec=$? cmd="$_MP_CMD" dur=$(( (SECONDS - ${_MP_T:-$SECONDS}) * 1000 )) cwd
   [[ -z "$cmd" ]] && return
   cmd="${cmd//\\\\/\\\\\\\\}"; cmd="${cmd//\\"/\\\\\\"}"
-  echo "{\\"command\\":\\"$cmd\\",\\"exit_code\\":$ec,\\"duration_ms\\":$dur}" >> ~/.methodproof/commands.jsonl
+  cwd="$(pwd)"; cwd="${cwd//\\\\/\\\\\\\\}"; cwd="${cwd//\\"/\\\\\\"}"
+  echo "{\\"command\\":\\"$cmd\\",\\"exit_code\\":$ec,\\"duration_ms\\":$dur,\\"cwd\\":\\"$cwd\\"}" >> ~/.methodproof/commands.jsonl
   unset _MP_CMD
 }
 autoload -Uz add-zsh-hook
@@ -52,7 +54,8 @@ function prompt {
     if ($global:_mpCmd) {
         $dur = [DateTimeOffset]::UtcNow.ToUnixTimeMilliseconds() - $global:_mpT
         $cmd = $global:_mpCmd -replace '\\\\','\\\\\\\\' -replace '"','\\"'
-        $line = "{`"command`":`"$cmd`",`"exit_code`":$ec,`"duration_ms`":$dur}"
+        $cwd = (Get-Location).Path -replace '\\\\','\\\\\\\\' -replace '"','\\"'
+        $line = "{`"command`":`"$cmd`",`"exit_code`":$ec,`"duration_ms`":$dur,`"cwd`":`"$cwd`"}"
         $logPath = Join-Path $HOME ".methodproof" "commands.jsonl"
         Add-Content -Path $logPath -Value $line
         $global:_mpCmd = $null

{methodproof-0.7.27 → methodproof-0.7.29}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "methodproof"
-version = "0.7.27"
+version = "0.7.29"
 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.27 → methodproof-0.7.29}/tests/test_cli_start.py

@@ -118,9 +118,10 @@ def test_start_creates_session_and_spawns_daemon(mock_sleep, mock_popen, mock_re
 @patch("subprocess.Popen")
 @patch("time.sleep")
 def test_start_journal_decrements_credits(mock_sleep, mock_popen, mock_req, mock_repo, mock_update, mock_auth,
-                                           mock_hook, mock_alive, logged_in_cfg, cli_args,
+                                           mock_hook, mock_alive, logged_in_cfg, fake_jwt, cli_args,
                                            monkeypatch, capsys):
-    cfg = logged_in_cfg(account_id="acct-1")
+    # Use free-tier JWT — pro/team skips credit deduction (unlimited)
+    cfg = logged_in_cfg(account_id="acct-1", token=fake_jwt(user_id="acct-1", account_type="free"))
     cfg["journal_credits"] = 2
     config.save(cfg)
     pidfile = config.DIR / "methodproof.pid"