jfl 0.1.0 → 0.2.0

package/template/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/template/scripts/session/session-end.sh

@@ -108,6 +108,10 @@ else
         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')"
 

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

@@ -26,7 +26,7 @@ CYAN='\033[0;36m'
 NC='\033[0m'
 
 # ==============================================================================
-# Step 1: Quick health check (warn only)
+# Step 0: Sync repos to latest (prevent context loss)
 # ==============================================================================
 
 echo ""
@@ -34,6 +34,18 @@ echo "━━━━━━━━━━━━━━━━━━━━━━━━
 echo "  JFL Session Init"
 echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
 
+# Sync repos before creating worktree (ensures worktree is from latest main)
+if [[ -x "$SCRIPT_DIR/session-sync.sh" ]]; then
+    echo ""
+    "$SCRIPT_DIR/session-sync.sh" || {
+        echo -e "${YELLOW}⚠${NC}  Session sync failed, continuing with local state"
+    }
+fi
+
+# ==============================================================================
+# Step 1: Quick health check (warn only)
+# ==============================================================================
+
 # Count stale sessions (no PID or PID not running)
 stale_count=0
 active_count=0
@@ -71,93 +83,268 @@ if [[ $stale_count -gt 5 ]]; then
 fi
 
 # ==============================================================================
-# Step 3: Create new worktree
+# Step 2.5: Crash Reconciliation - Check for uncommitted work in stale sessions
 # ==============================================================================
 
-# Generate session name with collision protection
+if [[ -d "$WORKTREES_DIR" ]]; then
+    worktrees_with_changes=""
+    change_count=0
+
+    for worktree in "$WORKTREES_DIR"/session-*; do
+        if [[ -d "$worktree" ]]; then
+            # Check if worktree has uncommitted changes
+            cd "$worktree"
+            if [[ -n $(git status --porcelain 2>/dev/null) ]]; then
+                session_name=$(basename "$worktree")
+                worktrees_with_changes="$worktrees_with_changes $session_name"
+                change_count=$((change_count + 1))
+            fi
+            cd "$REPO_DIR"
+        fi
+    done
+
+    if [[ $change_count -gt 0 ]]; then
+        echo ""
+        echo -e "${RED}⚠${NC}  Found $change_count session(s) with uncommitted work"
+        echo ""
+
+        for session in $worktrees_with_changes; do
+            worktree_path="$WORKTREES_DIR/$session"
+            cd "$worktree_path"
+            files=$(git status --porcelain | wc -l | tr -d ' ')
+            echo "  • $session ($files files)"
+            cd "$REPO_DIR"
+        done
+
+        echo ""
+        echo -e "${YELLOW}This work needs to be saved before continuing.${NC}"
+        echo ""
+
+        # Check if running non-interactively (hook context)
+        if [[ ! -t 0 ]]; then
+            # Non-interactive - auto-commit (safest)
+            echo "Running non-interactively - auto-committing all changes..."
+            choice="1"
+        else
+            # Interactive - ask user
+            echo "Options:"
+            echo "  1) Auto-commit all and continue (safest - no work lost)"
+            echo "  2) Show me the changes (for review)"
+            echo "  3) Skip for now (manual cleanup)"
+            echo ""
+            read -p "Choose [1-3]: " choice
+        fi
+
+        case "$choice" in
+            1)
+                echo ""
+                echo -e "${CYAN}→${NC}  Auto-committing all changes..."
+                for session in $worktrees_with_changes; do
+                    worktree_path="$WORKTREES_DIR/$session"
+                    cd "$worktree_path"
+
+                    if [[ -n $(git status --porcelain 2>/dev/null) ]]; then
+                        # Critical paths
+                        git add knowledge/ previews/ content/ suggestions/ CLAUDE.md .jfl/ 2>/dev/null || true
+
+                        if git commit -m "crash recovery: auto-save uncommitted work from $session" 2>/dev/null; then
+                            echo -e "  ${GREEN}✓${NC} $session - committed and saved"
+                            git push origin "$(git branch --show-current)" 2>/dev/null || true
+                        fi
+                    fi
+
+                    cd "$REPO_DIR"
+                done
+                echo ""
+                echo -e "${GREEN}✓${NC} All changes saved. Continuing..."
+                ;;
+            2)
+                echo ""
+                for session in $worktrees_with_changes; do
+                    worktree_path="$WORKTREES_DIR/$session"
+                    echo "─────────────────────────────────────"
+                    echo "$session:"
+                    echo ""
+                    cd "$worktree_path"
+                    git status --short
+                    cd "$REPO_DIR"
+                    echo ""
+                done
+                echo "─────────────────────────────────────"
+                echo ""
+                read -p "Commit these changes? [y/N]: " commit_choice
+                if [[ "$commit_choice" =~ ^[Yy]$ ]]; then
+                    for session in $worktrees_with_changes; do
+                        worktree_path="$WORKTREES_DIR/$session"
+                        cd "$worktree_path"
+                        git add knowledge/ previews/ content/ suggestions/ CLAUDE.md .jfl/ 2>/dev/null || true
+                        git commit -m "crash recovery: manual save from $session" 2>/dev/null || true
+                        git push origin "$(git branch --show-current)" 2>/dev/null || true
+                        cd "$REPO_DIR"
+                    done
+                    echo -e "${GREEN}✓${NC} Changes committed"
+                fi
+                ;;
+            3)
+                echo ""
+                echo -e "${YELLOW}Skipping crash recovery.${NC}"
+                echo "You can manually handle these sessions later."
+                echo ""
+                ;;
+            *)
+                echo ""
+                echo -e "${RED}Invalid choice. Skipping.${NC}"
+                ;;
+        esac
+    fi
+fi
+
+# ==============================================================================
+# Step 2.9: Check for concurrent sessions via jfl-services
+# ==============================================================================
+
+# Generate session details first
 user=$(git config user.name 2>/dev/null | tr ' ' '-' | tr '[:upper:]' '[:lower:]' | tr -cd 'a-z0-9-' || echo "user")
