@hitechclaw/clawspark 2.0.0

package/v2/lib/setup-extras.sh

@@ -0,0 +1,95 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+setup_v2_extras() {
+    log_info "Preparing v2 extras..."
+    _source_legacy_module_v2 "setup-skills.sh"
+    _source_legacy_module_v2 "setup-voice.sh"
+    _source_legacy_module_v2 "setup-messaging.sh"
+    _source_legacy_module_v2 "secure.sh"
+
+    mkdir -p "${CLAWSPARK_DIR}"
+    _install_v2_cli_assets
+    _seed_skills_config_v2
+    _prepare_messaging_choice_v2
+
+    log_info "Installing skills for v2..."
+    setup_skills || log_warn "Skill installation had issues -- continuing."
+
+    log_info "Configuring voice for v2..."
+    setup_voice || log_warn "Voice setup had issues -- continuing."
+
+    log_info "Configuring messaging for v2..."
+    setup_messaging || log_warn "Messaging setup had issues -- continuing."
+
+    log_info "Applying security hardening for v2..."
+    secure_setup || log_warn "Security hardening had issues -- continuing."
+
+    if declare -F _start_node_host >/dev/null; then
+        if check_command systemctl && systemctl is-active --quiet clawspark-nodehost.service 2>/dev/null; then
+            log_info "Node host already running via systemd."
+        else
+            log_info "Starting node host..."
+            _start_node_host || log_warn "Node host failed to start -- OpenClaw will still run without exec tools."
+        fi
+    fi
+
+    log_success "v2 extras complete."
+}
+
+_install_v2_cli_assets() {
+    if [[ -f "${CLAWSPARK_REPO_DIR}/clawspark" ]]; then
+        cp "${CLAWSPARK_REPO_DIR}/clawspark" "${CLAWSPARK_DIR}/clawspark"
+        chmod +x "${CLAWSPARK_DIR}/clawspark"
+        sudo cp "${CLAWSPARK_REPO_DIR}/clawspark" /usr/local/bin/clawspark 2>/dev/null || true
+        sudo chmod +x /usr/local/bin/clawspark 2>/dev/null || true
+    fi
+
+    rm -rf "${CLAWSPARK_DIR}/lib" "${CLAWSPARK_DIR}/configs"
+    cp -r "${CLAWSPARK_REPO_DIR}/lib" "${CLAWSPARK_DIR}/"
+    cp -r "${CLAWSPARK_REPO_DIR}/configs" "${CLAWSPARK_DIR}/"
+
+    if [[ -f "${CLAWSPARK_REPO_DIR}/uninstall.sh" ]]; then
+        cp "${CLAWSPARK_REPO_DIR}/uninstall.sh" "${CLAWSPARK_DIR}/uninstall.sh"
+    fi
+
+    log_info "Installed CLI assets into ${CLAWSPARK_DIR}"
+}
+
+_source_legacy_module_v2() {
+    local module="$1"
+    local module_path="${CLAWSPARK_REPO_DIR}/lib/${module}"
+
+    if [[ ! -f "${module_path}" ]]; then
+        log_warn "Legacy module not found: ${module}"
+        return 0
+    fi
+
+    # shellcheck source=/dev/null
+    source "${module_path}"
+}
+
+_seed_skills_config_v2() {
+    local bundled="${SCRIPT_DIR}/configs/skills.yaml"
+    local target="${CLAWSPARK_DIR}/skills.yaml"
+
+    if [[ -f "${bundled}" && ! -f "${target}" ]]; then
+        cp "${bundled}" "${target}"
+        log_info "Seeded v2 skills config: ${target}"
+    fi
+}
+
+_prepare_messaging_choice_v2() {
+    if [[ -n "${FLAG_MESSAGING:-}" ]]; then
+        FLAG_MESSAGING=$(to_lower "${FLAG_MESSAGING}")
+    elif [[ "${CLAWSPARK_DEFAULTS}" == "true" ]]; then
+        FLAG_MESSAGING="skip"
+    else
+        local msg_opts=("WhatsApp" "Telegram" "Both" "Skip")
+        FLAG_MESSAGING=$(prompt_choice "Connect a messaging platform? (Web UI is always available)" msg_opts 3)
+        FLAG_MESSAGING=$(to_lower "${FLAG_MESSAGING}")
+    fi
+
+    export FLAG_MESSAGING
+    log_info "Messaging preference: ${FLAG_MESSAGING}"
+}

