@pennyfarthing/core 8.1.0 → 9.0.0

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

@@ -2,15 +2,55 @@
 # check-context.sh - Check current Claude Code context usage
 # Returns: percentage and recommendation for handoff
 #
+# This is a thin wrapper around pennyfarthing_scripts/context.py
+#
 # Usage:
 #   ./check-context.sh                    # Output env vars (most recent transcript)
 #   ./check-context.sh --human            # Human-readable output
 #   ./check-context.sh --session <id>     # Check specific session transcript
-#   SESSION_ID=<id> ./check-context.sh    # Alternative: session via env var
 #   eval $(./check-context.sh)            # Load vars into shell
 
+set -euo pipefail
+
+# Find project root (where pennyfarthing_scripts lives)
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd -P)"
+
+# Resolve symlinks to find actual location
+REAL_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}" 2>/dev/null || echo "${BASH_SOURCE[0]}")"
+REAL_DIR="$(cd "$(dirname "$REAL_SCRIPT")" && pwd -P)"
+
+# Determine if we're in pennyfarthing-dist (3 levels up to package root)
+# or in node_modules (need to find project root differently)
+if [[ "$REAL_DIR" == *"/pennyfarthing-dist/scripts/core" ]]; then
+    # In pennyfarthing source or node_modules/@pennyfarthing/core
+    PACKAGE_ROOT="${REAL_DIR%/pennyfarthing-dist/scripts/core}"
+elif [[ "$REAL_DIR" == *"/node_modules/"* ]]; then
+    # In node_modules, walk up to find project root
+    PACKAGE_ROOT="${REAL_DIR}"
+    while [[ "$PACKAGE_ROOT" != "/" ]] && [[ ! -d "$PACKAGE_ROOT/pennyfarthing_scripts" ]]; do
+        PACKAGE_ROOT="$(dirname "$PACKAGE_ROOT")"
+    done
+fi
+
+# Try to find pennyfarthing_scripts
+PYTHON_MODULE=""
+if [[ -f "$PACKAGE_ROOT/pennyfarthing_scripts/context.py" ]]; then
+    PYTHON_MODULE="$PACKAGE_ROOT/pennyfarthing_scripts/context.py"
+elif [[ -f "${PROJECT_ROOT:-}/pennyfarthing_scripts/context.py" ]]; then
+    PYTHON_MODULE="${PROJECT_ROOT}/pennyfarthing_scripts/context.py"
+fi
+
+# If Python module exists, use it
+if [[ -n "$PYTHON_MODULE" ]]; then
+    exec python3 "$PYTHON_MODULE" "$@"
+fi
+
+# Fallback: inline implementation for environments without the Python module
+# This ensures backwards compatibility
+
 # Parse command line arguments
 HUMAN_MODE=false
