@blockrun/clawrouter 0.12.103 → 0.12.105

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blockrun/clawrouter",
-  "version": "0.12.103",
+  "version": "0.12.105",
   "description": "Smart LLM router — save 85% on inference costs. 55+ models (11 free), one wallet, x402 micropayments.",
   "type": "module",
   "main": "dist/index.js",

package/scripts/reinstall.sh

@@ -323,22 +323,58 @@ if [ -n "$CREDS_BACKUP" ] && [ -d "$CREDS_BACKUP" ]; then
   rm -rf "$(dirname "$CREDS_BACKUP")"
 fi
 
-# 6.1. Verify installation (check dist/ files exist)
+# 6.1. Verify installation and force-update if openclaw installed a stale cached version
 echo "→ Verifying installation..."
 DIST_PATH="$PLUGIN_DIR/dist/index.js"
-if [ ! -f "$DIST_PATH" ]; then
-  echo "  ⚠️  dist/ files missing, clearing npm cache and retrying..."
-  npm cache clean --force 2>/dev/null || true
-  rm -rf "$PLUGIN_DIR"
-  openclaw plugins install @blockrun/clawrouter
 
+force_install_from_npm() {
+  local version="$1"
+  echo "  → Force-fetching v${version} directly from npm registry..."
+  local TMPPACK
+  TMPPACK=$(mktemp -d)
+  if npm pack "@blockrun/clawrouter@${version}" --pack-destination "$TMPPACK" --prefer-online >/dev/null 2>&1; then
+    local TARBALL
+    TARBALL=$(ls "$TMPPACK"/blockrun-clawrouter-*.tgz 2>/dev/null | head -1)
+    if [ -n "$TARBALL" ]; then
+      rm -rf "$PLUGIN_DIR"
+      mkdir -p "$PLUGIN_DIR"
+      tar -xzf "$TARBALL" -C "$PLUGIN_DIR" --strip-components=1
+      rm -rf "$TMPPACK"
+      echo "  ✓ Force-installed v${version} from npm registry"
+      return 0
+    fi
+  fi
+  rm -rf "$TMPPACK"
+  echo "  ✗ Force install failed"
+  return 1
+}
+
+if [ ! -f "$DIST_PATH" ]; then
+  echo "  ⚠️  dist/ files missing — openclaw install may have cached an old version"
+  LATEST_VER=$(npm view @blockrun/clawrouter@latest version 2>/dev/null || echo "")
+  if [ -n "$LATEST_VER" ]; then
+    force_install_from_npm "$LATEST_VER" || exit 1
+  else
+    echo "  ❌ Cannot determine latest version — check npm registry connection"
+    exit 1
+  fi
   if [ ! -f "$DIST_PATH" ]; then
     echo "  ❌ Installation failed - dist/index.js still missing"
     echo "  Please report this issue at https://github.com/BlockRunAI/ClawRouter/issues"
     exit 1
   fi
+else
+  # dist/ exists — verify we have the latest version (openclaw may have served cached old version)
+  INSTALLED_VER=$(node -e "try{const p=require('$PLUGIN_DIR/package.json');console.log(p.version);}catch{console.log('');}" 2>/dev/null || echo "")
+  LATEST_VER=$(npm view @blockrun/clawrouter@latest version 2>/dev/null || echo "")
+  if [ -n "$LATEST_VER" ] && [ -n "$INSTALLED_VER" ] && [ "$INSTALLED_VER" != "$LATEST_VER" ]; then
+    echo "  ⚠️  openclaw installed v${INSTALLED_VER} (cached) but latest is v${LATEST_VER}"
+    force_install_from_npm "$LATEST_VER" || true
+  fi
 fi
-echo "  ✓ dist/index.js verified"
+
+INSTALLED_VER=$(node -e "try{const p=require('$PLUGIN_DIR/package.json');console.log(p.version);}catch{console.log('?');}" 2>/dev/null || echo "?")
+echo "  ✓ ClawRouter v${INSTALLED_VER} installed"
 
 # 6.1b. Ensure all dependencies are installed (Solana, x402, etc.)
 # openclaw's plugin installer may skip native deps like @solana/kit.

package/scripts/update.ps1

