@blockrun/clawrouter 0.12.265 → 0.12.267

package/scripts/update.ps1

@@ -6,14 +6,47 @@
 Set-StrictMode -Version Latest
 $ErrorActionPreference = "Stop"
 
-$PLUGIN_DIR = "$env:USERPROFILE\.openclaw\extensions\clawrouter"
+$PLUGIN_DIR = "$env:USERPROFILE\.openclaw\extensions\blockrun-clawrouter"
+$LEGACY_PLUGIN_DIR = "$env:USERPROFILE\.openclaw\extensions\clawrouter"
 $CONFIG_PATH = "$env:USERPROFILE\.openclaw\openclaw.json"
 $WALLET_FILE = "$env:USERPROFILE\.openclaw\blockrun\wallet.key"
+$AUTH_PATH = "$env:USERPROFILE\.openclaw\agents\main\agent\auth-profiles.json"
+$MODEL_CACHE_GLOB = "$env:USERPROFILE\.openclaw\agents\*\agent\models.json"
 
 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" }
+function Merge-BlockRunFields {
+    param($Source, $Destination, [bool]$RemoveFromSource = $false)
+    if (-not $Source) { return }
+    foreach ($name in @('walletKey', 'routing')) {
+        $property = $Source.PSObject.Properties[$name]
+        if ($property) {
+            if (-not $Destination.PSObject.Properties[$name]) {
+                $Destination | Add-Member -NotePropertyName $name -NotePropertyValue $property.Value -Force
+            }
+            if ($RemoveFromSource) { $Source.PSObject.Properties.Remove($name) }
+        }
+    }
+    if ($Source.PSObject.Properties['config'] -and $Source.config) {
+        if (-not $Destination.PSObject.Properties['config']) {
+            $Destination | Add-Member -NotePropertyName config -NotePropertyValue ([PSCustomObject]@{}) -Force
+        }
+        foreach ($name in @('walletKey', 'routing')) {
+            $property = $Source.config.PSObject.Properties[$name]
+            if ($property) {
+                if (-not $Destination.config.PSObject.Properties[$name]) {
+                    $Destination.config | Add-Member -NotePropertyName $name -NotePropertyValue $property.Value -Force
+                }
+                if ($RemoveFromSource) { $Source.config.PSObject.Properties.Remove($name) }
+            }
+        }
+        if ($RemoveFromSource -and $Source.config.PSObject.Properties.Count -eq 0) {
+            $Source.PSObject.Properties.Remove('config')
+        }
+    }
+}
 
 Write-Host ""
 Write-Host "ClawRouter Update (Windows)" -ForegroundColor Cyan
@@ -35,6 +68,51 @@ if (Test-Path $WALLET_FILE) {
     Write-Host "  i No existing wallet found"
 }
 