-# Truncate long usernames to prevent path issues
 user="${user:0:30}"
 date_str=$(date +%Y%m%d)
 time_str=$(date +%H%M)
+random_id=$(openssl rand -hex 3 2>/dev/null || printf "%06x" $RANDOM$RANDOM)
+session_name="session-${user}-${date_str}-${time_str}-${random_id}"
+
+# Get working branch (from config or current branch)
+working_branch=$(jq -r '.working_branch // empty' .jfl/config.json 2>/dev/null)
+if [[ -z "$working_branch" ]]; then
+    working_branch=$(git branch --show-current)
+fi
+
+# Check for concurrent sessions via jfl-services API
+use_worktree=false
+api_response=""
+if command -v curl >/dev/null 2>&1; then
+    api_response=$(curl -s -X GET "http://localhost:3401/sessions/active?projectPath=$(pwd)" 2>/dev/null || echo "")
 
-# Generate unique session name, retry if collision detected
-max_attempts=5
-attempt=0
-while [[ $attempt -lt $max_attempts ]]; do
-    random_id=$(openssl rand -hex 3 2>/dev/null || printf "%06x" $RANDOM$RANDOM)
-    session_name="session-${user}-${date_str}-${time_str}-${random_id}"
-
-    # Check for collision: journal file or worktree already exists
-    if [[ -f "$REPO_DIR/.jfl/journal/${session_name}.jsonl" ]] || [[ -d "$WORKTREES_DIR/$session_name" ]]; then
-        echo -e "${YELLOW}⚠${NC}  Session name collision, regenerating..."
-        attempt=$((attempt + 1))
-        sleep 0.1  # Brief pause before retry
+    if [[ -n "$api_response" ]] && echo "$api_response" | jq -e '.count' >/dev/null 2>&1; then
+        session_count=$(echo "$api_response" | jq -r '.count // 0')
+
+        if [[ $session_count -gt 0 ]]; then
+            use_worktree=true
+            echo -e "${YELLOW}→${NC}  Multiple sessions detected ($session_count active) - using worktree for isolation"
+        else
+            echo -e "${GREEN}→${NC}  Single session - working directly on branch $working_branch"
+        fi
     else
