@pennyfarthing/core 7.6.0 → 7.7.0

package/pennyfarthing-dist/scripts/core/check-context.sh

@@ -53,6 +53,7 @@ critical_threshold = $DEFAULT_CRITICAL_THRESHOLD
 max_tokens = $DEFAULT_MAX_TOKENS
 tirepump_threshold = $DEFAULT_TIREPUMP_THRESHOLD
 permission_mode = 'manual'  # Default to manual
+relay_mode = False  # MSSCI-12395: Independent auto-handoff toggle
 
 # First try .pennyfarthing/config.local.yaml (preferred location)
 try:
@@ -67,9 +68,13 @@ try:
                 critical_threshold = cb.get('critical_threshold', critical_threshold)
                 max_tokens = cb.get('max_tokens', max_tokens)
                 tirepump_threshold = cb.get('tirepump_threshold', tirepump_threshold)
-            # Read permission_mode from workflow section
-            if 'workflow' in config and 'permission_mode' in config['workflow']:
-                permission_mode = config['workflow']['permission_mode']
+            # Read permission_mode and relay_mode from workflow section
+            if 'workflow' in config:
+                if 'permission_mode' in config['workflow']:
+                    permission_mode = config['workflow']['permission_mode']
+                # MSSCI-12395: relay_mode for auto-handoff (independent of permission_mode)
+                if 'relay_mode' in config['workflow']:
+                    relay_mode = config['workflow']['relay_mode'] == True
 except:
     # Fallback to settings.local.json (legacy location)
     try:
@@ -82,8 +87,12 @@ except:
                 critical_threshold = cb.get('critical_threshold', critical_threshold)
                 max_tokens = cb.get('max_tokens', max_tokens)
                 tirepump_threshold = cb.get('tirepump_threshold', tirepump_threshold)
-            if 'workflow' in settings and 'permission_mode' in settings['workflow']:
-                permission_mode = settings['workflow']['permission_mode']
+            if 'workflow' in settings:
+                if 'permission_mode' in settings['workflow']:
+                    permission_mode = settings['workflow']['permission_mode']
+                # MSSCI-12395: relay_mode for auto-handoff (independent of permission_mode)
+                if 'relay_mode' in settings['workflow']:
+                    relay_mode = settings['workflow']['relay_mode'] == True
     except:
         pass
 
@@ -93,6 +102,7 @@ print(f'CRITICAL_THRESHOLD={critical_threshold}')
 print(f'MAX_TOKENS={max_tokens}')
 print(f'TIREPUMP_THRESHOLD={tirepump_threshold}')
 print(f'PERMISSION_MODE={permission_mode}')
+print(f'RELAY_MODE={str(relay_mode).lower()}')
 " 2>/dev/null)
 
 # Apply config or use defaults
@@ -140,6 +150,7 @@ import json
 warning_threshold = $WARNING_THRESHOLD
 max_tokens = $MAX_TOKENS
 permission_mode = '$PERMISSION_MODE'
+relay_mode = '$RELAY_MODE' == 'true'  # MSSCI-12395: Independent auto-handoff toggle
 tirepump_threshold = $TIREPUMP_THRESHOLD  # Threshold for TirePump auto-handoff (configurable)
 
 with open('$TRANSCRIPT', 'r') as f:
@@ -193,16 +204,22 @@ if last_total is not None:
     # Use usable percent for status decisions (more accurate for user)
     if usable_pct > warning_threshold:
         print('CONTEXT_STATUS=HIGH')
-        print('HANDOFF_MODE=auto')
     else:
         print('CONTEXT_STATUS=OK')
+
+    # HANDOFF_MODE: 'auto' if relay_mode enabled, 'ask' otherwise
+    # MSSCI-12395: relay_mode controls autohandoff independent of context level
+    if relay_mode:
+        print('HANDOFF_MODE=auto')
+    else:
         print('HANDOFF_MODE=ask')
 
     # TirePump: Use CONTEXT_CLEAR (clear + load next agent) when:
-    # 1. permission_mode is 'turbo' (auto-handoff enabled)
+    # 1. relay_mode is true (auto-handoff enabled) - MSSCI-12395
     # 2. context > 60% (tirepump_threshold)
     # This enables continuous autonomous runs without manual intervention
