jfl 0.2.4 → 0.3.0

package/scripts/session/session-cleanup.sh

@@ -155,12 +155,21 @@ if [ $MERGE_STATUS -eq 0 ]; then
   # Push to origin
   git push origin "$WORKING_BRANCH" 2>/dev/null || echo "⚠ Push failed - run manually: git push origin $WORKING_BRANCH"
 
-  # Remove worktree if it exists
-  WORKTREE_PATH=$(git worktree list | grep "$BRANCH" | awk '{print $1}' | head -1)
+  # Remove worktree if it exists (NEVER remove the main repo)
+  MAIN_TOPLEVEL=$(git rev-parse --show-toplevel 2>/dev/null)
+  WORKTREE_PATH=$(git worktree list | grep "$BRANCH" | grep -v "(bare)" | awk '{print $1}' | head -1)
   if [ -n "$WORKTREE_PATH" ] && [ -d "$WORKTREE_PATH" ]; then
-    echo "Removing worktree at $WORKTREE_PATH..."
-    rm -rf "$WORKTREE_PATH" 2>/dev/null || true
-    git worktree prune 2>/dev/null || true
+    WORKTREE_REAL=$(cd "$WORKTREE_PATH" && pwd -P)
+    MAIN_REAL=$(cd "$MAIN_TOPLEVEL" && pwd -P)
+    if [ "$WORKTREE_REAL" = "$MAIN_REAL" ]; then
+      echo "⚠ SAFETY: refusing to rm -rf main repo at $WORKTREE_PATH"
+    elif [ "$WORKTREE_REAL" = "$HOME" ] || [ "$WORKTREE_REAL" = "/" ]; then
+      echo "⚠ SAFETY: refusing to rm -rf protected path $WORKTREE_PATH"
+    else
+      echo "Removing worktree at $WORKTREE_PATH..."
+      git worktree remove "$WORKTREE_PATH" --force 2>/dev/null || true
+      git worktree prune 2>/dev/null || true
+    fi
   fi
 
   # Delete the branch
@@ -227,12 +236,21 @@ else
     # Push to origin
     git push origin "$WORKING_BRANCH" 2>/dev/null || echo "⚠ Push failed - run manually: git push origin $WORKING_BRANCH"
 
-    # Remove worktree
-    WORKTREE_PATH=$(git worktree list | grep "$BRANCH" | awk '{print $1}' | head -1)
+    # Remove worktree if it exists (NEVER remove the main repo)
+    MAIN_TOPLEVEL=$(git rev-parse --show-toplevel 2>/dev/null)
+    WORKTREE_PATH=$(git worktree list | grep "$BRANCH" | grep -v "(bare)" | awk '{print $1}' | head -1)
     if [ -n "$WORKTREE_PATH" ] && [ -d "$WORKTREE_PATH" ]; then
-      echo "Removing worktree at $WORKTREE_PATH..."
-      rm -rf "$WORKTREE_PATH" 2>/dev/null || true
-      git worktree prune 2>/dev/null || true
+      WORKTREE_REAL=$(cd "$WORKTREE_PATH" && pwd -P)
+      MAIN_REAL=$(cd "$MAIN_TOPLEVEL" && pwd -P)
+      if [ "$WORKTREE_REAL" = "$MAIN_REAL" ]; then
+        echo "⚠ SAFETY: refusing to rm -rf main repo at $WORKTREE_PATH"
+      elif [ "$WORKTREE_REAL" = "$HOME" ] || [ "$WORKTREE_REAL" = "/" ]; then
+        echo "⚠ SAFETY: refusing to rm -rf protected path $WORKTREE_PATH"
+      else
+        echo "Removing worktree at $WORKTREE_PATH..."
+        git worktree remove "$WORKTREE_PATH" --force 2>/dev/null || true
+        git worktree prune 2>/dev/null || true
+      fi
     fi
 
     # Delete the branch

package/scripts/session/session-end.sh

@@ -20,8 +20,6 @@ YELLOW='\033[1;33m'
 BLUE='\033[0;34m'
 NC='\033[0m'
 