@@ -0,0 +1,223 @@
+# ClawRouter Update Script for Windows (PowerShell)
+# Usage: iwr -useb https://blockrun.ai/ClawRouter-update.ps1 | iex
+#    or: powershell -ExecutionPolicy Bypass -Command "iwr -useb https://blockrun.ai/ClawRouter-update.ps1 | iex"
+#
+# Run as regular user (no admin needed)
+Set-StrictMode -Version Latest
+$ErrorActionPreference = "Stop"
+
+$PLUGIN_DIR = "$env:USERPROFILE\.openclaw\extensions\clawrouter"
+$CONFIG_PATH = "$env:USERPROFILE\.openclaw\openclaw.json"
+$WALLET_FILE = "$env:USERPROFILE\.openclaw\blockrun\wallet.key"
+
+function Write-Ok  { param($msg) Write-Host "  $([char]0x2713) $msg" -ForegroundColor Green }
+function Write-Warn { param($msg) Write-Host "  ! $msg" -ForegroundColor Yellow }
+function Write-Err  { param($msg) Write-Host "  x $msg" -ForegroundColor Red }
+function Write-Step { param($msg) Write-Host "`n-> $msg" }
+
+Write-Host ""
+Write-Host "ClawRouter Update (Windows)" -ForegroundColor Cyan
+Write-Host ""
+
+# ── Step 1: Back up wallet ────────────────────────────────────
+Write-Step "Backing up wallet..."
+$walletBackup = $null
+if (Test-Path $WALLET_FILE) {
+    $walletKey = (Get-Content $WALLET_FILE -Raw).Trim()
+    if ($walletKey -match '^0x[0-9a-fA-F]{64}$') {
+        $walletBackup = "$WALLET_FILE.bak.$(Get-Date -UFormat '%s')"
+        Copy-Item $WALLET_FILE $walletBackup
+        Write-Ok "Wallet backed up: $walletBackup"
+    } else {
+        Write-Warn "Wallet file found but has unexpected format — skipping backup"
+    }
+} else {
+    Write-Host "  i No existing wallet found"
+}
+
+# ── Step 2: Stop old proxy ────────────────────────────────────
+Write-Step "Stopping old proxy..."
+try {
+    $procs = Get-NetTCPConnection -LocalPort 8402 -ErrorAction SilentlyContinue |
+             Select-Object -ExpandProperty OwningProcess -Unique
+    foreach ($pid in $procs) {
+        if ($pid -gt 0) { Stop-Process -Id $pid -Force -ErrorAction SilentlyContinue }
+    }
+    Write-Ok "Port 8402 cleared"
+} catch {
+    Write-Host "  i Could not check port 8402 (normal if proxy was not running)"
+}
+
+# ── Step 3: Clean stale config entries ────────────────────────
+Write-Step "Cleaning config..."
+if (Test-Path $CONFIG_PATH) {
+    try {
+        $cfg = Get-Content $CONFIG_PATH -Raw | ConvertFrom-Json
+        $changed = $false
+        if ($cfg.plugins -and $cfg.plugins.entries -and $cfg.plugins.entries.PSObject.Properties['clawrouter']) {
+            $cfg.plugins.entries.PSObject.Properties.Remove('clawrouter')
+            $changed = $true
+        }
+        if ($cfg.plugins -and $cfg.plugins.installs -and $cfg.plugins.installs.PSObject.Properties['clawrouter']) {
+            $cfg.plugins.installs.PSObject.Properties.Remove('clawrouter')
+            $changed = $true
+        }
+        if ($changed) {
+            $cfg | ConvertTo-Json -Depth 20 | Set-Content $CONFIG_PATH -Encoding UTF8
+            Write-Ok "Removed stale plugin entries"
+        } else {
+            Write-Ok "Config already clean"
+        }
+    } catch {
+        Write-Warn "Could not parse config: $_"
+    }
+}
+
+# ── Step 3b: Ensure baseUrl / apiKey ──────────────────────────
+Write-Step "Verifying provider config..."
+if (Test-Path $CONFIG_PATH) {
+    try {
+        $cfg = Get-Content $CONFIG_PATH -Raw | ConvertFrom-Json
+        $provider = $cfg.models?.providers?.blockrun
+        if ($provider) {
+            $changed = $false
+            if (-not $provider.baseUrl) { $provider | Add-Member -NotePropertyName baseUrl -NotePropertyValue 'http://127.0.0.1:8402/v1' -Force; $changed = $true; Write-Ok "Fixed missing baseUrl" }
+            if (-not $provider.apiKey)  { $provider | Add-Member -NotePropertyName apiKey  -NotePropertyValue 'x402-proxy-handles-auth' -Force; $changed = $true; Write-Ok "Fixed missing apiKey" }
+            if ($changed) { $cfg | ConvertTo-Json -Depth 20 | Set-Content $CONFIG_PATH -Encoding UTF8 }
+            else { Write-Ok "Provider config OK" }
+        }
+    } catch {
+        Write-Warn "Could not verify provider config: $_"
+    }
+}
+
+# ── Step 4: Get latest version from npm ───────────────────────
+Write-Step "Fetching latest version from npm..."
+try {
+    $LATEST_VERSION = (npm view @blockrun/clawrouter@latest version 2>&1).Trim()
+    if (-not $LATEST_VERSION -or $LATEST_VERSION -match 'error|ERR') {
+        throw "npm view failed: $LATEST_VERSION"
+    }
+    Write-Ok "Latest: v$LATEST_VERSION"
+} catch {
+    Write-Err "Cannot determine latest version: $_"
+    Write-Host "  Check npm is installed and you have internet access."
+    exit 1
+}
+
+# ── Step 5: Install directly from npm (bypasses openclaw cache) ───
+Write-Step "Downloading ClawRouter v$LATEST_VERSION from npm..."
+
+$tmpDir = Join-Path $env:TEMP "clawrouter-install-$(Get-Random)"
+New-Item -ItemType Directory -Path $tmpDir -Force | Out-Null
+
+try {
+    npm pack "@blockrun/clawrouter@$LATEST_VERSION" --pack-destination $tmpDir --prefer-online 2>&1 | Out-Null
+
+    $tarball = Get-ChildItem "$tmpDir\*.tgz" | Select-Object -First 1
+    if (-not $tarball) { throw "npm pack produced no tarball in $tmpDir" }
+
+    # Remove old install
+    if (Test-Path $PLUGIN_DIR) {
+        Remove-Item -Recurse -Force $PLUGIN_DIR
+    }
+    New-Item -ItemType Directory -Path $PLUGIN_DIR -Force | Out-Null
+
+    # Extract (tar is built into Windows 10+ / Server 2019+)
+    tar -xzf $tarball.FullName -C $PLUGIN_DIR --strip-components=1
+    if ($LASTEXITCODE -ne 0) { throw "tar extraction failed (exit $LASTEXITCODE)" }
+
+    Write-Ok "Extracted v$LATEST_VERSION to $PLUGIN_DIR"
+} finally {
+    Remove-Item -Recurse -Force $tmpDir -ErrorAction SilentlyContinue
+}
+
+# ── Step 5b: Install npm dependencies ─────────────────────────
+Write-Step "Installing dependencies (Solana, x402, etc.)..."
+$logFile = Join-Path $env:TEMP "clawrouter-npm-install.log"
+$proc = Start-Process -FilePath "npm" -ArgumentList "install","--omit=dev" -WorkingDirectory $PLUGIN_DIR `
+        -RedirectStandardOutput $logFile -RedirectStandardError "$logFile.err" -Wait -PassThru -NoNewWindow
+if ($proc.ExitCode -ne 0) {
+    Write-Err "npm install failed. Log: $logFile"
+    Get-Content "$logFile.err" -ErrorAction SilentlyContinue | Select-Object -Last 20 | ForEach-Object { Write-Host "  $_" -ForegroundColor Red }
+    exit 1
+}
+Write-Ok "Dependencies installed"
+
+# ── Step 6: Register plugin in openclaw config ────────────────
+Write-Step "Registering plugin..."
+if (Test-Path $CONFIG_PATH) {
+    try {
+        $cfg = Get-Content $CONFIG_PATH -Raw | ConvertFrom-Json
+        if (-not $cfg.plugins) { $cfg | Add-Member -NotePropertyName plugins -NotePropertyValue ([PSCustomObject]@{}) -Force }
+        if (-not $cfg.plugins.allow) { $cfg.plugins | Add-Member -NotePropertyName allow -NotePropertyValue @() -Force }
+        $allow = [System.Collections.Generic.List[string]]$cfg.plugins.allow
+        if (-not $allow.Contains('clawrouter')) {
+            $allow.Add('clawrouter')
+            $cfg.plugins.allow = $allow.ToArray()
+            $cfg | ConvertTo-Json -Depth 20 | Set-Content $CONFIG_PATH -Encoding UTF8
+            Write-Ok "Added clawrouter to plugins.allow"
+        } else {
+            Write-Ok "Plugin already in allow list"
+        }
+    } catch {
+        Write-Warn "Could not update plugins.allow: $_"
+    }
+}
+
+# ── Step 7: Inject auth profile ───────────────────────────────
+Write-Step "Setting up auth profile..."
+$authDir  = "$env:USERPROFILE\.openclaw\agents\main\agent"
+$authPath = "$authDir\auth-profiles.json"
+New-Item -ItemType Directory -Path $authDir -Force | Out-Null
+$store = [PSCustomObject]@{ version = 1; profiles = [PSCustomObject]@{} }
+if (Test-Path $authPath) {
+    try { $store = Get-Content $authPath -Raw | ConvertFrom-Json } catch {}
+}
+if (-not $store.profiles.PSObject.Properties['blockrun:default']) {
+    $store.profiles | Add-Member -NotePropertyName 'blockrun:default' `
+        -NotePropertyValue ([PSCustomObject]@{ type = 'api_key'; provider = 'blockrun'; key = 'x402-proxy-handles-auth' }) -Force
+    $store | ConvertTo-Json -Depth 10 | Set-Content $authPath -Encoding UTF8
+    Write-Ok "Auth profile created"
+} else {
+    Write-Ok "Auth profile already exists"
+}
+
+# ── Step 8: Clean models cache ────────────────────────────────
+Write-Step "Cleaning models cache..."
+Get-ChildItem "$env:USERPROFILE\.openclaw\agents\*\agent\models.json" -ErrorAction SilentlyContinue |
+    Remove-Item -Force -ErrorAction SilentlyContinue
+Write-Ok "Models cache cleared"
+
+# ── Step 9: Verify wallet survived ────────────────────────────
+Write-Step "Verifying wallet integrity..."
+if (Test-Path $WALLET_FILE) {
+    $key = (Get-Content $WALLET_FILE -Raw).Trim()
+    if ($key -match '^0x[0-9a-fA-F]{64}$') {
+        Write-Ok "Wallet key intact"
+    } else {
+        if ($walletBackup -and (Test-Path $walletBackup)) {
+            Copy-Item $walletBackup $WALLET_FILE -Force
+            Write-Ok "Wallet restored from backup"
+        } else {
+            Write-Warn "Wallet file may be corrupted and no backup found"
+        }
+    }
+} else {
+    if ($walletBackup -and (Test-Path $walletBackup)) {
+        New-Item -ItemType Directory -Path (Split-Path $WALLET_FILE) -Force | Out-Null
+        Copy-Item $walletBackup $WALLET_FILE -Force
+        Write-Ok "Wallet restored from backup"
+    } else {
+        Write-Host "  i No wallet found — a new one will be generated on first start"
+    }
+}
+
+# ── Done ──────────────────────────────────────────────────────
+Write-Host ""
+Write-Host "ClawRouter v$LATEST_VERSION installed successfully!" -ForegroundColor Green
+Write-Host ""
+Write-Host "  Run: openclaw gateway restart" -ForegroundColor Cyan
+Write-Host ""
+Write-Host "  To verify: npx @blockrun/clawrouter doctor"
+Write-Host ""