-    use_tirepump = permission_mode == 'turbo' and usable_pct > tirepump_threshold
+    # Legacy: also support permission_mode == 'turbo' for backwards compatibility
+    use_tirepump = (relay_mode or permission_mode == 'turbo') and usable_pct > tirepump_threshold
     print(f'USE_TIREPUMP={str(use_tirepump).lower()}')
 
     # Cyclist detection: Multiple methods for robustness

package/pennyfarthing-dist/scripts/core/prime.sh

@@ -2,12 +2,13 @@
 # prime.sh - Load essential project context at agent activation
 # Usage: prime.sh [--minimal] [--full] [--quiet] [--agent <name>]
 #
-# Loads context in priority order (CLAUDE.md skipped - already in system prompt):
-# 1. Sprint summary (current-sprint.yaml key fields)
-# 2. Active session (.session/*-session.md)
-# 3. Agent sidecar (if --agent provided)
-# 4. Agent behavior guide (combined protocols for all agents)
-# 5. Domain docs (--full only)
+# Loads context in priority order (optimized for attention):
+# 1. CLAUDE.md (already in system prompt - skipped)
+# 2. Agent definition + behavior guide (HIGHEST PRIORITY - load first!)
+# 3. Persona (already output by agent-session.sh before this runs)
+# 4. Session summary (active work context)
+# 5. Sidecars (patterns, gotchas, decisions - lowest priority)
+# 6. Domain docs (--full only)
 
 set -euo pipefail
 
