claude-flow-novice 2.14.36 → 2.15.0

package/.claude/commands/switch-api.md

@@ -1,30 +1,47 @@
 ---
-description: Switch Main Chat and Task tool between Z.ai and Anthropic providers
+description: Switch Main Chat and Task tool between Z.ai, Kimi, OpenRouter, and Anthropic providers
 tags: [config, api, cost-optimization]
 ---
 
-Switch Main Chat and Task() tool API provider between Z.ai (cost-optimized) and Anthropic (high-quality).
+Switch Main Chat and Task() tool API provider between multiple AI providers.
 
-**Important:** CLI agents always use Z.ai (from `.env`). This command only affects Main Chat and Task() spawned agents.
+**Important:** CLI agents support custom routing when enabled. This command affects Main Chat and Task() spawned agents.
 
 **Usage:**
 - `/switch-api` - Show current status
-- `/switch-api zai` - Main Chat/Task tool use Z.ai ($0.50/1M tokens)
-- `/switch-api max` - Main Chat/Task tool use Anthropic ($15/1M tokens, requires re-login)
+- `/switch-api [zai|kimi|openrouter|max]` - Switch provider
+  - `zai` - Z.ai ($0.50/1M tokens)
+  - `kimi` - Moonshot Kimi ($2/1M tokens)
+  - `openrouter` - OpenRouter (varies by model)
+  - `max` or `claude` - Anthropic ($15/1M tokens, requires re-login)
 
 **Arguments:**
 - `status` - Show current routing configuration (default)
 - `zai` - Route Main Chat + Task tool to Z.ai for cost savings
+- `kimi` - Route Main Chat + Task tool to Moonshot Kimi
+- `openrouter` - Route Main Chat + Task tool to OpenRouter
 - `max` or `claude` - Route Main Chat + Task tool to Anthropic for quality
 
 **What This Does:**
 
 `/switch-api zai`:
-- Adds env vars to `.claude/settings.json`
+- Adds Z.ai env vars to `.claude/settings.json`
 - Main Chat + Task() agents use Z.ai
 - Cost: $0.50/1M tokens (97% savings)
 - No login required
 
+`/switch-api kimi`:
+- Adds Kimi env vars to `.claude/settings.json`
+- Main Chat + Task() agents use Moonshot Kimi
+- Cost: ~$2/1M tokens
+- Requires `KIMI_API_KEY` in root `.env`
+
+`/switch-api openrouter`:
+- Adds OpenRouter env vars to `.claude/settings.json`
+- Main Chat + Task() agents use OpenRouter
+- Cost: Varies by model
+- Requires `OPENROUTER_API_KEY` in root `.env`
+
 `/switch-api max`:
 - Removes env vars from `.claude/settings.json`
 - Main Chat + Task() agents use Anthropic
@@ -33,21 +50,25 @@ Switch Main Chat and Task() tool API provider between Z.ai (cost-optimized) and
 
 **Combined Architecture:**
 ```
-Main Chat (Anthropic or Z.ai - your choice)
+Main Chat (Anthropic/Z.ai/Kimi/OpenRouter - your choice)
   ↓
 Task() → Coordinator (uses Main Chat provider)
   ↓
-CLI spawn → Workers (always Z.ai from .env)
+CLI spawn → Workers (custom routing when enabled, see agent profiles)
 ```
 
 **Execute:**
 ```bash
-bash scripts/switch-api.sh {{args}}
+bash "$(git rev-parse --show-toplevel 2>/dev/null || pwd)/scripts/switch-api.sh" {{args}}
 ```
 
+**Note:** Script automatically resolves to project root directory.
+
 **Examples:**
 ```bash
-/switch-api          # Show current routing
-/switch-api zai      # Cost-optimize Main Chat
-/switch-api max      # Quality-optimize Main Chat (requires re-login)
+/switch-api             # Show current routing
+/switch-api zai         # Cost-optimize with Z.ai
+/switch-api kimi        # Use Moonshot Kimi
+/switch-api openrouter  # Use OpenRouter (access 400+ models)
+/switch-api max         # Quality-optimize with Anthropic (requires re-login)
 ```

package/.claude/skills/cfn-agent-spawning/get-agent-provider-env.sh

