Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	.githooks/commit-msg
#	.githooks/pre-commit

Author: localpibox

.githooks/commit-msg

@@ -7,7 +7,10 @@ COMMIT_MSG_FILE="$1"
 COMMIT_MSG=$(cat "$COMMIT_MSG_FILE")
 if echo "$COMMIT_MSG" | grep -q '\[skip-version\]'; then exit 0; fi
 
-DEVSTACK_DIR="$(cd "$(dirname "$0")/.." && pwd)"
+# Find devstack dir by searching upward from the git working tree
+DEVSTACK_DIR="$(git rev-parse --show-toplevel 2>/dev/null)"
+[ -z "$DEVSTACK_DIR" ] && DEVSTACK_DIR="$PWD"
+
 [ ! -f "$DEVSTACK_DIR/VERSION" ] && exit 0
 
 VERSION=$(cat "$DEVSTACK_DIR/VERSION" 2>/dev/null || echo "0.0.0-lpb")

.githooks/pre-commit

@@ -1,8 +1,19 @@
 #!/bin/bash
 # pre-commit hook — Validate & sync all stack repos before commit
+#
+# Validates:
+#   1. All VERSION files in sync
+#   2. lpb.stack.env LPB_PI_REF matches VERSION
+#   3. settings.json pins match VERSION
+#   4. All repos clean (except VERSION/env)
+#   5. Auto-add VERSION + env changes to staging
+#
+# Exit non-zero to abort commit.
 
+# Find devstack dir by searching upward from the git working tree
 DEVSTACK_DIR=""
-check_dir="$PWD"
+check_dir="$(git rev-parse --show-toplevel 2>/dev/null)"
+[ -z "$check_dir" ] && check_dir="$PWD"
 while [ "$check_dir" != "/" ]; do
     [ -f "$check_dir/VERSION" ] && [ -f "$check_dir/lpb.stack.env" ] && DEVSTACK_DIR="$check_dir" && break
     check_dir=$(dirname "$check_dir")
@@ -23,37 +34,70 @@ declare -a REPOS=(
 SETTINGS_JSON="/home/lpb/.pi/agent/settings.json"
 
 info()  { echo "  ✅ $*"; }
+warn()  { echo "  ⚠️  $*"; }
 error() { echo "  ❌ $*"; ERRORS=$((ERRORS + 1)); }
 
+# 1. Validate VERSION files
 echo "=== Stack Version Sync ==="
 for repo in "${REPOS[@]}"; do
     repo_name=$(basename "$repo")
-    [ ! -f "$repo/VERSION" ] && error "$repo_name: missing VERSION" && continue
+    if [ ! -f "$repo/VERSION" ]; then
+        error "$repo_name: missing VERSION file"
+        continue
+    fi
     repo_version=$(cat "$repo/VERSION")
-    [ "$repo_version" != "$CURRENT_VERSION" ] && error "$repo_name: $repo_version != $CURRENT_VERSION" || info "$repo_name: $repo_version"
+    if [ "$repo_version" != "$CURRENT_VERSION" ]; then
+        error "$repo_name: VERSION=$repo_version (expected $CURRENT_VERSION)"
+    else
+        info "$repo_name: $repo_version"
+    fi
 done
 
+# 2. Validate lpb.stack.env
 echo ""
 echo "=== Environment Sync ==="
 if [ -f "$DEVSTACK_DIR/lpb.stack.env" ]; then
     PI_REF=$(grep '^LPB_PI_REF=' "$DEVSTACK_DIR/lpb.stack.env" | cut -d= -f2)
-    [ "$PI_REF" != "$CURRENT_VERSION" ] && { error "LPB_PI_REF=$PI_REF != $CURRENT_VERSION"; sed -i "s/^LPB_PI_REF=.*/LPB_PI_REF=$CURRENT_VERSION/" "$DEVSTACK_DIR/lpb.stack.env"; } || info "LPB_PI_REF=$PI_REF"
+    if [ "$PI_REF" != "$CURRENT_VERSION" ]; then
+        error "lpb.stack.env: LPB_PI_REF=$PI_REF (expected $CURRENT_VERSION)"
+        sed -i "s/^LPB_PI_REF=.*/LPB_PI_REF=$CURRENT_VERSION/" "$DEVSTACK_DIR/lpb.stack.env"
+        echo "  🔧 Fixed LPB_PI_REF to $CURRENT_VERSION"
+    else
+        info "LPB_PI_REF=$PI_REF"
+    fi
 fi
 
+# 3. Validate settings.json pins
 echo ""
 echo "=== Extension Pins ==="
 if [ -f "$SETTINGS_JSON" ]; then
     for repo in lemonade-pi-plugin lpb-memory pi-subagents; do
-        python3 -c "
-import json
-d = json.load(open('$SETTINGS_JSON'))
-for p in d.get('packages',[]):
-    if isinstance(p,dict) and '$repo' in p.get('extension',''):
-        assert p.get('version','') == '$CURRENT_VERSION', f'MISMATCH: {p.get(\"version\")}'
-" 2>/dev/null && info "$repo: pinned" || warn "$repo: verification skipped"
+        if python3 -c "
+import json, sys
+with open('$SETTINGS_JSON') as f:
+    d = json.load(f)
+pins = d.get('packages', [])
+for p in pins:
+    if isinstance(p, dict) and '$repo' in p.get('extension', ''):
+        ver = p.get('version', '')
+        if ver and ver != '$CURRENT_VERSION':
+            print(f'MISMATCH: {ver}')
+            sys.exit(1)
+        elif not ver:
+            print('NO-PIN')
+            sys.exit(1)
+sys.exit(0)
+" 2>/dev/null; then
+            info "$repo: pinned correctly"
+        else
+            warn "$repo: pin verification skipped (format may differ)"
+        fi
     done
+else
+    warn "settings.json not found at $SETTINGS_JSON"
 fi
 
+# 4. Check repo cleanliness
 echo ""
 echo "=== Unstaged Changes ==="
 check_unstaged() {
@@ -71,7 +115,7 @@ done
 
 check_unstaged "$DEVSTACK_DIR" "devstack"
 
-# Auto-stage VERSION + env
+# 5. Auto-add VERSION + env changes
 if [ $ERRORS -eq 0 ] && [ "$CURRENT_VERSION" != "NOT FOUND" ]; then
     echo ""
     echo "=== Auto-stage VERSION ==="
@@ -82,9 +126,11 @@ if [ $ERRORS -eq 0 ] && [ "$CURRENT_VERSION" != "NOT FOUND" ]; then
     info "VERSION files + lpb.stack.env staged"
 fi
 
+# Result
 echo ""
 if [ $ERRORS -gt 0 ]; then
-    echo "❌ Pre-commit FAILED ($ERRORS error(s))"
+    echo "❌ Pre-commit FAILED ($ERRORS error(s)) — commit aborted"
+    echo "   Fix issues above and try again, or use --no-verify to skip"
     exit 1
 else
     echo "✅ All checks passed"