@@ -33,7 +34,7 @@ while [[ $# -gt 0 ]]; do
             echo "  --minimal      Skip all context (fastest)"
             echo "  --full         Include domain docs from .claude/project/"
             echo "  --quiet        Suppress section headers"
-            echo "  --agent <name> Load agent's sidecar patterns"
+            echo "  --agent <name> Load agent definition and sidecar"
             exit 0
             ;;
         *) shift ;;
@@ -48,33 +49,61 @@ print_header() {
     fi
 }
 
-# CLAUDE.md is already loaded by Claude Code system prompt - skip it
-
 # Stop here for minimal mode
 if [[ "$MINIMAL" == "true" ]]; then
     exit 0
 fi
 
-# 1. Sprint summary (uses shared functions from sprint-common.sh)
+# =============================================================================
+# PRIORITY 1: Agent definition (HIGHEST ATTENTION ZONE)
+# =============================================================================
+# This is the most critical content - load it FIRST while attention is highest
+
+if [[ -n "$AGENT_NAME" ]]; then
+    AGENT_FILE="$PROJECT_ROOT/.pennyfarthing/agents/${AGENT_NAME}.md"
+    if [[ -f "$AGENT_FILE" ]]; then
+        print_header "Agent Definition: ${AGENT_NAME}"
+        cat "$AGENT_FILE"
+    fi
+fi
+
+# =============================================================================
+# PRIORITY 2: Agent behavior guide (shared protocols)
+# =============================================================================
+
+if [[ -n "$AGENT_NAME" ]]; then
+    BEHAVIOR_GUIDE="$PROJECT_ROOT/.pennyfarthing/guides/agent-behavior.md"
+    if [[ -f "$BEHAVIOR_GUIDE" ]]; then
+        print_header "Agent Behavior Guide"
+        cat "$BEHAVIOR_GUIDE"
+    fi
+fi
+
+# =============================================================================
+# PRIORITY 3: Persona already loaded by agent-session.sh (before prime.sh runs)
+# =============================================================================
+# Nothing to do here - persona is output by agent-session.sh start
+
+# =============================================================================
+# PRIORITY 4: Session summary (active work context)
+# =============================================================================
+
+# Sprint summary (brief - just name and progress)
 if [[ -f "$(get_sprint_file)" ]]; then
     print_header "Sprint Context"
-
-    # Use shared functions for consistent output
     summary=$(get_sprint_summary)
     if [[ -n "$summary" ]]; then
         echo "$summary"
     fi
-
     progress=$(get_sprint_progress)
     if [[ -n "$progress" ]]; then
         echo "$progress"
     fi
 fi
 
-# 2. Active session (if exists) - extract header metadata + current assessment
+# Active session (if exists) - extract header metadata + current assessment
 SESSION_FILE=""
 if [[ -d "$PROJECT_ROOT/.session" ]]; then
-    # Find a session file (typically only one active at a time)
     SESSION_FILE=$(find "$PROJECT_ROOT/.session" -maxdepth 1 -name "*-session.md" -type f 2>/dev/null | head -1)
 fi
 
@@ -82,18 +111,14 @@ if [[ -n "$SESSION_FILE" && -f "$SESSION_FILE" ]]; then
     print_header "Active Session: $(basename "$SESSION_FILE")"
 
     # Extract header (everything before first ## heading)
-    # This includes: title, metadata fields (Phase, Workflow, Repos, Branch, etc.)
     awk '/^## / {exit} {print}' "$SESSION_FILE"
 
-    # Find the most recent assessment section (workflow-agnostic)
-    # Assessment sections are named: "## {Agent} Assessment" (TEA, Dev, Reviewer, SM, etc.)
-    # Show the LAST one in the file as it represents current state
+    # Find the most recent assessment section
     last_assessment=$(grep -n '^## .*Assessment' "$SESSION_FILE" | tail -1 | cut -d: -f1)
 
     if [[ -n "$last_assessment" ]]; then
         echo ""
         echo "---"
-        # Extract from that line to next ## or EOF
         awk -v start="$last_assessment" '
             NR >= start {
                 if (NR > start && /^## /) exit
@@ -103,29 +128,29 @@ if [[ -n "$SESSION_FILE" && -f "$SESSION_FILE" ]]; then
     fi
 fi
 
-# 3. Agent sidecar (if --agent provided)
+# =============================================================================
+# PRIORITY 5: Sidecars (patterns, gotchas, decisions - LOWEST PRIORITY)
+# =============================================================================
+# These are supplementary - loaded last when attention is lower
+
 if [[ -n "$AGENT_NAME" ]]; then
     SIDECAR_DIR="$PROJECT_ROOT/.pennyfarthing/sidecars/${AGENT_NAME}"
     if [[ -d "$SIDECAR_DIR" ]]; then
-        for pattern_file in "$SIDECAR_DIR"/*.md; do
+        # Load in specific order: patterns first (most useful), then gotchas, then decisions
+        for filename in patterns.md gotchas.md decisions.md; do
+            pattern_file="$SIDECAR_DIR/$filename"
             if [[ -f "$pattern_file" ]]; then
-                print_header "Agent Sidecar: $(basename "$pattern_file")"
+                print_header "Agent Sidecar: $filename"
                 cat "$pattern_file"
             fi
         done
     fi
 fi
 
-# 4. Agent behavior guide (combined protocols for all agents)
-if [[ -n "$AGENT_NAME" ]]; then
-    BEHAVIOR_GUIDE="$PROJECT_ROOT/.pennyfarthing/guides/agent-behavior.md"
-    if [[ -f "$BEHAVIOR_GUIDE" ]]; then
-        print_header "Agent Behavior Guide"
-        cat "$BEHAVIOR_GUIDE"
-    fi
-fi
+# =============================================================================
+# PRIORITY 6: Domain docs (--full only, rarely used)
+# =============================================================================
 
-# 5. Domain docs (--full only)
 if [[ "$FULL" == "true" ]]; then
     for doc in "$PROJECT_ROOT/.claude/project"/CLAUDE-*.md; do
         if [[ -f "$doc" ]]; then

package/pennyfarthing-dist/scripts/git/create-feature-branches.sh

@@ -143,6 +143,7 @@ echo "   Branch: $BRANCH_NAME"
 echo "   Repos: $REPOS"
 
 # Process repos based on selection
+# When processing multiple repos, run in parallel for faster network I/O
 case "$REPOS" in
     api)
         create_or_checkout_branch "$REPO_BASE/Pennyfarthing-api" "Pennyfarthing-api"
@@ -151,8 +152,42 @@ case "$REPOS" in
         create_or_checkout_branch "$REPO_BASE/Pennyfarthing-ui" "Pennyfarthing-ui"
         ;;
     all)
-        create_or_checkout_branch "$REPO_BASE/Pennyfarthing-api" "Pennyfarthing-api"
-        create_or_checkout_branch "$REPO_BASE/Pennyfarthing-ui" "Pennyfarthing-ui"
+        # Parallel execution for both repos
+        tmpdir=$(mktemp -d)
+        trap "rm -rf '$tmpdir'" EXIT
+        HAD_ERRORS=false
+
+        # Run both in parallel, capturing output
+        # Write to separate files to avoid race condition on shared file
+        (
+            create_or_checkout_branch "$REPO_BASE/Pennyfarthing-api" "Pennyfarthing-api"
+            echo "$REPO_BASE/Pennyfarthing-api:Pennyfarthing-api" > "$tmpdir/api.processed"
+        ) > "$tmpdir/api.out" 2>&1 &
+        pid_api=$!
+
+        (
+            create_or_checkout_branch "$REPO_BASE/Pennyfarthing-ui" "Pennyfarthing-ui"
+            echo "$REPO_BASE/Pennyfarthing-ui:Pennyfarthing-ui" > "$tmpdir/ui.processed"
+        ) > "$tmpdir/ui.out" 2>&1 &
+        pid_ui=$!
+
+        # Wait for both and capture exit codes
+        wait $pid_api; rc_api=$?
+        wait $pid_ui; rc_ui=$?
+
+        # Show output in order
+        [ -f "$tmpdir/api.out" ] && cat "$tmpdir/api.out"
+        [ -f "$tmpdir/ui.out" ] && cat "$tmpdir/ui.out"
+
+        # Rebuild PROCESSED_REPOS from separate files (avoids race condition)
+        [ -f "$tmpdir/api.processed" ] && PROCESSED_REPOS+=("$(cat "$tmpdir/api.processed")")
+        [ -f "$tmpdir/ui.processed" ] && PROCESSED_REPOS+=("$(cat "$tmpdir/ui.processed")")
+
+        # Check for failures
+        if [ $rc_api -ne 0 ] || [ $rc_ui -ne 0 ]; then
+            echo "⚠️  Some repos had errors"
+            HAD_ERRORS=true
+        fi
         ;;
 esac
 
@@ -222,5 +257,11 @@ done
 
 echo ""
 echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
-echo "✅ Done! All branches verified and ready."
-echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+if [ "$HAD_ERRORS" = true ]; then
+    echo "⚠️  Done with errors. Check output above."
+    echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+    exit 1
+else
+    echo "✅ Done! All branches verified and ready."
+    echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+fi

package/pennyfarthing-dist/scripts/git/git-status-all.sh

@@ -82,15 +82,26 @@ if ! $BRIEF; then
     echo ""
 fi
 
-# Check each repo from configuration
+# Check each repo from configuration (parallelized for performance)
 repo_count=$(get_repo_count)
 if [[ "$repo_count" -eq 0 ]]; then
     # No repos configured, just show current directory
     show_repo_status "Project" "$PROJECT_ROOT"
 else
+    # Create temp dir for parallel output capture
+    tmpdir=$(mktemp -d)
+    trap "rm -rf '$tmpdir'" EXIT
+
+    # Launch status checks in parallel
     for repo in $(get_repos); do
         repo_path=$(get_repo_full_path "$repo")
-        show_repo_status "$repo" "$repo_path"
+        (show_repo_status "$repo" "$repo_path" > "$tmpdir/$repo.out" 2>&1) &
+    done
+    wait
+
+    # Output results in order
+    for repo in $(get_repos); do
+        [ -f "$tmpdir/$repo.out" ] && cat "$tmpdir/$repo.out"
     done
 fi
 
@@ -108,14 +119,28 @@ if ! $BRIEF; then
         unpushed=$(git -C "$PROJECT_ROOT" log origin/develop..HEAD --oneline 2>/dev/null | wc -l | tr -d ' ')
         total_unpushed=$((total_unpushed + unpushed))
     else
+        # Parallelize summary collection
+        summary_tmp=$(mktemp -d)
         for repo in $(get_repos); do
             repo_path=$(get_repo_full_path "$repo")
-            [ -d "$repo_path/.git" ] || [ -d "$repo_path" ] || continue
-            count=$(git -C "$repo_path" status --short 2>/dev/null | wc -l | tr -d ' ')
-            total_changes=$((total_changes + count))
-            unpushed=$(git -C "$repo_path" log origin/develop..HEAD --oneline 2>/dev/null | wc -l | tr -d ' ')
-            total_unpushed=$((total_unpushed + unpushed))
+            (
+                [ -d "$repo_path/.git" ] || [ -d "$repo_path" ] || exit 0
+                count=$(git -C "$repo_path" status --short 2>/dev/null | wc -l | tr -d ' ')
+                unpushed=$(git -C "$repo_path" log origin/develop..HEAD --oneline 2>/dev/null | wc -l | tr -d ' ')
+                echo "$count $unpushed" > "$summary_tmp/$repo.count"
+            ) &
+        done
+        wait
+
+        # Aggregate results
+        for repo in $(get_repos); do
+            if [ -f "$summary_tmp/$repo.count" ]; then
+                read count unpushed < "$summary_tmp/$repo.count"
+                total_changes=$((total_changes + count))
+                total_unpushed=$((total_unpushed + unpushed))
+            fi
         done
+        rm -rf "$summary_tmp"
     fi
 
     if [ "$total_changes" -eq 0 ] && [ "$total_unpushed" -eq 0 ]; then

package/pennyfarthing-dist/scripts/hooks/bell-mode-hook.sh

@@ -8,7 +8,7 @@
 # Claude's next API call.
 #
 # Configuration files:
-#   .pennyfarthing/bell-mode.json - { "enabled": true/false }
+#   .pennyfarthing/config.local.yaml - workflow.bell_mode: true/false
 #   .pennyfarthing/bell-queue.json - [{ "text": "...", "images": [...] }, ...]
 #
 # Output format (when injecting):
@@ -35,15 +35,17 @@ if [[ ! -d "$PROJECT_ROOT/.pennyfarthing" ]]; then
   exit 0
 fi
 
-BELL_MODE_CONFIG="$PROJECT_ROOT/.pennyfarthing/bell-mode.json"
+CONFIG_LOCAL_YAML="$PROJECT_ROOT/.pennyfarthing/config.local.yaml"
 BELL_QUEUE_FILE="$PROJECT_ROOT/.pennyfarthing/bell-queue.json"
 
-# Check if bell mode is enabled
-if [[ ! -f "$BELL_MODE_CONFIG" ]]; then
+# Check if bell mode is enabled in config.local.yaml
+if [[ ! -f "$CONFIG_LOCAL_YAML" ]]; then
   exit 0
 fi
 
-ENABLED=$(cat "$BELL_MODE_CONFIG" 2>/dev/null | grep -o '"enabled"[[:space:]]*:[[:space:]]*true' || true)
+# Parse YAML to check workflow.bell_mode - look for "bell_mode: true"
+# This handles both "bell_mode: true" and "  bell_mode: true" (indented under workflow)
+ENABLED=$(grep -E '^\s*bell_mode:\s*true' "$CONFIG_LOCAL_YAML" 2>/dev/null || true)
 if [[ -z "$ENABLED" ]]; then
   exit 0
 fi
@@ -67,6 +69,13 @@ if [[ -z "$FIRST_MESSAGE_TEXT" ]]; then
   exit 0
 fi
 
+# Get Cyclist port (if running)
+CYCLIST_PORT=""
+PORT_FILE="$PROJECT_ROOT/.cyclist-port"
+if [[ -f "$PORT_FILE" ]]; then
+  CYCLIST_PORT=$(cat "$PORT_FILE" 2>/dev/null)
+fi
+
 # Output the hook response JSON
 cat << EOF
 {
@@ -77,11 +86,21 @@ cat << EOF
 }
 EOF
 
-# Remove the first message from the queue (for next invocation)
-# Use jq if available, otherwise leave queue management to the TypeScript side
-# Run in background and ignore errors to avoid blocking hook response
-if command -v jq &> /dev/null; then
-  (jq 'if length > 0 then .[1:] else [] end' "$BELL_QUEUE_FILE" > "$BELL_QUEUE_FILE.tmp" 2>/dev/null && mv "$BELL_QUEUE_FILE.tmp" "$BELL_QUEUE_FILE") &
-fi
+# Remove the first message from the queue and notify Cyclist
+# Run in background to avoid blocking hook response
+(
+  # Dequeue using jq if available
+  if command -v jq &> /dev/null; then
+    jq 'if length > 0 then .[1:] else [] end' "$BELL_QUEUE_FILE" > "$BELL_QUEUE_FILE.tmp" 2>/dev/null && mv "$BELL_QUEUE_FILE.tmp" "$BELL_QUEUE_FILE"
+  fi
+
+  # Notify Cyclist browser to dequeue and display the message
+  if [[ -n "$CYCLIST_PORT" ]] && [[ "$CYCLIST_PORT" =~ ^[0-9]+$ ]]; then
+    curl -s -X POST "http://localhost:$CYCLIST_PORT/api/bell-consumed" \
+      -H "Content-Type: application/json" \
+      -d "{\"text\": \"$FIRST_MESSAGE_TEXT\"}" \
+      >/dev/null 2>&1 || true
+  fi
+) &
 
 exit 0

package/pennyfarthing-dist/scripts/hooks/pre-commit.sh

@@ -1,8 +1,10 @@
 #!/bin/bash
-# pre-commit.sh - Git hook to enforce branch protection
+# pre-commit.sh - Git hook to enforce branch protection and agent validation
 #
-# Prevents direct commits to protected branches (main, develop).
-# Exception: sprint/ folder commits allowed on develop for administrative tracking.
+# Checks:
+# 1. Prevents direct commits to protected branches (main, develop)
+#    Exception: sprint/ folder commits allowed on develop
+# 2. Validates agent files when pennyfarthing-dist/agents/*.md is modified
 #
 # Installation:
 #   Installed to .git/hooks/pre-commit by pennyfarthing init or doctor --fix
@@ -10,6 +12,19 @@
 
 set -uo pipefail
 
+# Find project root
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+# Handle both direct execution and symlink from .git/hooks
+if [[ "$SCRIPT_DIR" == *".git/hooks"* ]]; then
+    PROJECT_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)"
+else
+    PROJECT_ROOT="$(cd "$SCRIPT_DIR/../../.." && pwd)"
+fi
+
+# =============================================================================
+# Check 1: Branch Protection
+# =============================================================================
+
 BRANCH=$(git rev-parse --abbrev-ref HEAD 2>/dev/null)
 PROTECTED_BRANCHES="^(main|develop)$"
 
@@ -21,30 +36,72 @@ if [[ $BRANCH =~ $PROTECTED_BRANCHES ]]; then
 
         # If all staged files are in sprint/, allow the commit
         if [ -z "$NON_SPRINT_FILES" ] && [ -n "$STAGED_FILES" ]; then
-            exit 0
+            # Continue to agent validation check
+            :
+        else
+            echo ""
+            echo "COMMIT BLOCKED"
+            echo ""
+            echo "You are trying to commit directly to: $BRANCH"
+            echo "This violates the git workflow rules."
+            echo ""
+            echo "Protected branches: main, develop"
+            echo ""
+            echo "What to do:"
+            echo "1. Create a feature branch:"
+            echo "   git checkout -b <type>/<epic-story>-<description>"
+            echo ""
+            echo "2. Example:"
+            echo "   git checkout -b feat/8-2-add-authentication"
+            echo ""
+            echo "3. Then commit your changes on the feature branch"
+            echo ""
+            echo "Exception: Sprint tracking files (sprint/*) can be committed to develop"
+            echo ""
+            exit 1
         fi
+    else
+        echo ""
+        echo "COMMIT BLOCKED - Cannot commit directly to $BRANCH"
+        echo ""
+        exit 1
     fi
+fi
 
+# =============================================================================
+# Check 2: Agent File Validation
+# =============================================================================
+
+STAGED_FILES=$(git diff --cached --name-only 2>/dev/null || true)
+AGENT_FILES=$(echo "$STAGED_FILES" | grep "^pennyfarthing-dist/agents/.*\.md$" || true)
+
+if [[ -n "$AGENT_FILES" ]]; then
+    echo "Agent files staged for commit:"
+    echo "$AGENT_FILES" | sed 's/^/  /'
     echo ""
-    echo "COMMIT BLOCKED"
-    echo ""
-    echo "You are trying to commit directly to: $BRANCH"
-    echo "This violates the git workflow rules."
-    echo ""
-    echo "Protected branches: main, develop"
-    echo ""
-    echo "What to do:"
-    echo "1. Create a feature branch:"
-    echo "   git checkout -b <type>/<epic-story>-<description>"
-    echo ""
-    echo "2. Example:"
-    echo "   git checkout -b feat/8-2-add-authentication"
-    echo ""
-    echo "3. Then commit your changes on the feature branch"
-    echo ""
-    echo "Exception: Sprint tracking files (sprint/*) can be committed to develop"
-    echo ""
-    exit 1
+
+    VALIDATOR="$PROJECT_ROOT/pennyfarthing-dist/scripts/validation/validate-agent-schema.sh"
+
+    if [[ -x "$VALIDATOR" ]]; then
+        echo "Running agent schema validation..."
+        echo ""
+
+        if ! "$VALIDATOR"; then
+            echo ""
+            echo "COMMIT BLOCKED - Agent validation failed"
+            echo ""
+            echo "Fix the validation errors above and try again."
+            echo "Run 'just validate-agents -v' for detailed output."
+            echo ""
+            exit 1
+        fi
+
+        echo ""
+        echo "✓ Agent validation passed"
+    else
+        echo "Warning: Agent validator not found at $VALIDATOR"
+        echo "Skipping agent validation."
+    fi
 fi
 
 exit 0