package/scripts/update.sh

@@ -211,7 +211,41 @@ if [ -n "$CREDS_BACKUP" ] && [ -d "$CREDS_BACKUP" ]; then
   rm -rf "$(dirname "$CREDS_BACKUP")"
 fi
 
-# ── Step 4b: Ensure all dependencies are installed ────────────
+# ── Step 4b: Verify version — force-update if openclaw served a stale cache ──
+force_install_from_npm() {
+  local version="$1"
+  echo "  → Force-fetching v${version} directly from npm registry..."
+  local TMPPACK
+  TMPPACK=$(mktemp -d)
+  if npm pack "@blockrun/clawrouter@${version}" --pack-destination "$TMPPACK" --prefer-online >/dev/null 2>&1; then
+    local TARBALL
+    TARBALL=$(ls "$TMPPACK"/blockrun-clawrouter-*.tgz 2>/dev/null | head -1)
+    if [ -n "$TARBALL" ]; then
+      rm -rf "$PLUGIN_DIR"
+      mkdir -p "$PLUGIN_DIR"
+      tar -xzf "$TARBALL" -C "$PLUGIN_DIR" --strip-components=1
+      rm -rf "$TMPPACK"
+      echo "  ✓ Force-installed v${version} from npm registry"
+      return 0
+    fi
+  fi
+  rm -rf "$TMPPACK"
+  echo "  ✗ Force install failed"
+  return 1
+}
+
+if [ -d "$PLUGIN_DIR" ] && [ -f "$PLUGIN_DIR/package.json" ]; then
+  INSTALLED_VER=$(node -e "try{const p=require('$PLUGIN_DIR/package.json');console.log(p.version);}catch{console.log('');}" 2>/dev/null || echo "")
+  LATEST_VER=$(npm view @blockrun/clawrouter@latest version 2>/dev/null || echo "")
+  if [ -n "$LATEST_VER" ] && [ -n "$INSTALLED_VER" ] && [ "$INSTALLED_VER" != "$LATEST_VER" ]; then
+    echo "  ⚠️  openclaw installed v${INSTALLED_VER} (cached) but latest is v${LATEST_VER}"
+    force_install_from_npm "$LATEST_VER" || true
+  fi
+  INSTALLED_VER=$(node -e "try{const p=require('$PLUGIN_DIR/package.json');console.log(p.version);}catch{console.log('?');}" 2>/dev/null || echo "?")
+  echo "  ✓ ClawRouter v${INSTALLED_VER} installed"
+fi
+
+# ── Step 4c: Ensure all dependencies are installed ────────────
 # openclaw's plugin installer may skip native/optional deps like @solana/kit.
 # Run npm install in the plugin directory to fill any gaps.
 if [ -d "$PLUGIN_DIR" ] && [ -f "$PLUGIN_DIR/package.json" ]; then