loki-mode 6.4.0 → 6.6.0

package/autonomy/loki

@@ -433,7 +433,7 @@ show_help() {
     echo "  help             Show this help"
     echo ""
     echo "Options for 'start':"
-    echo "  --provider NAME  AI provider: claude (default), codex, gemini"
+    echo "  --provider NAME  AI provider: claude (default), codex, gemini, cline, aider"
     echo "  --parallel       Enable parallel mode with git worktrees"
     echo "  --bg, --background  Run in background mode"
     echo "  --simple         Force simple complexity tier (3 phases)"
@@ -450,7 +450,7 @@ show_help() {
     echo "  --dry-run          Preview generated PRD without starting"
     echo "  --no-start         Generate PRD but don't start execution"
     echo "  --output FILE      Save PRD to custom path"
-    echo "  --provider NAME    AI provider: claude (default), codex, gemini"
+    echo "  --provider NAME    AI provider: claude (default), codex, gemini, cline, aider"
     echo "  --parallel         Enable parallel mode with git worktrees"
     echo "  --budget USD       Set cost budget limit"
     echo ""
@@ -499,7 +499,7 @@ cmd_start() {
                 echo "  PRD                   Path to PRD file (optional)"
                 echo ""
                 echo "Options:"
-                echo "  --provider NAME       AI provider: claude (default), codex, gemini"
+                echo "  --provider NAME       AI provider: claude (default), codex, gemini, cline, aider"
                 echo "  --parallel            Enable parallel mode with git worktrees"
                 echo "  --bg, --background    Run in background mode"
                 echo "  --simple              Force simple complexity tier (3 phases)"
@@ -536,7 +536,7 @@ cmd_start() {
                     args+=("--provider" "$provider")
                     shift 2
                 else
-                    echo -e "${RED}--provider requires a value (claude, codex, gemini)${NC}"
+                    echo -e "${RED}--provider requires a value (claude, codex, gemini, cline, aider)${NC}"
                     exit 1
                 fi
                 ;;
@@ -545,6 +545,45 @@ cmd_start() {
                 args+=("--provider" "$provider")
                 shift
                 ;;
+            --aider-model)
+                if [[ -n "${2:-}" ]]; then
+                    export LOKI_AIDER_MODEL="$2"
+                    shift 2
+                else
+                    echo -e "${RED}--aider-model requires a value${NC}"
+                    exit 1
+                fi
+                ;;
+            --aider-model=*)
+                export LOKI_AIDER_MODEL="${1#*=}"
+                shift
+                ;;
+            --aider-flags)
+                if [[ -n "${2:-}" ]]; then
+                    export LOKI_AIDER_FLAGS="$2"
+                    shift 2
+                else
+                    echo -e "${RED}--aider-flags requires a value${NC}"
+                    exit 1
+                fi
+                ;;
+            --aider-flags=*)
+                export LOKI_AIDER_FLAGS="${1#*=}"
+                shift
+                ;;
+            --cline-model)
+                if [[ -n "${2:-}" ]]; then
+                    export LOKI_CLINE_MODEL="$2"
+                    shift 2
+                else
+                    echo -e "${RED}--cline-model requires a value${NC}"
+                    exit 1
+                fi
+                ;;
+            --cline-model=*)
+                export LOKI_CLINE_MODEL="${1#*=}"
+                shift
+                ;;
             --parallel)
                 args+=("--parallel")
                 shift
@@ -1342,12 +1381,15 @@ cmd_status() {
     # Show provider with capability
     local capability="full features"
     case "$current_provider" in
-        codex|gemini)
+        codex|gemini|aider)
             capability="degraded mode"
             ;;
+        cline)
+            capability="near-full mode"
+            ;;
     esac
     echo -e "${CYAN}Provider:${NC} $current_provider ($capability)"
-    echo -e "${DIM}  Switch with: loki provider set <claude|codex|gemini>${NC}"
+    echo -e "${DIM}  Switch with: loki provider set <claude|codex|gemini|cline|aider>${NC}"
     echo ""
 
     # Show running sessions (v6.4.0 - concurrent session support)
