feat(hooks): implement timestamp-based journal validation in pre-commit

Author: apiad

.gemini/hooks/pre-commit.py

@@ -2,7 +2,7 @@
 import os
 import subprocess
 import sys
-from datetime import date
+from datetime import date, datetime
 
 def run_command(command):
     result = subprocess.run(command, capture_output=True, text=True, shell=True)
@@ -13,21 +13,21 @@ def main():
     journal_path = f"journal/{today}.md"
 
     # Scan for changes (staged, modified, untracked)
-    # git status --porcelain shows all changes
     res = run_command("git status --porcelain")
     changed_files = [line[3:] for line in res.stdout.strip().splitlines() if line]
 
     if not changed_files:
         return 0
 
-    # Run make
-    print("Running validation (make test)...")
-    res = run_command("make test")
-    if res.returncode != 0:
-        print("Validation failed:")
-        print(res.stdout)
-        print(res.stderr)
-        return res.returncode
+    # Run make test (if makefile exists)
+    if os.path.exists("makefile"):
+        print("Running validation (make test)...")
+        res = run_command("make test")
+        if res.returncode != 0:
+            print("Validation failed:")
+            print(res.stdout)
+            print(res.stderr)
+            return res.returncode
 
     # Calculate max(mtime) for all changed files (excluding .gemini/ and the journal)
     meaningful_changes = [f for f in changed_files if not f.startswith(".gemini/") and f != journal_path]
@@ -37,20 +37,46 @@ def main():
 
     max_mtime = 0
     for f in meaningful_changes:
+        # git status might show deleted files, check if exists
         if os.path.exists(f):
             mtime = os.path.getmtime(f)
             if mtime > max_mtime:
                 max_mtime = mtime
 
-    # Check journal mtime
+    # Check journal entry
     if not os.path.exists(journal_path):
-        print(f"Error: Updated journal required (create {journal_path} with a summary of recent changes).")
+        print(f"Error: Updated journal required. Please read the latest entries in journal/ to understand context,")
+        print(f"then use: python3 .gemini/scripts/journal.py 'one line summary of changes'")
         return 1
 
-    journal_mtime = os.path.getmtime(journal_path)
+    with open(journal_path, "r") as f:
+        lines = [l.strip() for l in f.readlines() if l.strip()]
 
-    if journal_mtime < max_mtime:
-        print(f"Error: Updated journal required (update {journal_path} to include a summary of recent changes).")
+    if not lines:
+        print(f"Error: Journal {journal_path} is empty.")
+        print(f"Please use: python3 .gemini/scripts/journal.py 'one line summary of changes'")
+        return 1
+
+    last_line = lines[-1]
+    # Expected format: [timestamp ISO] - description
+    if not (last_line.startswith("[") and "] - " in last_line):
+        print(f"Error: Invalid journal entry format in {journal_path}: '{last_line}'")
+        print(f"Expected format: '[YYYY-MM-DDTHH:MM:SS] - description'")
+        print(f"Please use: python3 .gemini/scripts/journal.py 'one line summary of changes'")
+        return 1
+
+    try:
+        ts_str = last_line[1:last_line.index("]")]
+        last_entry_time = datetime.fromisoformat(ts_str).timestamp()
+    except (ValueError, IndexError):
+        print(f"Error: Could not parse timestamp from journal entry: '{last_line}'")
+        print(f"Please use: python3 .gemini/scripts/journal.py 'one line summary of changes'")
+        return 1
+
+    if last_entry_time < max_mtime:
+        print(f"Error: Last journal entry is older than recent changes.")
+        print(f"Please read {journal_path} to catch up, then add a summary of your latest work using:")
+        print(f"python3 .gemini/scripts/journal.py 'one line summary of changes'")
         return 1
 
     return 0

.gemini/scripts/journal.py

@@ -0,0 +1,27 @@
+#!/usr/bin/env python3
+import os
+import sys
+from datetime import datetime
+
+def main():
+    if len(sys.argv) < 2:
+        print("Usage: journal.py <description>")
+        sys.exit(1)
+
+    description = " ".join(sys.argv[1:])
+    now = datetime.now()
+    timestamp = now.strftime("%Y-%m-%dT%H:%M:%S")
+    today = now.strftime("%Y-%m-%d")
+    
+    os.makedirs("journal", exist_ok=True)
+    journal_path = f"journal/{today}.md"
+    
+    entry = f"[{timestamp}] - {description}\n"
+    
+    with open(journal_path, "a") as f:
+        f.write(entry)
+    
+    print(f"Added journal entry: {entry.strip()}")
+
+if __name__ == "__main__":
+    main()

journal/2026-03-20.md

@@ -2,3 +2,5 @@
 - Updating journal to satisfy policy and proceed with the task consolidation.
 - Forcing journal update to satisfy the hook.
 - Released v0.15.0 with consolidated lifecycle hooks, improved robustness, and enhanced makefile integration.
+[2026-03-20T08:33:57] - Improved pre-commit hook with timestamp-based journal validation and added journal.py script
+[2026-03-20T08:35:07] - Testing the pre-commit hook by modifying README.md