fix(rotation): always set CLAUDE_CONFIG_DIR explicitly, add session reset on rotate

- Remove ~/.claude special case in switch_account() — CLAUDE_CONFIG_DIR is
  now always set explicitly for all rotation accounts. Using the default
  ~/.claude dir caused both accounts to share the same rate limit pool
  when credentials resolved to the same org.
- Each rotation account must use a dedicated config dir (e.g.,
  ~/.claude-account1, ~/.claude-account2) with separate credentials.
- Add reset_session("account_rotation") on successful rotation to prevent
  "No conversation found" errors from resuming account 1's session on
  account 2.
- Update tests to reflect new always-set behavior (61/61 pass).

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

Author: Andymendez100

CLAUDE.md

@@ -99,7 +99,8 @@ The system uses a modular architecture with reusable components in the `lib/` di
    - `get_active_account()`, `get_total_accounts()`: state queries
    - `mark_account_rate_limited()`: records rate-limit timestamp per account
    - `get_next_available_account()`: finds next account not in 60-min cooldown, wraps around
-   - `switch_account()`: sets the appropriate env var for the next account
+   - `switch_account()`: sets `CLAUDE_CONFIG_DIR` explicitly for each account (never falls back to default `~/.claude`)
+   - **Important**: Each rotation account must use a dedicated config dir (e.g., `~/.claude-account1`, `~/.claude-account2`). Do NOT use `~/.claude` — its keychain credentials conflict with interactive sessions and share the same rate limit pool.
    - `all_accounts_exhausted()`: checks if every account is in cooldown
    - `init_account_rotation()`: startup initialization, opt-in via `ACCOUNT_ROTATION=true`
    - `try_rotate_account()`: high-level function called from exit code 2 handler

lib/account_rotation.sh