@@ -1356,7 +1398,7 @@ cmd_status() {
         [ -n "$line" ] && running_sessions+=("$line")
     done < <(list_running_sessions 2>/dev/null)
 
-    if [ ${#running_sessions[@]} -gt 1 ]; then
+    if [ ${#running_sessions[@]} -gt 0 ]; then
         echo -e "${GREEN}Active Sessions: ${#running_sessions[@]}${NC}"
         for entry in "${running_sessions[@]}"; do
             local sid="${entry%%:*}"
@@ -1624,12 +1666,14 @@ cmd_provider() {
 }
 
 cmd_provider_show() {
+    local positional_arg="${1:-}"
+
     local saved_provider=""
     if [ -f "$LOKI_DIR/state/provider" ]; then
         saved_provider=$(cat "$LOKI_DIR/state/provider" 2>/dev/null)
     fi
 
-    local current="${saved_provider:-${LOKI_PROVIDER:-claude}}"
+    local current="${positional_arg:-${saved_provider:-${LOKI_PROVIDER:-claude}}}"
 
     echo -e "${BOLD}Current Provider${NC}"
     echo ""
@@ -1640,7 +1684,10 @@ cmd_provider_show() {
         claude)
             echo -e "${GREEN}Status:${NC}   Full features (subagents, parallel, MCP)"
             ;;
-        codex|gemini)
+        cline)
+            echo -e "${GREEN}Status:${NC}   Near-full mode (subagents, MCP, 12+ providers)"
+            ;;
+        codex|gemini|aider)
             echo -e "${YELLOW}Status:${NC}   Degraded mode (sequential only)"
             ;;
     esac
@@ -1661,17 +1708,17 @@ cmd_provider_set() {
 
     if [ -z "$new_provider" ]; then
         echo -e "${RED}Error: Provider name required${NC}"
-        echo "Usage: loki provider set <claude|codex|gemini>"
+        echo "Usage: loki provider set <claude|codex|gemini|cline|aider>"
         exit 1
     fi
 
     # Validate provider
     case "$new_provider" in
-        claude|codex|gemini)
+        claude|codex|gemini|cline|aider)
             ;;
         *)
             echo -e "${RED}Error: Invalid provider '$new_provider'${NC}"
-            echo "Valid providers: claude, codex, gemini"
+            echo "Valid providers: claude, codex, gemini, cline, aider"
             exit 1
             ;;
     esac
@@ -1690,6 +1737,12 @@ cmd_provider_set() {
             gemini)
                 echo "Install: npm install -g @google/gemini-cli"
                 ;;
+            cline)
+                echo "Install: npm install -g cline"
+                ;;
+            aider)
+                echo "Install: pip install aider-chat"
+                ;;
         esac
         echo ""
         echo -e "${DIM}Setting provider anyway...${NC}"
