jfl 0.1.0 → 0.2.0

package/scripts/session/session-cleanup.sh

@@ -0,0 +1,268 @@
+#!/bin/bash
+#
+# Session Cleanup - Auto-merge session and cleanup
+#
+# Called by Stop hook or /end skill to clean up sessions.
+# Handles both worktree mode (multiple sessions) and direct mode (single session).
+# Only keeps branches that have real conflicts or uncommitted work.
+
+set -e
+
+# Get working branch from config (fallback to main)
+get_working_branch() {
+    local config_branch=$(jq -r '.working_branch // empty' .jfl/config.json 2>/dev/null)
+    if [[ -n "$config_branch" ]]; then
+        echo "$config_branch"
+    else
+        echo "main"
+    fi
+}
+
+WORKING_BRANCH=$(get_working_branch)
+
+# Stop background processes first
+echo "Stopping background processes..."
+
+# Stop auto-commit if running
+if [ -f ".jfl/auto-commit.pid" ]; then
+  PID=$(cat ".jfl/auto-commit.pid")
+  if kill -0 "$PID" 2>/dev/null; then
+    echo "  Stopping auto-commit (PID: $PID)..."
+    kill -TERM "$PID" 2>/dev/null || true
+    sleep 1
+    # Force kill if still running
+    kill -0 "$PID" 2>/dev/null && kill -9 "$PID" 2>/dev/null || true
+  fi
+  rm -f ".jfl/auto-commit.pid"
+fi
+
+# Stop auto-merge if running
+if [ -f ".auto-merge.pid" ]; then
+  PID=$(cat ".auto-merge.pid")
+  if kill -0 "$PID" 2>/dev/null; then
+    echo "  Stopping auto-merge (PID: $PID)..."
+    kill -TERM "$PID" 2>/dev/null || true
+    sleep 1
+    kill -0 "$PID" 2>/dev/null && kill -9 "$PID" 2>/dev/null || true
+  fi
+  rm -f ".auto-merge.pid"
+fi
+
+# Stop context-hub if running (already handled by Stop hook, but be defensive)
+if [ -f ".jfl/context-hub.pid" ]; then
+  PID=$(cat ".jfl/context-hub.pid")
+  if kill -0 "$PID" 2>/dev/null; then
+    echo "  Stopping context-hub (PID: $PID)..."
+    kill -TERM "$PID" 2>/dev/null || true
+    sleep 1
+    kill -0 "$PID" 2>/dev/null && kill -9 "$PID" 2>/dev/null || true
+  fi
+  rm -f ".jfl/context-hub.pid"
+fi
+
+# Get current session info
+BRANCH=$(git branch --show-current 2>/dev/null || echo "")
+if [ -z "$BRANCH" ]; then
+  echo "Not on a branch, skipping cleanup"
+  exit 0
+fi
+
+# Skip if not a session branch
+if [[ ! "$BRANCH" =~ ^session- ]]; then
+  echo "Not a session branch, skipping cleanup"
+  exit 0
+fi
+
+# Detect mode: are we in a worktree or working directly?
+IN_WORKTREE=false
+if [[ "$(pwd)" == *"/worktrees/session-"* ]]; then
+  IN_WORKTREE=true
+  echo "Cleaning up worktree session: $BRANCH"
+else
+  echo "Cleaning up direct session: $BRANCH"
+fi
+
+# Auto-commit any uncommitted changes first
+if ! git diff --quiet || ! git diff --cached --quiet; then
+  echo "Auto-committing changes..."
+
+  # Check if last commit is already "session: end" (make idempotent)
+  LAST_MSG=$(git log -1 --pretty=%s 2>/dev/null || echo "")
+  if [[ "$LAST_MSG" =~ ^session:\ end ]]; then
+    echo "Last commit already is 'session: end', skipping duplicate commit"
+  else
+    git add -A
+    # Unstage session metadata files that should never be committed
+    git reset HEAD .jfl/current-session-branch.txt 2>/dev/null || true
+    git reset HEAD .jfl/current-worktree.txt 2>/dev/null || true
+    git reset HEAD .jfl/worktree-path.txt 2>/dev/null || true
+    git commit -m "session: end $(date +%Y-%m-%d\ %H:%M)" || true
+  fi
+fi
+
+# Detect main repo location
+if [ "$IN_WORKTREE" = true ]; then
+  # We're in a worktree - find main repo
+  MAIN_REPO=$(git rev-parse --git-common-dir 2>/dev/null | sed 's|/\.git$||')
+  if [ -z "$MAIN_REPO" ] || [ ! -d "$MAIN_REPO" ]; then
+    # Fallback: find parent directory
+    MAIN_REPO=$(git worktree list | grep "(bare)" | awk '{print $1}' | head -1)
+    if [ -z "$MAIN_REPO" ]; then
+      MAIN_REPO=$(git worktree list | head -1 | awk '{print $1}')
+    fi
+  fi
+else
+  # We're in direct mode - already in main repo
+  MAIN_REPO=$(pwd)
+fi
+
+# Pre-merge cleanup: Remove files that will definitely conflict
+echo "Pre-merge cleanup..."
+git rm -f .jfl/current-session-branch.txt 2>/dev/null || true
+git rm -f .jfl/current-worktree.txt 2>/dev/null || true
+git rm -f .jfl/worktree-path.txt 2>/dev/null || true
+
+# Remove any git conflict artifacts from previous failed merges
+find .jfl -name "journal~*" -type f -delete 2>/dev/null || true
+
+# Commit cleanup if there are changes
+if ! git diff --quiet HEAD 2>/dev/null; then
+  git commit -m "cleanup: remove session metadata before merge" 2>/dev/null || true
+fi
+
+# Try to merge to working branch
+echo "Attempting to merge $BRANCH to $WORKING_BRANCH..."
+cd "$MAIN_REPO"
+
+# Checkout working branch in the main repo
+if ! git checkout "$WORKING_BRANCH" 2>/dev/null; then
+  echo "⚠ Could not checkout $WORKING_BRANCH, skipping merge"
+  echo "  Session branch $BRANCH preserved for manual merge"
+  # Notify jfl-services that session ended
+  if command -v curl >/dev/null 2>&1; then
+    curl -s -X DELETE "http://localhost:3401/sessions/$BRANCH" >/dev/null 2>&1 || true
+  fi
+  exit 0
+fi
+
+# Attempt merge with auto-resolve for .jfl/ conflicts
+MERGE_OUTPUT=$(git merge --no-edit -X ours "$BRANCH" 2>&1)
+MERGE_STATUS=$?
+
+if [ $MERGE_STATUS -eq 0 ]; then
+  echo "✓ Merged $BRANCH to $WORKING_BRANCH"
+
+  # 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)
+  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
+  fi
+
+  # Delete the branch
+  echo "Deleting branch $BRANCH..."
+  git branch -D "$BRANCH" 2>/dev/null || true
+
+  echo "✓ Session cleanup complete - merged to $WORKING_BRANCH and pushed"
+
+  # Notify jfl-services that session ended
+  if command -v curl >/dev/null 2>&1; then
+    curl -s -X DELETE "http://localhost:3401/sessions/$BRANCH" >/dev/null 2>&1 || true
+  fi
+else
+  # Merge failed - try auto-resolving common conflicts
+  echo "Initial merge failed, attempting auto-resolve..."
+
+  # Check what conflicts we have
+  CONFLICTS=$(git diff --name-only --diff-filter=U 2>/dev/null)
+
+  AUTO_RESOLVED=true
+  while IFS= read -r file; do
+    if [[ -z "$file" ]]; then
+      continue
+    fi
+
+    case "$file" in
+      .jfl/current-session-branch.txt|.jfl/current-worktree.txt|.jfl/worktree-path.txt)
+        # Session metadata - just remove it
+        echo "  Auto-resolving: $file (removing)"
+        git rm -f "$file" 2>/dev/null || true
+        ;;
+      .jfl/journal~*)
+        # Git conflict artifact - remove it
+        echo "  Auto-resolving: $file (removing artifact)"
+        git rm -f "$file" 2>/dev/null || true
+        ;;
+      product)
+        # Product directory conflict (likely symlink vs dir)
+        # Keep working branch's version (which should be platform symlink or nothing)
+        echo "  Auto-resolving: $file (keeping $WORKING_BRANCH's version)"
+        git checkout --ours "$file" 2>/dev/null || git rm -f "$file" 2>/dev/null || true
+        ;;
+      platform|cli|runner)
+        # Submodule conflicts - keep working branch's version
+        echo "  Auto-resolving: $file (keeping $WORKING_BRANCH's submodule state)"
+        git checkout --ours "$file" 2>/dev/null || true
+        ;;
+      *)
+        # Unknown conflict - can't auto-resolve
+        echo "  ⚠ Cannot auto-resolve: $file"
+        AUTO_RESOLVED=false
+        ;;
+    esac
+  done <<< "$CONFLICTS"
+
+  if [ "$AUTO_RESOLVED" = true ]; then
+    # All conflicts resolved, complete the merge
+    echo "All conflicts auto-resolved, completing merge..."
+    git add -A
+    git commit --no-edit 2>/dev/null || true
+
+    echo "✓ Merged $BRANCH to $WORKING_BRANCH (with auto-resolution)"
+
+    # 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)
+    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
+    fi
+
+    # Delete the branch
+    echo "Deleting branch $BRANCH..."
+    git branch -D "$BRANCH" 2>/dev/null || true
+
+    echo "✓ Session cleanup complete - merged to $WORKING_BRANCH and pushed"
+
+    # Notify jfl-services that session ended
+    if command -v curl >/dev/null 2>&1; then
+      curl -s -X DELETE "http://localhost:3401/sessions/$BRANCH" >/dev/null 2>&1 || true
+    fi
+  else
+    # Still have unresolved conflicts
+    echo "⚠ Merge conflicts remain, keeping branch $BRANCH"
+    echo "  Review later with: git log $WORKING_BRANCH..$BRANCH"
+    echo "  Conflicting files:"
+    git diff --name-only --diff-filter=U 2>/dev/null | sed 's/^/    - /'
+    git merge --abort 2>/dev/null || true
+
+    # Notify jfl-services that session ended (even though we kept the branch)
+    if command -v curl >/dev/null 2>&1; then
+      curl -s -X DELETE "http://localhost:3401/sessions/$BRANCH" >/dev/null 2>&1 || true
+    fi
+  fi
+fi
+
+# Final notification to jfl-services (in case we skipped merge paths)
+if command -v curl >/dev/null 2>&1; then
+  curl -s -X DELETE "http://localhost:3401/sessions/$BRANCH" >/dev/null 2>&1 || true
+fi
+
+exit 0