@@ -232,14 +232,12 @@ switch_account() {
         local target_dir="${ACCOUNT_CONFIG_DIRS[$index]}"
         # Resolve ~ to $HOME (tilde doesn't expand inside quoted array values)
         target_dir="${target_dir/#\~/$HOME}"
-        # The default ~/.claude dir requires CLAUDE_CONFIG_DIR to be UNSET.
-        # Setting it explicitly to ~/.claude breaks auth (credentials are in the
-        # system keychain, tied to the unset state). For any other dir, set it.
-        if [[ "$target_dir" == "$HOME/.claude" || "$target_dir" == "$HOME/.claude/" ]]; then
-            unset CLAUDE_CONFIG_DIR
-        else
-            export CLAUDE_CONFIG_DIR="$target_dir"
-        fi
+        # Always set CLAUDE_CONFIG_DIR explicitly for rotation accounts.
+        # Each account must have its own dedicated config dir (e.g., ~/.claude-account1)
+        # with separate credentials. Using the default ~/.claude is discouraged because
+        # its keychain credentials are tied to the "unset" state and conflict with
+        # interactive sessions.
+        export CLAUDE_CONFIG_DIR="$target_dir"
     else
         return 1
     fi

ralph_loop.sh

@@ -1752,6 +1752,7 @@ main() {
                 local active_info
                 active_info=$(get_active_account)
                 log_status "SUCCESS" "🔄 Rotated to next account (active: $active_info)"
+                reset_session "account_rotation"  # Sessions are per-account; start fresh
                 log_status "INFO" "Retrying with new account..."
                 update_status "$loop_count" "$(cat "$CALL_COUNT_FILE")" "account_rotated" "running"
                 sleep 3

tests/unit/test_account_rotation.bats

@@ -764,27 +764,23 @@ EOF
 }
 
 # ============================================================================
-# Default ~/.claude config dir handling
+# Explicit config dir handling (always set CLAUDE_CONFIG_DIR)
 # ============================================================================
 
-@test "switch_account: unsets CLAUDE_CONFIG_DIR for default ~/.claude dir" {
-    # The default ~/.claude dir requires CLAUDE_CONFIG_DIR to be UNSET.
-    # Setting it explicitly breaks auth (credentials tied to unset state).
-    export ACCOUNT_CONFIG_DIRS=("$HOME/.claude" "/tmp/test-claude-account2")
+@test "switch_account: always sets CLAUDE_CONFIG_DIR explicitly for config_dir accounts" {
+    # Each rotation account must have a dedicated config dir.
+    # CLAUDE_CONFIG_DIR is always set explicitly — no unset/fallback to default.
+    export ACCOUNT_CONFIG_DIRS=("/tmp/test-claude-account1" "/tmp/test-claude-account2")
     export ACCOUNT_KEYS=()
     _ensure_state_file
 
-    # Set CLAUDE_CONFIG_DIR to something first to prove it gets unset
-    export CLAUDE_CONFIG_DIR="/tmp/something"
-
     switch_account 0 "config_dir"
 
-    # Should be unset, not set to ~/.claude
-    [[ -z "${CLAUDE_CONFIG_DIR:-}" ]]
+    [[ "$CLAUDE_CONFIG_DIR" == "/tmp/test-claude-account1" ]]
 }
 
-@test "switch_account: sets CLAUDE_CONFIG_DIR for non-default dirs" {
-    export ACCOUNT_CONFIG_DIRS=("$HOME/.claude" "/tmp/test-claude-account2")
+@test "switch_account: sets CLAUDE_CONFIG_DIR for second account" {
+    export ACCOUNT_CONFIG_DIRS=("/tmp/test-claude-account1" "/tmp/test-claude-account2")
     export ACCOUNT_KEYS=()
     _ensure_state_file
 
@@ -793,16 +789,14 @@ EOF
     [[ "$CLAUDE_CONFIG_DIR" == "/tmp/test-claude-account2" ]]
 }
 
-@test "switch_account: handles ~/.claude/ with trailing slash" {
-    export ACCOUNT_CONFIG_DIRS=("$HOME/.claude/" "/tmp/test-claude-account2")
+@test "switch_account: resolves tilde in config dir paths" {
+    export ACCOUNT_CONFIG_DIRS=("~/custom-claude-dir" "/tmp/test-claude-account2")
     export ACCOUNT_KEYS=()
     _ensure_state_file
 
-    export CLAUDE_CONFIG_DIR="/tmp/something"
-
     switch_account 0 "config_dir"
 
-    [[ -z "${CLAUDE_CONFIG_DIR:-}" ]]
+    [[ "$CLAUDE_CONFIG_DIR" == "$HOME/custom-claude-dir" ]]
 }
 
 @test "switch_account: unsets CLAUDE_CONFIG_DIR when switching to key type" {
@@ -830,19 +824,15 @@ EOF
     [[ -z "${ANTHROPIC_API_KEY:-}" ]]
 }
 
-@test "switch_account: resolves tilde in config dir paths" {
+@test "switch_account: resolves tilde in all config dir paths" {
     # Tilde doesn't expand inside quoted array values in .ralphrc
-    export ACCOUNT_CONFIG_DIRS=("~/.claude" "~/.claude-account2")
+    export ACCOUNT_CONFIG_DIRS=("~/.claude-account1" "~/.claude-account2")
     export ACCOUNT_KEYS=()
     _ensure_state_file
 
-    export CLAUDE_CONFIG_DIR="/tmp/something"
-
-    # ~/.claude should resolve to $HOME/.claude and trigger the unset path
     switch_account 0 "config_dir"
-    [[ -z "${CLAUDE_CONFIG_DIR:-}" ]]
+    [[ "$CLAUDE_CONFIG_DIR" == "$HOME/.claude-account1" ]]
 
-    # ~/.claude-account2 should resolve to $HOME/.claude-account2
     switch_account 1 "config_dir"
     [[ "$CLAUDE_CONFIG_DIR" == "$HOME/.claude-account2" ]]
 }