@@ -1719,6 +1772,8 @@ cmd_provider_list() {
     local claude_status="${RED}not installed${NC}"
     local codex_status="${RED}not installed${NC}"
     local gemini_status="${RED}not installed${NC}"
+    local cline_status="${RED}not installed${NC}"
+    local aider_status="${RED}not installed${NC}"
 
     if command -v claude &> /dev/null; then
         claude_status="${GREEN}installed${NC}"
@@ -1729,6 +1784,12 @@ cmd_provider_list() {
     if command -v gemini &> /dev/null; then
         gemini_status="${GREEN}installed${NC}"
     fi
+    if command -v cline &> /dev/null; then
+        cline_status="${GREEN}installed${NC}"
+    fi
+    if command -v aider &> /dev/null; then
+        aider_status="${GREEN}installed${NC}"
+    fi
 
     # Display providers
     local marker=""
@@ -1743,6 +1804,14 @@ cmd_provider_list() {
     [ "$current" = "gemini" ] && marker=" ${CYAN}(current)${NC}"
     echo -e "  gemini  - Gemini CLI (Google)         $gemini_status$marker"
 
+    marker=""
+    [ "$current" = "cline" ] && marker=" ${CYAN}(current)${NC}"
+    echo -e "  cline   - Cline (multi-provider)      $cline_status$marker"
+
+    marker=""
+    [ "$current" = "aider" ] && marker=" ${CYAN}(current)${NC}"
+    echo -e "  aider   - Aider (terminal pair prog)  $aider_status$marker"
+
     echo ""
     echo -e "Set provider: ${CYAN}loki provider set <name>${NC}"
 }
@@ -1792,6 +1861,34 @@ cmd_provider_info() {
             echo ""
             echo "Status:      Degraded mode"
             ;;
+        cline)
+            echo "Name:        Cline CLI (Multi-Provider)"
+            echo "Vendor:      Cline (supports 12+ providers)"
+            echo "CLI:         cline"
+            echo "Flag:        -y (YOLO mode)"
+            echo ""
+            echo "Features:"
+            echo "  - Autonomous mode"
+            echo "  - Subagent support"
+            echo "  - MCP server support"
+            echo "  - 12+ model providers"
+            echo ""
+            echo "Status:      Near-full mode (Tier 2)"
+            ;;
+        aider)
+            echo "Name:        Aider (18+ Providers)"
+            echo "Vendor:      Aider (supports 18+ providers)"
+            echo "CLI:         aider"
+            echo "Flag:        --yes-always"
+            echo ""
+            echo "Features:"
+            echo "  - Autonomous mode"
+            echo "  - 18+ model providers"
+            echo "  - Architect mode (dual model)"
+            echo "  - Built-in lint/test integration"
+            echo ""
+            echo "Status:      Degraded mode (Tier 3)"
+            ;;
         *)
             echo -e "${RED}Unknown provider: $provider${NC}"
             exit 1
@@ -2092,7 +2189,7 @@ cmd_dashboard_stop() {
         local wait_count=0
         while kill -0 "$pid" 2>/dev/null && [ $wait_count -lt 10 ]; do
             sleep 0.5
-            ((wait_count++))
+            wait_count=$((wait_count + 1))
         done
 
         # Force kill if still running
@@ -2770,7 +2867,7 @@ cmd_run() {
                 echo "  --dry-run          Preview generated PRD without starting"
                 echo "  --no-start         Generate PRD but don't start execution"
                 echo "  --output FILE      Save PRD to custom path"
-                echo "  --provider NAME    AI provider: claude (default), codex, gemini"
+                echo "  --provider NAME    AI provider: claude (default), codex, gemini, cline, aider"
                 echo "  --parallel         Enable parallel mode with git worktrees"
                 echo "  --bg, --background Run in background mode"
                 echo "  --simple           Force simple complexity tier"
@@ -2867,27 +2964,23 @@ cmd_run() {
                 shift
                 ;;
             --worktree|-w)
-                start_args+=("--parallel")
                 use_worktree=true
                 shift
                 ;;
             --pr)
                 use_worktree=true
                 create_pr=true
-                start_args+=("--parallel")
                 shift
                 ;;
             --ship)
                 use_worktree=true
                 create_pr=true
                 auto_merge=true
-                start_args+=("--parallel")
                 shift
                 ;;
             --detach|-d)
                 use_worktree=true
                 run_detached=true
-                start_args+=("--parallel")
                 shift
                 ;;
             -*)