-END_START_TIME=$(date +%s)
-
 FORCE=false
 while [[ $# -gt 0 ]]; do
     case $1 in
@@ -190,14 +188,6 @@ else
     # Clean up session file
     rm -f "$SESSION_FILE"
 
-    # Track session end telemetry (fire-and-forget)
-    END_DURATION=$(( $(date +%s) - END_START_TIME ))
-    jfl telemetry track \
-      --category session \
-      --event "hook:session_end" \
-      --duration "${END_DURATION}000" \
-      --success true 2>/dev/null &
-
     echo ""
     echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
     echo -e "  ${GREEN}Session ended successfully!${NC}"

package/scripts/session/session-init.sh

@@ -15,7 +15,6 @@ set -e
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 REPO_DIR="${JFL_REPO_DIR:-$(pwd)}"
 WORKTREES_DIR="$REPO_DIR/worktrees"
-INIT_START_TIME=$(date +%s)
 
 cd "$REPO_DIR" || exit 1
 
@@ -158,10 +157,6 @@ if [[ -d "$WORKTREES_DIR" ]]; then
                 done
                 echo ""
                 echo -e "${GREEN}✓${NC} All changes saved. Continuing..."
-                jfl telemetry track \
-                  --category session \
-                  --event "hook:crash_recovery" \
-                  --success true 2>/dev/null &
                 ;;
             2)
                 echo ""
@@ -353,14 +348,3 @@ if [[ "$use_worktree" != "true" ]]; then
     echo -e "${GREEN}✓${NC}  Session ready on branch: $session_name"
     echo ""
 fi
-
-# ==============================================================================
-# Step 4: Track session init telemetry (fire-and-forget)
-# ==============================================================================
-
-INIT_DURATION=$(( $(date +%s) - INIT_START_TIME ))
-jfl telemetry track \
-  --category session \
-  --event "hook:session_init" \
-  --duration "${INIT_DURATION}000" \
-  --success true 2>/dev/null &

package/template/THEORY.md

@@ -0,0 +1,26 @@
+# Theory — {agent-name}
+
+## Current Hypothesis
+
+{What do you believe is true about your approach? Why should it work? What's the core insight?}
+
+## Approach
+
+{How are you executing on the hypothesis? What's the method?}
+
+## Predictions (specific, falsifiable)
+
+| # | Prediction | Metric | Target | By |
+|---|-----------|--------|--------|-----|
+| P1 | {specific claim} | {metric name} | {threshold} | {version or date} |
+| P2 | {specific claim} | {metric name} | {threshold} | {version or date} |
+
+## Evidence
+
+| Date | Prediction | Actual | Delta | Verdict |
+|------|-----------|--------|-------|---------|
+| | | | | |
+
+## Revisions
+
+{When evidence contradicts predictions, document what changed and why.}

package/template/scripts/session/session-cleanup.sh

@@ -155,12 +155,21 @@ if [ $MERGE_STATUS -eq 0 ]; then
   # Push to origin
   git push origin "$WORKING_BRANCH" 2>/dev/null || echo "⚠ Push failed - run manually: git push origin $WORKING_BRANCH"
 
-  # Remove worktree if it exists
-  WORKTREE_PATH=$(git worktree list | grep "$BRANCH" | awk '{print $1}' | head -1)
+  # Remove worktree if it exists (NEVER remove the main repo)
+  MAIN_TOPLEVEL=$(git rev-parse --show-toplevel 2>/dev/null)
+  WORKTREE_PATH=$(git worktree list | grep "$BRANCH" | grep -v "(bare)" | awk '{print $1}' | head -1)
   if [ -n "$WORKTREE_PATH" ] && [ -d "$WORKTREE_PATH" ]; then
-    echo "Removing worktree at $WORKTREE_PATH..."
-    rm -rf "$WORKTREE_PATH" 2>/dev/null || true
-    git worktree prune 2>/dev/null || true
+    WORKTREE_REAL=$(cd "$WORKTREE_PATH" && pwd -P)
+    MAIN_REAL=$(cd "$MAIN_TOPLEVEL" && pwd -P)
+    if [ "$WORKTREE_REAL" = "$MAIN_REAL" ]; then
+      echo "⚠ SAFETY: refusing to rm -rf main repo at $WORKTREE_PATH"
+    elif [ "$WORKTREE_REAL" = "$HOME" ] || [ "$WORKTREE_REAL" = "/" ]; then
+      echo "⚠ SAFETY: refusing to rm -rf protected path $WORKTREE_PATH"
+    else
+      echo "Removing worktree at $WORKTREE_PATH..."
+      git worktree remove "$WORKTREE_PATH" --force 2>/dev/null || true
+      git worktree prune 2>/dev/null || true
+    fi
   fi
 
   # Delete the branch
@@ -227,12 +236,21 @@ else
     # Push to origin
     git push origin "$WORKING_BRANCH" 2>/dev/null || echo "⚠ Push failed - run manually: git push origin $WORKING_BRANCH"
 
-    # Remove worktree
-    WORKTREE_PATH=$(git worktree list | grep "$BRANCH" | awk '{print $1}' | head -1)
+    # Remove worktree if it exists (NEVER remove the main repo)
+    MAIN_TOPLEVEL=$(git rev-parse --show-toplevel 2>/dev/null)
+    WORKTREE_PATH=$(git worktree list | grep "$BRANCH" | grep -v "(bare)" | awk '{print $1}' | head -1)
     if [ -n "$WORKTREE_PATH" ] && [ -d "$WORKTREE_PATH" ]; then
-      echo "Removing worktree at $WORKTREE_PATH..."
-      rm -rf "$WORKTREE_PATH" 2>/dev/null || true
-      git worktree prune 2>/dev/null || true
+      WORKTREE_REAL=$(cd "$WORKTREE_PATH" && pwd -P)
+      MAIN_REAL=$(cd "$MAIN_TOPLEVEL" && pwd -P)
+      if [ "$WORKTREE_REAL" = "$MAIN_REAL" ]; then
+        echo "⚠ SAFETY: refusing to rm -rf main repo at $WORKTREE_PATH"
+      elif [ "$WORKTREE_REAL" = "$HOME" ] || [ "$WORKTREE_REAL" = "/" ]; then
+        echo "⚠ SAFETY: refusing to rm -rf protected path $WORKTREE_PATH"
+      else
+        echo "Removing worktree at $WORKTREE_PATH..."
+        git worktree remove "$WORKTREE_PATH" --force 2>/dev/null || true
+        git worktree prune 2>/dev/null || true
+      fi
     fi
 
     # Delete the branch

package/template/scripts/session/session-sync.sh

@@ -154,6 +154,16 @@ echo "--- Syncing submodules ---"
 cd "$GTM_ROOT"
 git submodule update --init --recursive 2>/dev/null || true
 
+# Ensure jfl CLI and template files are up to date (at most once per 24h)
+echo ""
+echo "--- Checking jfl version ---"
+cd "$GTM_ROOT"
+if command -v jfl &>/dev/null; then
+    jfl update --auto 2>/dev/null && echo -e "${GREEN}jfl is up to date${NC}" || echo -e "${YELLOW}WARNING: jfl update check failed (offline?)${NC}"
+else
+    echo -e "${YELLOW}WARNING: jfl not found in PATH${NC}"
+fi
+
 # Final status
 echo ""
 echo "========================================"