-        break
+        # API unavailable - fall back to local detection
+        echo -e "${YELLOW}→${NC}  jfl-services unavailable - checking locally..."
+        local_sessions=$(ps aux | grep -c "claude.*$(pwd)" 2>/dev/null || echo "1")
+        if [[ $local_sessions -gt 2 ]]; then
+            use_worktree=true
+            echo -e "${YELLOW}→${NC}  Multiple processes detected - using worktree for isolation"
+        fi
     fi
-done
+else
+    # No curl - assume single session
+    echo -e "${GREEN}→${NC}  Working directly on branch $working_branch"
+fi
 
-if [[ $attempt -ge $max_attempts ]]; then
-    echo -e "${RED}✗${NC}  Failed to generate unique session name after $max_attempts attempts"
-    exit 1
+# Register this session with jfl-services
+if command -v curl >/dev/null 2>&1; then
+    curl -s -X POST "http://localhost:3401/sessions/start" \
+        -H "Content-Type: application/json" \
+        -d "{\"id\":\"$session_name\",\"projectPath\":\"$(pwd)\",\"branch\":\"$working_branch\",\"user\":\"$user\",\"pid\":$$,\"worktree\":\"$use_worktree\"}" \
+        >/dev/null 2>&1 || true
 fi
 
-worktree_path="$WORKTREES_DIR/$session_name"
+# ==============================================================================
+# Step 3: Create worktree (if needed) or work directly
+# ==============================================================================
 
-echo ""
-echo "Creating session: $session_name"
+if [[ "$use_worktree" == "true" ]]; then
+    # WORKTREE MODE: Multiple sessions detected
+    echo ""
+    echo "Creating worktree session: $session_name"
 
-# Create worktree
-if git worktree add "$worktree_path" -b "$session_name" 2>&1 | head -3; then
-    echo -e "${GREEN}✓${NC}  Worktree created"
-else
-    echo -e "${RED}✗${NC}  Failed to create worktree"
-    # Fall back to main branch
-    echo "main" > "$REPO_DIR/.jfl/current-worktree.txt"
-    echo "main" > "$REPO_DIR/.jfl/current-session-branch.txt"
-    exit 0
-fi
+    worktree_path="$WORKTREES_DIR/$session_name"
 
-# Initialize submodules in worktree (quick, no network)
-cd "$worktree_path"
-if [[ -f ".gitmodules" ]]; then
-    if [[ ! -d "product/.git" ]] && [[ ! -f "product/.git" ]]; then
-        echo "→  Initializing submodules..."
-        git submodule update --init --depth 1 product 2>/dev/null || true
+    # Create worktree
+    if git worktree add "$worktree_path" -b "$session_name" 2>&1 | head -3; then
+        echo -e "${GREEN}✓${NC}  Worktree created"
+    else
+        echo -e "${RED}✗${NC}  Failed to create worktree"
+        # Fall back to direct branch mode
+        use_worktree=false
     fi
-fi
 
-# Create session directories
-mkdir -p .jfl/logs
+    if [[ "$use_worktree" == "true" ]]; then
+        # Initialize submodules in worktree (quick, no network)
+        cd "$worktree_path"
+        if [[ -f ".gitmodules" ]]; then
+            if [[ ! -d "product/.git" ]] && [[ ! -f "product/.git" ]]; then
+                echo "→  Initializing submodules..."
+                git submodule update --init --depth 1 product 2>/dev/null || true
+            fi
+        fi
+
+        # Create session directories
+        mkdir -p .jfl/logs
 