+# Snapshot every lifecycle resource before the first destructive step. This is
+# deliberately separate from the wallet backup, which is retained for recovery.
+$rollbackDir = Join-Path $env:TEMP "clawrouter-update-rollback-$(Get-Random)"
+New-Item -ItemType Directory -Path $rollbackDir -Force | Out-Null
+$configExisted = Test-Path $CONFIG_PATH
+$pluginExisted = Test-Path $PLUGIN_DIR
+$walletExisted = Test-Path $WALLET_FILE
+$authExisted = Test-Path $AUTH_PATH
+$legacyBlockRunExisted = $false
+$preservedBlockRunEntry = $null
+$preservedLegacyEntry = $null
+if ($configExisted) {
+    Copy-Item $CONFIG_PATH (Join-Path $rollbackDir 'openclaw.json') -Force
+    $originalConfig = Get-Content $CONFIG_PATH -Raw | ConvertFrom-Json
+    if ($originalConfig.plugins -and $originalConfig.plugins.entries) {
+        $preservedBlockRunProperty = $originalConfig.plugins.entries.PSObject.Properties['blockrun-clawrouter']
+        $preservedLegacyProperty = $originalConfig.plugins.entries.PSObject.Properties['clawrouter']
+        if ($preservedBlockRunProperty) { $preservedBlockRunEntry = $preservedBlockRunProperty.Value }
+        if ($preservedLegacyProperty) { $preservedLegacyEntry = $preservedLegacyProperty.Value }
+    }
+}
+if ($pluginExisted) { Copy-Item $PLUGIN_DIR (Join-Path $rollbackDir 'plugin') -Recurse -Force }
+if ($walletExisted) { Copy-Item $WALLET_FILE (Join-Path $rollbackDir 'wallet.key') -Force }
+if ($authExisted) { Copy-Item $AUTH_PATH (Join-Path $rollbackDir 'auth-profiles.json') -Force }
+$modelCacheSnapshots = @()
+$modelCacheIndex = 0
+Get-ChildItem $MODEL_CACHE_GLOB -ErrorAction SilentlyContinue | ForEach-Object {
+    $backup = Join-Path $rollbackDir "models-$modelCacheIndex.json"
+    Copy-Item $_.FullName $backup -Force
+    $modelCacheSnapshots += [PSCustomObject]@{ Path = $_.FullName; Backup = $backup }
+    $modelCacheIndex += 1
+}
+$legacyPackageForBackup = Join-Path $LEGACY_PLUGIN_DIR 'package.json'
+if (Test-Path $legacyPackageForBackup) {
+    try {
+        $legacyBackupMetadata = Get-Content $legacyPackageForBackup -Raw | ConvertFrom-Json
+        $legacyBlockRunExisted = $legacyBackupMetadata.name -eq '@blockrun/clawrouter'
+        if ($legacyBlockRunExisted) {
+            Copy-Item $LEGACY_PLUGIN_DIR (Join-Path $rollbackDir 'legacy-plugin') -Recurse -Force
+        }
+    } catch {}
+}
+
+try {
+
 # ── Step 2: Stop old proxy ────────────────────────────────────
 Write-Step "Stopping old proxy..."
 try {
@@ -54,13 +132,42 @@ 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
+        $blockRunPluginIds = @('blockrun-clawrouter', 'ClawRouter', '@blockrun/clawrouter')
+        foreach ($pluginId in $blockRunPluginIds) {
+            if ($cfg.plugins -and $cfg.plugins.entries -and $cfg.plugins.entries.PSObject.Properties[$pluginId]) {
+                $cfg.plugins.entries.PSObject.Properties.Remove($pluginId)
+                $changed = $true
+            }
+            if ($cfg.plugins -and $cfg.plugins.installs -and $cfg.plugins.installs.PSObject.Properties[$pluginId]) {
+                $cfg.plugins.installs.PSObject.Properties.Remove($pluginId)
+                $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 ($legacyBlockRunExisted -and $cfg.plugins -and $cfg.plugins.entries) {
+            $legacyProperty = $cfg.plugins.entries.PSObject.Properties['clawrouter']
+            if ($legacyProperty) {
+                $legacyEntry = $legacyProperty.Value
+                foreach ($name in @('walletKey', 'routing')) {
+                    if ($legacyEntry.PSObject.Properties[$name]) {
+                        $legacyEntry.PSObject.Properties.Remove($name)
+                        $changed = $true
+                    }
+                    if ($legacyEntry.PSObject.Properties['config'] -and $legacyEntry.config.PSObject.Properties[$name]) {
+                        $legacyEntry.config.PSObject.Properties.Remove($name)
+                        $changed = $true
+                    }
+                }
+                if ($legacyEntry.PSObject.Properties['config'] -and $legacyEntry.config.PSObject.Properties.Count -eq 0) {
+                    $legacyEntry.PSObject.Properties.Remove('config')
+                }
+            }
+        }
+        if ($cfg.plugins -and $cfg.plugins.allow) {
+            $nextAllow = @($cfg.plugins.allow | Where-Object { $blockRunPluginIds -notcontains $_ })
+            if ($nextAllow.Count -ne @($cfg.plugins.allow).Count) {
+                $cfg.plugins.allow = $nextAllow
+                $changed = $true
+            }
         }
         if ($changed) {
             $cfg | ConvertTo-Json -Depth 20 | Set-Content $CONFIG_PATH -Encoding UTF8
@@ -106,7 +213,7 @@ try {
 } catch {
     Write-Err "Cannot determine latest version: $_"
     Write-Host "  Check npm is installed and you have internet access."
-    exit 1
+    throw "Cannot determine latest version"
 }
 
 # ── Step 5: Install directly from npm (bypasses openclaw cache) ───
@@ -114,6 +221,7 @@ 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
+$managedInstall = $false
 
 try {
     # Run npm pack via cmd.exe to completely bypass PowerShell's stderr-as-error behavior
@@ -122,31 +230,53 @@ try {
     $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
+    # The lowercase legacy path is ambiguous now. Remove it only when package
+    # metadata proves it is an old BlockRun install; otherwise it is official.
+    $legacyPackage = Join-Path $LEGACY_PLUGIN_DIR 'package.json'
+    if (Test-Path $legacyPackage) {
+        try {
+            $legacyMetadata = Get-Content $legacyPackage -Raw | ConvertFrom-Json
+            if ($legacyMetadata.name -eq '@blockrun/clawrouter') {
+                Remove-Item -Recurse -Force $LEGACY_PLUGIN_DIR
+                Write-Ok "Removed legacy BlockRun plugin directory"
+            }
+        } catch {
+            Write-Warn "Preserved ambiguous legacy clawrouter directory"
+        }
+    }
+    if (Get-Command openclaw -ErrorAction SilentlyContinue) {
+        $installArgs = @('plugins', 'install', '--force')
+        $installHelp = (& openclaw plugins install --help 2>&1 | Out-String)
+        if ($installHelp -match '--accept-capabilities') { $installArgs += '--accept-capabilities' }
+        $installArgs += $tarball.FullName
+        & openclaw @installArgs
+        if ($LASTEXITCODE -ne 0) { throw "openclaw plugin install failed (exit $LASTEXITCODE)" }
+        $managedInstall = $true
+        Write-Ok "Installed v$LATEST_VERSION through OpenClaw's plugin manager"
+    } else {
+        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-Warn "OpenClaw CLI was not found; extracted files without managed registration"
     }
-    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"
-& cmd /c "cd /d `"$PLUGIN_DIR`" && npm install --omit=dev > `"$logFile`" 2>&1"
-if ($LASTEXITCODE -ne 0) {
-    Write-Err "npm install failed. Log: $logFile"
-    Get-Content $logFile -ErrorAction SilentlyContinue | Select-Object -Last 20 | ForEach-Object { Write-Host "  $_" -ForegroundColor Red }
-    exit 1
+if (-not $managedInstall) {
+    Write-Step "Installing dependencies (Solana, x402, etc.)..."
+    $logFile = Join-Path $env:TEMP "clawrouter-npm-install.log"
+    & cmd /c "cd /d `"$PLUGIN_DIR`" && npm install --omit=dev > `"$logFile`" 2>&1"
+    if ($LASTEXITCODE -ne 0) {
+        Write-Err "npm install failed. Log: $logFile"
+        Get-Content $logFile -ErrorAction SilentlyContinue | Select-Object -Last 20 | ForEach-Object { Write-Host "  $_" -ForegroundColor Red }
+        throw "npm install failed"
+    }
+    Write-Ok "Dependencies installed"
 }
-Write-Ok "Dependencies installed"
 
 # ── Step 6: Register plugin in openclaw config ────────────────
 Write-Step "Registering plugin..."
@@ -154,25 +284,42 @@ 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.entries) { $cfg.plugins | Add-Member -NotePropertyName entries -NotePropertyValue ([PSCustomObject]@{}) -Force }
+        $currentProperty = $cfg.plugins.entries.PSObject.Properties['blockrun-clawrouter']
+        $currentEntry = if ($currentProperty) { $currentProperty.Value } else { [PSCustomObject]@{} }
+        Merge-BlockRunFields $preservedBlockRunEntry $currentEntry $false
+        if ($legacyBlockRunExisted) {
+            if ($preservedLegacyEntry -and $preservedLegacyEntry.PSObject.Properties['enabled'] -and -not $currentEntry.PSObject.Properties['enabled']) {
+                $currentEntry | Add-Member -NotePropertyName enabled -NotePropertyValue $preservedLegacyEntry.enabled -Force
+            }
+            Merge-BlockRunFields $preservedLegacyEntry $currentEntry $false
+            $liveLegacyProperty = $cfg.plugins.entries.PSObject.Properties['clawrouter']
+            if ($liveLegacyProperty) { Merge-BlockRunFields $liveLegacyProperty.Value $currentEntry $true }
+        }
+        $currentEntry | Add-Member -NotePropertyName enabled -NotePropertyValue $true -Force
+        $cfg.plugins.entries | Add-Member -NotePropertyName 'blockrun-clawrouter' -NotePropertyValue $currentEntry -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')
+        if (-not $allow.Contains('blockrun-clawrouter')) {
+            $allow.Add('blockrun-clawrouter')
             $cfg.plugins.allow = $allow.ToArray()
-            $cfg | ConvertTo-Json -Depth 20 | Set-Content $CONFIG_PATH -Encoding UTF8
-            Write-Ok "Added clawrouter to plugins.allow"
+            Write-Ok "Added blockrun-clawrouter to plugins.allow"
         } else {
             Write-Ok "Plugin already in allow list"
         }
+        if ($cfg.plugins.deny) {
+            $cfg.plugins.deny = @($cfg.plugins.deny | Where-Object { $_ -ne 'blockrun-clawrouter' })
+        }
+        $cfg | ConvertTo-Json -Depth 20 | Set-Content $CONFIG_PATH -Encoding UTF8
     } catch {
-        Write-Warn "Could not update plugins.allow: $_"
+        throw "Could not register blockrun-clawrouter: $_"
     }
 }
 
 # ── Step 7: Inject auth profile ───────────────────────────────
 Write-Step "Setting up auth profile..."
-$authDir  = "$env:USERPROFILE\.openclaw\agents\main\agent"
-$authPath = "$authDir\auth-profiles.json"
+$authDir  = Split-Path $AUTH_PATH
+$authPath = $AUTH_PATH
 New-Item -ItemType Directory -Path $authDir -Force | Out-Null
 $store = [PSCustomObject]@{ version = 1; profiles = [PSCustomObject]@{} }
 if (Test-Path $authPath) {
@@ -225,3 +372,38 @@ Write-Host "  Run: openclaw gateway restart" -ForegroundColor Cyan
 Write-Host ""
 Write-Host "  To verify: npx @blockrun/clawrouter doctor"
 Write-Host ""
+} catch {
+    Write-Err "Update failed; restoring the previous installation: $_"
+    if (Test-Path $PLUGIN_DIR) { Remove-Item -Recurse -Force $PLUGIN_DIR }
+    if ($pluginExisted) { Copy-Item (Join-Path $rollbackDir 'plugin') $PLUGIN_DIR -Recurse -Force }
+    if ($legacyBlockRunExisted) {
+        if (Test-Path $LEGACY_PLUGIN_DIR) { Remove-Item -Recurse -Force $LEGACY_PLUGIN_DIR }
+        Copy-Item (Join-Path $rollbackDir 'legacy-plugin') $LEGACY_PLUGIN_DIR -Recurse -Force
+    }
+    if ($configExisted) {
+        Copy-Item (Join-Path $rollbackDir 'openclaw.json') $CONFIG_PATH -Force
+    } elseif (Test-Path $CONFIG_PATH) {
+        Remove-Item $CONFIG_PATH -Force
+    }
+    if ($walletExisted) {
+        New-Item -ItemType Directory -Path (Split-Path $WALLET_FILE) -Force | Out-Null
+        Copy-Item (Join-Path $rollbackDir 'wallet.key') $WALLET_FILE -Force
+    } elseif (Test-Path $WALLET_FILE) {
+        Remove-Item $WALLET_FILE -Force
+    }
+    if ($authExisted) {
+        New-Item -ItemType Directory -Path (Split-Path $AUTH_PATH) -Force | Out-Null
+        Copy-Item (Join-Path $rollbackDir 'auth-profiles.json') $AUTH_PATH -Force
+    } elseif (Test-Path $AUTH_PATH) {
+        Remove-Item $AUTH_PATH -Force
+    }
+    Get-ChildItem $MODEL_CACHE_GLOB -ErrorAction SilentlyContinue |
+        Remove-Item -Force -ErrorAction SilentlyContinue
+    foreach ($snapshot in $modelCacheSnapshots) {
+        New-Item -ItemType Directory -Path (Split-Path $snapshot.Path) -Force | Out-Null
+        Copy-Item $snapshot.Backup $snapshot.Path -Force
+    }
+    throw
+} finally {
+    Remove-Item -Recurse -Force $rollbackDir -ErrorAction SilentlyContinue
+}