package/scripts/session/session-end.sh

@@ -0,0 +1,198 @@
+#!/bin/bash
+# session-end.sh - Gracefully end a JFL session
+# Handles both worktree sessions (merge + cleanup) and main branch sessions
+#
+# Usage:
+#   ./scripts/session/session-end.sh              # Standard end
+#   ./scripts/session/session-end.sh --force      # Force end (even with uncommitted changes)
+
+set -e
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+PROJECT_ROOT="$(pwd)"
+LOG_DIR="$PROJECT_ROOT/.jfl/logs"
+SESSION_FILE="$PROJECT_ROOT/.jfl/current-session.json"
+
+# Colors
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+BLUE='\033[0;34m'
+NC='\033[0m'
+
+FORCE=false
+while [[ $# -gt 0 ]]; do
+    case $1 in
+        --force|-f)
+            FORCE=true
+            shift
+            ;;
+        *)
+            shift
+            ;;
+    esac
+done
+
+echo ""
+echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+echo "  JFL Session End"
+echo "  $(date '+%Y-%m-%d %H:%M:%S')"
+echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+echo ""
+
+cd "$PROJECT_ROOT"
+
+# Check if this is a worktree session
+IS_WORKTREE=false
+SESSION_NAME=""
+WORKTREE_PATH=""
+
+if [ -f "$SESSION_FILE" ]; then
+    # Parse session info
+    if grep -q '"worktree": true' "$SESSION_FILE" 2>/dev/null; then
+        IS_WORKTREE=true
+        SESSION_NAME=$(grep -o '"session_name"[^,}]*' "$SESSION_FILE" | cut -d'"' -f4)
+        WORKTREE_PATH=$(grep -o '"worktree_path"[^,}]*' "$SESSION_FILE" | cut -d'"' -f4)
+    fi
+fi
+
+if $IS_WORKTREE && [ -n "$SESSION_NAME" ] && [ "$SESSION_NAME" != "main" ] && [ "$SESSION_NAME" != "null" ]; then
+    echo -e "${BLUE}→${NC} Ending worktree session: $SESSION_NAME"
+    echo ""
+
+    # Use worktree-session.sh to properly end (merge + cleanup)
+    if [ -f "$SCRIPT_DIR/worktree-session.sh" ]; then
+        "$SCRIPT_DIR/worktree-session.sh" end "$SESSION_NAME"
+    else
+        echo -e "${RED}✗${NC} worktree-session.sh not found!"
+        echo "  Manual cleanup needed:"
+        echo "  1. cd $WORKTREE_PATH && git add -A && git commit"
+        echo "  2. Merge branch $SESSION_NAME to main"
+        echo "  3. Remove worktree: git worktree remove $WORKTREE_PATH"
+        exit 1
+    fi
+
+    # Clean up session file
+    rm -f "$SESSION_FILE"
+
+else
+    # Main branch session - just commit and push
+    echo -e "${BLUE}→${NC} Ending main branch session..."
+
+    # Step 1: Stop auto-commit
+    echo -e "${BLUE}→${NC} Stopping auto-commit..."
+    "$SCRIPT_DIR/auto-commit.sh" stop 2>/dev/null || true
+
+    # Step 2: Take final snapshot (fast - skip large files)
+    echo -e "${BLUE}→${NC} Taking final snapshot..."
+    mkdir -p "$LOG_DIR"
+    SNAPSHOT_END="$LOG_DIR/snapshot-end-$(date +%Y%m%d-%H%M%S).txt"
+    CRITICAL_PATHS=("knowledge/" "previews/" "content/" "suggestions/" "CLAUDE.md")
+
+    # Skip .jfl/ for snapshots (contains large memory.db)
+    # Use stat instead of md5 for speed (size + mtime is enough for change detection)
+    for p in "${CRITICAL_PATHS[@]}"; do
+        if [ -e "$PROJECT_ROOT/$p" ]; then
+            find "$PROJECT_ROOT/$p" -type f -exec stat -f "%z %m %N" {} \; 2>/dev/null
+        fi
+    done | sort > "$SNAPSHOT_END"
+
+    # Step 3: Check for uncommitted changes
+    echo -e "${BLUE}→${NC} Checking for uncommitted changes..."
+    CHANGES=$(git status --porcelain 2>/dev/null | wc -l | tr -d ' ')
+
+    if [ "$CHANGES" -gt 0 ]; then
+        echo -e "${YELLOW}⚠${NC} Found $CHANGES uncommitted changes"
+        git status --short
+
+        echo ""
+        echo -e "${BLUE}→${NC} Committing all changes..."
+        git add -A
+        # Unstage session metadata files that should never be committed
+        git reset HEAD .jfl/current-session-branch.txt 2>/dev/null || true
+        git reset HEAD .jfl/current-worktree.txt 2>/dev/null || true
+        git reset HEAD .jfl/worktree-path.txt 2>/dev/null || true
+
+        COMMIT_MSG="session: end $(date '+%Y-%m-%d %H:%M')"
+
+        if git commit -m "$COMMIT_MSG"; then
+            echo -e "${GREEN}✓${NC} Changes committed"
+        else
+            echo -e "${YELLOW}⚠${NC} Nothing to commit"
+        fi
+    else
+        echo -e "${GREEN}✓${NC} No uncommitted changes"
+    fi
+
+    # Step 4: Push to remote
+    echo -e "${BLUE}→${NC} Pushing to remote..."
+    CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+    if git push origin "$CURRENT_BRANCH" 2>/dev/null; then
+        echo -e "${GREEN}✓${NC} Pushed to origin/$CURRENT_BRANCH"
+    else
+        echo -e "${YELLOW}⚠${NC} Push failed (will retry on next session)"
+    fi
+
+    # Step 5: Sync product repo if symlink/submodule
+    PRODUCT_PATH="$PROJECT_ROOT/product"
+    if [ -L "$PRODUCT_PATH" ] || [ -d "$PRODUCT_PATH/.git" ]; then
+        echo ""
+        echo -e "${BLUE}→${NC} Syncing product repo..."
+
+        if [ -L "$PRODUCT_PATH" ]; then
+            TARGET=$(readlink "$PRODUCT_PATH")
+            if [[ "$TARGET" == ../* ]]; then
+                TARGET="$PROJECT_ROOT/$TARGET"
+            fi
+            TARGET=$(cd "$TARGET" 2>/dev/null && pwd)
+        else
+            TARGET="$PRODUCT_PATH"
+        fi
+
+        if [ -d "$TARGET/.git" ]; then
+            cd "$TARGET"
+            PRODUCT_CHANGES=$(git status --porcelain 2>/dev/null | wc -l | tr -d ' ')
+            if [ "$PRODUCT_CHANGES" -gt 0 ]; then
+                git add -A
+                git commit -m "session: end $(date '+%Y-%m-%d %H:%M')" || true
+                git push 2>/dev/null || echo -e "${YELLOW}⚠${NC} Product push failed"
+                echo -e "${GREEN}✓${NC} Product repo synced"
+            else
+                echo -e "${GREEN}✓${NC} Product repo clean"
+            fi
+            cd "$PROJECT_ROOT"
+        fi
+    fi
+
+    # Step 6: Compare snapshots
+    if [ -f "$SESSION_FILE" ]; then
+        SNAPSHOT_BEFORE=$(grep -o '"snapshot_before"[^,}]*' "$SESSION_FILE" | cut -d'"' -f4)
+
+        if [ -f "$SNAPSHOT_BEFORE" ]; then
+            echo ""
+            echo -e "${BLUE}→${NC} Session file changes:"
+            DIFF_OUTPUT=$(diff "$SNAPSHOT_BEFORE" "$SNAPSHOT_END" 2>/dev/null || true)
+
+            if [ -n "$DIFF_OUTPUT" ]; then
+                ADDED=$(echo "$DIFF_OUTPUT" | grep "^>" | wc -l | tr -d ' ')
+                REMOVED=$(echo "$DIFF_OUTPUT" | grep "^<" | wc -l | tr -d ' ')
+                echo "  Files added/modified: $ADDED"
+                echo "  Files removed: $REMOVED"
+                echo "$DIFF_OUTPUT" > "$LOG_DIR/session-diff-$(date +%Y%m%d-%H%M%S).txt"
+            else
+                echo "  No file changes this session"
+            fi
+        fi
+    fi
+
+    # Clean up session file
+    rm -f "$SESSION_FILE"
+
+    echo ""
+    echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+    echo -e "  ${GREEN}Session ended successfully!${NC}"
+    echo ""
+    echo "  All changes committed and pushed."
+    echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+    echo ""
+fi