loki-mode 6.5.0 → 6.6.1

package/README.md

@@ -9,7 +9,7 @@
 [![Agent Types](https://img.shields.io/badge/Agent%20Types-41-blue)]()
 [![Autonomi](https://img.shields.io/badge/Autonomi-autonomi.dev-5B4EEA)](https://www.autonomi.dev/)
 
-**Current Version: v6.5.0**
+**Current Version: v6.6.1**
 
 ---
 
@@ -36,7 +36,7 @@ Every iteration follows the **RARV cycle**: Reason (read state, identify next ta
 | **Code Generation** | Full-stack apps from PRDs | Complex domain logic may need human review |
 | **Deployment** | Generates configs, Dockerfiles, CI/CD workflows | Does not deploy -- human provides cloud credentials and runs deploy |
 | **Testing** | 9 automated quality gates, blind review | Test quality depends on AI-generated assertions |
-| **Multi-Provider** | Claude (full), Codex/Gemini (sequential only) | Codex and Gemini lack parallel agents and Task tool |
+| **Multi-Provider** | Claude (full), Codex/Gemini/Cline/Aider (sequential only) | Non-Claude providers lack parallel agents and Task tool |
 | **Enterprise** | TLS, OIDC, RBAC, audit trail | Self-signed certs only; some features require env var activation |
 | **Dashboard** | Real-time status, task queue, agents | Single-machine only; no multi-node clustering |
 
@@ -44,7 +44,7 @@ Every iteration follows the **RARV cycle**: Reason (read state, identify next ta
 
 ## Quick Start
 
-**Requirements:** Node.js 18+, Python 3.8+, macOS/Linux/WSL2, and at least one AI CLI (Claude Code, Codex, or Gemini).
+**Requirements:** Node.js 18+, Python 3.8+, macOS/Linux/WSL2, and at least one AI CLI (Claude Code, Codex, Gemini, Cline, or Aider).
 
 ### CLI Mode
 
@@ -129,7 +129,7 @@ See [full architecture documentation](docs/enterprise/architecture.md) for the d
 | **Quality** | 9 gates: blind review, anti-sycophancy, mock/mutation detection | [Quality Gates](skills/quality-gates.md) |
 | **Dashboard** | Real-time monitoring, API v2, WebSocket, auto-starts with `loki start` | [Dashboard Guide](docs/dashboard-guide.md) |
 | **Memory** | 3-tier (episodic/semantic/procedural), knowledge graph, vector search | [Memory System](references/memory-system.md) |
-| **Providers** | Claude (full), Codex (sequential), Gemini (sequential) | [Provider Guide](skills/providers.md) |
+| **Providers** | Claude (full), Codex/Gemini/Cline/Aider (sequential) | [Provider Guide](skills/providers.md) |
 | **Enterprise** | TLS, OIDC/SSO, RBAC, OTEL, policy engine, audit trails | [Enterprise Guide](docs/enterprise/architecture.md) |
 | **Integrations** | Jira, Slack, Teams, GitHub Actions (Linear: partial) | [Integration Cookbook](docs/enterprise/integration-cookbook.md) |
 | **Deployment** | Helm, Docker Compose, Terraform configs (AWS/Azure/GCP) | [Deployment Guide](deploy/helm/README.md) |
@@ -142,8 +142,10 @@ See [full architecture documentation](docs/enterprise/architecture.md) for the d
 | Claude Code | `npm i -g @anthropic-ai/claude-code` | `--dangerously-skip-permissions` | Yes (10+) |
 | Codex CLI | `npm i -g @openai/codex` | `--full-auto` | No (sequential) |
 | Gemini CLI | `npm i -g @google/gemini-cli` | `--approval-mode=yolo` | No (sequential) |
+| Cline CLI | `npm i -g @anthropic-ai/cline` | `--auto-approve` | No (sequential) |
+| Aider | `pip install aider-chat` | `--yes-always` | No (sequential) |
 
-Claude gets full features (subagents, parallelization, MCP, Task tool). Codex and Gemini run in sequential mode -- one agent at a time, no Task tool. See [Provider Guide](skills/providers.md) for the full comparison.
+Claude gets full features (subagents, parallelization, MCP, Task tool). All other providers run in sequential mode -- one agent at a time, no Task tool. See [Provider Guide](skills/providers.md) for the full comparison.
 
 ---
 

package/SKILL.md

@@ -3,11 +3,11 @@ name: loki-mode
 description: Multi-agent autonomous startup system. Triggers on "Loki Mode". Takes PRD to deployed product with minimal human intervention. Requires --dangerously-skip-permissions flag.
 ---
 
-# Loki Mode v6.5.0
+# Loki Mode v6.6.1
 
 **You are an autonomous agent. You make decisions. You do not ask questions. You do not stop.**
 
-**New in v5.0.0:** Multi-provider support (Claude/Codex/Gemini), abstract model tiers, degraded mode for non-Claude providers. See `skills/providers.md`.
+**New in v5.0.0:** Multi-provider support (Claude/Codex/Gemini/Cline/Aider), abstract model tiers, degraded mode for non-Claude providers. See `skills/providers.md`.
 
 ---
 
@@ -95,7 +95,7 @@ These rules guide autonomous operation. Test results and code quality always tak
 
 **Parallelization rule (Claude only):** Launch up to 10 agents simultaneously for independent tasks.
 
-**Degraded mode (Codex/Gemini):** No parallel agents or Task tool. Codex has MCP support. Runs RARV cycle sequentially. See `skills/model-selection.md`.
+**Degraded mode (Codex/Gemini/Cline/Aider):** No parallel agents or Task tool. Codex has MCP support. Runs RARV cycle sequentially. See `skills/model-selection.md`.
 
 **Git worktree parallelism:** For true parallel feature development, use `--parallel` flag with run.sh. See `skills/parallel-workflows.md`.
 
@@ -187,6 +187,8 @@ claude --dangerously-skip-permissions
 ./autonomy/run.sh --provider claude ./prd.md   # Default, full features
 ./autonomy/run.sh --provider codex ./prd.json  # GPT-5.3 Codex, degraded mode
 ./autonomy/run.sh --provider gemini ./prd.md   # Gemini 3 Pro, degraded mode
+./autonomy/run.sh --provider cline ./prd.md    # Cline CLI, degraded mode
+./autonomy/run.sh --provider aider ./prd.md    # Aider (18+ providers), degraded mode
 
 # Or via CLI wrapper
 loki start --provider codex ./prd.md
@@ -199,6 +201,8 @@ loki start --provider codex ./prd.md
 - **Claude**: Opus 4.6, 1M context (beta), 128K output, adaptive thinking, agent teams, full features (Task tool, parallel agents, MCP)
 - **Codex**: GPT-5.3, 400K context, 128K output, MCP support, --full-auto mode, degraded (sequential only, no Task tool)
 - **Gemini**: Degraded mode (sequential only, no Task tool, 1M context)
+- **Cline**: Multi-provider CLI, degraded mode (sequential only, no Task tool)
+- **Aider**: 18+ provider backends, degraded mode (sequential only, no Task tool)
 
 ---
 
@@ -263,4 +267,4 @@ The following features are documented in skill modules but not yet fully automat
 | Quality gates 3-reviewer system | Implemented (v5.35.0) | 5 specialist reviewers in `skills/quality-gates.md`; execution in run.sh |
 | Benchmarks (HumanEval, SWE-bench) | Infrastructure only | Runner scripts and datasets exist in `benchmarks/`; no published results |
 
-**v6.5.0 | [Autonomi](https://www.autonomi.dev/) flagship product | ~260 lines core**
+**v6.6.1 | [Autonomi](https://www.autonomi.dev/) flagship product | ~260 lines core**

package/VERSION

@@ -1 +1 @@
-6.5.0
+6.6.1

package/autonomy/completion-council.sh

@@ -141,7 +141,11 @@ council_track_iteration() {
         # Check last 200 lines for completion-like language
         local done_indicators
         done_indicators=$(tail -200 "$log_file" 2>/dev/null | grep -ciE \
-            "(all tests pass|all requirements met|implementation complete|feature complete|task complete|project complete|all tasks done|everything is working)" 2>/dev/null || echo "0")
+            "(all tests pass|all requirements met|implementation complete|feature complete|task complete|project complete|all tasks done|everything is working)" 2>/dev/null) || true
+        done_indicators="${done_indicators:-0}"
+        # Ensure we have a clean integer (strip any whitespace/newlines)
+        done_indicators=$(echo "$done_indicators" | tr -dc '0-9')
+        done_indicators="${done_indicators:-0}"
 
         if [ "$done_indicators" -gt 0 ]; then
             ((COUNCIL_DONE_SIGNALS++))
@@ -663,6 +667,8 @@ council_member_review() {
         claude) command -v claude >/dev/null 2>&1 || { log_error "Claude CLI not found"; return 1; } ;;
         codex) command -v codex >/dev/null 2>&1 || { log_error "Codex CLI not found"; return 1; } ;;
         gemini) command -v gemini >/dev/null 2>&1 || { log_error "Gemini CLI not found"; return 1; } ;;
+        cline) command -v cline >/dev/null 2>&1 || { log_error "Cline CLI not found"; return 1; } ;;
+        aider) command -v aider >/dev/null 2>&1 || { log_error "Aider not found"; return 1; } ;;
     esac
 
     local evidence
@@ -753,6 +759,16 @@ ISSUES: CRITICAL:description (optional, one per line per issue)"
                 verdict=$(echo "$prompt" | gemini 2>/dev/null | tail -5)
             fi
             ;;
+        cline)
+            if command -v cline &>/dev/null; then
+                verdict=$(cline -y "$prompt" 2>/dev/null | tail -5)
+            fi
+            ;;
+        aider)
+            if command -v aider &>/dev/null; then
+                verdict=$(aider --message "$prompt" --yes-always --no-auto-commits --no-git 2>/dev/null | tail -5)
+            fi
+            ;;
     esac
 
     # Fallback: if no AI provider available, use heuristic-based review
@@ -777,6 +793,8 @@ council_devils_advocate() {
         claude) command -v claude >/dev/null 2>&1 || { log_error "Claude CLI not found"; return 1; } ;;
         codex) command -v codex >/dev/null 2>&1 || { log_error "Codex CLI not found"; return 1; } ;;
         gemini) command -v gemini >/dev/null 2>&1 || { log_error "Gemini CLI not found"; return 1; } ;;
