claude-flow-novice 2.14.37 → 2.15.1

package/claude-assets/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-assets/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-assets/skills/cfn-docker-agent-spawning/spawn-agent.sh

@@ -9,7 +9,7 @@ set -euo pipefail
 DEFAULT_MEMORY_LIMIT="1g"
 DEFAULT_CPU_LIMIT="1.0"
 DEFAULT_NETWORK="mcp-network"
-DEFAULT_IMAGE="claude-flow-novice:agent"
+DEFAULT_IMAGE="claude-flow-novice-agent:latest"
 
 # Colors for output
 RED='\033[0;31m'
@@ -208,14 +208,18 @@ 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
 WORKSPACE_DIR="/tmp/agent-workspace-${AGENT_ID}"
 mkdir -p "$WORKSPACE_DIR"
-chmod 777 "$WORKSPACE_DIR"
+chmod 777 "$WORKSPACE_DIR" 2>/dev/null || true  # Suppress errors on WSL2 bind mounts
 
 # Function to get MCP configuration for agent type
 get_mcp_config() {
@@ -235,7 +239,7 @@ get_mcp_config() {
 if [[ -z "$MCP_SERVERS" ]]; then
     log "Auto-selecting MCP servers for agent type: $AGENT_TYPE"
     MCP_CONFIG=$(get_mcp_config "$AGENT_TYPE")
-    MCP_SERVERS=$(echo "$MCP_CONFIG" | jq -r '.selectedMCPServers[]' | tr '\n' ',' | sed 's/,$//')
+    MCP_SERVERS=$(echo "$MCP_CONFIG" | jq -r '.selectedMCPServers[]? // empty' | tr '\n' ',' | sed 's/,$//')
 
     if [[ "$VERBOSE" == true ]]; then
         log "Auto-selected MCP servers: ${MCP_SERVERS:-'none'}"
@@ -285,6 +289,9 @@ fi
 # Build Docker command
 DOCKER_CMD="docker run"
 
+# Override hardcoded entrypoint (image has coordinator entrypoint, we need shell)
+DOCKER_CMD="$DOCKER_CMD --entrypoint /bin/sh"
+
 # Add container options
 if [[ "$DETACH" == true ]]; then
     DOCKER_CMD="$DOCKER_CMD --detach"
@@ -328,16 +335,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"
@@ -359,16 +380,32 @@ else
     log "CFN mode detected - using agent coordination with shell wrapper"
 fi
 
+# Prepare context file if specified
+CONTEXT_ARG=""
+if [[ -n "$CONTEXT_FILE" ]]; then
+    if [[ -f "$CONTEXT_FILE" ]]; then
+        # Copy context file to workspace so it's accessible inside container
+        CONTEXT_FILENAME="context-${AGENT_ID}.json"
+        cp "$CONTEXT_FILE" "${WORKSPACE_DIR}/${CONTEXT_FILENAME}"
+
+        # Prepare context argument for agent-spawn command
+        CONTEXT_ARG="--context /app/workspace/${CONTEXT_FILENAME}"
+    else
+        log_error "Context file not found: $CONTEXT_FILE"
+        exit 1
+    fi
+fi
+
 # Add image and command
 DOCKER_CMD="$DOCKER_CMD $IMAGE"
 
-# Add the shell command
+# Add the shell command (note: entrypoint is /bin/sh, so use -c not sh -c)
 if [[ "${TASK_ID}" =~ concurrent-.* || "${TASK_ID}" =~ test-.* || "${TASK_ID}" =~ context-.* ]]; then
-    # Test mode command
-    DOCKER_CMD="$DOCKER_CMD sh -c 'cd /app/workspace && echo \"Task: ${TASK_ID}\" > task-info.txt && echo \"Agent: ${AGENT_TYPE}\" >> task-info.txt && echo \"Starting task execution...\" >> task-info.txt && sleep 3 && echo \"${AGENT_TYPE} task completed\" > ${AGENT_TYPE}-task-result.txt && echo \"Workspace verified\" > ${AGENT_TYPE}-workspace-check.txt && echo \"Task completed\" > ${AGENT_TYPE}-completion-log.txt && echo \"All files created successfully\" && ls -la && sleep 2'"
+    # Test mode command (context not used)
+    DOCKER_CMD="$DOCKER_CMD -c 'cd /app/workspace && echo \"Task: ${TASK_ID}\" > task-info.txt && echo \"Agent: ${AGENT_TYPE}\" >> task-info.txt && echo \"Starting task execution...\" >> task-info.txt && sleep 3 && echo \"${AGENT_TYPE} task completed\" > ${AGENT_TYPE}-task-result.txt && echo \"Workspace verified\" > ${AGENT_TYPE}-workspace-check.txt && echo \"Task completed\" > ${AGENT_TYPE}-completion-log.txt && echo \"All files created successfully\" && ls -la && sleep 2'"
 else
-    # Full CFN mode command
-    DOCKER_CMD="$DOCKER_CMD sh -c 'cd /app && npx claude-flow-novice agent-spawn --type ${AGENT_TYPE} --task-id ${TASK_ID} --agent-id ${AGENT_ID}'"
+    # Full CFN mode command with optional context (call compiled bin directly)
+    DOCKER_CMD="$DOCKER_CMD -c 'cd /app && node dist/cli/spawn.js --type ${AGENT_TYPE} --task-id ${TASK_ID} --agent-id ${AGENT_ID} ${CONTEXT_ARG}'"
 fi
 
 # Remove container on exit for interactive mode (not needed for test mode with --rm)
@@ -376,16 +413,6 @@ if [[ "$INTERACTIVE" == true && ! "${TASK_ID}" =~ concurrent-.* && ! "${TASK_ID}
     DOCKER_CMD="$DOCKER_CMD --rm"
 fi
 
-# Add context file if specified
-if [[ -n "$CONTEXT_FILE" ]]; then
-    if [[ -f "$CONTEXT_FILE" ]]; then
-        DOCKER_CMD="$DOCKER_CMD --context $(cat "$CONTEXT_FILE")"
-    else
-        log_error "Context file not found: $CONTEXT_FILE"
-        exit 1
-    fi
-fi
-
 # Display configuration
 log "Container Configuration:"
 log "  Agent ID: $AGENT_ID"