@clawpump/claw-agent 0.1.13 → 0.1.15

package/agent/apps/desktop/electron/main.cjs

@@ -1451,6 +1451,33 @@ async function getOriginUrl(updateRoot) {
   return origin.code === 0 ? origin.stdout.trim() : ''
 }
 
+// The ClawPump fork the desktop must always track. Anyone who installed
+// upstream Hermes has origin=NousResearch in ~/.hermes/hermes-agent; the
+// self-update fetches/rebuilds whatever origin points at, then dittos the
+// rebuilt app over the running one. With an upstream origin that rebuilds
+// UPSTREAM Hermes (its icon, installer, branding) on top of Claw Agent.
+const CLAWPUMP_FORK_HTTPS = 'https://github.com/Clawpump/claw-agent.git'
+
+// Force a pre-existing checkout's origin to the ClawPump fork before any
+// update check/apply. Idempotent — no-ops once origin already points at the
+// fork (the common case after the install.sh bootstrap re-point). Best-effort:
+// never throws, so a git hiccup can't block the update path.
+async function ensureClawpumpOrigin(updateRoot) {
+  try {
+    const url = await getOriginUrl(updateRoot)
+    if (/clawpump\/claw-agent/i.test(url)) return false
+    const res = await runGit(['remote', 'set-url', 'origin', CLAWPUMP_FORK_HTTPS], { cwd: updateRoot })
+    if (res.code !== 0) {
+      await runGit(['remote', 'add', 'origin', CLAWPUMP_FORK_HTTPS], { cwd: updateRoot })
+    }
+    rememberLog(`[updates] re-pointed origin to the ClawPump fork (was: ${url || 'none'})`)
+    return true
+  } catch (error) {
+    rememberLog(`[updates] ensureClawpumpOrigin failed: ${error.message}`)
+    return false
+  }
+}
+
 function emitUpdateProgress(payload) {
   const merged = { stage: 'idle', message: '', percent: null, error: null, ...payload, at: Date.now() }
   rememberLog(`[updates] ${merged.stage}: ${merged.message || merged.error || ''}`)
@@ -1487,6 +1514,7 @@ async function resolveHealedBranch(updateRoot, branch) {
 
 async function checkUpdates() {
   const updateRoot = resolveUpdateRoot()
+  await ensureClawpumpOrigin(updateRoot)
   let { branch } = readDesktopUpdateConfig()
   const gitDir = path.join(updateRoot, '.git')
   if (!directoryExists(gitDir)) {
@@ -1764,6 +1792,9 @@ async function applyUpdates(opts = {}) {
   updateInFlight = true
 
   try {
+    // Guard against rebuilding/installing UPSTREAM Hermes over Claw Agent: make
+    // sure the checkout the apply pulls + rebuilds from tracks the fork.
+    await ensureClawpumpOrigin(resolveUpdateRoot())
     const updater = resolveUpdaterBinary()
     if (!updater && !IS_WINDOWS) {
       // macOS/Linux drag-install: no staged Tauri hermes-setup. Unlike Windows

package/agent/apps/desktop/package.json

@@ -2,7 +2,7 @@
   "name": "hermes",
   "productName": "Claw Agent",
   "private": true,
-  "version": "0.15.3",
+  "version": "0.15.5",
   "description": "Claw Agent by ClawPump — native desktop app for Solana agents, built on Hermes Agent by Nous Research.",
   "author": "ClawPump (built on Hermes by Nous Research)",
   "type": "module",

package/agent/hermes_cli/main.py

@@ -5953,7 +5953,7 @@ def _update_via_zip(args):
         )
         sys.exit(1)
     zip_url = (
-        f"https://github.com/NousResearch/hermes-agent/archive/refs/heads/{branch}.zip"
+        f"https://github.com/Clawpump/claw-agent/archive/refs/heads/{branch}.zip"
     )
 
     print("→ Downloading latest version...")
@@ -8624,7 +8624,7 @@ def _cmd_update_impl(args, gateway_mode: bool):
                 return
             print("✗ Not a git repository. Please reinstall:")
             print(
-                "  curl -fsSL https://hermes-agent.nousresearch.com/install.sh | bash"
+                "  npx @clawpump/claw-agent"
             )
             sys.exit(1)
 

package/agent/scripts/install.cmd

@@ -5,10 +5,10 @@ REM ============================================================================
 REM This batch file launches the PowerShell installer for users running CMD.
 REM
 REM Usage:
-REM   curl -fsSL https://raw.githubusercontent.com/NousResearch/hermes-agent/main/scripts/install.cmd -o install.cmd && install.cmd && del install.cmd
+REM   curl -fsSL https://raw.githubusercontent.com/Clawpump/claw-agent/main/scripts/install.cmd -o install.cmd && install.cmd && del install.cmd
 REM
 REM Or if you're already in PowerShell, use the direct command instead:
-REM   iex (irm https://hermes-agent.nousresearch.com/install.ps1)
+REM   iex (irm https://raw.githubusercontent.com/Clawpump/claw-agent/main/scripts/install.ps1)
 REM ============================================================================
 
 echo.
@@ -16,12 +16,12 @@ echo  Hermes Agent Installer
 echo  Launching PowerShell installer...
 echo.
 
-powershell -ExecutionPolicy ByPass -NoProfile -Command "iex (irm https://hermes-agent.nousresearch.com/install.ps1)"
+powershell -ExecutionPolicy ByPass -NoProfile -Command "iex (irm https://raw.githubusercontent.com/Clawpump/claw-agent/main/scripts/install.ps1)"
 
 if %ERRORLEVEL% NEQ 0 (
     echo.
     echo  Installation failed. Please try running PowerShell directly:
-    echo    powershell -ExecutionPolicy ByPass -c "iex (irm https://hermes-agent.nousresearch.com/install.ps1)"
+    echo    powershell -ExecutionPolicy ByPass -c "iex (irm https://raw.githubusercontent.com/Clawpump/claw-agent/main/scripts/install.ps1)"
     echo.
     pause
     exit /b 1

package/agent/scripts/install.ps1

@@ -1208,6 +1208,19 @@ function Install-Repository {
                 # users hit on update. Pin autocrlf=false so the dirt is never
                 # created in the first place.
                 git -c windows.appendAtomically=false config core.autocrlf false 2>$null
+                # Re-point a pre-existing checkout at the ClawPump fork. Anyone
+                # who installed upstream Hermes has origin=NousResearch here;
+                # without this the update pulls upstream (none of the ClawPump
+                # features) into the install. Force origin to the fork; the
+                # diverged history means the update below hard-resets onto it.
+                $repoRepointed = $false
+                $currentOrigin = (git -c windows.appendAtomically=false remote get-url origin 2>$null) -join ""
+                if ($currentOrigin -notmatch "(?i)clawpump/claw-agent") {
+                    Write-Warn "Re-pointing origin to the ClawPump fork (was: $currentOrigin)."
+                    git -c windows.appendAtomically=false remote set-url origin $RepoUrlHttps 2>$null
+                    if ($LASTEXITCODE -ne 0) { git -c windows.appendAtomically=false remote add origin $RepoUrlHttps 2>$null }
+                    $repoRepointed = $true
+                }
                 # Preserve any real local changes before the checkout instead of
                 # discarding them with `reset --hard HEAD`. The old hard reset
                 # silently destroyed agent-edited source on managed clones (the
@@ -1254,8 +1267,16 @@ function Install-Repository {
                 } else {
                     git -c windows.appendAtomically=false checkout $Branch
                     if ($LASTEXITCODE -ne 0) { throw "git checkout $Branch failed (exit $LASTEXITCODE)" }
-                    git -c windows.appendAtomically=false pull --ff-only origin $Branch
-                    if ($LASTEXITCODE -ne 0) { throw "git pull failed (exit $LASTEXITCODE)" }
+                    if ($repoRepointed) {
+                        # Upstream -> fork is a diverged history; fast-forward is
+                        # impossible. Hard-reset the branch onto the fork.
+                        Write-Info "Resetting $Branch to the ClawPump fork (origin/$Branch)..."
+                        git -c windows.appendAtomically=false reset --hard "origin/$Branch"
+                        if ($LASTEXITCODE -ne 0) { throw "git reset --hard origin/$Branch failed (exit $LASTEXITCODE)" }
+                    } else {
+                        git -c windows.appendAtomically=false pull --ff-only origin $Branch
+                        if ($LASTEXITCODE -ne 0) { throw "git pull failed (exit $LASTEXITCODE)" }
+                    }
                 }
 
                 if ($autostashRef) {
@@ -1266,7 +1287,9 @@ function Install-Repository {
                     # bootstrap run the installer without a usable console -- in
                     # those cases Read-Host would hang or return empty, so we
                     # skip the prompt and just restore (the safe default).
-                    $restoreNow = $true
+                    # Don't replay upstream-Hermes local edits onto the fork —
+                    # they target different code and would only conflict.
+                    $restoreNow = -not $repoRepointed
                     $hasConsole = $false
                     try {
                         $hasConsole = (

package/agent/scripts/install.sh

@@ -1804,6 +1804,30 @@ SOUL_EOF
             fi
         fi
     fi
+
+    # Seed the ClawPump MCP (133 ClawPump tools: wallet, trading, marketplace,
+    # perps, token launch) so it's connected out of the box instead of needing
+    # a manual `hermes clawpump setup`. The remote entry is OAuth-deferred — the
+    # sign-in browser opens on first connect, not here — so this only writes
+    # config. Idempotent (skips if already configured) and best-effort: a
+    # failure here must never fail the install.
+    if [ -x "$INSTALL_DIR/venv/bin/python" ]; then
+        log_info "Ensuring the ClawPump MCP is connected..."
+        if "$INSTALL_DIR/venv/bin/python" - >/dev/null 2>&1 <<'PY'
+import sys
+try:
+    from hermes_cli.clawpump_cli import _configured_entry
+    from hermes_cli.mcp_picker import install_by_name
+    sys.exit(0 if _configured_entry() else install_by_name("clawpump"))
+except Exception:
+    sys.exit(1)
+PY
+        then
+            log_success "ClawPump MCP connected — sign in on first launch"
+        else
+            log_info "ClawPump MCP seed deferred (run 'hermes clawpump setup' to connect)"
+        fi
+    fi
 }
 
 find_system_browser() {

package/bin/cli.mjs

@@ -133,6 +133,24 @@ function main() {
   run(uv, ["pip", "install", "--python", venvExe("python"), "-e", `${AGENT_DIR}[${EXTRA}]`]);
   ok("dependencies installed");
 
+  // 3b) Seed the ClawPump MCP (133 tools — wallet, trading, marketplace) so
+  // it's connected out of the box. Idempotent (skips if already configured)
+  // and best-effort — a failure here must never abort the install. The remote
+  // entry is OAuth-deferred, so the sign-in browser opens on first connect.
+  try {
+    const seed = [
+      "import sys",
+      "try:",
+      "    from hermes_cli.clawpump_cli import _configured_entry",
+      "    from hermes_cli.mcp_picker import install_by_name",
+      "    sys.exit(0 if _configured_entry() else install_by_name('clawpump'))",
+      "except Exception:",
+      "    sys.exit(1)",
+    ].join("\n");
+    const r = spawnSync(venvExe("python"), ["-c", seed], { stdio: "ignore" });
+    if (r.status === 0) ok("ClawPump MCP connected — sign in on first launch");
+  } catch { /* best-effort: connect manually with `claw clawpump setup` */ }
+
   // 4) launcher
   const onPath = makeLauncher();
   ok(`launcher → ${path.join(BIN_DIR, "claw")}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawpump/claw-agent",
-  "version": "0.1.13",
+  "version": "0.1.15",
   "publishConfig": {
     "access": "public"
   },