package/v2/lib/setup-openclaw.sh

@@ -0,0 +1,187 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+setup_openclaw_v2() {
+    log_info "Installing and configuring OpenClaw for v2..."
+    _ensure_node_v2
+    _install_openclaw_v2
+    _write_openclaw_config_v2
+    _run_onboard_v2
+    log_success "OpenClaw v2 configuration complete."
+}
+
+_ensure_node_v2() {
+    local required_major=22
+    if check_command node; then
+        local node_ver major
+        node_ver=$(node -v 2>/dev/null | sed 's/^v//')
+        major=$(echo "${node_ver}" | cut -d. -f1)
+        if (( major >= required_major )); then
+            log_success "Node.js v${node_ver} satisfies >= ${required_major}."
+            return 0
+        fi
+    fi
+
+    log_info "Installing Node.js ${required_major}.x..."
+    if check_command apt-get; then
+        (curl -fsSL "https://deb.nodesource.com/setup_${required_major}.x" | sudo -E bash - && sudo apt-get install -y nodejs) >> "${CLAWSPARK_V2_LOG}" 2>&1 &
+        spinner $! "Installing Node.js..."
+    elif check_command brew; then
+        (brew install "node@${required_major}") >> "${CLAWSPARK_V2_LOG}" 2>&1 &
+        spinner $! "Installing Node.js..."
+    else
+        log_error "No supported package manager found for Node.js install."
+        return 1
+    fi
+
+    if ! check_command node; then
+        log_error "Node.js installation failed."
+        return 1
+    fi
+}
+
+_install_openclaw_v2() {
+    if check_command openclaw; then
+        log_success "OpenClaw already installed."
+        return 0
+    fi
+
+    log_info "Installing OpenClaw globally via npm..."
+    (npm install -g openclaw@latest 2>>"${CLAWSPARK_V2_LOG}" || sudo npm install -g openclaw@latest) >> "${CLAWSPARK_V2_LOG}" 2>&1 &
+    spinner $! "Installing OpenClaw..."
+    hash -r 2>/dev/null || true
+
+    if ! check_command openclaw; then
+        log_error "OpenClaw install failed."
+        return 1
+    fi
+}
+
+_write_openclaw_config_v2() {
+    local config_dir="${HOME}/.openclaw"
+    local config_file="${config_dir}/openclaw.json"
+    local auth_token
+
+    mkdir -p "${config_dir}"
+    chmod 700 "${config_dir}"
+
+    auth_token=$(openssl rand -hex 32 2>/dev/null || head -c 64 /dev/urandom | od -An -tx1 | tr -d ' \n')
+    [[ -f "${config_file}" ]] || echo '{}' > "${config_file}"
+
+    openclaw config set gateway.mode local >> "${CLAWSPARK_V2_LOG}" 2>&1 || true
+    openclaw config set gateway.port 18789 >> "${CLAWSPARK_V2_LOG}" 2>&1 || true
+    openclaw config set gateway.auth.token "${auth_token}" >> "${CLAWSPARK_V2_LOG}" 2>&1 || true
+    openclaw config set tools.profile full >> "${CLAWSPARK_V2_LOG}" 2>&1 || true
+    openclaw config set agents.defaults.memorySearch.enabled false >> "${CLAWSPARK_V2_LOG}" 2>&1 || true
+    openclaw config set agents.defaults.workspace "${HOME}/workspace" >> "${CLAWSPARK_V2_LOG}" 2>&1 || true
+
+    local default_model_ref
+    default_model_ref=$(_provider_model_ref_v2 "${PRIMARY_PROVIDER}" "${SELECTED_MODEL_ID}")
+    openclaw config set agents.defaults.model "${default_model_ref}" >> "${CLAWSPARK_V2_LOG}" 2>&1 || true
+
+    python3 - "${config_file}" "${PRIMARY_PROVIDER}" "${SELECTED_MODEL_ID}" "${RUNTIME_MODE}" "${FALLBACK_PROVIDER:-}" "${FALLBACK_MODEL_ID:-}" "${CUSTOM_PROVIDER_NAME:-}" <<'PY'
+import json, sys
+path, provider, model, runtime_mode, fallback_provider, fallback_model, custom_provider_name = sys.argv[1:8]
+with open(path, 'r', encoding='utf-8') as fh:
+    cfg = json.load(fh)
+
+cfg.setdefault('tools', {})
+cfg['tools']['profile'] = 'full'
+cfg.setdefault('gateway', {})
+cfg['gateway']['mode'] = 'local'
+cfg.setdefault('agents', {}).setdefault('defaults', {})
+
+def provider_ref(p, m):
+    if p == 'ollama':
+        return f'ollama/{m}'
+    if p == 'openai':
+        return f'openai/{m}'
+    if p == 'anthropic':
+        return f'anthropic/{m}'
+    if p == 'openrouter':
+        return f'openai/{m}'
+    if p == 'google':
+        return f'openai/{m}'
+    if p == 'custom':
+        return f'openai/{m}'
+    return m
+
+cfg['agents']['defaults']['model'] = provider_ref(provider, model)
+cfg['clawsparkV2'] = {
+    'runtimeMode': runtime_mode,
+    'primaryProvider': provider,
+    'primaryModel': model,
+}
+if fallback_provider and fallback_model:
+    cfg['clawsparkV2']['fallbackProvider'] = fallback_provider
+    cfg['clawsparkV2']['fallbackModel'] = fallback_model
+if provider == 'custom' and custom_provider_name:
+    cfg['clawsparkV2']['customProviderName'] = custom_provider_name
+
+cfg.setdefault('models', {})
+cfg['models'].setdefault('providers', {})
+
+if provider == 'ollama':
+    cfg['models']['providers']['ollama'] = {
+        'baseUrl': 'http://127.0.0.1:11434/v1',
+        'api': 'openai-completions'
+    }
+elif provider in ('openai', 'openrouter', 'google'):
+    provider_key = 'openai'
+    cfg['models']['providers'][provider_key] = {
+        'api': 'openai-completions'
+    }
+elif provider == 'custom':
+    cfg['models']['providers']['openai'] = {
+        'api': 'openai-completions'
+    }
+elif provider == 'anthropic':
+    cfg['models']['providers']['anthropic'] = {
+        'api': 'anthropic-messages'
+    }
+
+with open(path, 'w', encoding='utf-8') as fh:
+    json.dump(cfg, fh, indent=2)
+PY
+
+    echo "${auth_token}" > "${config_dir}/.gateway-token"
+    chmod 600 "${config_dir}/.gateway-token"
+}
+
+_provider_model_ref_v2() {
+    local provider="$1"
+    local model="$2"
+    case "${provider}" in
+        ollama) printf 'ollama/%s' "${model}" ;;
+        openai) printf 'openai/%s' "${model}" ;;
+        anthropic) printf 'anthropic/%s' "${model}" ;;
+        openrouter) printf 'openai/%s' "${model}" ;;
+        google) printf 'openai/%s' "${model}" ;;
+        custom) printf 'openai/%s' "${model}" ;;
+        *) printf '%s' "${model}" ;;
+    esac
+}
+
+_run_onboard_v2() {
+    local env_file="${HOME}/.openclaw/gateway.env"
+    if [[ -f "${env_file}" ]]; then
+        set +e
+        set -a
+        source "${env_file}" 2>/dev/null
+        set +a
+        set -e
+    fi
+
+    openclaw onboard \
+        --non-interactive \
+        --accept-risk \
+        --auth-choice skip \
+        --skip-daemon \
+        --skip-channels \
+        --skip-skills \
+        --skip-ui \
+        --skip-health \
+        >> "${CLAWSPARK_V2_LOG}" 2>&1 || {
+        log_warn "openclaw onboard returned non-zero. This may be acceptable on reruns."
+    }
+}