@@ -0,0 +1,107 @@
+#!/bin/bash
+
+# Get Agent Provider Environment Variables
+# Determines which provider environment variables to use for CLI/Docker agent spawning
+#
+# Logic:
+# 1. If custom routing is disabled, use Main Chat settings (from .claude/settings.json)
+# 2. If custom routing is enabled:
+#    a. Check agent profile for PROVIDER_PARAMETERS
+#    b. If found, use agent-specific provider/model
+#    c. If not found, use Main Chat settings
+#
+# Usage: source get-agent-provider-env.sh AGENT_TYPE
+# Exports: ANTHROPIC_BASE_URL, ANTHROPIC_AUTH_TOKEN, ANTHROPIC_MODEL, ANTHROPIC_SMALL_FAST_MODEL
+
+set -euo pipefail
+
+AGENT_TYPE="${1:-}"
+CUSTOM_ROUTING_ENABLED="${CFN_CUSTOM_ROUTING:-false}"
+SETTINGS_FILE=".claude/settings.json"
+
+if [[ -z "$AGENT_TYPE" ]]; then
+    echo "Usage: source $0 AGENT_TYPE" >&2
+    return 1 2>/dev/null || exit 1
+fi
+
+# Function to get provider config (zai, kimi, openrouter, anthropic)
+get_provider_config() {
+    local provider="$1"
+    local model="${2:-}"
+
+    case "$provider" in
+        zai)
+            export ANTHROPIC_BASE_URL="https://api.z.ai/api/anthropic"
+            export ANTHROPIC_AUTH_TOKEN="${ZAI_API_KEY:-}"
+            export ANTHROPIC_MODEL="${model:-glm-4.6}"
+            export ANTHROPIC_SMALL_FAST_MODEL="${model:-glm-4.6}"
+            ;;
+        kimi)
+            export ANTHROPIC_BASE_URL="https://api.moonshot.ai/anthropic"
+            export ANTHROPIC_AUTH_TOKEN="${KIMI_API_KEY:-}"
+            export ANTHROPIC_MODEL="${model:-kimi-k2-turbo-preview}"
+            export ANTHROPIC_SMALL_FAST_MODEL="${model:-kimi-k2-turbo-preview}"
+            ;;
+        openrouter)
+            export ANTHROPIC_BASE_URL="https://openrouter.ai/api/v1"
+            export ANTHROPIC_AUTH_TOKEN="${OPENROUTER_API_KEY:-}"
+            export ANTHROPIC_MODEL="${model:-anthropic/claude-sonnet-4.5}"
+            export ANTHROPIC_SMALL_FAST_MODEL="${model:-anthropic/claude-sonnet-4.5}"
+            ;;
+        anthropic|*)
+            # Use default Anthropic settings (remove custom env vars)
+            unset ANTHROPIC_BASE_URL
+            unset ANTHROPIC_AUTH_TOKEN
+            unset ANTHROPIC_MODEL
+            unset ANTHROPIC_SMALL_FAST_MODEL
+            ;;
+    esac
+}
+
+# Function to detect provider from base URL
+detect_provider_from_url() {
+    local base_url="$1"
+
+    if [[ "$base_url" == *"z.ai"* ]]; then
+        echo "zai"
+    elif [[ "$base_url" == *"moonshot.ai"* ]]; then
+        echo "kimi"
+    elif [[ "$base_url" == *"openrouter.ai"* ]]; then
+        echo "openrouter"
+    else
+        echo "anthropic"
+    fi
+}
+
+# Step 1: Check if custom routing is enabled
+if [[ "$CUSTOM_ROUTING_ENABLED" != "true" ]]; then
+    # Custom routing disabled - use Main Chat settings from .claude/settings.json
+    if [[ -f "$SETTINGS_FILE" ]]; then
+        BASE_URL=$(jq -r '.env.ANTHROPIC_BASE_URL // empty' "$SETTINGS_FILE" 2>/dev/null || echo "")
+
+        if [[ -n "$BASE_URL" ]]; then
+            # Main Chat has custom provider configured
+            export ANTHROPIC_BASE_URL="$BASE_URL"
+            export ANTHROPIC_AUTH_TOKEN=$(jq -r '.env.ANTHROPIC_AUTH_TOKEN // empty' "$SETTINGS_FILE" 2>/dev/null || echo "")
+            export ANTHROPIC_MODEL=$(jq -r '.env.ANTHROPIC_MODEL // empty' "$SETTINGS_FILE" 2>/dev/null || echo "")
+            export ANTHROPIC_SMALL_FAST_MODEL=$(jq -r '.env.ANTHROPIC_SMALL_FAST_MODEL // empty' "$SETTINGS_FILE" 2>/dev/null || echo "")
+        fi
+        # else: No custom provider, use default Anthropic
+    fi
+    return 0 2>/dev/null || exit 0
+fi
+
+# Step 2: Custom routing enabled - check agent profile for PROVIDER_PARAMETERS
+AGENT_PROVIDER=$(bash .claude/skills/cfn-agent-spawning/parse-agent-provider.sh "$AGENT_TYPE" --field provider)
+AGENT_MODEL=$(bash .claude/skills/cfn-agent-spawning/parse-agent-provider.sh "$AGENT_TYPE" --field model)
+
+if [[ -n "$AGENT_PROVIDER" ]]; then
+    # Agent has provider parameters - use them
+    get_provider_config "$AGENT_PROVIDER" "$AGENT_MODEL"
+else
+    # No agent-specific provider - default to Z.ai with glm-4.6
+    export ANTHROPIC_BASE_URL="https://api.z.ai/api/anthropic"
+    export ANTHROPIC_AUTH_TOKEN="${ZAI_API_KEY:-}"
+    export ANTHROPIC_MODEL="glm-4.6"
+    export ANTHROPIC_SMALL_FAST_MODEL="glm-4.6"
+fi

