jfl 0.4.3 → 0.5.0

package/template/.github/workflows/jfl-eval.yml

@@ -38,6 +38,38 @@ jobs:
       - name: Build
         run: npx tsc --build --noEmit
 
+      - name: Predict eval delta (Stratus, optional)
+        id: predict
+        if: env.STRATUS_API_KEY != ''
+        continue-on-error: true
+        env:
+          STRATUS_API_KEY: ${{ secrets.STRATUS_API_KEY }}
+          PR_TITLE: ${{ github.event.pull_request.title }}
+        run: |
+          DIFF_SUMMARY=$(git diff origin/main...HEAD --stat | tail -5)
+          CURRENT_SCORE=$(cat .jfl/eval.jsonl 2>/dev/null | tail -1 | node -e "let d='';process.stdin.on('data',c=>d+=c);process.stdin.on('end',()=>{try{console.log(JSON.parse(d).composite||0)}catch{console.log(0)}})" 2>/dev/null || echo "0")
+
+          RESULT=$(node -e "
+            const { Predictor } = require('./dist/lib/predictor.js');
+            const p = new Predictor();
+            p.predict({
+              proposal: { description: '$PR_TITLE — $DIFF_SUMMARY', change_type: 'fix', scope: 'medium' },
+              current_score: $CURRENT_SCORE,
+              goal: 'test_pass_rate >= 1.0',
+              recent_trajectory: [],
+            }).then(r => {
+              console.log(JSON.stringify({id: r.prediction_id, delta: r.predicted_delta, confidence: r.confidence, recommendation: r.recommendation}));
+            }).catch(e => {
+              console.error('Prediction failed:', e.message);
+              console.log(JSON.stringify({id: '', delta: 0, confidence: 0, recommendation: 'revise'}));
+            });
+          " 2>/dev/null || echo '{"id":"","delta":0,"confidence":0,"recommendation":"revise"}')
+
+          echo "prediction_id=$(echo "$RESULT" | node -e "let d='';process.stdin.on('data',c=>d+=c);process.stdin.on('end',()=>{try{console.log(JSON.parse(d).id)}catch{console.log('')}})")" >> $GITHUB_OUTPUT
+          echo "predicted_delta=$(echo "$RESULT" | node -e "let d='';process.stdin.on('data',c=>d+=c);process.stdin.on('end',()=>{try{console.log(JSON.parse(d).delta)}catch{console.log(0)}})")" >> $GITHUB_OUTPUT
+          echo "confidence=$(echo "$RESULT" | node -e "let d='';process.stdin.on('data',c=>d+=c);process.stdin.on('end',()=>{try{console.log(JSON.parse(d).confidence)}catch{console.log(0)}})")" >> $GITHUB_OUTPUT
+          echo "recommendation=$(echo "$RESULT" | node -e "let d='';process.stdin.on('data',c=>d+=c);process.stdin.on('end',()=>{try{console.log(JSON.parse(d).recommendation)}catch{console.log('revise')}})")" >> $GITHUB_OUTPUT
+
       - name: Run tests (baseline from main)
         id: baseline
         run: |
@@ -129,6 +161,24 @@ jobs:
           echo "tests_passing_added=$TESTS_PASSING_ADDED" >> $GITHUB_OUTPUT
           echo "Delta: $DELTA, tests_added=$TESTS_ADDED (improved=$IMPROVED)"
 
+      - name: Resolve prediction (Stratus, optional)
+        if: steps.predict.outputs.prediction_id != ''
+        continue-on-error: true
+        env:
+          STRATUS_API_KEY: ${{ secrets.STRATUS_API_KEY }}
+        run: |
+          PRED_ID="${{ steps.predict.outputs.prediction_id }}"
+          DELTA=${{ steps.delta.outputs.delta }}
+          PR_SCORE=${{ steps.pr_eval.outputs.score }}
+
+          node -e "
+            const { Predictor } = require('./dist/lib/predictor.js');
+            const p = new Predictor();
+            p.resolve('$PRED_ID', $DELTA, $PR_SCORE, '${{ github.run_id }}')
+              .then(() => console.log('Prediction resolved: $PRED_ID'))
+              .catch(e => console.error('Resolve failed:', e.message));
+          " 2>/dev/null || echo "Warning: could not resolve prediction"
+
       - name: AI quality assessment
         id: ai_eval
         env:
@@ -263,6 +313,23 @@ jobs:
             }
           " >> $GITHUB_OUTPUT
 