package/v2/lib/setup-provider.sh

@@ -0,0 +1,131 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+setup_provider_v2() {
+    log_info "Preparing inference backend..."
+    mkdir -p "${HOME}/.openclaw"
+
+    if [[ "${PRIMARY_PROVIDER}" == "ollama" ]]; then
+        setup_ollama_backend_v2
+    else
+        log_info "API backend selected; local inference install skipped."
+        INFERENCE_API_URL="${API_BASE_URL}"
+        export INFERENCE_API_URL
+    fi
+
+    _write_gateway_env_v2
+    log_success "Provider backend ready."
+}
+
+setup_ollama_backend_v2() {
+    if ! check_command ollama; then
+        log_info "Ollama not found — installing..."
+        if [[ "$(uname)" == "Darwin" ]]; then
+            if check_command brew; then
+                (brew install ollama) >> "${CLAWSPARK_V2_LOG}" 2>&1 &
+                spinner $! "Installing Ollama..."
+            else
+                curl -fsSL https://ollama.com/install.sh | sh >> "${CLAWSPARK_V2_LOG}" 2>&1 || true
+            fi
+        else
+            curl -fsSL https://ollama.com/install.sh | sh >> "${CLAWSPARK_V2_LOG}" 2>&1 || true
+        fi
+        hash -r 2>/dev/null || true
+    fi
+
+    if ! check_command ollama; then
+        log_error "Ollama install failed."
+        return 1
+    fi
+
+    if ! curl -sf http://127.0.0.1:11434/ &>/dev/null; then
+        log_info "Starting Ollama service..."
+        if check_command systemctl && systemctl is-enabled ollama &>/dev/null; then
+            sudo systemctl start ollama >> "${CLAWSPARK_V2_LOG}" 2>&1 || true
+        else
+            nohup ollama serve >> "${CLAWSPARK_V2_DIR}/ollama.log" 2>&1 &
+            echo $! > "${CLAWSPARK_V2_DIR}/ollama.pid"
+        fi
+    fi
+
+    local attempt=0
+    while (( attempt < 30 )); do
+        if curl -sf http://127.0.0.1:11434/ &>/dev/null; then
+            break
+        fi
+        attempt=$(( attempt + 1 ))
+        sleep 1
+    done
+
+    if ! curl -sf http://127.0.0.1:11434/ &>/dev/null; then
+        log_error "Ollama is not responding."
+        return 1
+    fi
+
+    if ! ollama list 2>/dev/null | grep -qF "${SELECTED_MODEL_ID}"; then
+        log_info "Pulling local model ${SELECTED_MODEL_ID}..."
+        if ! ollama pull "${SELECTED_MODEL_ID}" 2>&1 | tee -a "${CLAWSPARK_V2_LOG}"; then
+            log_error "Failed to pull ${SELECTED_MODEL_ID}"
+            return 1
+        fi
+    else
+        log_success "Local model already available."
+    fi
+
+    INFERENCE_API_URL="http://127.0.0.1:11434/v1"
+    export INFERENCE_API_URL
+}
+
+_write_gateway_env_v2() {
+    local env_file="${HOME}/.openclaw/gateway.env"
+    mkdir -p "$(dirname "${env_file}")"
+    : > "${env_file}"
+
+    local npm_prefix_bin
+    npm_prefix_bin="$(npm config get prefix 2>/dev/null)/bin"
+    local computed_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+    [[ -d "${npm_prefix_bin}" ]] && computed_path="${npm_prefix_bin}:${computed_path}"
+    [[ -d "${HOME}/.npm-global/bin" ]] && computed_path="${HOME}/.npm-global/bin:${computed_path}"
+    [[ -d "/snap/bin" ]] && computed_path="${computed_path}:/snap/bin"
+
+    printf 'PATH=%s\n' "${computed_path}" >> "${env_file}"
+    printf 'OPENCLAW_GATEWAY_OPENAI_COMPAT=true\n' >> "${env_file}"
+    printf 'CLAWSPARK_V2_RUNTIME_MODE=%s\n' "${RUNTIME_MODE}" >> "${env_file}"
+    printf 'CLAWSPARK_V2_PRIMARY_PROVIDER=%s\n' "${PRIMARY_PROVIDER}" >> "${env_file}"
+
+    case "${PRIMARY_PROVIDER}" in
+        ollama)
+            printf 'OLLAMA_API_KEY=ollama\n' >> "${env_file}"
+            printf 'OLLAMA_BASE_URL=http://127.0.0.1:11434\n' >> "${env_file}"
+            ;;
+        openai)
+            printf 'OPENAI_API_KEY=%s\n' "${API_KEY}" >> "${env_file}"
+            printf 'OPENAI_BASE_URL=%s\n' "${API_BASE_URL}" >> "${env_file}"
+            ;;
+        anthropic)
+            printf 'ANTHROPIC_API_KEY=%s\n' "${API_KEY}" >> "${env_file}"
+            printf 'ANTHROPIC_BASE_URL=%s\n' "${API_BASE_URL}" >> "${env_file}"
+            ;;
+        openrouter)
+            printf 'OPENROUTER_API_KEY=%s\n' "${API_KEY}" >> "${env_file}"
+            printf 'OPENROUTER_BASE_URL=%s\n' "${API_BASE_URL}" >> "${env_file}"
+            ;;
+        google)
+            printf 'GOOGLE_API_KEY=%s\n' "${API_KEY}" >> "${env_file}"
+            printf 'GOOGLE_BASE_URL=%s\n' "${API_BASE_URL}" >> "${env_file}"
+            ;;
+        custom)
+            printf 'CUSTOM_AI_API_KEY=%s\n' "${API_KEY}" >> "${env_file}"
+            printf 'CUSTOM_AI_BASE_URL=%s\n' "${API_BASE_URL}" >> "${env_file}"
+            printf 'CUSTOM_AI_PROVIDER_NAME=%s\n' "${CUSTOM_PROVIDER_NAME:-Custom AI}" >> "${env_file}"
+            ;;
+    esac
+
+    if [[ -n "${FALLBACK_PROVIDER:-}" ]]; then
+        printf 'CLAWSPARK_V2_FALLBACK_PROVIDER=%s\n' "${FALLBACK_PROVIDER}" >> "${env_file}"
+        printf 'CLAWSPARK_V2_FALLBACK_MODEL=%s\n' "${FALLBACK_MODEL_ID}" >> "${env_file}"
+    fi
+
+    chmod 600 "${env_file}"
+    log_info "gateway.env written for ${PRIMARY_PROVIDER}"
+}