-# CRITICAL: Symlink journal to main repo so entries persist after worktree cleanup
-# Without this, journal entries written in worktree are lost when worktree is removed!
-rm -rf .jfl/journal 2>/dev/null || true
-ln -sf "$REPO_DIR/.jfl/journal" .jfl/journal
-echo -e "${GREEN}✓${NC}  Journal symlinked to main repo"
+        # CRITICAL: Symlink journal to main repo so entries persist after worktree cleanup
+        rm -rf .jfl/journal 2>/dev/null || true
+        ln -sf "$REPO_DIR/.jfl/journal" .jfl/journal
+        echo -e "${GREEN}✓${NC}  Journal symlinked to main repo"
+
+        # Start auto-commit in background
+        if [[ -x "$SCRIPT_DIR/auto-commit.sh" ]]; then
+            "$SCRIPT_DIR/auto-commit.sh" start >> .jfl/logs/auto-commit.log 2>&1 &
+            echo -e "${GREEN}✓${NC}  Auto-commit started"
+        fi
 
-# Start auto-commit in background
-if [[ -x "$SCRIPT_DIR/auto-commit.sh" ]]; then
-    "$SCRIPT_DIR/auto-commit.sh" start >> .jfl/logs/auto-commit.log 2>&1 &
-    echo -e "${GREEN}✓${NC}  Auto-commit started"
+        cd "$REPO_DIR"
+
+        # Save paths
+        echo "$worktree_path" > "$REPO_DIR/.jfl/current-worktree.txt"
+        echo "$session_name" > "$REPO_DIR/.jfl/current-session-branch.txt"
+        echo "$session_name" > "$worktree_path/.jfl/current-session-branch.txt"
+
+        echo ""
+        echo -e "${GREEN}✓${NC}  Session ready in worktree: $worktree_path"
+        echo ""
+    fi
 fi
 
-cd "$REPO_DIR"
+if [[ "$use_worktree" != "true" ]]; then
+    # DIRECT MODE: Single session, work on current branch
+    echo ""
+    echo "Direct session mode: $session_name"
 
-# ==============================================================================
-# Step 4: Save state and output instructions
-# ==============================================================================
+    # Ensure we're on working branch
+    current_branch=$(git branch --show-current)
+    if [[ "$current_branch" != "$working_branch" ]]; then
+        echo "→  Switching to working branch: $working_branch"
+        git checkout "$working_branch" 2>&1 | head -3
+    fi
+
+    # Create session branch from working branch
+    if git checkout -b "$session_name" 2>&1 | head -3; then
+        echo -e "${GREEN}✓${NC}  Session branch created: $session_name"
+    else
+        echo -e "${YELLOW}⚠${NC}  Continuing on branch: $current_branch"
+        session_name="$current_branch"
+    fi
 
-# Save paths
-echo "$worktree_path" > "$REPO_DIR/.jfl/current-worktree.txt"
-echo "$session_name" > "$REPO_DIR/.jfl/current-session-branch.txt"
+    # Create session directories
+    mkdir -p .jfl/logs
 
-# Also save in worktree
-echo "$session_name" > "$worktree_path/.jfl/current-session-branch.txt"
+    # Start auto-commit in background
+    if [[ -x "$SCRIPT_DIR/auto-commit.sh" ]]; then
+        "$SCRIPT_DIR/auto-commit.sh" start >> .jfl/logs/auto-commit.log 2>&1 &
+        echo -e "${GREEN}✓${NC}  Auto-commit started"
+    fi
 
-echo ""
-echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
-echo -e "  ${CYAN}CLAUDE: You MUST run:${NC} cd $worktree_path"
-echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
-echo ""
+    # Save session info (no worktree path in direct mode)
+    echo "direct" > "$REPO_DIR/.jfl/current-worktree.txt"
+    echo "$session_name" > "$REPO_DIR/.jfl/current-session-branch.txt"
+
+    echo ""
+    echo -e "${GREEN}✓${NC}  Session ready on branch: $session_name"
+    echo ""
+fi