@hitechclaw/clawspark 2.0.0

package/scripts/release.sh

@@ -0,0 +1,133 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+cd "${ROOT_DIR}"
+
+usage() {
+    cat <<'USAGE'
+Usage: bash scripts/release.sh [patch|minor|major|<version>] [--push]
+
+Examples:
+  bash scripts/release.sh patch
+  bash scripts/release.sh minor --push
+  bash scripts/release.sh 2.1.0 --push
+USAGE
+}
+
+require_clean_git() {
+    if ! git diff --quiet || ! git diff --cached --quiet; then
+        echo "Working tree is not clean. Commit or stash changes before releasing." >&2
+        exit 1
+    fi
+}
+
+require_command() {
+    command -v "$1" >/dev/null 2>&1 || {
+        echo "Required command not found: $1" >&2
+        exit 1
+    }
+}
+
+resolve_command() {
+    local candidate="$1"
+    local resolved=""
+
+    if resolved="$(command -v "${candidate}" 2>/dev/null)" && [[ -n "${resolved}" ]]; then
+        printf '%s' "${resolved}"
+        return 0
+    fi
+
+    if resolved="$(command -v "${candidate}.exe" 2>/dev/null)" && [[ -n "${resolved}" ]]; then
+        printf '%s' "${resolved}"
+        return 0
+    fi
+
+    if resolved="$(command -v "${candidate}.cmd" 2>/dev/null)" && [[ -n "${resolved}" ]]; then
+        printf '%s' "${resolved}"
+        return 0
+    fi
+
+    if command -v where.exe >/dev/null 2>&1; then
+        resolved="$(where.exe "${candidate}" 2>/dev/null | head -n 1 | tr -d '\r')"
+        if [[ -n "${resolved}" ]]; then
+            printf '%s' "${resolved}"
+            return 0
+        fi
+    fi
+
+    return 1
+}
+
+require_runtime_command() {
+    local candidate="$1"
+    local resolved=""
+
+    if resolved="$(resolve_command "${candidate}" 2>/dev/null)" && [[ -n "${resolved}" ]]; then
+        printf '%s' "${resolved}"
+        return 0
+    fi
+
+    echo "Required command not found: ${candidate}" >&2
+    exit 1
+}
+
+bump_arg="${1:-}"
+push_flag="false"
+
+if [[ -z "${bump_arg}" || "${bump_arg}" == "-h" || "${bump_arg}" == "--help" ]]; then
+    usage
+    exit 0
+fi
+
+shift || true
+while [[ $# -gt 0 ]]; do
+    case "$1" in
+        --push)
+            push_flag="true"
+            shift
+            ;;
+        *)
+            echo "Unknown option: $1" >&2
+            usage
+            exit 1
+            ;;
+    esac
+done
+
+require_command git
+require_command bash
+
+NODE_BIN="$(require_runtime_command node)"
+NPM_BIN="$(require_runtime_command npm)"
+
+require_clean_git
+
+bash -n ./clawspark
+bash ./tests/run.sh
+"${NPM_BIN}" pack --dry-run >/dev/null
+
+case "${bump_arg}" in
+    patch|minor|major)
+        "${NPM_BIN}" version "${bump_arg}"
+        ;;
+    *)
+        if [[ ! "${bump_arg}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+            echo "Version must be patch, minor, major, or an explicit semver like 2.1.0" >&2
+            exit 1
+        fi
+        "${NPM_BIN}" version "${bump_arg}"
+        ;;
+esac
+
+new_version="$("${NODE_BIN}" -p "require('./package.json').version")"
+echo "Prepared release v${new_version}"
+
+echo "Next steps:"
+echo "  git push origin main --follow-tags"
+
+echo "This will trigger CI, npm publish, and GitHub Release workflows once pushed."
+
+if [[ "${push_flag}" == "true" ]]; then
+    git push origin main --follow-tags
+fi

package/uninstall.sh

@@ -0,0 +1,161 @@
+#!/usr/bin/env bash
+# uninstall.sh — Clean removal of clawspark, OpenClaw, models, and configs.
+set -euo pipefail
+
+CLAWSPARK_DIR="${HOME}/.clawspark"
+
+# ── Minimal color support ──────────────────────────────────────────────────
+if [[ -t 1 ]]; then
+    RED=$'\033[0;31m'; GREEN=$'\033[0;32m'; YELLOW=$'\033[0;33m'
+    CYAN=$'\033[0;36m'; BOLD=$'\033[1m'; RESET=$'\033[0m'
+else
+    RED=''; GREEN=''; YELLOW=''; CYAN=''; BOLD=''; RESET=''
+fi
+
+log_info()    { printf '%s[INFO]%s %s\n' "${CYAN}" "${RESET}" "$*"; }
+log_warn()    { printf '%s[WARN]%s %s\n' "${YELLOW}" "${RESET}" "$*" >&2; }
+log_success() { printf '%s[OK]%s %s\n' "${GREEN}" "${RESET}" "$*"; }
+log_error()   { printf '%s[ERROR]%s %s\n' "${RED}" "${RESET}" "$*" >&2; }
+
+# ── Confirmation ────────────────────────────────────────────────────────────
+confirmed=false
+if [[ "${1:-}" == "--confirmed" ]]; then
+    confirmed=true
+fi
+
+if ! ${confirmed}; then
+    printf '\n%s%s clawspark uninstaller%s\n\n' "${BOLD}" "${RED}" "${RESET}"
+    printf '  This will remove:\n'
+    printf '    - OpenClaw (npm global package)\n'
+    printf '    - OpenClaw configuration (~/.openclaw)\n'
+    printf '    - clawspark data (~/.clawspark)\n'
+    printf '    - clawspark CLI (/usr/local/bin/clawspark)\n'
+    printf '    - Optionally: Ollama models\n'
+    printf '    - Optionally: firewall rules\n\n'
+
+    printf '  %sType YES to proceed:%s ' "${RED}" "${RESET}"
+    read -r answer
+    if [[ "${answer}" != "YES" ]]; then
+        log_info "Uninstall cancelled."
+        exit 0
+    fi
+fi
+
+printf '\n'
+
+# ── Step 1: Stop services ──────────────────────────────────────────────────
+log_info "Stopping services..."
+
+# Gateway
+if [[ -f "${CLAWSPARK_DIR}/gateway.pid" ]]; then
+    local_pid=$(cat "${CLAWSPARK_DIR}/gateway.pid" 2>/dev/null || echo "")
+    if [[ -n "${local_pid}" ]] && kill -0 "${local_pid}" 2>/dev/null; then
+        kill "${local_pid}" 2>/dev/null || true
+        log_info "Gateway stopped (PID ${local_pid})."
+    fi
+fi
+
+# Ollama (only our managed instance)
+if [[ -f "${CLAWSPARK_DIR}/ollama.pid" ]]; then
+    local_pid=$(cat "${CLAWSPARK_DIR}/ollama.pid" 2>/dev/null || echo "")
+    if [[ -n "${local_pid}" ]] && kill -0 "${local_pid}" 2>/dev/null; then
+        kill "${local_pid}" 2>/dev/null || true
+        log_info "Ollama stopped (PID ${local_pid})."
+    fi
+fi
+
+# If Ollama is managed by systemd, stop it too
+if command -v systemctl &>/dev/null && systemctl is-active ollama &>/dev/null; then
+    log_info "Stopping Ollama systemd service..."
+    sudo systemctl stop ollama 2>/dev/null || true
+fi
+
+log_success "Services stopped."
+
+# ── Step 2: Optionally remove Ollama models ────────────────────────────────
+if command -v ollama &>/dev/null; then
+    if ${confirmed}; then
+        remove_models="n"
+    else
+        printf '\n  %sRemove all Ollama models? This frees disk space but re-download needed later.%s\n' "${YELLOW}" "${RESET}"
+        printf '  %s[y/N]:%s ' "${BOLD}" "${RESET}"
+        read -r remove_models
+        remove_models=$(echo "${remove_models}" | tr '[:upper:]' '[:lower:]')
+    fi
+
+    if [[ "${remove_models}" =~ ^y ]]; then
+        log_info "Removing Ollama models..."
+        local_models=$(ollama list 2>/dev/null | tail -n +2 | awk '{print $1}')
+        for model in ${local_models}; do
+            printf '  Removing %s ... ' "${model}"
+            ollama rm "${model}" 2>/dev/null && printf '%sdone%s\n' "${GREEN}" "${RESET}" \
+                || printf '%sfailed%s\n' "${YELLOW}" "${RESET}"
+        done
+        log_success "Models removed."
+    else
+        log_info "Keeping Ollama models."
+    fi
+fi
+
+# ── Step 3: Uninstall OpenClaw ──────────────────────────────────────────────
+if command -v openclaw &>/dev/null; then
+    log_info "Uninstalling OpenClaw..."
+    npm uninstall -g openclaw 2>/dev/null || true
+    log_success "OpenClaw removed."
+else
+    log_info "OpenClaw not found — skipping."
+fi
+
+# ── Step 4: Remove configuration directories ───────────────────────────────
+log_info "Removing configuration directories..."
+
+if [[ -d "${HOME}/.openclaw" ]]; then
+    rm -rf "${HOME}/.openclaw"
+    log_info "Removed ~/.openclaw"
+fi
+
+if [[ -d "${CLAWSPARK_DIR}" ]]; then
+    rm -rf "${CLAWSPARK_DIR}"
+    log_info "Removed ~/.clawspark"
+fi
+
+# ── Step 5: Remove CLI ─────────────────────────────────────────────────────
+if [[ -f /usr/local/bin/clawspark ]]; then
+    log_info "Removing /usr/local/bin/clawspark..."
+    sudo rm -f /usr/local/bin/clawspark 2>/dev/null || {
+        log_warn "Could not remove /usr/local/bin/clawspark — you may need to delete it manually."
+    }
+    log_success "CLI removed."
+fi
+
+# ── Step 6: Revert firewall rules ──────────────────────────────────────────
+if command -v ufw &>/dev/null; then
+    if ${confirmed}; then
+        revert_fw="n"
+    else
+        printf '\n  %sRevert firewall (UFW) rules added by clawspark?%s\n' "${YELLOW}" "${RESET}"
+        printf '  %s[y/N]:%s ' "${BOLD}" "${RESET}"
+        read -r revert_fw
+        revert_fw=$(echo "${revert_fw}" | tr '[:upper:]' '[:lower:]')
+    fi
+
+    if [[ "${revert_fw}" =~ ^y ]]; then
+        log_info "Reverting UFW rules..."
+        sudo ufw default allow outgoing 2>/dev/null || true
+        # Reset rules added for air-gap
+        sudo ufw delete allow out to 10.0.0.0/8 2>/dev/null || true
+        sudo ufw delete allow out to 172.16.0.0/12 2>/dev/null || true
+        sudo ufw delete allow out to 192.168.0.0/16 2>/dev/null || true
+        sudo ufw delete allow out to 127.0.0.0/8 2>/dev/null || true
+        sudo ufw delete allow out 53 2>/dev/null || true
+        log_success "Firewall rules reverted."
+    else
+        log_info "Keeping firewall rules as-is."
+    fi
+fi
+
+# ── Done ────────────────────────────────────────────────────────────────────
+printf '\n'
+printf '  %s%sclawspark has been completely removed.%s\n' "${GREEN}" "${BOLD}" "${RESET}"
+printf '  Ollama itself was NOT uninstalled (only models were optionally removed).\n'
+printf '  To remove Ollama: sudo rm -f /usr/local/bin/ollama\n\n'

package/v2/README.md

@@ -0,0 +1,50 @@
+# clawspark v2
+
+`v2/` is a CPU-friendly and provider-aware installer track for `clawspark`.
+
+## Goals
+
+- Support machines with **CPU only**, not just GPU-first setups.
+- Allow **third-party API providers** as primary inference backends.
+- Keep **hybrid mode** available for local + cloud fallback.
+- Preserve OpenClaw-based workflow while reducing hard dependency on Ollama.
+
+## Runtime modes
+
+- `local-gpu` — local Ollama on GPU hardware.
+- `local-cpu` — local Ollama on CPU-first hosts.
+- `api-only` — no local model install, use provider API directly.
+- `hybrid` — combine local and remote providers.
+
+## Providers
+
+Current provider catalog is in `v2/configs/providers.yaml`.
+
+Initial providers:
+
+- `ollama`
+- `openai`
+- `anthropic`
+- `openrouter`
+- `google`
+- `custom` (OpenAI-compatible third-party endpoint)
+
+## Main files
+
+- `v2/install.sh` — new installer entrypoint.
+- `v2/lib/detect-hardware.sh` — CPU/GPU-aware classification.
+- `v2/lib/select-runtime.sh` — runtime, provider, and model selection.
+- `v2/lib/setup-provider.sh` — local or API backend preparation.
+- `v2/lib/setup-openclaw.sh` — provider-aware OpenClaw config.
+- `v2/lib/setup-extras.sh` — reuses legacy skill, voice, messaging, and security modules.
+- `v2/lib/verify.sh` — validation for both local and API modes.
+
+## Notes
+
+`v2` now reuses the stable legacy modules for skills, voice, messaging, and security hardening.
+
+Runtime state is kept under `~/.clawspark-v2`, while OpenClaw configuration remains under `~/.openclaw`.
+
+For `custom`, provide your own base URL, API key, and model ID. This is intended for OpenAI-compatible vendors, self-hosted gateways, or enterprise AI endpoints.
+
+The root `clawspark` CLI is now v2-aware for profile detection, provider-aware status, and remote/custom model inspection. `v2` should still be treated as a preview track while broader command coverage continues to improve.

package/v2/configs/providers.yaml

@@ -0,0 +1,79 @@
+providers:
+  ollama:
+    type: local
+    runtime_modes:
+      - local-gpu
+      - local-cpu
+      - hybrid
+    default_base_url: http://127.0.0.1:11434/v1
+    env:
+      api_key: OLLAMA_API_KEY
+      base_url: OLLAMA_BASE_URL
+    cpu_models:
+      - qwen2.5:14b-instruct-q4_K_M
+      - qwen2.5:7b-instruct-q4_K_M
+      - llama3.1:8b-instruct-q4_K_M
+      - phi4-mini
+  openai:
+    type: api
+    runtime_modes:
+      - api-only
+      - hybrid
+    default_base_url: https://api.openai.com/v1
+    env:
+      api_key: OPENAI_API_KEY
+      base_url: OPENAI_BASE_URL
+    models:
+      - gpt-4.1
+      - gpt-4.1-mini
+      - gpt-5-mini
+  anthropic:
+    type: api
+    runtime_modes:
+      - api-only
+      - hybrid
+    default_base_url: https://api.anthropic.com
+    env:
+      api_key: ANTHROPIC_API_KEY
+      base_url: ANTHROPIC_BASE_URL
+    models:
+      - claude-sonnet-4-20250514
+      - claude-3-5-haiku-latest
+  openrouter:
+    type: api
+    runtime_modes:
+      - api-only
+      - hybrid
+    default_base_url: https://openrouter.ai/api/v1
+    env:
+      api_key: OPENROUTER_API_KEY
+      base_url: OPENROUTER_BASE_URL
+    models:
+      - openai/gpt-4.1-mini
+      - anthropic/claude-3.5-haiku
+      - google/gemini-2.0-flash-001
+  google:
+    type: api
+    runtime_modes:
+      - api-only
+      - hybrid
+    default_base_url: https://generativelanguage.googleapis.com/v1beta/openai
+    env:
+      api_key: GOOGLE_API_KEY
+      base_url: GOOGLE_BASE_URL
+    models:
+      - gemini-2.0-flash
+      - gemini-1.5-pro
+  custom:
+    type: api
+    runtime_modes:
+      - api-only
+      - hybrid
+    default_base_url: https://your-provider.example.com/v1
+    env:
+      api_key: CUSTOM_AI_API_KEY
+      base_url: CUSTOM_AI_BASE_URL
+      provider_name: CUSTOM_AI_PROVIDER_NAME
+    notes:
+      - OpenAI-compatible custom endpoint
+      - Bring your own model ID

package/v2/configs/skills.yaml

@@ -0,0 +1,36 @@
+# clawspark v2 default skills
+# Edit this file and re-run `bash v2/install.sh` to re-apply skill setup.
+
+skills:
+  enabled:
+    # Core
+    - name: local-whisper
+      description: Offline voice transcription via Whisper
+    - name: self-improvement
+      description: Agent learns from your corrections
+    - name: memory-setup
+      description: Persistent memory across conversations
+
+    # Voice
+    - name: whatsapp-voice-chat-integration-open-source
+      description: Voice notes to conversational flow
+
+    # Productivity
+    - name: deep-research-pro
+      description: Multi-step research with planning
+    - name: agent-browser
+      description: Web automation and browsing
+
+    # Knowledge
+    - name: second-brain
+      description: Personal knowledge base
+    - name: proactive-agent
+      description: Proactive assistance and suggestions
+
+    # Web Search
+    - name: ddg-web-search
+      description: DuckDuckGo search (no API key needed)
+    - name: local-web-search-skill
+      description: Local web search fallback
+
+  custom: []

package/v2/install.sh

@@ -0,0 +1,116 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+CLAWSPARK_DEFAULTS="${CLAWSPARK_DEFAULTS:-false}"
+FLAG_RUNTIME_MODE=""
+FLAG_PROVIDER=""
+FLAG_API_KEY=""
+FLAG_BASE_URL=""
+FLAG_PROVIDER_NAME=""
+FLAG_MODEL=""
+FLAG_MESSAGING=""
+AIR_GAP="false"
+
+while [[ $# -gt 0 ]]; do
+    case "$1" in
+        --defaults)
+            CLAWSPARK_DEFAULTS="true"
+            shift ;;
+        --runtime=*)
+            FLAG_RUNTIME_MODE="${1#*=}"
+            shift ;;
+        --provider=*)
+            FLAG_PROVIDER="${1#*=}"
+            shift ;;
+        --api-key=*)
+            FLAG_API_KEY="${1#*=}"
+            shift ;;
+        --base-url=*)
+            FLAG_BASE_URL="${1#*=}"
+            shift ;;
+        --provider-name=*)
+            FLAG_PROVIDER_NAME="${1#*=}"
+            shift ;;
+        --model=*)
+            FLAG_MODEL="${1#*=}"
+            shift ;;
+        --messaging=*)
+            FLAG_MESSAGING="${1#*=}"
+            shift ;;
+        --air-gap|--airgap)
+            AIR_GAP="true"
+            shift ;;
+        -h|--help)
+            cat <<HELP
+Usage: v2/install.sh [OPTIONS]
+
+Options:
+  --defaults              Skip interactive prompts
+  --runtime=<mode>        local-gpu | local-cpu | api-only | hybrid
+    --provider=<name>       ollama | openai | anthropic | openrouter | google | custom
+  --api-key=<key>         Provider API key for API modes
+    --base-url=<url>        Override provider API base URL
+    --provider-name=<name>  Label for custom API provider
+  --model=<id>            Override default model ID
+    --messaging=<type>      whatsapp | telegram | both | skip
+    --air-gap               Enable outbound network lock-down after setup
+  -h, --help              Show this help
+HELP
+            exit 0 ;;
+        *)
+            echo "Unknown option: $1" >&2
+            exit 1 ;;
+    esac
+done
+
+CLAWSPARK_REPO_DIR="$(cd "${SCRIPT_DIR}/.." && pwd)"
+
+export CLAWSPARK_DEFAULTS FLAG_RUNTIME_MODE FLAG_PROVIDER FLAG_API_KEY FLAG_BASE_URL FLAG_PROVIDER_NAME FLAG_MODEL
+export FLAG_MESSAGING AIR_GAP CLAWSPARK_REPO_DIR
+
+source "${SCRIPT_DIR}/lib/common.sh"
+source "${SCRIPT_DIR}/lib/detect-hardware.sh"
+source "${SCRIPT_DIR}/lib/select-runtime.sh"
+source "${SCRIPT_DIR}/lib/setup-provider.sh"
+source "${SCRIPT_DIR}/lib/setup-openclaw.sh"
+source "${SCRIPT_DIR}/lib/setup-extras.sh"
+source "${SCRIPT_DIR}/lib/verify.sh"
+
+mkdir -p "${CLAWSPARK_V2_DIR}"
+: > "${CLAWSPARK_V2_LOG}"
+
+show_banner_v2() {
+    printf '\n%s%sclawspark v2%s\n' "${BOLD}" "${BLUE}" "${RESET}"
+    printf '%sCPU-ready, API-ready OpenClaw installer%s\n\n' "${CYAN}" "${RESET}"
+    hr
+}
+
+show_banner_v2
+
+detect_hardware_v2
+select_runtime_v2
+select_provider_v2
+select_model_v2
+
+if [[ -n "${FLAG_MODEL}" ]]; then
+    SELECTED_MODEL_ID="${FLAG_MODEL}"
+    SELECTED_MODEL_NAME="${FLAG_MODEL}"
+fi
+
+collect_provider_credentials_v2
+setup_provider_v2
+setup_openclaw_v2
+setup_v2_extras
+verify_v2_installation
+
+printf '\n'
+log_success "clawspark v2 setup finished."
+print_box \
+    "${BOLD}Summary${RESET}" \
+    "" \
+    "Runtime   : ${RUNTIME_MODE}" \
+    "Provider  : ${PRIMARY_PROVIDER}" \
+    "Model     : ${SELECTED_MODEL_ID}" \
+    "API URL   : ${INFERENCE_API_URL:-n/a}"