package/v2/lib/verify.sh

@@ -0,0 +1,133 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+verify_v2_installation() {
+    log_info "Running v2 verification checks..."
+    hr
+
+    local pass=0
+    local fail=0
+
+    _check_pass() {
+        printf '  %s✓%s %s\n' "${GREEN}" "${RESET}" "$1"
+        pass=$(( pass + 1 ))
+    }
+
+    _check_fail() {
+        printf '  %s✗%s %s\n' "${RED}" "${RESET}" "$1"
+        fail=$(( fail + 1 ))
+    }
+
+    _check_pass "Runtime mode: ${RUNTIME_MODE}"
+    _check_pass "Primary provider: ${PRIMARY_PROVIDER}"
+    _check_pass "Default model: ${SELECTED_MODEL_ID}"
+
+    if check_command openclaw; then
+        _check_pass "OpenClaw installed: $(openclaw --version 2>/dev/null || echo unknown)"
+    else
+        _check_fail "OpenClaw not installed"
+    fi
+
+    if [[ "${PRIMARY_PROVIDER}" == "ollama" ]]; then
+        if curl -sf http://127.0.0.1:11434/ &>/dev/null; then
+            _check_pass "Ollama API responding"
+        else
+            _check_fail "Ollama API not responding"
+        fi
+
+        if check_command ollama && ollama list 2>/dev/null | grep -qF "${SELECTED_MODEL_ID}"; then
+            _check_pass "Local model available in Ollama"
+        else
+            _check_fail "Local model missing in Ollama"
+        fi
+    else
+        local env_file="${HOME}/.openclaw/gateway.env"
+        if [[ -f "${env_file}" ]]; then
+            _check_pass "gateway.env written for API provider"
+        else
+            _check_fail "gateway.env missing"
+        fi
+
+        case "${PRIMARY_PROVIDER}" in
+            openai)
+                grep -q '^OPENAI_API_KEY=' "${env_file}" 2>/dev/null && _check_pass "OpenAI API key configured" || _check_fail "OpenAI API key missing"
+                ;;
+            anthropic)
+                grep -q '^ANTHROPIC_API_KEY=' "${env_file}" 2>/dev/null && _check_pass "Anthropic API key configured" || _check_fail "Anthropic API key missing"
+                ;;
+            openrouter)
+                grep -q '^OPENROUTER_API_KEY=' "${env_file}" 2>/dev/null && _check_pass "OpenRouter API key configured" || _check_fail "OpenRouter API key missing"
+                ;;
+            google)
+                grep -q '^GOOGLE_API_KEY=' "${env_file}" 2>/dev/null && _check_pass "Google API key configured" || _check_fail "Google API key missing"
+                ;;
+            custom)
+                grep -q '^CUSTOM_AI_API_KEY=' "${env_file}" 2>/dev/null && _check_pass "Custom AI API key configured" || _check_fail "Custom AI API key missing"
+                grep -q '^CUSTOM_AI_BASE_URL=' "${env_file}" 2>/dev/null && _check_pass "Custom AI base URL configured" || _check_fail "Custom AI base URL missing"
+                grep -q '^CUSTOM_AI_PROVIDER_NAME=' "${env_file}" 2>/dev/null && _check_pass "Custom AI label configured" || _check_fail "Custom AI label missing"
+                ;;
+        esac
+    fi
+
+    local config_file="${HOME}/.openclaw/openclaw.json"
+    if [[ -f "${config_file}" ]]; then
+        _check_pass "OpenClaw config present"
+    else
+        _check_fail "OpenClaw config missing"
+    fi
+
+    if [[ -f "${CLAWSPARK_DIR}/skills.yaml" ]]; then
+        _check_pass "v2 skills config present"
+    else
+        _check_fail "v2 skills config missing"
+    fi
+
+    if [[ -f "${HOME}/.openclaw/skills/local-whisper/config.json" ]]; then
+        _check_pass "Voice config present"
+    else
+        _check_fail "Voice config missing"
+    fi
+
+    if [[ -f "${CLAWSPARK_DIR}/token" ]]; then
+        _check_pass "Security token generated"
+    else
+        _check_fail "Security token missing"
+    fi
+
+    if [[ "${FLAG_MESSAGING:-skip}" == "skip" || "${MESSAGING_CHOICE:-skip}" == "skip" ]]; then
+        _check_pass "Messaging setup skipped"
+    else
+        _check_pass "Messaging configured: ${MESSAGING_CHOICE:-${FLAG_MESSAGING}}"
+    fi
+
+    if [[ -f "${CLAWSPARK_DIR}/gateway.pid" ]]; then
+        local gateway_pid
+        gateway_pid=$(cat "${CLAWSPARK_DIR}/gateway.pid" 2>/dev/null || echo "")
+        if [[ -n "${gateway_pid}" ]] && kill -0 "${gateway_pid}" 2>/dev/null; then
+            _check_pass "Gateway process running"
+        else
+            _check_fail "Gateway process not running"
+        fi
+    else
+        _check_fail "Gateway PID file missing"
+    fi
+
+    if [[ -f "${CLAWSPARK_DIR}/node.pid" ]]; then
+        local node_pid
+        node_pid=$(cat "${CLAWSPARK_DIR}/node.pid" 2>/dev/null || echo "")
+        if [[ -n "${node_pid}" ]] && kill -0 "${node_pid}" 2>/dev/null; then
+            _check_pass "Node host running"
+        else
+            _check_fail "Node host not running"
+        fi
+    else
+        _check_fail "Node host PID file missing"
+    fi
+
+    printf '\n'
+    if (( fail == 0 )); then
+        log_success "All ${pass} verification checks passed."
+    else
+        log_warn "${pass} checks passed, ${fail} failed."
+    fi
+}