diff --git a/ralph_loop.sh b/ralph_loop.sh index fdedb66..08dae39 100755 --- a/ralph_loop.sh +++ b/ralph_loop.sh @@ -37,6 +37,7 @@ CLAUDE_MIN_VERSION="2.0.76" # Minimum required Claude CLI version # Note: SESSION_EXPIRATION_SECONDS is defined in lib/response_analyzer.sh (86400 = 24 hours) RALPH_SESSION_FILE=".ralph_session" # Ralph-specific session tracking (lifecycle) RALPH_SESSION_HISTORY_FILE=".ralph_session_history" # Session transition history +CLAUDE_SESSION_EXPIRY_HOURS=${CLAUDE_SESSION_EXPIRY_HOURS:-24} # Session expiration in hours (default: 24) # Valid tool patterns for --allowed-tools validation # Tools can be exact matches or pattern matches with wildcards in parentheses @@ -453,12 +454,55 @@ build_loop_context() { echo "${context:0:500}" } -# Initialize or resume Claude session +# Get session file age in hours (cross-platform) +get_session_file_age_hours() { + local file=$1 + + if [[ ! -f "$file" ]]; then + echo "0" + return + fi + + local os_type + os_type=$(uname) + + local file_mtime + if [[ "$os_type" == "Darwin" ]]; then + # macOS (BSD stat) + file_mtime=$(stat -f %m "$file" 2>/dev/null || echo 0) + else + # Linux (GNU stat) + file_mtime=$(stat -c %Y "$file" 2>/dev/null || echo 0) + fi + + local current_time + current_time=$(date +%s) + + local age_seconds=$((current_time - file_mtime)) + local age_hours=$((age_seconds / 3600)) + + echo "$age_hours" +} + +# Initialize or resume Claude session (with expiration check) init_claude_session() { if [[ -f "$CLAUDE_SESSION_FILE" ]]; then + # Check session age + local age_hours + age_hours=$(get_session_file_age_hours "$CLAUDE_SESSION_FILE") + + # Check if session has expired + if [[ $age_hours -ge $CLAUDE_SESSION_EXPIRY_HOURS ]]; then + log_status "INFO" "Session expired (${age_hours}h old, max ${CLAUDE_SESSION_EXPIRY_HOURS}h), starting new session" + rm -f "$CLAUDE_SESSION_FILE" + echo "" + return 0 + fi + + # Session is valid, try to read it local session_id=$(cat "$CLAUDE_SESSION_FILE" 2>/dev/null) if [[ -n "$session_id" ]]; then - log_status "INFO" "Resuming Claude session: ${session_id:0:20}..." + log_status "INFO" "Resuming Claude session: ${session_id:0:20}... (${age_hours}h old)" echo "$session_id" return 0 fi @@ -1108,6 +1152,7 @@ Modern CLI Options (Phase 1.1): --output-format FORMAT Set Claude output format: json or text (default: $CLAUDE_OUTPUT_FORMAT) --allowed-tools TOOLS Comma-separated list of allowed tools (default: $CLAUDE_ALLOWED_TOOLS) --no-continue Disable session continuity across loops + --session-expiry HOURS Set session expiration time in hours (default: $CLAUDE_SESSION_EXPIRY_HOURS) Files created: - $LOG_DIR/: All execution logs @@ -1130,6 +1175,7 @@ Examples: $0 --verbose --timeout 5 # 5-minute timeout with detailed progress $0 --output-format text # Use legacy text output format $0 --no-continue # Disable session continuity + $0 --session-expiry 48 # 48-hour session expiration HELPEOF } @@ -1219,6 +1265,14 @@ while [[ $# -gt 0 ]]; do CLAUDE_USE_CONTINUE=false shift ;; + --session-expiry) + if [[ -z "$2" || ! "$2" =~ ^[1-9][0-9]*$ ]]; then + echo "Error: --session-expiry requires a positive integer (hours)" + exit 1 + fi + CLAUDE_SESSION_EXPIRY_HOURS="$2" + shift 2 + ;; *) echo "Unknown option: $1" show_help diff --git a/tests/unit/test_session_continuity.bats b/tests/unit/test_session_continuity.bats index 89ff6d3..a56e0f1 100644 --- a/tests/unit/test_session_continuity.bats +++ b/tests/unit/test_session_continuity.bats @@ -304,6 +304,93 @@ EOF [[ "$output" == "false" ]] } +@test "CLAUDE_SESSION_EXPIRY_HOURS is defined in ralph_loop.sh" { + run grep 'CLAUDE_SESSION_EXPIRY_HOURS' "${BATS_TEST_DIRNAME}/../../ralph_loop.sh" + + [[ $status -eq 0 ]] || skip "CLAUDE_SESSION_EXPIRY_HOURS not yet implemented" +} + +@test "CLAUDE_SESSION_EXPIRY_HOURS defaults to 24" { + # Source ralph_loop.sh in a subshell to get the default + run bash -c "source '${BATS_TEST_DIRNAME}/../../ralph_loop.sh' --help 2>/dev/null; echo \$CLAUDE_SESSION_EXPIRY_HOURS" + + # Should contain 24 as default + [[ "$output" == *"24"* ]] || skip "CLAUDE_SESSION_EXPIRY_HOURS not yet implemented" +} + +@test "--session-expiry flag is recognized in help" { + run bash "${BATS_TEST_DIRNAME}/../../ralph_loop.sh" --help + + [[ "$output" == *"session-expiry"* ]] || skip "--session-expiry flag not yet implemented" +} + +@test "--session-expiry flag accepts positive integer" { + # Just check the flag is parsed (don't run full loop) + run grep -E '\-\-session-expiry' "${BATS_TEST_DIRNAME}/../../ralph_loop.sh" + + [[ $status -eq 0 ]] || skip "--session-expiry flag not yet implemented" +} + +@test "--session-expiry rejects non-integer value" { + run timeout 5 bash "${BATS_TEST_DIRNAME}/../../ralph_loop.sh" --session-expiry abc 2>&1 + + # Should fail with error about invalid value + if [[ "$output" == *"Unknown option"* ]]; then + skip "--session-expiry flag not yet implemented" + fi + + [[ "$output" == *"positive integer"* ]] || [[ "$output" == *"Error"* ]] +} + +@test "--session-expiry rejects zero value" { + run timeout 5 bash "${BATS_TEST_DIRNAME}/../../ralph_loop.sh" --session-expiry 0 2>&1 + + # Should fail with error about invalid value + if [[ "$output" == *"Unknown option"* ]]; then + skip "--session-expiry flag not yet implemented" + fi + + [[ "$output" == *"positive integer"* ]] || [[ "$output" == *"Error"* ]] +} + +@test "--session-expiry rejects negative value" { + run timeout 5 bash "${BATS_TEST_DIRNAME}/../../ralph_loop.sh" --session-expiry -5 2>&1 + + # Should fail with error about invalid value + if [[ "$output" == *"Unknown option"* ]]; then + skip "--session-expiry flag not yet implemented" + fi + + [[ "$output" == *"positive integer"* ]] || [[ "$output" == *"Error"* ]] +} + +# ============================================================================= +# INIT_CLAUDE_SESSION EXPIRATION TESTS +# ============================================================================= + +@test "init_claude_session checks session expiration" { + # Check that init_claude_session includes expiration logic + run grep -A30 'init_claude_session' "${BATS_TEST_DIRNAME}/../../ralph_loop.sh" + + # Should reference expiration or age checking + [[ "$output" == *"expir"* ]] || [[ "$output" == *"age"* ]] || [[ "$output" == *"stat"* ]] || skip "Session expiration not yet implemented in init_claude_session" +} + +@test "init_claude_session uses cross-platform stat command" { + # Check for uname or Darwin/Linux detection in get_session_file_age_hours + run grep -A30 'get_session_file_age_hours' "${BATS_TEST_DIRNAME}/../../ralph_loop.sh" + + # Should have cross-platform handling + [[ "$output" == *"Darwin"* ]] || [[ "$output" == *"uname"* ]] || skip "Cross-platform stat not yet implemented" +} + +@test "get_session_file_age_hours returns correct age" { + # Check if helper function exists + run grep 'get_session_file_age_hours' "${BATS_TEST_DIRNAME}/../../ralph_loop.sh" + + [[ $status -eq 0 ]] || skip "get_session_file_age_hours function not yet implemented" +} + # ============================================================================= # EDGE CASES # =============================================================================