@@ -2904,6 +2997,11 @@ cmd_run() {
         esac
     done
 
+    # Add --parallel once if worktree mode is enabled (not per-flag)
+    if $use_worktree; then
+        start_args+=("--parallel")
+    fi
+
     if [[ -z "$issue_ref" ]]; then
         echo -e "${RED}Error: Issue reference required${NC}"
         echo ""
@@ -2971,6 +3069,13 @@ cmd_run() {
 
     # Detached mode: fork to background
     if $run_detached; then
+        # Guard: prevent launching duplicate session
+        if is_session_running "$session_id"; then
+            echo -e "${RED}Error: Session '$session_id' is already running.${NC}"
+            echo -e "Stop it first with: ${CYAN}loki stop $session_id${NC}"
+            exit 1
+        fi
+
         local log_file="$LOKI_DIR/logs/run-${number:-$(date +%s)}.log"
         mkdir -p "$(dirname "$log_file")"
         echo -e "${GREEN}Running detached. Logs: $log_file${NC}"
@@ -2985,32 +3090,51 @@ cmd_run() {
             branch_name="issue/detach-$(date +%s)"
         fi
 
-        nohup bash -c "
-            cd $(pwd)
-            export LOKI_DETACHED=true
-            export LOKI_PARALLEL_MODE=true
-            export LOKI_SESSION_ID=\"$session_id\"
-            export LOKI_WORKTREE_BRANCH=\"$branch_name\"
-            $(command -v loki || echo "$0") start \"$detach_prd\" --parallel ${start_args[*]+"${start_args[*]}"}
-
-            # Post-completion: create PR if requested
-            if [[ \"$create_pr\" == \"true\" ]]; then
-                branch_current=\$(git rev-parse --abbrev-ref HEAD 2>/dev/null || echo \"\")
-                if [[ -n \"\$branch_current\" && \"\$branch_current\" != \"main\" && \"\$branch_current\" != \"master\" ]]; then
-                    git push origin \"\$branch_current\" 2>/dev/null || true
-                    gh pr create --title \"${title:-Implementation for issue ${issue_ref}}\" --body \"Implemented by Loki Mode\" --head \"\$branch_current\" 2>/dev/null || true
-                fi
-            fi
-            # Post-completion: auto-merge if requested
-            if [[ \"$auto_merge\" == \"true\" ]]; then
-                branch_current=\$(git rev-parse --abbrev-ref HEAD 2>/dev/null || echo \"\")
-                if gh pr merge \"\$branch_current\" --squash --delete-branch 2>/dev/null; then
-                    if [[ -n \"${number:-}\" ]]; then
-                        gh issue close \"$number\" --comment \"Resolved by Loki Mode\" 2>/dev/null || true
-                    fi
-                fi
-            fi
-        " > "$log_file" 2>&1 &
+        # Write a temp script to avoid shell injection via variable interpolation
+        local run_script="$LOKI_DIR/scripts/run-${number:-detached}.sh"
+        mkdir -p "$LOKI_DIR/scripts"
+        local loki_cmd
+        loki_cmd="$(command -v loki || echo "$0")"
+        cat > "$run_script" << 'INNER_SCRIPT_EOF'
+#!/usr/bin/env bash
+set -euo pipefail
+cd "$LOKI_RUN_DIR"
+export LOKI_DETACHED=true
+export LOKI_PARALLEL_MODE=true
+"$LOKI_CMD" start "$LOKI_PRD_PATH" ${LOKI_START_ARGS:-}
+
+# Post-completion: create PR if requested
+if [[ "$LOKI_CREATE_PR" == "true" ]]; then
+    branch_current=$(git rev-parse --abbrev-ref HEAD 2>/dev/null || echo "")
+    if [[ -n "$branch_current" && "$branch_current" != "main" && "$branch_current" != "master" ]]; then
+        git push origin "$branch_current" 2>/dev/null || true
+        gh pr create --title "$LOKI_PR_TITLE" --body "Implemented by Loki Mode" --head "$branch_current" 2>/dev/null || true
+    fi
+fi
+# Post-completion: auto-merge if requested
+if [[ "$LOKI_AUTO_MERGE" == "true" ]]; then
+    branch_current=$(git rev-parse --abbrev-ref HEAD 2>/dev/null || echo "")
+    if gh pr merge "$branch_current" --squash --delete-branch 2>/dev/null; then
+        if [[ -n "${LOKI_ISSUE_NUMBER:-}" ]]; then
+            gh issue close "$LOKI_ISSUE_NUMBER" --comment "Resolved by Loki Mode" 2>/dev/null || true
+        fi
+    fi
+fi
+INNER_SCRIPT_EOF
+        chmod +x "$run_script"
+
+        # Pass all variables safely via environment
+        LOKI_RUN_DIR="$(pwd)" \
+        LOKI_CMD="$loki_cmd" \
+        LOKI_SESSION_ID="$session_id" \
+        LOKI_WORKTREE_BRANCH="$branch_name" \
+        LOKI_PRD_PATH="$detach_prd" \
+        LOKI_START_ARGS="${start_args[*]+"${start_args[*]}"}" \
+        LOKI_CREATE_PR="$create_pr" \
+        LOKI_AUTO_MERGE="$auto_merge" \
+        LOKI_PR_TITLE="${title:-Implementation for issue ${issue_ref}}" \
+        LOKI_ISSUE_NUMBER="${number:-}" \
+        nohup bash "$run_script" > "$log_file" 2>&1 &
 
         local bg_pid=$!
         echo "$bg_pid" > "$LOKI_DIR/run-${number:-detached}.pid"
@@ -3191,7 +3315,7 @@ cmd_issue() {
                 echo "  --output FILE      Save PRD to custom path (default: .loki/prd-issue-N.md)"
                 echo ""
                 echo "Options passed to 'start' (when --start is used):"
-                echo "  --provider NAME    AI provider: claude (default), codex, gemini"
+                echo "  --provider NAME    AI provider: claude (default), codex, gemini, cline, aider"
                 echo "  --parallel         Enable parallel mode with git worktrees"
                 echo "  --bg, --background Run in background mode"
                 echo ""
@@ -3904,7 +4028,7 @@ cmd_config() {
             echo "  model.planning       Model for planning tier"
             echo "  model.development    Model for development tier"
             echo "  model.fast           Model for fast tier"
-            echo "  provider             Default AI provider: claude, codex, gemini"
+            echo "  provider             Default AI provider: claude, codex, gemini, cline, aider"
             echo "  issue.provider       Default issue provider: github, gitlab, jira, azure_devops"
             echo "  blind_validation     Blind validation mode: true, false (default: true)"
             echo "  adversarial_testing  Adversarial testing: true, false (default: true)"
@@ -3947,8 +4071,8 @@ cmd_config_set() {
             ;;
         provider)
             case "$value" in
-                claude|codex|gemini) ;;
-                *) echo -e "${RED}Invalid provider: $value (expected: claude, codex, gemini)${NC}"; return 1 ;;
+                claude|codex|gemini|cline|aider) ;;
+                *) echo -e "${RED}Invalid provider: $value (expected: claude, codex, gemini, cline, aider)${NC}"; return 1 ;;
             esac
             ;;
         issue.provider)
@@ -4244,6 +4368,8 @@ cmd_setup_skill() {
         "$HOME/.claude/skills/loki-mode:Claude Code"
         "$HOME/.codex/skills/loki-mode:Codex CLI"
         "$HOME/.gemini/skills/loki-mode:Gemini CLI"
+        "$HOME/.cline/skills/loki-mode:Cline CLI"
+        "$HOME/.aider/skills/loki-mode:Aider CLI"
     )
 
     local created=0
@@ -4392,6 +4518,12 @@ cmd_doctor() {
             gemini)
                 version=$(gemini --version 2>/dev/null | head -1 | sed 's/[^0-9.]//g' | head -1)
                 ;;
+            cline)
+                version=$(cline --version 2>/dev/null | head -1 | sed 's/[^0-9.]//g' | head -1)
+                ;;
+            aider)
+                version=$(aider --version 2>/dev/null | head -1 | sed 's/[^0-9.]//g' | head -1)
+                ;;
         esac
 
         local version_display=""
@@ -4426,17 +4558,19 @@ cmd_doctor() {
     }
 
     echo -e "${CYAN}Required:${NC}"
-    doctor_check "Node.js (>= 18)"    node     required    18.0
-    doctor_check "Python 3 (>= 3.8)"  python3  required    3.8
-    doctor_check "jq"                  jq       required
-    doctor_check "git"                 git      required
-    doctor_check "curl"                curl     required
+    doctor_check "Node.js (>= 18)"    node     required    18.0  || true
+    doctor_check "Python 3 (>= 3.8)"  python3  required    3.8   || true
+    doctor_check "jq"                  jq       required          || true
+    doctor_check "git"                 git      required          || true
+    doctor_check "curl"                curl     required          || true
     echo ""
 
     echo -e "${CYAN}AI Providers:${NC}"
-    doctor_check "Claude CLI"          claude   optional
-    doctor_check "Codex CLI"           codex    optional
-    doctor_check "Gemini CLI"          gemini   optional
+    doctor_check "Claude CLI"          claude   optional || true
+    doctor_check "Codex CLI"           codex    optional || true
+    doctor_check "Gemini CLI"          gemini   optional || true
+    doctor_check "Cline CLI"           cline    optional || true
+    doctor_check "Aider CLI"           aider    optional || true
     echo ""
 
     echo -e "${CYAN}Skills:${NC}"
@@ -4444,6 +4578,8 @@ cmd_doctor() {
         "$HOME/.claude/skills/loki-mode:Claude Code"
         "$HOME/.codex/skills/loki-mode:Codex CLI"
         "$HOME/.gemini/skills/loki-mode:Gemini CLI"
+        "$HOME/.cline/skills/loki-mode:Cline CLI"
+        "$HOME/.aider/skills/loki-mode:Aider CLI"
     )
     for entry in "${skill_dirs[@]}"; do
         local sdir="${entry%%:*}"
@@ -4463,7 +4599,7 @@ cmd_doctor() {
     echo ""
 
     echo -e "${CYAN}System:${NC}"
-    doctor_check "bash (>= 4.0)"      bash     recommended  4.0
+    doctor_check "bash (>= 4.0)"      bash     recommended  4.0  || true
 
     # Disk space check
     local disk_avail
@@ -4563,6 +4699,8 @@ checks.append(check_tool('bash', 'bash', 'recommended', '4.0'))
 checks.append(check_tool('Claude CLI', 'claude', 'optional'))
 checks.append(check_tool('Codex CLI', 'codex', 'optional'))
 checks.append(check_tool('Gemini CLI', 'gemini', 'optional'))
+checks.append(check_tool('Cline CLI', 'cline', 'optional'))
+checks.append(check_tool('Aider CLI', 'aider', 'optional'))
 
 # Disk space
 disk_gb = None
@@ -4946,7 +5084,7 @@ cmd_notify_test() {
             echo -n "  Slack...    "
             if send_slack_notification "$message" "Test"; then
                 echo -e "${GREEN}OK${NC}"
-                ((channels_notified++))
+                channels_notified=$((channels_notified + 1))
             else
                 echo -e "${RED}FAILED${NC}"
             fi
@@ -4959,7 +5097,7 @@ cmd_notify_test() {
             echo -n "  Discord...  "
             if send_discord_notification "$message" "Test"; then
                 echo -e "${GREEN}OK${NC}"
-                ((channels_notified++))
+                channels_notified=$((channels_notified + 1))
             else
                 echo -e "${RED}FAILED${NC}"
             fi
@@ -4972,7 +5110,7 @@ cmd_notify_test() {
             echo -n "  Webhook...  "
             if send_webhook_notification "$message" "Test"; then
                 echo -e "${GREEN}OK${NC}"
-                ((channels_notified++))
+                channels_notified=$((channels_notified + 1))
             else
                 echo -e "${RED}FAILED${NC}"
             fi
@@ -6691,7 +6829,7 @@ Tasks:
             local provider_name="${LOKI_PROVIDER:-claude}"
             case "$provider_name" in
                 claude)
-                    (cd "$codebase_path" && claude --dangerously-skip-permissions -p "$phase_prompt" --output-format stream-json --verbose 2>&1) | \
+                    { (cd "$codebase_path" && claude --dangerously-skip-permissions -p "$phase_prompt" --output-format stream-json --verbose 2>&1) | \
                         while IFS= read -r line; do
                             # Extract text from stream-json
                             if echo "$line" | python3 -c "
@@ -6706,8 +6844,7 @@ except Exception: pass
 " 2>/dev/null; then
                                 true
                             fi
-                        done
-                    phase_exit=${PIPESTATUS[0]}
+                        done; } && phase_exit=0 || phase_exit=$?
                     ;;
                 codex)
                     (cd "$codebase_path" && codex exec --full-auto "$phase_prompt" 2>&1) || phase_exit=$?
@@ -6715,8 +6852,17 @@ except Exception: pass
                 gemini)
                     (cd "$codebase_path" && gemini --approval-mode=yolo "$phase_prompt" 2>&1) || phase_exit=$?
                     ;;
+                cline)
+                    (cd "$codebase_path" && cline -y "$phase_prompt" 2>&1) || phase_exit=$?
+                    ;;
+                aider)
+                    local aider_model="${LOKI_AIDER_MODEL:-claude-3.7-sonnet}"
+                    local aider_flags="${LOKI_AIDER_FLAGS:-}"
+                    # shellcheck disable=SC2086
+                    (cd "$codebase_path" && aider --message "$phase_prompt" --yes-always --no-auto-commits --model "$aider_model" $aider_flags 2>&1) || phase_exit=$?
+                    ;;
                 *)
-                    echo -e "${RED}Error: Unknown provider '${provider_name}'. Supported: claude, codex, gemini${NC}"
+                    echo -e "${RED}Error: Unknown provider '${provider_name}'. Supported: claude, codex, gemini, cline, aider${NC}"
                     phase_exit=1
                     ;;
             esac
@@ -6854,7 +7000,7 @@ IMPORTANT RULES:
         local provider_name="${LOKI_PROVIDER:-claude}"
         case "$provider_name" in
             claude)
-                (cd "$codebase_path" && claude --dangerously-skip-permissions -p "$doc_prompt" --output-format stream-json --verbose 2>&1) | \
+                { (cd "$codebase_path" && claude --dangerously-skip-permissions -p "$doc_prompt" --output-format stream-json --verbose 2>&1) | \
                     while IFS= read -r line; do
                         if echo "$line" | python3 -c "
 import sys, json
@@ -6868,8 +7014,7 @@ except Exception: pass
 " 2>/dev/null; then
                             true
                         fi
-                    done
-                doc_exit=${PIPESTATUS[0]}
+                    done; } && doc_exit=0 || doc_exit=$?
                 ;;
             codex)
                 (cd "$codebase_path" && codex exec --full-auto "$doc_prompt" 2>&1) || doc_exit=$?
@@ -6877,6 +7022,15 @@ except Exception: pass
             gemini)
                 (cd "$codebase_path" && gemini --approval-mode=yolo "$doc_prompt" 2>&1) || doc_exit=$?
                 ;;
+            cline)
+                (cd "$codebase_path" && cline -y "$doc_prompt" 2>&1) || doc_exit=$?
+                ;;
+            aider)
+                local aider_model="${LOKI_AIDER_MODEL:-claude-3.7-sonnet}"
+                local aider_flags="${LOKI_AIDER_FLAGS:-}"
+                # shellcheck disable=SC2086
+                (cd "$codebase_path" && aider --message "$doc_prompt" --yes-always --no-auto-commits --model "$aider_model" $aider_flags 2>&1) || doc_exit=$?
+                ;;
         esac
 
         if [ "$doc_exit" -eq 0 ] && [ -d "${codebase_path}/migration_docs" ]; then