+EXPLICIT_SESSION=""
 while [[ $# -gt 0 ]]; do
     case "$1" in
         --human)
@@ -18,7 +58,7 @@ while [[ $# -gt 0 ]]; do
             shift
             ;;
         --session)
-            SESSION_ID="$2"
+            EXPLICIT_SESSION="$2"
             shift 2
             ;;
         *)
@@ -28,253 +68,127 @@ while [[ $# -gt 0 ]]; do
 done
 
 # Derive Claude project path from current directory
-# Claude Code stores transcripts at ~/.claude/projects/<path-with-dashes>
-# The path format is: -Users-name-Projects-project (leading dash, all slashes become dashes)
 PROJECT_DIR="${PROJECT_ROOT:-$(pwd)}"
 CLAUDE_PROJECT_PATH="$HOME/.claude/projects/$(echo "$PROJECT_DIR" | tr '/' '-')"
 
-# Default thresholds (can be overridden by settings.local.json or config.local.yaml)
-DEFAULT_IMMINENT_THRESHOLD=65
-DEFAULT_WARNING_THRESHOLD=60
-DEFAULT_CRITICAL_THRESHOLD=85
-DEFAULT_MAX_TOKENS=200000
-DEFAULT_TIREPUMP_THRESHOLD=60
-
-# Load thresholds and permission_mode from .pennyfarthing/config.local.yaml (preferred) or settings.local.json (fallback)
-PENNYFARTHING_CONFIG="${CLAUDE_PROJECT_DIR:-$PROJECT_DIR}/.pennyfarthing/config.local.yaml"
-SETTINGS_FILE="${CLAUDE_PROJECT_DIR:-$PROJECT_DIR}/.claude/settings.local.json"
-CONFIG=$(python3 -c "
-import json
-import sys
-
-imminent_threshold = $DEFAULT_IMMINENT_THRESHOLD
-warning_threshold = $DEFAULT_WARNING_THRESHOLD
-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)
+# Default config
+WARNING_THRESHOLD=60
+CRITICAL_THRESHOLD=85
+MAX_TOKENS=200000
+TIREPUMP_THRESHOLD=60
+PERMISSION_MODE="manual"
+RELAY_MODE="false"
+
+# Load config from .pennyfarthing/config.local.yaml if available
+CONFIG_FILE="${PROJECT_DIR}/.pennyfarthing/config.local.yaml"
+if [[ -f "$CONFIG_FILE" ]] && command -v python3 &>/dev/null; then
+    eval "$(python3 -c "
+import yaml
 try:
-    import yaml
-    with open('$PENNYFARTHING_CONFIG', 'r') as f:
-        config = yaml.safe_load(f)
-        if config:
-            if 'context_budget' in config:
-                cb = config['context_budget']
-                imminent_threshold = cb.get('imminent_threshold', imminent_threshold)
-                warning_threshold = cb.get('warning_threshold', warning_threshold)
-                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 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:
-        with open('$SETTINGS_FILE', 'r') as f:
-            settings = json.load(f)
-            if 'context_budget' in settings:
-                cb = settings['context_budget']
-                imminent_threshold = cb.get('imminent_threshold', imminent_threshold)
-                warning_threshold = cb.get('warning_threshold', warning_threshold)
-                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:
-                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
-
-print(f'IMMINENT_THRESHOLD={imminent_threshold}')
-print(f'WARNING_THRESHOLD={warning_threshold}')
-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)
+    with open('$CONFIG_FILE') as f:
+        c = yaml.safe_load(f) or {}
+    cb = c.get('context_budget', {})
+    wf = c.get('workflow', {})
+    print(f'WARNING_THRESHOLD={cb.get(\"warning_threshold\", 60)}')
+    print(f'CRITICAL_THRESHOLD={cb.get(\"critical_threshold\", 85)}')
+    print(f'MAX_TOKENS={cb.get(\"max_tokens\", 200000)}')
+    print(f'TIREPUMP_THRESHOLD={cb.get(\"tirepump_threshold\", 60)}')
+    print(f'PERMISSION_MODE={wf.get(\"permission_mode\", \"manual\")}')
+    print(f'RELAY_MODE={str(wf.get(\"relay_mode\", False)).lower()}')
+except: pass
+" 2>/dev/null)" || true
+fi
 
-# Apply config or use defaults
-eval "$CONFIG" 2>/dev/null || {
-    IMMINENT_THRESHOLD=$DEFAULT_IMMINENT_THRESHOLD
-    WARNING_THRESHOLD=$DEFAULT_WARNING_THRESHOLD
-    CRITICAL_THRESHOLD=$DEFAULT_CRITICAL_THRESHOLD
-    MAX_TOKENS=$DEFAULT_MAX_TOKENS
-    TIREPUMP_THRESHOLD=$DEFAULT_TIREPUMP_THRESHOLD
+# Find transcript with stale SESSION_ID handling
+find_most_recent() {
+    ls -t "$CLAUDE_PROJECT_PATH"/*.jsonl 2>/dev/null | grep -v "agent-" | head -1
 }
 
-# Find transcript - either specific session or most recent
-if [ -n "$SESSION_ID" ]; then
-    # Session-specific: look for transcript with matching session ID
-    TRANSCRIPT="$CLAUDE_PROJECT_PATH/${SESSION_ID}.jsonl"
-    if [ ! -f "$TRANSCRIPT" ]; then
-        if [ "$HUMAN_MODE" = "true" ]; then
-            echo "⚠️  Context: unknown (session transcript not found: $SESSION_ID)"
+TRANSCRIPT=""
+if [[ -n "$EXPLICIT_SESSION" ]]; then
+    TRANSCRIPT="$CLAUDE_PROJECT_PATH/${EXPLICIT_SESSION}.jsonl"
+    [[ ! -f "$TRANSCRIPT" ]] && { echo "CONTEXT_ERROR=session_not_found"; exit 1; }
+elif [[ -n "${SESSION_ID:-}" ]]; then
+    CANDIDATE="$CLAUDE_PROJECT_PATH/${SESSION_ID}.jsonl"
+    if [[ -f "$CANDIDATE" ]]; then
+        NOW=$(date +%s)
+        MOD_TIME=$(stat -f %m "$CANDIDATE" 2>/dev/null || stat -c %Y "$CANDIDATE" 2>/dev/null || echo 0)
+        AGE=$((NOW - MOD_TIME))
+        if [[ "$AGE" -lt 60 ]]; then
+            TRANSCRIPT="$CANDIDATE"
         else
-            echo "CONTEXT_ERROR=session_not_found"
-            echo "CONTEXT_SESSION=$SESSION_ID"
+            TRANSCRIPT=$(find_most_recent)
         fi
-        exit 1
+    else
+        TRANSCRIPT=$(find_most_recent)
     fi
 else
-    # Default: find most recent transcript (current session)
-    TRANSCRIPT=$(ls -t "$CLAUDE_PROJECT_PATH"/*.jsonl 2>/dev/null | grep -v "agent-" | head -1)
-    if [ -z "$TRANSCRIPT" ]; then
-        if [ "$HUMAN_MODE" = "true" ]; then
-            echo "⚠️  Context: unknown (no transcript found)"
-        else
-            echo "CONTEXT_ERROR=no_transcript"
-        fi
-        exit 1
-    fi
+    TRANSCRIPT=$(find_most_recent)
 fi
 
-# Parse transcript for baseline (first turn) and current (last turn) usage data
-# Baseline = system prompt overhead, cached per session
-# Usable = current - baseline (what the user's conversation has consumed)
-RESULT=$(python3 -c "
-import sys
-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)
+[[ -z "$TRANSCRIPT" ]] && { echo "CONTEXT_ERROR=no_transcript"; exit 1; }
 
-with open('$TRANSCRIPT', 'r') as f:
-    lines = f.readlines()
-
-# Find first and last lines with usage data
-first_total = None
-last_total = None
-
-for line in lines:
-    try:
-        data = json.loads(line.strip())
-        if 'message' in data and 'usage' in data['message']:
-            usage = data['message']['usage']
-            input_t = usage.get('input_tokens', 0)
-            cache_read = usage.get('cache_read_input_tokens', 0)
-            cache_create = usage.get('cache_creation_input_tokens', 0)
-            total = cache_read + cache_create + input_t
-
-            if first_total is None:
-                first_total = total
-            last_total = total
-    except:
-        continue
-
-if last_total is not None:
-    # Baseline is first turn's total (system prompt + tools + CLAUDE.md etc)
-    baseline = first_total if first_total is not None else 0
-
-    # Usable tokens = what user's conversation has consumed
-    usable_tokens = last_total - baseline
-
-    # Available capacity = max minus baseline overhead
-    available_capacity = max_tokens - baseline
-
-    # Usable percent = conversation usage as % of available capacity
-    usable_pct = (usable_tokens / available_capacity * 100) if available_capacity > 0 else 0
-
-    # Total percent (for backwards compatibility)
-    total_pct = (last_total / max_tokens) * 100
+# Parse transcript
+RESULT=$(python3 -c "
+import json, os
+from pathlib import Path
+
+with open('$TRANSCRIPT') as f:
+    first_total = last_total = None
+    for line in f:
+        try:
+            data = json.loads(line.strip())
+            if 'message' in data and 'usage' in data['message']:
+                u = data['message']['usage']
+                total = u.get('input_tokens',0) + u.get('cache_read_input_tokens',0) + u.get('cache_creation_input_tokens',0)
+                if first_total is None: first_total = total
+                last_total = total
+        except: continue
+
+if last_total:
+    baseline = first_total or 0
+    usable = last_total - baseline
+    available = $MAX_TOKENS - baseline
+    usable_pct = int((usable / available * 100) if available > 0 else 0)
+    total_pct = int((last_total / $MAX_TOKENS) * 100)
+    status = 'HIGH' if usable_pct > $WARNING_THRESHOLD else 'OK'
+    relay = '$RELAY_MODE' == 'true'
+    tirepump = (relay or '$PERMISSION_MODE' == 'turbo') and usable_pct > $TIREPUMP_THRESHOLD
+    is_cyclist = os.environ.get('CYCLIST') == '1' or Path('$PROJECT_DIR/packages/cyclist/.cyclist-port').exists()
 
-    # Output all values
     print(f'CONTEXT_TOKENS={last_total}')
-    print(f'CONTEXT_PERCENT={total_pct:.0f}')
+    print(f'CONTEXT_PERCENT={total_pct}')
     print(f'CONTEXT_BASELINE={baseline}')
-    print(f'CONTEXT_USABLE_TOKENS={usable_tokens}')
-    print(f'CONTEXT_USABLE_PERCENT={usable_pct:.0f}')
-    print(f'CONTEXT_AVAILABLE={available_capacity}')
-    print(f'PERMISSION_MODE={permission_mode}')
-
-    # Use usable percent for status decisions (more accurate for user)
-    if usable_pct > warning_threshold:
-        print('CONTEXT_STATUS=HIGH')
-    else:
-        print('CONTEXT_STATUS=OK')
-
-    # RELAY_MODE: Output for handoff-marker.sh to use
-    print(f'RELAY_MODE={str(relay_mode).lower()}')
-
-    # 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. relay_mode is true (auto-handoff enabled) - MSSCI-12395
-    # 2. context > 60% (tirepump_threshold)
-    # This enables continuous autonomous runs without manual intervention
-    # 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
-    # 1. CYCLIST env var set to '1' (Electron mode - Cyclist spawns Claude)
-    # 2. .cyclist-port file exists (Web mode - Claude connects to running Cyclist)
-    import os
-    from pathlib import Path
-    is_cyclist = os.environ.get('CYCLIST', '') == '1'
-    if not is_cyclist:
-        # Check for .cyclist-port file in packages/cyclist directory
-        # This indicates Cyclist is running in web mode
-        project_dir = os.environ.get('CYCLIST_PROJECT_DIR', os.getcwd())
-        port_file = Path(project_dir) / 'packages' / 'cyclist' / '.cyclist-port'
-        if not port_file.exists():
-            # Also check cwd in case we're already in cyclist dir
-            port_file = Path(os.getcwd()) / '.cyclist-port'
-        is_cyclist = port_file.exists()
+    print(f'CONTEXT_USABLE_TOKENS={usable}')
+    print(f'CONTEXT_USABLE_PERCENT={usable_pct}')
+    print(f'CONTEXT_AVAILABLE={available}')
+    print(f'CONTEXT_STATUS={status}')
+    print(f'PERMISSION_MODE=$PERMISSION_MODE')
+    print(f'RELAY_MODE=$RELAY_MODE')
+    print(f'HANDOFF_MODE={\"auto\" if relay else \"ask\"}')
+    print(f'USE_TIREPUMP={str(tirepump).lower()}')
     print(f'IS_CYCLIST={str(is_cyclist).lower()}')
+    if usable_pct >= $CRITICAL_THRESHOLD:
+        print('CONTEXT_WARNING=Critical')
+        print(\"CONTEXT_RECOMMENDATION='checkpoint and handoff recommended'\")
+    elif usable_pct >= $WARNING_THRESHOLD:
+        print('CONTEXT_WARNING=High')
+        print(\"CONTEXT_RECOMMENDATION='consider handoff soon'\")
 " 2>/dev/null)
 
-if [ "$HUMAN_MODE" = "true" ]; then
+if [[ "$HUMAN_MODE" == "true" ]]; then
     eval "$RESULT"
-    if [ "$USE_TIREPUMP" = "true" ]; then
-        echo "🔄 Context: ${CONTEXT_USABLE_PERCENT}% used (${CONTEXT_USABLE_TOKENS} of ${CONTEXT_AVAILABLE} available) - TIREPUMP (clear + next agent)"
-    elif [ "$CONTEXT_STATUS" = "HIGH" ]; then
-        echo "⚠️  Context: ${CONTEXT_USABLE_PERCENT}% used (${CONTEXT_USABLE_TOKENS} of ${CONTEXT_AVAILABLE} available) - AUTO-HANDOFF"
+    if [[ "${USE_TIREPUMP:-}" == "true" ]]; then
+        echo "🔄 Context: ${CONTEXT_USABLE_PERCENT}% used (${CONTEXT_USABLE_TOKENS} of ${CONTEXT_AVAILABLE} available) - TIREPUMP"
+    elif [[ "${CONTEXT_STATUS:-}" == "HIGH" ]]; then
+        echo "⚠️  Context: ${CONTEXT_USABLE_PERCENT}% used (${CONTEXT_USABLE_TOKENS} of ${CONTEXT_AVAILABLE} available) - HIGH"
     else
-        echo "✅ Context: ${CONTEXT_USABLE_PERCENT}% used (${CONTEXT_USABLE_TOKENS} of ${CONTEXT_AVAILABLE} available)"
-    fi
-    echo "   Overhead: ${CONTEXT_BASELINE} tokens (system prompt + tools)"
-    echo "   Mode: ${PERMISSION_MODE}"
-
-    # Output warning messages at configurable thresholds (use usable percent)
-    if [ -n "$CONTEXT_USABLE_PERCENT" ]; then
-        if [ "$CONTEXT_USABLE_PERCENT" -ge "$CRITICAL_THRESHOLD" ] 2>/dev/null; then
-            echo "CONTEXT_WARNING: Critical (${CONTEXT_USABLE_PERCENT}%) - checkpoint and handoff recommended"
-        elif [ "$CONTEXT_USABLE_PERCENT" -ge "$WARNING_THRESHOLD" ] 2>/dev/null; then
-            echo "CONTEXT_WARNING: High (${CONTEXT_USABLE_PERCENT}%) - consider handoff soon"
-        fi
+        echo "✅ Context: ${CONTEXT_USABLE_PERCENT:-?}% used (${CONTEXT_USABLE_TOKENS:-?} of ${CONTEXT_AVAILABLE:-?} available)"
     fi
+    echo "   Overhead: ${CONTEXT_BASELINE:-?} tokens (system prompt + tools)"
+    echo "   Mode: ${PERMISSION_MODE:-manual}"
+    [[ "${CONTEXT_WARNING:-}" == "Critical" ]] && echo "CONTEXT_WARNING: Critical - checkpoint and handoff recommended"
+    [[ "${CONTEXT_WARNING:-}" == "High" ]] && echo "CONTEXT_WARNING: High - consider handoff soon"
 else
     echo "$RESULT"
-
-    # Also output warnings in non-human mode for scripting (use usable percent)
-    eval "$RESULT" 2>/dev/null || true
-    if [ -n "$CONTEXT_USABLE_PERCENT" ]; then
-        if [ "$CONTEXT_USABLE_PERCENT" -ge "$CRITICAL_THRESHOLD" ] 2>/dev/null; then
-            echo "CONTEXT_WARNING=Critical"
-            echo "CONTEXT_RECOMMENDATION='checkpoint and handoff recommended'"
-        elif [ "$CONTEXT_USABLE_PERCENT" -ge "$WARNING_THRESHOLD" ] 2>/dev/null; then
-            echo "CONTEXT_WARNING=High"
-            echo "CONTEXT_RECOMMENDATION='consider handoff soon'"
-        fi
-    fi
 fi

package/pennyfarthing-dist/scripts/core/handoff-marker.sh

@@ -62,12 +62,23 @@ AGENT_COMMAND:
 ---
 EOF
 elif [[ "$IS_CYCLIST" != "true" ]]; then
-  # Not in Cyclist - no marker
+  # Not in Cyclist - no marker, include context info
+  # Get context percentage for warning
+  CONTEXT_PCT="${CONTEXT_USABLE_PERCENT:-unknown}"
+  if [[ "$CONTEXT_PCT" != "unknown" ]] && [[ "$CONTEXT_PCT" -ge 60 ]] 2>/dev/null; then
+    CONTEXT_WARNING=" (context: ${CONTEXT_PCT}% - consider /clear before continuing)"
+  elif [[ "$CONTEXT_PCT" != "unknown" ]]; then
+    CONTEXT_WARNING=" (context: ${CONTEXT_PCT}%)"
+  else
+    CONTEXT_WARNING=""
+  fi
   cat <<EOF
 ---
 AGENT_COMMAND:
   marker: ""
-  fallback: "Run \`/${NEXT_AGENT}\` to continue"
+  fallback: "Run \`/${NEXT_AGENT}\` to continue${CONTEXT_WARNING}"
+  relay_mode: ${RELAY_MODE}
+  context_percent: ${CONTEXT_PCT}
 ---
 EOF
 elif [[ "$RELAY_MODE" != "true" ]]; then

package/pennyfarthing-dist/scripts/git/worktree-manager.sh

@@ -8,6 +8,9 @@
 
 set -e
 
+# Self-locate: derive paths from this script's position
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]:-$0}")" && pwd -P)"
+
 # Load environment
 if [ -f "$PROJECT_ROOT/.env" ]; then
     set -a; source "$PROJECT_ROOT/.env"; set +a
@@ -20,7 +23,7 @@ fi
 
 # Source repo utilities (handles repos.yaml or legacy env vars)
 REPO_UTILS_LAZY=1  # Don't auto-load, we'll do it after validation
-source "$PROJECT_ROOT/scripts/repo-utils.sh"
+source "$SCRIPT_DIR/../misc/repo-utils.sh"
 
 WORKTREE_ROOT="${WORKTREE_ROOT:-$PROJECT_ROOT/worktrees}"
 WORKTREE_PORT_OFFSET="${WORKTREE_PORT_OFFSET:-100}"

package/pennyfarthing-dist/scripts/health/drift-detection.sh

@@ -22,13 +22,7 @@ while [[ $# -gt 0 ]]; do
 done
 
 # Find project root
-if [[ -z "${PROJECT_ROOT:-}" ]]; then
-  d="$PWD"
-  while [[ ! -d "$d/.pennyfarthing" ]] && [[ "$d" != "/" ]]; do
-    d="$(dirname "$d")"
-  done
-  PROJECT_ROOT="$d"
-fi
+source "$(dirname "${BASH_SOURCE[0]}")/../lib/find-root.sh"
 
 ARCHIVE_DIR="$PROJECT_ROOT/sprint/archive"
 SESSION_DIR="$PROJECT_ROOT/.session/archive"

package/pennyfarthing-dist/scripts/hooks/post-merge.sh

@@ -14,18 +14,11 @@
 
 set -uo pipefail
 
-# Self-locate and set up PROJECT_ROOT
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]:-$0}")" && pwd -P)"
-source "$SCRIPT_DIR/../lib/find-root.sh"
-
-# Initialize paths
-PROJECT_ROOT="$(find_project_root 2>/dev/null || echo "")"
-if [[ -z "$PROJECT_ROOT" ]]; then
-    # Not in a pennyfarthing project, silently exit
-    exit 0
-fi
+# Self-locate (resolve symlink first for .git/hooks/ symlinks)
+REAL_SCRIPT="$(readlink -f "${BASH_SOURCE[0]:-$0}" 2>/dev/null || realpath "${BASH_SOURCE[0]:-$0}" 2>/dev/null || echo "${BASH_SOURCE[0]:-$0}")"
+source "$(dirname "$REAL_SCRIPT")/../lib/find-root.sh"
 
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd -P)"
+# PROJECT_ROOT is now set by find-root.sh
 SESSION_DIR="$PROJECT_ROOT/.session"
 SPRINT_FILE="$PROJECT_ROOT/sprint/current-sprint.yaml"
 

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

@@ -12,14 +12,9 @@
 
 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
+# Find project root (resolve symlink first for .git/hooks/ symlinks)
+REAL_SCRIPT="$(readlink -f "${BASH_SOURCE[0]:-$0}" 2>/dev/null || realpath "${BASH_SOURCE[0]:-$0}" 2>/dev/null || echo "${BASH_SOURCE[0]:-$0}")"
+source "$(dirname "$REAL_SCRIPT")/../lib/find-root.sh"
 
 # =============================================================================
 # Check 1: Branch Protection

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

@@ -9,9 +9,9 @@
 
 set -uo pipefail
 
-# Self-locate and set up PROJECT_ROOT
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]:-$0}")" && pwd -P)"
-if ! source "$SCRIPT_DIR/../lib/find-root.sh" 2>/dev/null; then
+# Self-locate (resolve symlink first for .git/hooks/ symlinks)
+REAL_SCRIPT="$(readlink -f "${BASH_SOURCE[0]:-$0}" 2>/dev/null || realpath "${BASH_SOURCE[0]:-$0}" 2>/dev/null || echo "${BASH_SOURCE[0]:-$0}")"
+if ! source "$(dirname "$REAL_SCRIPT")/../lib/find-root.sh" 2>/dev/null; then
     exit 0
 fi
 

package/pennyfarthing-dist/scripts/jira/create-jira-epic.sh

@@ -19,13 +19,7 @@ if [[ -z "$EPIC_ID" ]]; then
 fi
 
 # Find project root
-if [[ -z "${PROJECT_ROOT:-}" ]]; then
-  d="$PWD"
-  while [[ ! -d "$d/.pennyfarthing" ]] && [[ "$d" != "/" ]]; do
-    d="$(dirname "$d")"
-  done
-  PROJECT_ROOT="$d"
-fi
+source "$(dirname "${BASH_SOURCE[0]}")/../lib/find-root.sh"
 
 SPRINT_FILE="$PROJECT_ROOT/sprint/current-sprint.yaml"
 SCRIPTS_DIR="$PROJECT_ROOT/.pennyfarthing/scripts"

package/pennyfarthing-dist/scripts/jira/create-jira-story.sh

@@ -14,14 +14,8 @@ if [[ -z "$EPIC_JIRA_KEY" || -z "$STORY_ID" ]]; then
   exit 1
 fi
 
-# PROJECT_ROOT should be set by find-root.sh, but find it if not
-if [[ -z "${PROJECT_ROOT:-}" ]]; then
-  d="$PWD"
-  while [[ ! -d "$d/.pennyfarthing" ]] && [[ "$d" != "/" ]]; do
-    d="$(dirname "$d")"
-  done
-  PROJECT_ROOT="$d"
-fi
+# Find project root
+source "$(dirname "${BASH_SOURCE[0]}")/../lib/find-root.sh"
 
 SPRINT_FILE="$PROJECT_ROOT/sprint/current-sprint.yaml"
 JIRA_PROJECT="${JIRA_PROJECT_KEY:-MSSCI}"

package/pennyfarthing-dist/scripts/jira/jira-reconcile.sh

@@ -13,14 +13,8 @@
 
 set -euo pipefail
 
-# PROJECT_ROOT should be set by find-root.sh, but find it if not
-if [[ -z "${PROJECT_ROOT:-}" ]]; then
-  d="$PWD"
-  while [[ ! -d "$d/.pennyfarthing" ]] && [[ "$d" != "/" ]]; do
-    d="$(dirname "$d")"
-  done
-  PROJECT_ROOT="$d"
-fi
+# Find project root
+source "$(dirname "${BASH_SOURCE[0]}")/../lib/find-root.sh"
 
 SPRINT_FILE="$PROJECT_ROOT/sprint/current-sprint.yaml"
 FIX_MODE="${1:-}"