@clawpump/claw-agent 0.1.12 → 0.1.14

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.2",
+  "version": "0.15.4",
   "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/scripts/install.sh

@@ -1135,6 +1135,24 @@ clone_repo() {
             log_info "Existing installation found, updating..."
             cd "$INSTALL_DIR"
 
+            # Re-point a pre-existing checkout at the ClawPump fork. Anyone who
+            # installed upstream Hermes has origin=NousResearch here; without
+            # this, every update pulls upstream (none of the ClawPump features —
+            # x402, Pod, the ClawPump MCP) into the install. Force origin to our
+            # fork so the fetch below lands the right source.
+            local repo_repointed=""
+            local current_origin
+            current_origin="$(git remote get-url origin 2>/dev/null || echo '')"
+            case "$current_origin" in
+                *[Cc]lawpump/claw-agent*) : ;;
+                *)
+                    log_warn "Re-pointing origin to the ClawPump fork (was: ${current_origin:-none})."
+                    git remote set-url origin "$REPO_URL_HTTPS" 2>/dev/null \
+                        || git remote add origin "$REPO_URL_HTTPS"
+                    repo_repointed="yes"
+                    ;;
+            esac
+
             local autostash_ref=""
             if [ -n "$(git status --porcelain)" ]; then
                 # A previously interrupted update can leave the index with
@@ -1164,11 +1182,23 @@ clone_repo() {
             git remote set-branches origin "$BRANCH" 2>/dev/null || true
             git fetch origin "$BRANCH"
             git checkout "$BRANCH"
-            git pull --ff-only origin "$BRANCH"
+            if [ "$repo_repointed" = "yes" ]; then
+                # Upstream -> fork is a diverged history; a fast-forward is
+                # impossible across the fork point. Hard-reset the branch onto
+                # the fork so the working tree becomes the ClawPump source.
+                log_info "Resetting $BRANCH to the ClawPump fork (origin/$BRANCH)..."
+                git reset --hard "origin/$BRANCH"
+            else
+                git pull --ff-only origin "$BRANCH"
+            fi
 
             if [ -n "$autostash_ref" ]; then
                 local restore_now="yes"
-                if [ -t 0 ] && [ -t 1 ]; then
+                if [ "$repo_repointed" = "yes" ]; then
+                    # Don't replay upstream-Hermes local edits onto the fork —
+                    # they target different code and would only conflict.
+                    restore_now="no"
+                elif [ -t 0 ] && [ -t 1 ]; then
                     echo
                     log_warn "Local changes were stashed before updating."
                     log_warn "Restoring them may reapply local customizations onto the updated codebase."
@@ -1774,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.12",
+  "version": "0.1.14",
   "publishConfig": {
     "access": "public"
   },