+        cline) command -v cline >/dev/null 2>&1 || { log_error "Cline CLI not found"; return 1; } ;;
+        aider) command -v aider >/dev/null 2>&1 || { log_error "Aider not found"; return 1; } ;;
     esac
 
     local evidence
@@ -830,6 +848,16 @@ REASON: your reasoning"
                 verdict=$(echo "$prompt" | gemini 2>/dev/null | tail -5)
             fi
             ;;
+        cline)
+            if command -v cline &>/dev/null; then
+                verdict=$(cline -y "$prompt" 2>/dev/null | tail -5)
+            fi
+            ;;
+        aider)
+            if command -v aider &>/dev/null; then
+                verdict=$(aider --message "$prompt" --yes-always --no-auto-commits --no-git 2>/dev/null | tail -5)
+            fi
+            ;;
     esac
 
     if [ -z "$verdict" ]; then

package/autonomy/council-v2.sh

@@ -282,6 +282,20 @@ Respond ONLY with a valid JSON object. No markdown fencing."
                 result='{"verdict":"REJECT","reasoning":"reviewer CLI unavailable","issues":[]}'
             fi
             ;;
+        cline)
+            if command -v cline &>/dev/null; then
+                result=$(cline -y "$full_prompt" 2>/dev/null || echo '{"verdict":"REJECT","reasoning":"review execution failed","issues":[]}')
+            else
+                result='{"verdict":"REJECT","reasoning":"reviewer CLI unavailable","issues":[]}'
+            fi
+            ;;
+        aider)
+            if command -v aider &>/dev/null; then
+                result=$(aider --message "$full_prompt" --yes-always --no-auto-commits --no-git 2>/dev/null || echo '{"verdict":"REJECT","reasoning":"review execution failed","issues":[]}')
+            else
+                result='{"verdict":"REJECT","reasoning":"reviewer CLI unavailable","issues":[]}'
+            fi
+            ;;
         *)
             result='{"verdict":"REJECT","reasoning":"review not supported for this provider","issues":[]}'
             ;;

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)
@@ -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
@@ -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,7 +2964,6 @@ cmd_run() {
                 shift
                 ;;
             --worktree|-w)
-                start_args+=("--parallel")
                 use_worktree=true
                 shift
                 ;;
@@ -3219,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 ""
@@ -3932,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)"
@@ -3975,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)
@@ -4272,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
@@ -4420,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=""
@@ -4454,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}"
@@ -4472,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%%:*}"
@@ -4491,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
@@ -4591,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
@@ -6742,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
@@ -6903,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