+      - name: Detect agent from branch
+        id: agent
+        run: |
+          BRANCH="${{ github.head_ref }}"
+          # Extract agent from branch prefix: pp/* → peter-parker, bot/* → bot, etc.
+          if [[ "$BRANCH" == pp/* ]]; then
+            echo "name=peter-parker" >> $GITHUB_OUTPUT
+          elif [[ "$BRANCH" == bot/* ]]; then
+            echo "name=bot" >> $GITHUB_OUTPUT
+          elif [[ "$BRANCH" == agent/* ]]; then
+            # agent/agent-name/description → agent-name
+            AGENT_NAME=$(echo "$BRANCH" | cut -d'/' -f2)
+            echo "name=$AGENT_NAME" >> $GITHUB_OUTPUT
+          else
+            echo "name=${{ github.event.pull_request.user.login }}" >> $GITHUB_OUTPUT
+          fi
+
       - name: Commit eval entry to PR branch
         run: |
           git config user.name "github-actions[bot]"
@@ -271,18 +338,27 @@ jobs:
           # Checkout the actual PR branch (not detached HEAD)
           git checkout ${{ github.head_ref }}
 
-          # Write eval entry
-          mkdir -p .jfl/eval
-          cat >> .jfl/eval/eval.jsonl << EOF
-          {"v":1,"ts":"$(date -u +%Y-%m-%dT%H:%M:%SZ)","agent":"peter-parker","dataset":"ci-eval","metrics":{"test_pass_rate":${{ steps.pr_eval.outputs.score }},"tests_passed":${{ steps.pr_eval.outputs.passing }},"tests_total":${{ steps.pr_eval.outputs.total }}},"composite":${{ steps.pr_eval.outputs.score }},"delta":{"composite":${{ steps.delta.outputs.delta }}},"model_version":"pp-run","improved":${{ steps.delta.outputs.improved }},"pr_number":${{ github.event.pull_request.number }},"branch":"${{ github.head_ref }}"}
+          AGENT="${{ steps.agent.outputs.name }}"
+          PRED_ID="${{ steps.predict.outputs.prediction_id }}"
+
+          # Write eval entry (matches readEvals path: .jfl/eval.jsonl)
+          mkdir -p .jfl
+          cat >> .jfl/eval.jsonl << EOF
+          {"v":1,"ts":"$(date -u +%Y-%m-%dT%H:%M:%SZ)","agent":"$AGENT","dataset":"ci-eval","metrics":{"test_pass_rate":${{ steps.pr_eval.outputs.score }},"tests_passed":${{ steps.pr_eval.outputs.passing }},"tests_total":${{ steps.pr_eval.outputs.total }}},"composite":${{ steps.pr_eval.outputs.score }},"delta":{"composite":${{ steps.delta.outputs.delta }}},"model_version":"$AGENT-run","improved":${{ steps.delta.outputs.improved }},"pr_number":${{ github.event.pull_request.number }},"branch":"${{ github.head_ref }}","quality_score":${{ steps.ai_eval.outputs.quality_score }},"dim_correctness":${{ steps.ai_eval.outputs.dim_correctness }},"dim_coverage":${{ steps.ai_eval.outputs.dim_coverage }},"dim_architecture":${{ steps.ai_eval.outputs.dim_architecture }},"dim_value":${{ steps.ai_eval.outputs.dim_value }},"prediction_id":"$PRED_ID"}
           EOF
 
           # Write eval:scored event for hub file watcher
           cat >> .jfl/service-events.jsonl << EOF
-          {"ts":"$(date -u +%Y-%m-%dT%H:%M:%S.000Z)","type":"eval:scored","source":"ci","data":{"agent":"peter-parker","composite":${{ steps.pr_eval.outputs.score }},"baseline":${{ steps.baseline.outputs.score }},"delta":${{ steps.delta.outputs.delta }},"improved":"${{ steps.delta.outputs.improved }}","pr_number":${{ github.event.pull_request.number }},"branch":"${{ github.head_ref }}","run_url":"${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}","quality_score":${{ steps.ai_eval.outputs.quality_score }},"dim_correctness":${{ steps.ai_eval.outputs.dim_correctness }},"dim_coverage":${{ steps.ai_eval.outputs.dim_coverage }},"dim_architecture":${{ steps.ai_eval.outputs.dim_architecture }},"dim_value":${{ steps.ai_eval.outputs.dim_value }}}}
+          {"ts":"$(date -u +%Y-%m-%dT%H:%M:%S.000Z)","type":"eval:scored","source":"ci","data":{"agent":"$AGENT","composite":${{ steps.pr_eval.outputs.score }},"baseline":${{ steps.baseline.outputs.score }},"delta":${{ steps.delta.outputs.delta }},"improved":"${{ steps.delta.outputs.improved }}","pr_number":${{ github.event.pull_request.number }},"branch":"${{ github.head_ref }}","run_url":"${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}","quality_score":${{ steps.ai_eval.outputs.quality_score }},"dim_correctness":${{ steps.ai_eval.outputs.dim_correctness }},"dim_coverage":${{ steps.ai_eval.outputs.dim_coverage }},"dim_architecture":${{ steps.ai_eval.outputs.dim_architecture }},"dim_value":${{ steps.ai_eval.outputs.dim_value }}}}
+          EOF
+
+          # Write training tuple for policy head
+          cat >> .jfl/training-buffer.jsonl << EOF
+          {"id":"tb_ci_${{ github.run_id }}","v":1,"ts":"$(date -u +%Y-%m-%dT%H:%M:%SZ)","agent":"$AGENT","state":{"composite_score":${{ steps.baseline.outputs.score }},"dimension_scores":{},"tests_passing":${{ steps.baseline.outputs.passing }},"tests_total":${{ steps.baseline.outputs.total }},"trajectory_length":0,"recent_deltas":[],"agent":"$AGENT"},"action":{"type":"experiment","description":"${{ github.event.pull_request.title }}","files_affected":[],"scope":"medium","branch":"${{ github.head_ref }}"},"reward":{"composite_delta":${{ steps.delta.outputs.delta }},"dimension_deltas":{},"tests_added":${{ steps.delta.outputs.tests_added }},"quality_score":${{ steps.ai_eval.outputs.quality_score }},"improved":${{ steps.delta.outputs.improved }},"prediction_error":0},"metadata":{"pr_number":${{ github.event.pull_request.number }},"branch":"${{ github.head_ref }}","eval_run_id":"${{ github.run_id }}","prediction_id":"$PRED_ID","source":"ci"}}
           EOF
 
-          git add .jfl/eval/eval.jsonl .jfl/service-events.jsonl
+          git add .jfl/eval.jsonl .jfl/service-events.jsonl .jfl/training-buffer.jsonl
+          git add .jfl/predictions/ 2>/dev/null || true
           git commit -m "eval: scored PR #${{ github.event.pull_request.number }} (composite=${{ steps.pr_eval.outputs.score }}, delta=${{ steps.delta.outputs.delta }})"
           git push origin ${{ github.head_ref }}
 
@@ -301,7 +377,7 @@ jobs:
                 "pr_url": "${{ github.event.pull_request.html_url }}",
                 "branch": "${{ github.head_ref }}",
                 "commit_sha": "${{ github.sha }}",
-                "agent": "peter-parker",
+                "agent": "${{ steps.agent.outputs.name }}",
                 "metrics": {
                   "test_pass_rate": ${{ steps.pr_eval.outputs.score }},
                   "test_count": ${{ steps.pr_eval.outputs.total }},
@@ -350,6 +426,27 @@ jobs:
             const dimArchitecture = '${{ steps.ai_eval.outputs.dim_architecture }}' || '—';
             const dimValue = '${{ steps.ai_eval.outputs.dim_value }}' || '—';
 
+            // Prediction data (optional)
+            const predId = '${{ steps.predict.outputs.prediction_id }}' || '';
+            const predDelta = parseFloat('${{ steps.predict.outputs.predicted_delta }}') || 0;
+            const predConf = parseFloat('${{ steps.predict.outputs.confidence }}') || 0;
+            const predRec = '${{ steps.predict.outputs.recommendation }}' || '';
+
+            const predictionSection = predId ? [
+              '',
+              `### Stratus Prediction`,
+              '',
+              `| Metric | Value |`,
+              `|--------|-------|`,
+              `| Predicted delta | ${predDelta >= 0 ? '+' : ''}${predDelta.toFixed(4)} |`,
+              `| Actual delta | ${delta >= 0 ? '+' : ''}${delta.toFixed(4)} |`,
+              `| Prediction error | ${Math.abs(predDelta - delta).toFixed(4)} |`,
+              `| Confidence | ${Math.round(predConf * 100)}% |`,
+              `| Recommendation | ${predRec} |`,
+              `| Direction correct | ${(predDelta >= 0) === (delta >= 0) ? ':white_check_mark:' : ':x:'} |`,
+              '',
+            ] : [];
+
             const body = [
               `## JFL Eval Results ${emoji}`,
               '',
@@ -369,7 +466,7 @@ jobs:
               `| Value | ${dimValue} |`,
               '',
               `> ${qualityReason}`,
-              '',
+              ...predictionSection,
               `**Verdict: ${verdict}**`,
               '',
               improved

package/template/.github/workflows/jfl-review.yml

@@ -327,6 +327,10 @@ jobs:
             echo "Red findings detected — requesting changes"
             gh pr review ${{ github.event.pull_request.number }} --request-changes \
               --body "JFL AI Review: ${{ steps.findings.outputs.red_count }} blocker(s) found. Address red findings before merge."
+          else
+            echo "No blockers — approving (dismisses any previous CHANGES_REQUESTED)"
+            gh pr review ${{ github.event.pull_request.number }} --approve \
+              --body "JFL AI Review: Clean. No blockers found."
           fi
 
       - name: Post review:findings event to hub

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

@@ -12,6 +12,7 @@ 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"
+LOCK_SCRIPT="$SCRIPT_DIR/session-lock.sh"
 
 # Colors
 RED='\033[0;31m'
@@ -56,10 +57,32 @@ if [ -f "$SESSION_FILE" ]; then
     fi
 fi
 
+SESSION_ID=""
+if [ -f "$PROJECT_ROOT/.jfl/current-session-branch.txt" ]; then
+    SESSION_ID=$(cat "$PROJECT_ROOT/.jfl/current-session-branch.txt" 2>/dev/null || echo "")
+fi
+
+# Stop heartbeat daemon
+stop_heartbeat() {
+    local pid_file="$1"
+    if [ -f "$pid_file" ]; then
+        local hb_pid
+        hb_pid=$(cat "$pid_file" 2>/dev/null || echo "")
+        if [ -n "$hb_pid" ]; then
+            kill "$hb_pid" 2>/dev/null || true
+        fi
+        rm -f "$pid_file"
+    fi
+}
+
 if $IS_WORKTREE && [ -n "$SESSION_NAME" ] && [ "$SESSION_NAME" != "main" ] && [ "$SESSION_NAME" != "null" ]; then
     echo -e "${BLUE}→${NC} Ending worktree session: $SESSION_NAME"
     echo ""
 
+    # Stop heartbeat
+    stop_heartbeat "$WORKTREE_PATH/.jfl/heartbeat.pid"
+    stop_heartbeat "$PROJECT_ROOT/.jfl/heartbeat.pid"
+
     # 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"
@@ -72,13 +95,22 @@ if $IS_WORKTREE && [ -n "$SESSION_NAME" ] && [ "$SESSION_NAME" != "main" ] && [
         exit 1
     fi
 
+    # Unregister from lock registry
+    if [ -x "$LOCK_SCRIPT" ] && [ -n "$SESSION_ID" ]; then
+        "$LOCK_SCRIPT" unregister "$SESSION_ID" >/dev/null 2>&1 || true
+        echo -e "${GREEN}✓${NC} Session unregistered from lock registry"
+    fi
+
     # Clean up session file
     rm -f "$SESSION_FILE"
 
 else
-    # Main branch session - just commit and push
+    # Main branch session - commit, merge, push
     echo -e "${BLUE}→${NC} Ending main branch session..."
 
+    # Step 0: Stop heartbeat
+    stop_heartbeat "$PROJECT_ROOT/.jfl/heartbeat.pid"
+
     # Step 1: Stop auto-commit
     echo -e "${BLUE}→${NC} Stopping auto-commit..."
     "$SCRIPT_DIR/auto-commit.sh" stop 2>/dev/null || true
@@ -124,13 +156,38 @@ else
         echo -e "${GREEN}✓${NC} No uncommitted changes"
     fi
 
-    # Step 4: Push to remote
-    echo -e "${BLUE}→${NC} Pushing to remote..."
+    # Step 4: Merge session branch to working branch (sequenced)
     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"
+    WORKING_BRANCH=$(jq -r '.working_branch // empty' .jfl/config.json 2>/dev/null)
+    if [ -z "$WORKING_BRANCH" ]; then WORKING_BRANCH="main"; fi
+
+    if [ "$CURRENT_BRANCH" != "$WORKING_BRANCH" ] && [[ "$CURRENT_BRANCH" == session-* ]]; then
+        echo -e "${BLUE}→${NC} Merging $CURRENT_BRANCH → $WORKING_BRANCH (sequenced)..."
+
+        if [ -x "$LOCK_SCRIPT" ] && [ -n "$SESSION_ID" ]; then
+            if "$LOCK_SCRIPT" merge "$CURRENT_BRANCH" "$WORKING_BRANCH" "$SESSION_ID" "$PROJECT_ROOT" 2>&1; then
+                echo -e "${GREEN}✓${NC} Merged and pushed via sequencer"
+            else
+                echo -e "${YELLOW}⚠${NC} Sequenced merge failed — pushing branch for manual merge"
+                git push origin "$CURRENT_BRANCH" 2>/dev/null || true
+            fi
+        else
+            # Fallback: direct push
+            echo -e "${BLUE}→${NC} Pushing to remote..."
+            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
+        fi
     else
-        echo -e "${YELLOW}⚠${NC} Push failed (will retry on next session)"
+        # Already on working branch — just push
+        echo -e "${BLUE}→${NC} Pushing to remote..."
+        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
     fi
 
     # Step 5: Sync product repo if symlink/submodule
@@ -188,6 +245,12 @@ else
     # Clean up session file
     rm -f "$SESSION_FILE"
 
+    # Unregister from lock registry
+    if [ -x "$LOCK_SCRIPT" ] && [ -n "$SESSION_ID" ]; then
+        "$LOCK_SCRIPT" unregister "$SESSION_ID" >/dev/null 2>&1 || true
+        echo -e "${GREEN}✓${NC} Session unregistered from lock registry"
+    fi
+
     echo ""
     echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
     echo -e "  ${GREEN}Session ended successfully!${NC}"

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

@@ -200,9 +200,11 @@ if [[ -d "$WORKTREES_DIR" ]]; then
 fi
 
 # ==============================================================================
-# Step 2.9: Check for concurrent sessions via jfl-services
+# Step 2.9: Check for concurrent sessions via lock registry
 # ==============================================================================
 
+LOCK_SCRIPT="$SCRIPT_DIR/session-lock.sh"
+
 # Generate session details first
 user=$(git config user.name 2>/dev/null | tr ' ' '-' | tr '[:upper:]' '[:lower:]' | tr -cd 'a-z0-9-' || echo "user")
 user="${user:0:30}"
@@ -217,41 +219,41 @@ 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 "")
-
-    if [[ -n "$api_response" ]] && echo "$api_response" | jq -e '.count' >/dev/null 2>&1; then
-        session_count=$(echo "$api_response" | jq -r '.count // 0')
+# Clean stale sessions first
+if [[ -x "$LOCK_SCRIPT" ]]; then
+    cleaned=$("$LOCK_SCRIPT" clean 2>/dev/null | grep -o '[0-9]*' || echo "0")
+    if [[ "$cleaned" -gt 0 ]]; then
+        echo -e "${YELLOW}→${NC}  Cleaned $cleaned stale session lock(s)"
+    fi
+fi
 
-        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
+# Check for concurrent sessions via lock registry (no external service needed)
+use_worktree=false
+if [[ -x "$LOCK_SCRIPT" ]]; then
+    session_count=$("$LOCK_SCRIPT" count 2>/dev/null || echo "0")
+
+    if [[ $session_count -gt 0 ]]; then
+        use_worktree=true
+        echo -e "${YELLOW}→${NC}  $session_count active session(s) detected — using worktree for isolation"
+        # Show who's active
+        "$LOCK_SCRIPT" active 2>/dev/null | python3 -c "
+import sys, json
+try:
+    sessions = json.load(sys.stdin)
+    for s in sessions:
+        print(f'     • {s[\"id\"]} (branch: {s[\"branch\"]}, pid: {s[\"pid\"]})')
+except: pass
+" 2>/dev/null || true
     else
-        # 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
+        echo -e "${GREEN}→${NC}  Single session — working directly on branch $working_branch"
     fi
 else
-    # No curl - assume single session
-    echo -e "${GREEN}→${NC}  Working directly on branch $working_branch"
+    echo -e "${YELLOW}→${NC}  session-lock.sh not found — assuming single session"
 fi
 
-# 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
+# Register this session in the lock registry
+if [[ -x "$LOCK_SCRIPT" ]]; then
+    "$LOCK_SCRIPT" register "$session_name" "$working_branch" >/dev/null 2>&1 || true
 fi
 
 # ==============================================================================
@@ -305,6 +307,20 @@ if [[ "$use_worktree" == "true" ]]; then
         echo "$session_name" > "$REPO_DIR/.jfl/current-session-branch.txt"
         echo "$session_name" > "$worktree_path/.jfl/current-session-branch.txt"
 
+        # Update lock registry with worktree path
+        if [[ -x "$LOCK_SCRIPT" ]]; then
+            "$LOCK_SCRIPT" register "$session_name" "$session_name" "$worktree_path" >/dev/null 2>&1 || true
+        fi
+
+        # Start heartbeat in background (touch lock file every 30s)
+        if [[ -x "$LOCK_SCRIPT" ]]; then
+            (while true; do "$LOCK_SCRIPT" heartbeat "$session_name" >/dev/null 2>&1 || break; sleep 30; done) &
+            HEARTBEAT_PID=$!
+            echo "$HEARTBEAT_PID" > "$worktree_path/.jfl/heartbeat.pid"
+            disown "$HEARTBEAT_PID" 2>/dev/null || true
+            echo -e "${GREEN}✓${NC}  Heartbeat started (PID $HEARTBEAT_PID)"
+        fi
+
         echo ""
         echo -e "${GREEN}✓${NC}  Session ready in worktree: $worktree_path"
         echo ""
@@ -344,6 +360,15 @@ if [[ "$use_worktree" != "true" ]]; then
     echo "direct" > "$REPO_DIR/.jfl/current-worktree.txt"
     echo "$session_name" > "$REPO_DIR/.jfl/current-session-branch.txt"
 
+    # Start heartbeat in background (touch lock file every 30s)
+    if [[ -x "$LOCK_SCRIPT" ]]; then
+        (while true; do "$LOCK_SCRIPT" heartbeat "$session_name" >/dev/null 2>&1 || break; sleep 30; done) &
+        HEARTBEAT_PID=$!
+        echo "$HEARTBEAT_PID" > "$REPO_DIR/.jfl/heartbeat.pid"
+        disown "$HEARTBEAT_PID" 2>/dev/null || true
+        echo -e "${GREEN}✓${NC}  Heartbeat started (PID $HEARTBEAT_PID)"
+    fi
+
     echo ""
     echo -e "${GREEN}✓${NC}  Session ready on branch: $session_name"
     echo ""