fix(loop): fix set -e crash, monitor counter, daily cap and not-logged-in detection

- Fix set -e killing script when execute_claude_code returns non-zero:
  use `execute_claude_code "$loop_count" || exec_result=$?` pattern
- Fix monitor call counter display: use increment_call_counter() to persist
  immediately instead of deferring to successful execution only
- Add 'hit your limit' to Layer 3 text fallback pattern (#198)
- Add Layer 4 detection: 'not logged in' triggers rotation when ACCOUNT_ROTATION=true
- Add daily cap fixture, 'hit your limit' test, and two 'not logged in' tests
- Update CLAUDE.md test counts (630 total)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: Andymendez100

CLAUDE.md

@@ -194,7 +194,7 @@ tmux attach -t <session-name>
 
 ### Running Tests
 ```bash
-# Run all tests (627 tests)
+# Run all tests (630 tests)
 npm test
 
 # Run specific test suites
@@ -538,13 +538,13 @@ Ralph uses a multi-layered strategy to prevent Claude from accidentally deleting
 
 ## Test Suite
 
-### Test Files (627 tests total)
+### Test Files (630 tests total)
 
 | File | Tests | Description |
 |------|-------|-------------|
 | `test_circuit_breaker_recovery.bats` | 19 | Cooldown timer, auto-reset, parse_iso_to_epoch, CLI flag (Issue #160) |
 | `test_cli_parsing.bats` | 35 | CLI argument parsing for all flags + monitor parameter forwarding |
-| `test_cli_modern.bats` | 66 | Modern CLI commands (Phase 1.1) + build_claude_command fix + live mode text format fix (#164) + errexit pipeline guard (#175) + ALLOWED_TOOLS tightening (#149) + API limit false positive detection (#183) + Claude CLI command validation (#97) |
+| `test_cli_modern.bats` | 69 | Modern CLI commands (Phase 1.1) + build_claude_command fix + live mode text format fix (#164) + errexit pipeline guard (#175) + ALLOWED_TOOLS tightening (#149) + API limit false positive detection (#183) + Claude CLI command validation (#97) + daily cap + account rotation Layer 4 detection (#81) |
 | `test_json_parsing.bats` | 52 | JSON output format parsing + Claude CLI format + session management + array format |
 | `test_session_continuity.bats` | 44 | Session lifecycle management + expiration + circuit breaker integration + issue #91 fix |
 | `test_exit_detection.bats` | 53 | Exit signal detection + EXIT_SIGNAL-based completion indicators + progress detection |

ralph_loop.sh

@@ -1089,8 +1089,10 @@ execute_claude_code() {
     local timestamp=$(date '+%Y-%m-%d_%H-%M-%S')
     local output_file="$LOG_DIR/claude_output_${timestamp}.log"
     local loop_count=$1
-    local calls_made=$(cat "$CALL_COUNT_FILE" 2>/dev/null || echo "0")
-    calls_made=$((calls_made + 1))
+    # Persist call count immediately so monitor dashboard reflects actual usage
+    # API calls consume rate limits regardless of success/failure
+    local calls_made
+    calls_made=$(increment_call_counter)
 
     # Fix #141: Capture git HEAD SHA at loop start to detect commits as progress
     # Store in file for access by progress detection after Claude execution
@@ -1395,9 +1397,6 @@ EOF
     fi
 
     if [ $exit_code -eq 0 ]; then
-        # Only increment counter on successful execution
-        echo "$calls_made" > "$CALL_COUNT_FILE"
-
         # Clear progress file
         echo '{"status": "completed", "timestamp": "'$(date '+%Y-%m-%d %H:%M:%S')'"}' > "$PROGRESS_FILE"
 
@@ -1512,11 +1511,17 @@ EOF
 
         # Layer 3: Filtered text fallback — only check tail, excluding tool result lines
         # Filters out type:user, tool_result, and tool_use_id lines which contain echoed file content
-        if tail -30 "$output_file" 2>/dev/null | grep -vE '"type"\s*:\s*"user"' | grep -v '"tool_result"' | grep -v '"tool_use_id"' | grep -qi "5.*hour.*limit\|limit.*reached.*try.*back\|usage.*limit.*reached"; then
+        if tail -30 "$output_file" 2>/dev/null | grep -vE '"type"\s*:\s*"user"' | grep -v '"tool_result"' | grep -v '"tool_use_id"' | grep -qi "5.*hour.*limit\|limit.*reached.*try.*back\|usage.*limit.*reached\|hit your limit"; then
             log_status "ERROR" "🚫 Claude API 5-hour usage limit reached"
             return 2  # API limit detected via text fallback
         fi
 
+        # Layer 4: Account not logged in — treat as rotatable error when rotation is configured
+        if [[ "${ACCOUNT_ROTATION:-false}" == "true" ]] && grep -qi "not logged in\|please run /login" "$output_file" 2>/dev/null; then
+            log_status "ERROR" "🔐 Claude account not logged in — triggering rotation"
+            return 2  # Use same code as API limit so rotation logic fires
+        fi
+
         log_status "ERROR" "❌ Claude Code execution failed, check: $output_file"
         return 1
     fi
@@ -1721,8 +1726,9 @@ main() {
         update_status "$loop_count" "$calls_made" "executing" "running"
 
         # Execute Claude Code
-        execute_claude_code "$loop_count"
-        local exec_result=$?
+        # Use || to prevent set -e from exiting on non-zero return codes (2=API limit, 3=circuit breaker)
+        local exec_result=0
+        execute_claude_code "$loop_count" || exec_result=$?
 
         if [ $exec_result -eq 0 ]; then
             update_status "$loop_count" "$(cat "$CALL_COUNT_FILE")" "completed" "success"

tests/helpers/fixtures.bash

@@ -398,3 +398,21 @@ create_sample_stream_json_with_prompt_echo() {
 {"type":"result","subtype":"rate_limit_event","rate_limit_event":{"type":"rate_limit","status":"allowed","remaining":42}}
 EOF
 }
+
+# Sample output for daily usage cap: "You've hit your limit · resets 6pm"
+# This is the result JSON line after session extraction in live mode.
+create_sample_daily_limit_result() {
+    local file=${1:-"claude_output.log"}
+    cat > "$file" << 'EOF'
+{"type":"result","subtype":"error","is_error":true,"result":"You've hit your limit · resets 6pm"}
+EOF
+}
+
+# Sample output when Claude account is not logged in.
+# Occurs when CLAUDE_CONFIG_DIR points to an account that hasn't run /login.
+create_sample_not_logged_in_result() {
+    local file=${1:-"claude_output.log"}
+    cat > "$file" << 'EOF'
+{"type":"result","subtype":"success","is_error":true,"duration_ms":34,"result":"Not logged in · Please run /login","session_id":"abc123"}
+EOF
+}

tests/unit/test_cli_modern.bats

@@ -1051,7 +1051,12 @@ _detect_api_limit() {
     fi
 
     # Layer 3: Filtered text fallback
-    if tail -30 "$output_file" 2>/dev/null | grep -vE '"type"\s*:\s*"user"' | grep -v '"tool_result"' | grep -v '"tool_use_id"' | grep -qi "5.*hour.*limit\|limit.*reached.*try.*back\|usage.*limit.*reached"; then
+    if tail -30 "$output_file" 2>/dev/null | grep -vE '"type"\s*:\s*"user"' | grep -v '"tool_result"' | grep -v '"tool_use_id"' | grep -qi "5.*hour.*limit\|limit.*reached.*try.*back\|usage.*limit.*reached\|hit your limit"; then
+        return 2
+    fi
+
+    # Layer 4: Account not logged in — rotatable error when rotation is configured
+    if [[ "${ACCOUNT_ROTATION:-false}" == "true" ]] && grep -qi "not logged in\|please run /login" "$output_file" 2>/dev/null; then
         return 2
     fi
 
@@ -1090,6 +1095,39 @@ _detect_api_limit() {
     [[ "$status" -eq 1 ]]
 }
 
+@test "behavioral: daily usage cap 'hit your limit' message returns 2 not 1" {
+    # Scenario: Claude hit the daily usage cap (not 5-hour API limit)
+    # Error: "You've hit your limit · resets 6pm" with is_error:true
+    # This is the result JSON after session extraction in live mode
+    local output_file="$TEST_DIR/claude_output_daily_limit.log"
+    create_sample_daily_limit_result "$output_file"
+
+    # exit_code=1 (non-zero — Claude exited with error) — should detect as API limit
+    run _detect_api_limit 1 "$output_file"
+    [[ "$status" -eq 2 ]]
+}
+
+@test "behavioral: 'not logged in' with ACCOUNT_ROTATION=true returns 2 (triggers rotation)" {
+    # Scenario: CLAUDE_CONFIG_DIR points to an account that hasn't run /login yet.
+    # With rotation enabled, this should rotate to the next account (return 2)
+    # rather than treating it as a generic failure (return 1).
+    local output_file="$TEST_DIR/claude_output_not_logged_in.log"
+    create_sample_not_logged_in_result "$output_file"
+
+    ACCOUNT_ROTATION=true run _detect_api_limit 1 "$output_file"
+    [[ "$status" -eq 2 ]]
+}
+
+@test "behavioral: 'not logged in' with ACCOUNT_ROTATION=false returns 1 (not rotatable)" {
+    # Scenario: Without rotation configured, a 'not logged in' error is a regular failure.
+    # The user needs to fix their auth manually — no automatic rotation.
+    local output_file="$TEST_DIR/claude_output_not_logged_in.log"
+    create_sample_not_logged_in_result "$output_file"
+
+    ACCOUNT_ROTATION=false run _detect_api_limit 1 "$output_file"
+    [[ "$status" -eq 1 ]]
+}
+
 # --- Claude Code Command Validation Tests (Issue #97) ---
 
 @test "validate_claude_command succeeds for command that exists" {