package/.claude/skills/cfn-agent-spawning/parse-agent-provider.sh

@@ -0,0 +1,59 @@
+#!/bin/bash
+
+# Parse Agent Provider Parameters
+# Extracts provider and model from agent profile's PROVIDER_PARAMETERS section
+# Usage: parse-agent-provider.sh AGENT_TYPE [--field provider|model]
+
+set -euo pipefail
+
+AGENT_TYPE="${1:-}"
+FIELD="${2:---field}"
+FIELD_VALUE="${3:-provider}"
+
+if [[ -z "$AGENT_TYPE" ]]; then
+    echo "Usage: $0 AGENT_TYPE [--field provider|model]" >&2
+    exit 1
+fi
+
+# Find agent file in multiple locations
+AGENT_FILE=""
+SEARCH_PATHS=(
+    ".claude/agents/cfn-dev-team/**/${AGENT_TYPE}.md"
+    ".claude/agents/custom/${AGENT_TYPE}.md"
+    ".claude/agents/${AGENT_TYPE}.md"
+)
+
+for pattern in "${SEARCH_PATHS[@]}"; do
+    # Use find with glob pattern
+    while IFS= read -r -d '' file; do
+        if [[ -f "$file" ]]; then
+            AGENT_FILE="$file"
+            break 2
+        fi
+    done < <(find .claude/agents -type f -name "${AGENT_TYPE}.md" -print0 2>/dev/null)
+done
+
+if [[ -z "$AGENT_FILE" ]]; then
+    # Agent file not found, return empty (will fallback to main chat settings)
+    echo ""
+    exit 0
+fi
+
+# Extract PROVIDER_PARAMETERS section
+# Format:
+# <!-- PROVIDER_PARAMETERS
+# provider: kimi
+# model: kimi-k2-turbo-preview
+# -->
+
+PARAM_VALUE=$(awk '
+    /<!-- PROVIDER_PARAMETERS/,/-->/ {
+        if ($0 ~ /^'"${FIELD_VALUE}"':/) {
+            sub(/^'"${FIELD_VALUE}"':[ \t]*/, "")
+            print $0
+            exit
+        }
+    }
+' "$AGENT_FILE" | tr -d '\r' | xargs)
+
+echo "$PARAM_VALUE"

package/.claude/skills/cfn-docker-agent-spawning/spawn-agent.sh

@@ -208,8 +208,12 @@ if ! docker image inspect "$IMAGE" &> /dev/null; then
     exit 1
 fi
 
-# Get project root directory
-PROJECT_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../../.." && pwd)"
+# Get project root directory (use git root for reliability)
+PROJECT_ROOT="$(git rev-parse --show-toplevel 2>/dev/null)"
+if [[ -z "$PROJECT_ROOT" ]]; then
+    # Fallback to script-relative path
+    PROJECT_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../../.." && pwd -P)"
+fi
 cd "$PROJECT_ROOT"
 
 # Create workspace directory with proper permissions
@@ -328,16 +332,30 @@ DOCKER_CMD="$DOCKER_CMD --env AGENT_TYPE=${AGENT_TYPE}"
 DOCKER_CMD="$DOCKER_CMD --env TASK_ID=${TASK_ID}"
 DOCKER_CMD="$DOCKER_CMD --env PROJECT_ROOT=/app"
 
-# Add Redis URL if Redis is available
-if command -v redis-cli &> /dev/null && redis-cli ping &> /dev/null; then
-    DOCKER_CMD="$DOCKER_CMD --env REDIS_URL=redis://redis:6379"
-fi
+# Add Redis URL for container-to-container networking
+# Always set Redis URL regardless of host Redis status
+DOCKER_CMD="$DOCKER_CMD --env REDIS_URL=redis://redis:6379"
 
 # Add MCP tokens file path if tokens generated
 if [[ -n "$TOKENS_FILE" ]]; then
     DOCKER_CMD="$DOCKER_CMD --env MCP_TOKENS_FILE=/app/workspace/mcp-tokens.json"
 fi
 
+# Add provider routing environment variables (custom routing support)
+source .claude/skills/cfn-agent-spawning/get-agent-provider-env.sh "$AGENT_TYPE"
+if [[ -n "${ANTHROPIC_BASE_URL:-}" ]]; then
+    DOCKER_CMD="$DOCKER_CMD --env ANTHROPIC_BASE_URL=${ANTHROPIC_BASE_URL}"
+fi
+if [[ -n "${ANTHROPIC_AUTH_TOKEN:-}" ]]; then
+    DOCKER_CMD="$DOCKER_CMD --env ANTHROPIC_AUTH_TOKEN=${ANTHROPIC_AUTH_TOKEN}"
+fi
+if [[ -n "${ANTHROPIC_MODEL:-}" ]]; then
+    DOCKER_CMD="$DOCKER_CMD --env ANTHROPIC_MODEL=${ANTHROPIC_MODEL}"
+fi
+if [[ -n "${ANTHROPIC_SMALL_FAST_MODEL:-}" ]]; then
+    DOCKER_CMD="$DOCKER_CMD --env ANTHROPIC_SMALL_FAST_MODEL=${ANTHROPIC_SMALL_FAST_MODEL}"
+fi
+
 # Add custom environment variables
 if [[ -n "$ENVIRONMENT" ]]; then
     IFS=',' read -ra ENV_ARRAY <<< "$ENVIRONMENT"

package/.claude/skills/cfn-loop-orchestration/helpers/spawn-agents.sh

@@ -190,15 +190,24 @@ spawn_agents_with_context() {
       ((injection_success_count++))
     fi
 
-    # Spawn agent in background with enriched context
-    npx claude-flow-novice agent "$safe_agent_type" \
-      --task-id "$safe_task_id" \
-      --agent-id "$safe_agent_id" \
-      --iteration "$iteration" \
-      --context "$context_to_use" &
-
-    # Store PID for monitoring
-    AGENT_PID=$!
+    # Set provider environment variables for this agent (custom routing support)
+    # Spawn in subshell to isolate provider env vars per agent
+    (
+      source .claude/skills/cfn-agent-spawning/get-agent-provider-env.sh "$safe_agent_type"
+
+      # Spawn agent in background with enriched context and custom provider
+      npx claude-flow-novice agent "$safe_agent_type" \
+        --task-id "$safe_task_id" \
+        --agent-id "$safe_agent_id" \
+        --iteration "$iteration" \
+        --context "$context_to_use" &
+
+      AGENT_PID=$!
+      echo $AGENT_PID
+    )
+
+    # Capture PID from subshell output
+    AGENT_PID=$(jobs -p | tail -1)
     "$REDIS_COORD_SKILL/store-context.sh" \
       --task-id "$task_id" \
       --key "${UNIQUE_AGENT_ID}:pid" \