@clawpump/claw-agent 0.1.1 → 0.1.2

package/agent/README.md

@@ -15,13 +15,13 @@
   <a href="https://github.com/NousResearch/hermes-agent">Upstream: Hermes</a>
 </p>
 
-ClawPump's full feature set — **104 MCP tools** spanning agents, trading, Phoenix perps, DCA, Jupiter lending, token launch, marketplace, predictions, and market intelligence — is wired in natively. One command:
+ClawPump's full feature set — **131 MCP tools** spanning agents, trading, Phoenix perps, DCA, Jupiter lending, token launch, marketplace, predictions, gift cards (Laso), agent mail, wallet transfers, pay.sh x402 paid APIs, and market intelligence — is wired in natively. One command:
 
 ```bash
 hermes clawpump setup     # pick remote OAuth (browser) or stdio (cpk_ key)
 ```
 
-That pairs the agent with the ClawPump MCP — remote `https://mcp.clawpump.tech/mcp`, or the local `npx @clawpump/agents` stdio path — and the ClawPump green theme is on by default. See the [ClawPump skill](skills/clawpump/SKILL.md) and the catalog entries under [`optional-mcps/`](optional-mcps/) (`clawpump`, `clawpump-stdio`).
+That pairs the agent with the ClawPump MCP — remote `https://mcp.clawpump.tech/mcp`, or the local `npx @clawpump/agents` stdio path — and the ClawPump green theme is on by default. See the [ClawPump skill](skills/clawpump/SKILL.md) and the catalog entries under [`optional-mcps/`](optional-mcps/) (`clawpump`, `clawpump-stdio`). [pay.sh](https://pay.sh) x402 paid APIs are paid straight from the agent wallet via the `pay_sh_*` tools — no separate wallet.
 
 > **Built on Hermes.** ClawPump is a downstream distribution of the **Hermes Agent** by **Nous Research**, used under the MIT License. The upstream agent — its runtime, docs, and features — is unchanged below; ClawPump adds the native ClawPump MCP integration plus init/theme branding on top. Full credit for the underlying agent goes to Nous Research. See [`LICENSE`](LICENSE).
 

package/agent/docs/UPSTREAM_SYNC.md

@@ -0,0 +1,58 @@
+# Keeping ClawPump in sync with upstream Hermes
+
+ClawPump (`Clawpump/claw-agent`) is a **fork of [`NousResearch/hermes-agent`](https://github.com/NousResearch/hermes-agent)** that shares full git history with upstream. Upstream ships very frequently (CalVer, ~daily), so we pull its changes in continuously rather than letting the fork drift.
+
+## How divergence is kept small
+
+All ClawPump-specific behavior lives in a single downstream-owned module, **`hermes_cli/distribution.py`** (skin, default skin, default MCP server, `CLAWPUMP_*` env vars, the `clawpump` subcommand, the npm self-update, the update-check repo URL). The upstream-owned files (`skin_engine.py`, `config.py`, `main.py`, `banner.py`) carry only a small, self-degrading hook each and otherwise match vanilla Hermes byte-for-byte.
+
+**Rule of thumb:** never edit an upstream-owned file to add ClawPump behavior. Add it to `distribution.py` and wire a one-line hook. The smaller the divergence in upstream files, the cleaner every sync.
+
+## Automated sync (`.github/workflows/upstream-sync.yml`)
+
+Runs daily (and via **Actions → Upstream Sync → Run workflow**). Each run:
+
+1. Fetches `upstream/main` and checks how far `main` is behind.
+2. If behind **and** no `upstream-sync` PR is already open, creates a `sync/upstream-<timestamp>` branch and **merges** `upstream/main` into it (a real merge commit, to preserve history).
+3. Opens a PR into `main`, labelled `upstream-sync` (and `has-conflicts` if the merge had conflicts — the markers are committed so you can resolve them in the branch).
+
+It is self-throttling: only one open sync PR at a time, and it no-ops when already up to date.
+
+### Reviewing / merging a sync PR
+
+- **Clean merge:** review the diff + CI, then **merge with a merge commit** (not squash — squashing discards the upstream parent and breaks future merge-bases).
+- **Conflicts:** they're almost always in docs (`README.md`, `.env.example`). Resolve in the branch:
+  ```bash
+  git fetch origin && git switch sync/upstream-<timestamp>
+  # resolve conflicts; for docs you usually keep ours
+  git add -A && git commit && git push
+  ```
+  If a conflict lands in an upstream-owned `.py` file, that's a signal a downstream edit leaked in — prefer moving that edit into `distribution.py` so it won't conflict again.
+
+### One-time setup for full CI on sync PRs
+
+PRs opened with the default `GITHUB_TOKEN` do **not** trigger other workflows, so the repo's CI (tests / lint / branding) won't auto-run on a sync PR. To get CI as the merge gate, add a repo secret **`UPSTREAM_SYNC_PAT`** (a fine-scoped PAT with `repo` + `workflow`); the workflow uses it automatically. Without it, re-run CI on the sync PR manually.
+
+### Caveats
+
+- **`contributor-check`** requires every new commit-author email to be in `AUTHOR_MAP` (`scripts/release.py`). A sync that brings in commits from a *new* upstream contributor will fail this check until you add their mapping — the check prints the exact lines to paste.
+- **`history-check`** requires a common ancestor with `main`; a real merge from our shared-history upstream always satisfies it.
+
+## Manual sync (by hand)
+
+```bash
+# one-time
+git remote add upstream https://github.com/NousResearch/hermes-agent.git
+
+git fetch --no-tags upstream main
+git switch -c sync/upstream-manual main
+git merge upstream/main
+# resolve any conflicts (usually README.md / .env.example), then:
+git commit
+git push -u origin sync/upstream-manual
+# open a PR into main
+```
+
+## Versioning
+
+Tag ClawPump releases off the upstream CalVer base plus a suffix, e.g. `v2026.6.5-clawpump.1`, so it's always clear which upstream snapshot a release is built on.

package/agent/hermes_cli/auth.py

@@ -531,6 +531,33 @@ def _resolve_kimi_base_url(api_key: str, default_url: str, env_override: str) ->
     return default_url
 
 
+# =============================================================================
+# UsePod Endpoint Derivation
+# =============================================================================
+
+# UsePod (usepod.ai) is a drop-in OpenAI-compatible proxy that authenticates by
+# the token embedded in the request PATH — ``/proxy/<token>/v1/...`` — and
+# ignores the Authorization header. The inference base URL is therefore derived
+# from the API key (the token) rather than stored as a static endpoint, so the
+# user only ever needs to paste their token.
+USEPOD_API_BASE = "https://api.usepod.ai"
+
+
+def _resolve_usepod_base_url(api_key: str, env_override: str = "") -> str:
+    """Return the UsePod proxy base URL for *api_key* (the token).
+
+    An explicit ``USEPOD_BASE_URL`` (``env_override``) always wins — e.g. for a
+    self-hosted UsePod gateway. With no token yet, return the proxy root so
+    callers degrade gracefully instead of producing a malformed URL.
+    """
+    if env_override:
+        return env_override.rstrip("/")
+    token = (api_key or "").strip()
+    if not token:
+        return f"{USEPOD_API_BASE}/proxy"
+    return f"{USEPOD_API_BASE}/proxy/{token}/v1"
+
+
 
 _PLACEHOLDER_SECRET_VALUES = {
     "*",
@@ -5657,6 +5684,8 @@ def get_api_key_provider_status(provider_id: str) -> Dict[str, Any]:
 
     if provider_id in {"kimi-coding", "kimi-coding-cn"}:
         base_url = _resolve_kimi_base_url(api_key, pconfig.inference_base_url, env_url)
+    elif provider_id == "usepod":
+        base_url = _resolve_usepod_base_url(api_key, env_url)
     elif env_url:
         base_url = env_url
     else:
@@ -5848,6 +5877,8 @@ def resolve_api_key_provider_credentials(provider_id: str) -> Dict[str, Any]:
         base_url = _resolve_kimi_base_url(api_key, pconfig.inference_base_url, env_url)
     elif provider_id == "zai":
         base_url = _resolve_zai_base_url(api_key, pconfig.inference_base_url, env_url)
+    elif provider_id == "usepod":
+        base_url = _resolve_usepod_base_url(api_key, env_url)
     elif env_url:
         base_url = env_url.rstrip("/")
     else:

package/agent/hermes_cli/banner.py

@@ -129,7 +129,10 @@ _UPDATE_CHECK_CACHE_SECONDS = 6 * 3600
 # (e.g. nix-built hermes — no local git history to count against).
 UPDATE_AVAILABLE_NO_COUNT = -1
 
-_UPSTREAM_REPO_URL = "https://github.com/Clawpump/claw-agent.git"
+try:
+    from hermes_cli.distribution import UPDATE_REPO_URL as _UPSTREAM_REPO_URL
+except Exception:
+    _UPSTREAM_REPO_URL = "https://github.com/NousResearch/hermes-agent.git"
 
 
 def _check_via_rev(local_rev: str) -> Optional[int]:

package/agent/hermes_cli/clawpump_cli.py

@@ -1,6 +1,6 @@
 """``hermes clawpump`` — one-command install/auth for the ClawPump MCP.
 
-ClawPump ships its full feature set (104 tools) as an MCP server, bundled in
+ClawPump ships its full feature set (131 tools) as an MCP server, bundled in
 the Hermes catalog as two entries:
 
   - ``clawpump``        remote OAuth over Streamable HTTP (browser, paste cpk_*)
@@ -59,9 +59,10 @@ def _cmd_setup(args) -> int:
     print()
     print(color("  ClawPump setup", Colors.GREEN + Colors.BOLD))
     print(color("  ──────────────", Colors.GREEN))
-    print("  ClawPump's 104 tools (agents, trading, perps, DCA, lending,")
-    print("  token launch, marketplace, predictions, intelligence) come in")
-    print("  through an MCP server. Two ways to connect:")
+    print("  ClawPump's 131 tools (agents, trading, perps, DCA, lending,")
+    print("  token launch, marketplace, predictions, gift cards, agent")
+    print("  mail, intelligence) come in through an MCP server. Two ways")
+    print("  to connect:")
     print()
     print(f"    1) {color('Remote', Colors.GREEN)}  — browser login, paste your cpk_* key (recommended)")
     print(f"    2) {color('Stdio', Colors.GREEN)}   — local npx, store the cpk_* key in ~/.hermes/.env")
@@ -220,7 +221,7 @@ def add_parser(subparsers) -> None:
         help="ClawPump (Solana token launch, trading, perps, DeFi) via MCP",
         description=(
             "Install and authenticate the ClawPump MCP server, then manage which "
-            "of its 104 tools are enabled. Subcommands: setup (default: status), "
+            "of its 131 tools are enabled. Subcommands: setup (default: status), "
             "login, status, tools."
         ),
     )

package/agent/hermes_cli/config.py

@@ -741,23 +741,7 @@ DEFAULT_CONFIG = {
     "fallback_providers": [],
     "credential_pool_strategies": {},
     "toolsets": ["hermes-cli"],
-    # ClawPump is enabled by default in this distribution: the remote MCP
-    # server (the full ClawPump tool surface) comes pre-wired. On first connect
-    # Hermes opens a browser to log in to ClawPump — that one step is per-user
-    # auth and cannot be skipped — after which the mcp_clawpump_* tools load
-    # automatically. The bundled `clawpump` skill requires explicit user
-    # confirmation before any financial/irreversible tool runs. Prune the tool
-    # set any time with `hermes mcp configure clawpump`.
-    "mcp_servers": {
-        "clawpump": {
-            # TODO: switch to https://mcp.clawpump.tech/mcp once the DNS CNAME
-            # is configured; the custom domain is currently NXDOMAIN, so point
-            # at the live Railway domain so a fresh install connects.
-            "url": "https://clawpump-mcp-production.up.railway.app/mcp",
-            "auth": "oauth",
-            "enabled": True,
-        },
-    },
+    "mcp_servers": {},
     "agent": {
         "max_turns": 90,
         # Inactivity timeout for gateway agent execution (seconds).
@@ -1337,7 +1321,7 @@ DEFAULT_CONFIG = {
         # failure isn't silent from the UI's perspective.  Set false to suppress.
         "turn_completion_explainer": True,
         "show_cost": False,       # Show $ cost in the status bar (off by default)
-        "skin": "clawpump",       # ClawPump brand (green claw). Switch with /skin or display.skin.
+        "skin": "default",       # distribution default (clawpump) applied via distribution.apply_config_overlay
         # UI language for static user-facing messages (approval prompts, a
         # handful of gateway slash-command replies).  Does NOT affect agent
         # responses, log lines, tool outputs, or slash-command descriptions.
@@ -3395,38 +3379,21 @@ OPTIONAL_ENV_VARS = {
         "password": False,
         "category": "setting",
     },
-
-    # ── ClawPump (Solana token launch, trading, perps, DeFi) ──
-    # Used by the stdio ClawPump MCP path (`npx @clawpump/agents`, catalog
-    # entry `clawpump-stdio`). The remote OAuth path (`clawpump`) stores
-    # per-user tokens under ~/.hermes/mcp-tokens/ instead and needs no key
-    # here. The ClawPump tools themselves come from the MCP server, not the
-    # native registry, so there's no `tools` list.
-    "CLAWPUMP_API_KEY": {
-        "description": "ClawPump API key (cpk_*) for the ClawPump MCP stdio transport",
-        "prompt": "ClawPump API key (cpk_…)",
-        "url": "https://agents.clawpump.tech/dashboard/api",
-        "password": True,
-        "category": "tools",
-    },
-    "CLAWPUMP_API_URL": {
-        "description": "ClawPump backend URL override (advanced — leave empty for the default)",
-        "prompt": "ClawPump backend URL (leave empty for default)",
-        "url": None,
-        "password": False,
-        "category": "tools",
-        "advanced": True,
-    },
-    "CLAWPUMP_DEFAULT_AGENT": {
-        "description": "Default ClawPump agent id (optional — skips agent-selection prompts)",
-        "prompt": "Default ClawPump agent id (optional)",
-        "url": None,
-        "password": False,
-        "category": "tools",
-        "advanced": True,
-    },
 }
 
+# ── ClawPump distribution overlay (downstream) ───────────────────────────
+# Apply ClawPump's defaults (pre-wired MCP server + default skin) and env-var
+# registry from the downstream-owned overlay, keeping this upstream-owned file
+# mergeable. No-ops on vanilla Hermes (module/keys absent).
+try:
+    from hermes_cli import distribution as _distribution
+
+    _distribution.apply_config_overlay(DEFAULT_CONFIG)
+    _distribution.apply_env_var_overlay(OPTIONAL_ENV_VARS)
+except Exception:
+    pass
+
+
 # Tool Gateway env vars are always visible — they're useful for
 # self-hosted / custom gateway setups regardless of subscription state.
 

package/agent/hermes_cli/distribution.py

@@ -0,0 +1,230 @@
+"""ClawPump distribution overlay (downstream-owned).
+
+This module is the single home for everything that makes this distribution
+"ClawPump" rather than vanilla Hermes. Keeping it here -- instead of editing
+upstream-owned files (skin_engine.py, config.py, ...) -- keeps those files
+byte-for-byte mergeable with NousResearch/hermes-agent, so syncing upstream
+stays (near) conflict-free.
+
+Every upstream consumer imports this lazily and degrades to vanilla Hermes
+when the module (or a given key) is absent. Keep imports light: config.py
+imports this at startup.
+"""
+
+from __future__ import annotations
+
+from typing import Any, Dict
+
+# Default skin for this distribution (vanilla Hermes uses "default").
+DEFAULT_SKIN = "clawpump"
+
+# Git remote the in-app update check compares against (vanilla Hermes uses
+# NousResearch/hermes-agent).
+UPDATE_REPO_URL = "https://github.com/Clawpump/claw-agent.git"
+
+# Extra top-level CLI subcommands this distribution adds (kept in sync with
+# main.py's _BUILTIN_SUBCOMMANDS validation set via a hook there).
+EXTRA_SUBCOMMANDS = ("clawpump",)
+
+# ── Skins shipped by this distribution ───────────────────────────────────
+# Moved verbatim out of hermes_cli/skin_engine.py:_BUILTIN_SKINS and merged
+# back into that dict by a small hook there, so every skin consumer
+# (list_skins / load_skin / get_active_skin) sees it unchanged.
+BUILTIN_SKINS: Dict[str, Dict[str, Any]] = {
+    "clawpump": {
+        "name": "clawpump",
+        "description": "ClawPump — Solana green, claw mark (built on Hermes)",
+        "colors": {
+            "banner_border": "#16A34A",
+            "banner_title": "#4ADE80",
+            "banner_accent": "#22C55E",
+            "banner_dim": "#15803D",
+            "banner_text": "#DCFCE7",
+            "ui_accent": "#22C55E",
+            "ui_label": "#4ADE80",
+            "ui_ok": "#22C55E",
+            "ui_error": "#ef5350",
+            "ui_warn": "#ffa726",
+            "prompt": "#DCFCE7",
+            "input_rule": "#16A34A",
+            "response_border": "#4ADE80",
+            "status_bar_bg": "#0B1F14",
+            "status_bar_text": "#DCFCE7",
+            "status_bar_strong": "#4ADE80",
+            "status_bar_dim": "#3F6B50",
+            "status_bar_good": "#22C55E",
+            "status_bar_warn": "#FACC15",
+            "status_bar_bad": "#F59E0B",
+            "status_bar_critical": "#EF5350",
+            "session_label": "#4ADE80",
+            "session_border": "#3F6B50",
+            "selection_bg": "#14532D",
+            "completion_menu_bg": "#06140C",
+            "completion_menu_current_bg": "#14532D",
+            "completion_menu_meta_bg": "#0B1F14",
+            "completion_menu_meta_current_bg": "#14532D",
+        },
+        "spinner": {
+            "waiting_faces": ["(◴)", "(◷)", "(◶)", "(◵)", "(<>)"],
+            "thinking_faces": ["(✦)", "(◇)", "(◈)", "(⌁)", "(<>)"],
+            "thinking_verbs": [
+                "pumping", "launching", "scanning the mints", "routing the swap",
+                "reading the chart", "minting", "snapping the claw", "checking liquidity",
+            ],
+            "wings": [
+                ["⟪◇", "◇⟫"],
+                ["⟪✦", "✦⟫"],
+                ["⟪>", "<⟫"],
+                ["⟪◈", "◈⟫"],
+            ],
+        },
+        "branding": {
+            "agent_name": "ClawPump",
+            "org": "ClawPump",
+            "credit": "built on Hermes ☤ by Nous Research",
+            "welcome": "Welcome to ClawPump 🦀 — Solana agents, trading & token launch. Type your message or /help for commands.",
+            "goodbye": "Claws out! 🦀",
+            "response_label": " ✦ ClawPump ",
+            "prompt_symbol": "❯",
+            "help_header": "(✦) Available Commands",
+        },
+        "tool_prefix": "┊",
+        "banner_logo": """[bold #86EFAC] ██████╗██╗      █████╗ ██╗    ██╗██████╗ ██╗   ██╗███╗   ███╗██████╗ [/]
+[bold #4ADE80]██╔════╝██║     ██╔══██╗██║    ██║██╔══██╗██║   ██║████╗ ████║██╔══██╗[/]
+[#22C55E]██║     ██║     ███████║██║ █╗ ██║██████╔╝██║   ██║██╔████╔██║██████╔╝[/]
+[#16A34A]██║     ██║     ██╔══██║██║███╗██║██╔═══╝ ██║   ██║██║╚██╔╝██║██╔═══╝ [/]
+[#15803D]╚██████╗███████╗██║  ██║╚███╔███╔╝██║     ╚██████╔╝██║ ╚═╝ ██║██║     [/]
+[#166534] ╚═════╝╚══════╝╚═╝  ╚═╝ ╚══╝╚══╝ ╚═╝      ╚═════╝ ╚═╝     ╚═╝╚═╝     [/]""",
+        "banner_hero": """[#86EFAC]⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠠⣀⣂⣤⣤⣤⣤⣤⣤⠄[/]
+[#7EE5A4]⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣢⣵⣾⣿⣿⣿⣿⣿⣿⣿⡿⠃⠀[/]
+[#77DA9B]⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢠⣴⠿⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠟⠀⠀⠀[/]
+[#6FD093]⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢠⣾⠟⠁⢀⣼⣿⣿⣿⣿⣿⣿⣿⡿⠀⠀⠀⠀⠀[/]
+[#68C58A]⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣜⡿⠁⢀⣴⣿⣿⣿⣿⣿⣿⣿⣿⣿⠗⠀⠀⠀⠀⠀[/]
+[#60BB82]⠀⠀⠀⠀⠀⠀⠀⠀⢀⣮⣿⣇⣴⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠁⠀⠀⠀⠀⠀⠀[/]
+[#58B179]⠀⠀⠀⠀⠀⠀⠀⢠⣿⣿⠃⣸⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠀⠀⠀⠀⠀⠀⠀[/]
+[#51A671]⠀⠀⠀⠀⠀⠀⢀⣾⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⠃⠀⠀⠀⠀⠀⠀⠀[/]
+[#499C68]⠀⠀⠀⠀⠀⠀⢸⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠿⠋⠀⠀⠀⠀⠀⠀⠀⠀⠀[/]
+[#429160]⠀⠀⠀⠀⠀⣀⣈⡙⠻⢿⣿⣿⣿⣿⣿⣿⡿⠋⣡⣤⣤⠀⠀⠀⠀⠀⠐⢀⣠⣴[/]
+[#3A8757]⠀⠀⠀⢀⣞⣿⠟⠉⣷⣦⣌⠙⢿⣿⣿⣿⣠⣾⣿⣿⣿⣷⣷⣶⣶⣶⣿⣿⣿⠃[/]
+[#327D4F]⠀⠀⣀⣉⡛⠳⢴⣾⣿⣿⣿⣷⣄⠹⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⠁⠀[/]
+[#2B7246]⢠⣞⣿⡟⣩⣿⣶⣌⠻⢿⣿⣿⣿⣆⠘⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⠋⠀⠀⠀[/]
+[#23683E]⠀⠉⠙⠻⢿⣿⣿⣿⣷⣄⠻⣿⣿⣿⡀⠹⢿⣿⣿⣿⣿⠿⠟⠋⠁⠀⠀⠀⠀⠀[/]
+[#1C5D35]⠀⠀⠀⠀⠀⠈⠻⣿⣿⣿⣆⠹⣿⠟⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀[/]
+[#14532D]⠀⠀⠀⠀⠀⠀⠀⠘⢿⣿⠟⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀[/]""",
+    },
+}
+
+
+# ── Default-config overlay ───────────────────────────────────────────────
+# ClawPump ships its remote MCP server pre-wired and the clawpump skin as the
+# default brand. Applied onto DEFAULT_CONFIG by a hook in config.py.
+_CLAWPUMP_MCP_SERVER = {
+    # TODO: switch to https://mcp.clawpump.tech/mcp once the DNS CNAME is
+    # configured; the custom domain is currently NXDOMAIN, so point at the
+    # live Railway domain so a fresh install connects.
+    "url": "https://clawpump-mcp-production.up.railway.app/mcp",
+    "auth": "oauth",
+    "enabled": True,
+}
+
+
+def apply_config_overlay(default_config: Dict[str, Any]) -> None:
+    """Apply ClawPump defaults onto a freshly-built DEFAULT_CONFIG.
+
+    Pre-wires the remote ClawPump MCP server (the full tool surface; first
+    connect opens a browser for per-user OAuth, after which the mcp_clawpump_*
+    tools load automatically -- prune with ``hermes mcp configure clawpump``)
+    and makes the clawpump skin the default brand. Idempotent.
+    """
+    servers = default_config.setdefault("mcp_servers", {})
+    if isinstance(servers, dict):
+        servers.setdefault("clawpump", dict(_CLAWPUMP_MCP_SERVER))
+    display = default_config.get("display")
+    if isinstance(display, dict):
+        display["skin"] = DEFAULT_SKIN
+
+
+# ── OPTIONAL_ENV_VARS overlay ────────────────────────────────────────────
+# ClawPump (Solana token launch, trading, perps, DeFi). Used by the stdio
+# ClawPump MCP path (``npx @clawpump/agents``, catalog entry
+# ``clawpump-stdio``). The remote OAuth path (``clawpump``) stores per-user
+# tokens under ~/.hermes/mcp-tokens/ instead and needs no key here.
+_CLAWPUMP_ENV_VARS: Dict[str, Dict[str, Any]] = {
+    "CLAWPUMP_API_KEY": {
+        "description": "ClawPump API key (cpk_*) for the ClawPump MCP stdio transport",
+        "prompt": "ClawPump API key (cpk_…)",
+        "url": "https://agents.clawpump.tech/dashboard/api",
+        "password": True,
+        "category": "tools",
+    },
+    "CLAWPUMP_API_URL": {
+        "description": "ClawPump backend URL override (advanced — leave empty for the default)",
+        "prompt": "ClawPump backend URL (leave empty for default)",
+        "url": None,
+        "password": False,
+        "category": "tools",
+        "advanced": True,
+    },
+    "CLAWPUMP_DEFAULT_AGENT": {
+        "description": "Default ClawPump agent id (optional — skips agent-selection prompts)",
+        "prompt": "Default ClawPump agent id (optional)",
+        "url": None,
+        "password": False,
+        "category": "tools",
+        "advanced": True,
+    },
+}
+
+
+def apply_env_var_overlay(optional_env_vars: Dict[str, Any]) -> None:
+    """Register ClawPump's env vars into config.OPTIONAL_ENV_VARS. Idempotent."""
+    for name, spec in _CLAWPUMP_ENV_VARS.items():
+        optional_env_vars.setdefault(name, dict(spec))
+
+
+# ── CLI integration ──────────────────────────────────────────────────────
+
+
+def register_subparsers(subparsers) -> None:
+    """Register distribution-specific CLI subcommands.
+
+    Wires the ``clawpump`` command (ClawPump MCP install / auth / tool
+    selection) onto the top-level argparse subparsers.
+    """
+    from hermes_cli.clawpump_cli import add_parser as _add_clawpump_parser
+
+    _add_clawpump_parser(subparsers)
+
+
+def try_self_update(project_root: Any) -> bool:
+    """Handle distribution-specific self-update; return True if handled.
+
+    ClawPump agents installed via ``npx @clawpump/claw-agent`` have no git
+    checkout (the bundle ships inside the npm package), so the normal git-pull
+    update can't apply -- re-run the npm installer instead. Returns False when
+    this isn't an npm-bundle install, so the caller falls through to the
+    standard (git / pip / docker) update paths.
+    """
+    from pathlib import Path
+
+    if not (Path(project_root) / ".claw-bundle").exists():
+        return False
+
+    import shutil
+    import subprocess
+    import sys
+
+    print("→ Updating ClawPump agent via npm (npx @clawpump/claw-agent@latest)…")
+    npx = shutil.which("npx")
+    if not npx:
+        print("✗ npx (Node.js) not found. Install Node.js, then run:")
+        print("    npx @clawpump/claw-agent@latest")
+        sys.exit(1)
+    try:
+        subprocess.run([npx, "-y", "@clawpump/claw-agent@latest"], check=True)
+    except subprocess.CalledProcessError as exc:
+        print(f"✗ Update failed (exit {exc.returncode}). Try manually:")
+        print("    npx @clawpump/claw-agent@latest")
+        sys.exit(1)
+    print("✓ ClawPump agent updated. Restart your session with `claw`.")
+    return True

package/agent/hermes_cli/main.py

@@ -5806,19 +5806,31 @@ def _model_flow_api_key_provider(config, provider_id, current_model=""):
             pass
     effective_base = current_base or pconfig.inference_base_url
 
-    try:
-        override = input(f"Base URL [{effective_base}]: ").strip()
-    except (KeyboardInterrupt, EOFError):
-        print()
-        override = ""
-    if override and base_url_env:
-        if not override.startswith(("http://", "https://")):
-            print(
-                "  Invalid URL — must start with http:// or https://. Keeping current value."
-            )
-        else:
-            save_env_value(base_url_env, override)
-            effective_base = override
+    if provider_id == "usepod":
+        # UsePod authenticates by the token embedded in the URL path, so there
+        # is no base URL for the user to type — it is derived from the pasted
+        # key. Skip the prompt; honour USEPOD_BASE_URL only for self-hosting.
+        from hermes_cli.auth import _resolve_usepod_base_url
+
+        key_for_probe = existing_key or (get_env_value(key_env) if key_env else "")
+        env_override = ""
+        if base_url_env:
+            env_override = get_env_value(base_url_env) or os.getenv(base_url_env, "")
+        effective_base = _resolve_usepod_base_url(key_for_probe, env_override)
+    else:
+        try:
+            override = input(f"Base URL [{effective_base}]: ").strip()
+        except (KeyboardInterrupt, EOFError):
+            print()
+            override = ""
+        if override and base_url_env:
+            if not override.startswith(("http://", "https://")):
+                print(
+                    "  Invalid URL — must start with http:// or https://. Keeping current value."
+                )
+            else:
+                save_env_value(base_url_env, override)
+                effective_base = override
 
     # Model selection — resolution order:
     #   1. models.dev registry (cached, filtered for agentic/tool-capable models)
@@ -5857,6 +5869,22 @@ def _model_flow_api_key_provider(config, provider_id, current_model=""):
         )
         if model_list:
             print(f"  Found {len(model_list)} model(s) from Ollama Cloud")
+    elif provider_id == "usepod":
+        from hermes_cli.models import fetch_api_models
+        from providers import get_provider_profile
+
+        api_key_for_probe = existing_key or (get_env_value(key_env) if key_env else "")
+        live_models = fetch_api_models(api_key_for_probe, effective_base)
+        if live_models:
+            model_list = live_models
+            print(f"  Found {len(model_list)} model(s) from {pconfig.name} API")
+        else:
+            _pp = get_provider_profile("usepod")
+            model_list = list(getattr(_pp, "fallback_models", ()) or [])
+            if model_list:
+                print(
+                    f'  Showing {len(model_list)} curated models — use "Enter custom model name" for others.'
+                )
     elif provider_id == "novita":
         from hermes_cli.models import fetch_api_models
 
@@ -5964,7 +5992,13 @@ def _model_flow_api_key_provider(config, provider_id, current_model=""):
             model = {"default": model} if model else {}
             cfg["model"] = model
         model["provider"] = provider_id
-        model["base_url"] = effective_base
+        if provider_id == "usepod":
+            # The effective base URL embeds the token; persisting it would bake
+            # the secret into config.yaml and go stale on key rotation. Runtime
+            # always re-derives it from the current USEPOD_API_KEY.
+            model.pop("base_url", None)
+        else:
+            model["base_url"] = effective_base
         if provider_id in {"opencode-zen", "opencode-go"}:
             model["api_mode"] = opencode_model_api_mode(provider_id, selected)
         else:
@@ -9179,28 +9213,6 @@ def _discard_lockfile_churn(git_cmd, repo_root):
         pass
 
 
-def _cmd_update_claw_npm():
-    """Update a ClawPump agent that was installed via ``npx @clawpump/claw-agent``.
-
-    These installs have no git checkout (the bundle ships inside the npm
-    package), so the normal git-pull update can't apply. Re-run the npm
-    installer instead — it re-bundles the latest and reinstalls in place.
-    """
-    print("→ Updating ClawPump agent via npm (npx @clawpump/claw-agent@latest)…")
-    npx = shutil.which("npx")
-    if not npx:
-        print("✗ npx (Node.js) not found. Install Node.js, then run:")
-        print("    npx @clawpump/claw-agent@latest")
-        sys.exit(1)
-    try:
-        subprocess.run([npx, "-y", "@clawpump/claw-agent@latest"], check=True)
-    except subprocess.CalledProcessError as exc:
-        print(f"✗ Update failed (exit {exc.returncode}). Try manually:")
-        print("    npx @clawpump/claw-agent@latest")
-        sys.exit(1)
-    print("✓ ClawPump agent updated. Restart your session with `claw`.")
-
-
 def cmd_update(args):
     """Update Hermes Agent to the latest version.
 
@@ -9219,10 +9231,13 @@ def cmd_update(args):
         managed_error("update Hermes Agent")
         return
 
-    # ClawPump agents installed via `npx @clawpump/claw-agent` have no git
-    # checkout to pull — update by re-running the npm installer instead.
-    if (PROJECT_ROOT / ".claw-bundle").exists():
-        _cmd_update_claw_npm()
+    # Distribution-specific self-update (e.g. ClawPump's npm bundle, which has
+    # no git checkout to pull). No-op on vanilla Hermes.
+    try:
+        from hermes_cli import distribution as _distribution
+    except Exception:
+        _distribution = None
+    if _distribution is not None and _distribution.try_self_update(PROJECT_ROOT):
         return
 
     # Docker users can't ``git pull`` — the image excludes ``.git`` from
@@ -11485,7 +11500,7 @@ def cmd_logs(args):
 # to parse.
 _BUILTIN_SUBCOMMANDS = frozenset(
     {
-        "acp", "auth", "backup", "bundles", "checkpoints", "claw", "clawpump", "completion",
+        "acp", "auth", "backup", "bundles", "checkpoints", "claw", "completion",
         "computer-use",
         "config", "cron", "curator", "dashboard", "debug", "doctor",
         "dump", "fallback", "gateway", "hooks", "import", "insights",
@@ -11502,6 +11517,14 @@ _BUILTIN_SUBCOMMANDS = frozenset(
     }
 )
 
+# Distribution-specific subcommands (e.g. ClawPump). No-op on vanilla Hermes.
+try:
+    from hermes_cli import distribution as _distribution
+
+    _BUILTIN_SUBCOMMANDS = _BUILTIN_SUBCOMMANDS | frozenset(_distribution.EXTRA_SUBCOMMANDS)
+except Exception:
+    pass
+
 
 # Top-level flags that take a value. Needed by ``_first_positional_argv``
 # so that in ``hermes -m gpt5 chat``, ``gpt5`` is correctly skipped as a
@@ -12782,10 +12805,14 @@ def main():
     _add_portal_parser(subparsers)
 
     # =========================================================================
-    # clawpump command — ClawPump MCP install / auth / tool selection
+    # Distribution-specific subcommands (e.g. ClawPump). No-op on vanilla Hermes.
     # =========================================================================
-    from hermes_cli.clawpump_cli import add_parser as _add_clawpump_parser
-    _add_clawpump_parser(subparsers)
+    try:
+        from hermes_cli import distribution as _distribution
+    except Exception:
+        _distribution = None
+    if _distribution is not None:
+        _distribution.register_subparsers(subparsers)
 
     # =========================================================================
     # kanban command — multi-profile collaboration board

package/agent/hermes_cli/runtime_provider.py

@@ -368,6 +368,19 @@ def _resolve_runtime_from_pool_entry(
         # For Anthropic-style endpoints, strip /v1 suffix
         if api_mode == "anthropic_messages":
             base_url = re.sub(r"/v1/?$", "", base_url)
+    elif provider == "usepod":
+        # UsePod authenticates by the token in the URL path, so the pool
+        # entry's base_url is only the proxy root — derive the real per-token
+        # base URL from the resolved key. A config base_url or USEPOD_BASE_URL
+        # (self-hosted gateway) still wins.
+        from hermes_cli.auth import _resolve_usepod_base_url
+        cfg_provider = str(model_cfg.get("provider") or "").strip().lower()
+        cfg_base_url = ""
+        if cfg_provider == "usepod":
+            cfg_base_url = str(model_cfg.get("base_url") or "").strip().rstrip("/")
+        env_override = os.getenv("USEPOD_BASE_URL", "").strip()
+        base_url = cfg_base_url or _resolve_usepod_base_url(api_key, env_override).rstrip("/")
+        api_mode = "chat_completions"
     else:
         configured_provider = str(model_cfg.get("provider") or "").strip().lower()
         # Honour model.base_url from config.yaml when the configured provider
@@ -1165,6 +1178,11 @@ def _resolve_explicit_runtime(
             if provider in {"kimi-coding", "kimi-coding-cn"}:
                 creds = resolve_api_key_provider_credentials(provider)
                 base_url = creds.get("base_url", "").rstrip("/")
+            elif provider == "usepod":
+                # UsePod embeds the token in the URL path; defer base_url until
+                # the token is resolved below so it always reflects the current
+                # key (covers explicit --api-key overrides too).
+                base_url = ""
             else:
                 base_url = env_url or pconfig.inference_base_url
 
@@ -1175,6 +1193,12 @@ def _resolve_explicit_runtime(
             if not base_url:
                 base_url = creds.get("base_url", "").rstrip("/")
 
+        if provider == "usepod" and not explicit_base_url:
+            # Derive the proxy base URL from the resolved token. An explicit
+            # --base-url (or USEPOD_BASE_URL, carried via env_url) still wins.
+            from hermes_cli.auth import _resolve_usepod_base_url
+            base_url = _resolve_usepod_base_url(api_key, env_url).rstrip("/")
+
         api_mode = "chat_completions"
         if provider == "copilot":
             api_mode = _copilot_runtime_api_mode(model_cfg, api_key)

package/agent/hermes_cli/skin_engine.py

@@ -196,87 +196,6 @@ _BUILTIN_SKINS: Dict[str, Dict[str, Any]] = {
         },
         "tool_prefix": "┊",
     },
-    "clawpump": {
-        "name": "clawpump",
-        "description": "ClawPump — Solana green, claw mark (built on Hermes)",
-        "colors": {
-            "banner_border": "#16A34A",
-            "banner_title": "#4ADE80",
-            "banner_accent": "#22C55E",
-            "banner_dim": "#15803D",
-            "banner_text": "#DCFCE7",
-            "ui_accent": "#22C55E",
-            "ui_label": "#4ADE80",
-            "ui_ok": "#22C55E",
-            "ui_error": "#ef5350",
-            "ui_warn": "#ffa726",
-            "prompt": "#DCFCE7",
-            "input_rule": "#16A34A",
-            "response_border": "#4ADE80",
-            "status_bar_bg": "#0B1F14",
-            "status_bar_text": "#DCFCE7",
-            "status_bar_strong": "#4ADE80",
-            "status_bar_dim": "#3F6B50",
-            "status_bar_good": "#22C55E",
-            "status_bar_warn": "#FACC15",
-            "status_bar_bad": "#F59E0B",
-            "status_bar_critical": "#EF5350",
-            "session_label": "#4ADE80",
-            "session_border": "#3F6B50",
-            "selection_bg": "#14532D",
-            "completion_menu_bg": "#06140C",
-            "completion_menu_current_bg": "#14532D",
-            "completion_menu_meta_bg": "#0B1F14",
-            "completion_menu_meta_current_bg": "#14532D",
-        },
-        "spinner": {
-            "waiting_faces": ["(◴)", "(◷)", "(◶)", "(◵)", "(<>)"],
-            "thinking_faces": ["(✦)", "(◇)", "(◈)", "(⌁)", "(<>)"],
-            "thinking_verbs": [
-                "pumping", "launching", "scanning the mints", "routing the swap",
-                "reading the chart", "minting", "snapping the claw", "checking liquidity",
-            ],
-            "wings": [
-                ["⟪◇", "◇⟫"],
-                ["⟪✦", "✦⟫"],
-                ["⟪>", "<⟫"],
-                ["⟪◈", "◈⟫"],
-            ],
-        },
-        "branding": {
-            "agent_name": "ClawPump",
-            "org": "ClawPump",
-            "credit": "built on Hermes ☤ by Nous Research",
-            "welcome": "Welcome to ClawPump 🦀 — Solana agents, trading & token launch. Type your message or /help for commands.",
-            "goodbye": "Claws out! 🦀",
-            "response_label": " ✦ ClawPump ",
-            "prompt_symbol": "❯",
-            "help_header": "(✦) Available Commands",
-        },
-        "tool_prefix": "┊",
-        "banner_logo": """[bold #86EFAC] ██████╗██╗      █████╗ ██╗    ██╗██████╗ ██╗   ██╗███╗   ███╗██████╗ [/]
-[bold #4ADE80]██╔════╝██║     ██╔══██╗██║    ██║██╔══██╗██║   ██║████╗ ████║██╔══██╗[/]
-[#22C55E]██║     ██║     ███████║██║ █╗ ██║██████╔╝██║   ██║██╔████╔██║██████╔╝[/]
-[#16A34A]██║     ██║     ██╔══██║██║███╗██║██╔═══╝ ██║   ██║██║╚██╔╝██║██╔═══╝ [/]
-[#15803D]╚██████╗███████╗██║  ██║╚███╔███╔╝██║     ╚██████╔╝██║ ╚═╝ ██║██║     [/]
-[#166534] ╚═════╝╚══════╝╚═╝  ╚═╝ ╚══╝╚══╝ ╚═╝      ╚═════╝ ╚═╝     ╚═╝╚═╝     [/]""",
-        "banner_hero": """[#86EFAC]⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠠⣀⣂⣤⣤⣤⣤⣤⣤⠄[/]
-[#7EE5A4]⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣢⣵⣾⣿⣿⣿⣿⣿⣿⣿⡿⠃⠀[/]
-[#77DA9B]⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢠⣴⠿⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠟⠀⠀⠀[/]
-[#6FD093]⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢠⣾⠟⠁⢀⣼⣿⣿⣿⣿⣿⣿⣿⡿⠀⠀⠀⠀⠀[/]
-[#68C58A]⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣜⡿⠁⢀⣴⣿⣿⣿⣿⣿⣿⣿⣿⣿⠗⠀⠀⠀⠀⠀[/]
-[#60BB82]⠀⠀⠀⠀⠀⠀⠀⠀⢀⣮⣿⣇⣴⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠁⠀⠀⠀⠀⠀⠀[/]
-[#58B179]⠀⠀⠀⠀⠀⠀⠀⢠⣿⣿⠃⣸⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠀⠀⠀⠀⠀⠀⠀[/]
-[#51A671]⠀⠀⠀⠀⠀⠀⢀⣾⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⠃⠀⠀⠀⠀⠀⠀⠀[/]
-[#499C68]⠀⠀⠀⠀⠀⠀⢸⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠿⠋⠀⠀⠀⠀⠀⠀⠀⠀⠀[/]
-[#429160]⠀⠀⠀⠀⠀⣀⣈⡙⠻⢿⣿⣿⣿⣿⣿⣿⡿⠋⣡⣤⣤⠀⠀⠀⠀⠀⠐⢀⣠⣴[/]
-[#3A8757]⠀⠀⠀⢀⣞⣿⠟⠉⣷⣦⣌⠙⢿⣿⣿⣿⣠⣾⣿⣿⣿⣷⣷⣶⣶⣶⣿⣿⣿⠃[/]
-[#327D4F]⠀⠀⣀⣉⡛⠳⢴⣾⣿⣿⣿⣷⣄⠹⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⠁⠀[/]
-[#2B7246]⢠⣞⣿⡟⣩⣿⣶⣌⠻⢿⣿⣿⣿⣆⠘⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⠋⠀⠀⠀[/]
-[#23683E]⠀⠉⠙⠻⢿⣿⣿⣿⣷⣄⠻⣿⣿⣿⡀⠹⢿⣿⣿⣿⣿⠿⠟⠋⠁⠀⠀⠀⠀⠀[/]
-[#1C5D35]⠀⠀⠀⠀⠀⠈⠻⣿⣿⣿⣆⠹⣿⠟⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀[/]
-[#14532D]⠀⠀⠀⠀⠀⠀⠀⠘⢿⣿⠟⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀[/]""",
-    },
     "ares": {
         "name": "ares",
         "description": "War-god theme — crimson and bronze",
@@ -730,8 +649,21 @@ _BUILTIN_SKINS: Dict[str, Dict[str, Any]] = {
 # Skin loading and management
 # =============================================================================
 
+# -- ClawPump distribution overlay (downstream) ---------------------------
+# Pull ClawPump's skins + default-skin name from the downstream-owned
+# overlay so this upstream-owned file stays mergeable. Falls back to
+# vanilla Hermes ("default") when the overlay module is absent.
+try:
+    from hermes_cli.distribution import (
+        BUILTIN_SKINS as _DIST_SKINS,
+        DEFAULT_SKIN as _DISTRIBUTION_DEFAULT_SKIN,
+    )
+    _BUILTIN_SKINS.update(_DIST_SKINS)
+except Exception:
+    _DISTRIBUTION_DEFAULT_SKIN = "default"
+
 _active_skin: Optional[SkinConfig] = None
-_active_skin_name: str = "clawpump"
+_active_skin_name: str = _DISTRIBUTION_DEFAULT_SKIN
 
 
 def _skins_dir() -> Path:
@@ -876,11 +808,11 @@ def init_skin_from_config(config: dict) -> None:
     display = config.get("display") or {}
     if not isinstance(display, dict):
         display = {}
-    skin_name = display.get("skin", "clawpump")
+    skin_name = display.get("skin", _DISTRIBUTION_DEFAULT_SKIN)
     if isinstance(skin_name, str) and skin_name.strip():
         set_active_skin(skin_name.strip())
     else:
-        set_active_skin("clawpump")
+        set_active_skin(_DISTRIBUTION_DEFAULT_SKIN)
 
 
 # =============================================================================

package/agent/optional-mcps/clawpump/manifest.yaml

@@ -3,7 +3,7 @@
 manifest_version: 1
 
 name: clawpump
-description: ClawPump — Solana AI agents, trading, perps, DCA, token launch, marketplace, lending, predictions, market intelligence (104 tools).
+description: ClawPump — Solana AI agents, trading, perps, DCA, token launch, marketplace, lending, predictions, gift cards, agent mail, x402 paid APIs, market intelligence (131 tools).
 source: https://mcp.clawpump.tech
 
 # ClawPump ships a remote MCP server: Streamable HTTP + native OAuth 2.1 +
@@ -29,11 +29,13 @@ auth:
   # first probe / first connect.
 
 # Tool selection at install time.
-# ClawPump exposes 104 tools; 28 of them move real funds or are irreversible
+# ClawPump exposes 131 tools; 37 of them move real funds or are irreversible
 # (perps orders, swaps, DCA/limit orders, lending deposit/withdraw, prediction
-# positions, marketplace bids, external-wallet changes, token launches).
+# positions, marketplace bids, external-wallet changes, wallet transfers,
+# token launches, gift-card purchases/withdrawals, agent-mail
+# provisioning/sending, x402 paid-API execution).
 # Hermes does NOT auto-gate MCP tools by their destructiveHint, so we ship a
-# read-mostly default: the 76 safe tools below are pre-checked in the install
+# read-mostly default: the 94 safe tools below are pre-checked in the install
 # checklist (and applied directly if the server can't be probed before auth).
 # Users opt into the financial tools per their threat model in the checklist,
 # or later with `hermes mcp configure clawpump`.
@@ -54,6 +56,23 @@ tools:
     - upload_agent_avatar
     - get_agent_asset_url
     - list_available_skills
+    # agent cards (Laso — reads / linking / quotes; purchase & withdraw are opt-in)
+    - agent_card_list
+    - agent_card_get
+    - agent_card_status
+    - agent_card_balance
+    - agent_card_data
+    - agent_card_withdrawals
+    - agent_card_quote
+    - agent_card_refresh
+    - agent_card_search_gift_cards
+    - agent_card_search_merchants
+    - agent_card_connect
+    - agent_card_connect_link
+    # agent mail (reads; inbox provisioning & sending are opt-in)
+    - agent_mail_get_address
+    - agent_mail_list
+    - agent_mail_read
     # automations
     - list_automations
     - get_automation
@@ -95,6 +114,10 @@ tools:
     - get_my_bids
     - get_received_bids
     - get_marketplace_history
+    # pay.sh x402 (catalog / pricing / approval prep — paid execution is opt-in)
+    - pay_sh_search
+    - pay_sh_provider_details
+    - pay_sh_prepare_call
     # perps (read / preview only)
     - perps_markets
     - perps_market_data
@@ -143,8 +166,12 @@ post_install: |
 
   FINANCIAL / IRREVERSIBLE TOOLS are OFF by default (perps_*, swap_execute,
   dca_create, limit_order_create, jup_lend_deposit/withdraw, predictions_open/
-  close, place_bid / accept_marketplace_bid, set_external_wallet, and the
-  token-launch tools). Several require confirmRisk=true / confirm_launch=true.
+  close, place_bid / accept_marketplace_bid, set_external_wallet,
+  wallet_transfer, agent_card_create/cancel/reveal/withdraw,
+  agent_mail_create/send, pay_sh_execute_approved, and the token-launch
+  tools). Several require explicit confirm flags (confirmRisk,
+  confirm_launch, confirm_spend, confirm_send, confirm_transfer,
+  confirm_payment, …).
   Enable the ones you want and review every call:
     hermes mcp configure clawpump
 

package/agent/optional-mcps/clawpump-stdio/manifest.yaml

@@ -3,7 +3,7 @@
 manifest_version: 1
 
 name: clawpump-stdio
-description: ClawPump (stdio) — the same 104 tools via the npm package, authed with a cpk_* API key (no browser).
+description: ClawPump (stdio) — the same 131 tools via the npm package, authed with a cpk_* API key (no browser).
 source: https://www.npmjs.com/package/@clawpump/agents
 
 # Same tool surface as the `clawpump` remote entry, but run locally over stdio
@@ -31,8 +31,8 @@ auth:
       secret: false
       default: ""
 
-# Same read-mostly default as the remote `clawpump` entry: 76 safe tools
-# pre-checked; the 28 financial/irreversible tools are opt-in. See the
+# Same read-mostly default as the remote `clawpump` entry: 94 safe tools
+# pre-checked; the 37 financial/irreversible tools are opt-in. See the
 # `clawpump` manifest for the rationale (Hermes does not auto-gate MCP tools
 # by destructiveHint).
 tools:
@@ -52,6 +52,23 @@ tools:
     - upload_agent_avatar
     - get_agent_asset_url
     - list_available_skills
+    # agent cards (Laso — reads / linking / quotes; purchase & withdraw are opt-in)
+    - agent_card_list
+    - agent_card_get
+    - agent_card_status
+    - agent_card_balance
+    - agent_card_data
+    - agent_card_withdrawals
+    - agent_card_quote
+    - agent_card_refresh
+    - agent_card_search_gift_cards
+    - agent_card_search_merchants
+    - agent_card_connect
+    - agent_card_connect_link
+    # agent mail (reads; inbox provisioning & sending are opt-in)
+    - agent_mail_get_address
+    - agent_mail_list
+    - agent_mail_read
     # automations
     - list_automations
     - get_automation
@@ -93,6 +110,10 @@ tools:
     - get_my_bids
     - get_received_bids
     - get_marketplace_history
+    # pay.sh x402 (catalog / pricing / approval prep — paid execution is opt-in)
+    - pay_sh_search
+    - pay_sh_provider_details
+    - pay_sh_prepare_call
     # perps (read / preview only)
     - perps_markets
     - perps_market_data

package/agent/plugins/model-providers/usepod/__init__.py

@@ -0,0 +1,100 @@
+"""UsePod provider profile.
+
+UsePod (usepod.ai) is a drop-in OpenAI- and Anthropic-compatible inference
+marketplace.  Independent operators serve open-weight models (or relay their
+own upstream keys) and centralized providers stay available as a fallback;
+billing is pay-per-request, settled in USDC from a per-token balance.
+
+Unlike a normal API-key provider, UsePod authenticates by the token embedded
+in the request *path* (``/proxy/<token>/v1/...``) and ignores the
+Authorization header.  The base URL is therefore DERIVED from the API key
+rather than being static — see ``hermes_cli.auth._resolve_usepod_base_url`` and
+the ``usepod`` branches in ``resolve_api_key_provider_credentials`` /
+``get_api_key_provider_status`` (auth.py) and ``_resolve_explicit_runtime``
+(runtime_provider.py).
+
+The net effect for the user: they only paste the token they obtained from
+``POST https://api.usepod.ai/v1/register`` (and funded on https://usepod.ai/fund)
+— the proxy URL is built for them.  An explicit ``USEPOD_BASE_URL`` env var
+still wins, e.g. for a self-hosted UsePod gateway.
+"""
+
+from __future__ import annotations
+
+import json
+import logging
+import urllib.request
+
+from providers import register_provider
+from providers.base import ProviderProfile, _profile_user_agent
+
+logger = logging.getLogger(__name__)
+
+# Production gateway host. The token-bearing inference base URL is
+# ``{USEPOD_API_BASE}/proxy/<token>/v1``; the catalog is
+# ``{USEPOD_API_BASE}/proxy/<token>/v1/models``.
+USEPOD_API_BASE = "https://api.usepod.ai"
+
+
+class UsePodProfile(ProviderProfile):
+    """UsePod — OpenAI-compatible proxy with the auth token in the URL path."""
+
+    def fetch_models(self, *, api_key: str | None = None, timeout: float = 8.0):
+        """List models from the per-token catalog endpoint.
+
+        UsePod exposes ``/proxy/<token>/v1/models``; the token lives in the
+        path, so the base-class implementation (which builds the URL from the
+        static ``base_url``) cannot reach it. Returns None when no token is
+        available so callers fall back to ``fallback_models``.
+        """
+        token = (api_key or "").strip()
+        if not token:
+            return None
+        url = f"{USEPOD_API_BASE}/proxy/{token}/v1/models"
+        req = urllib.request.Request(url)
+        # Harmless — UsePod ignores it (auth is the path token) — but send it
+        # for parity with standard OpenAI clients / intermediaries.
+        req.add_header("Authorization", f"Bearer {token}")
+        req.add_header("Accept", "application/json")
+        req.add_header("User-Agent", _profile_user_agent())
+        try:
+            with urllib.request.urlopen(req, timeout=timeout) as resp:
+                data = json.loads(resp.read().decode())
+            items = data if isinstance(data, list) else data.get("data", [])
+            return [m["id"] for m in items if isinstance(m, dict) and "id" in m]
+        except Exception as exc:
+            logger.debug("fetch_models(usepod): %s", exc)
+            return None
+
+
+usepod = UsePodProfile(
+    name="usepod",
+    # USEPOD_API_KEY = the token (paste-in). USEPOD_BASE_URL = optional override
+    # for self-hosted gateways; the registry auto-maps the *_BASE_URL var to the
+    # base_url override env var.
+    env_vars=("USEPOD_API_KEY", "USEPOD_BASE_URL"),
+    display_name="UsePod",
+    description="UsePod (drop-in OpenAI-compatible inference marketplace, pay-per-use in USDC)",
+    signup_url="https://usepod.ai",
+    # Non-empty so the picker + live-fetch plumbing engages; the *effective*
+    # inference URL is derived per-token (see module docstring). hostname pins
+    # the URL→provider reverse mapping to api.usepod.ai.
+    base_url=f"{USEPOD_API_BASE}/proxy",
+    hostname="api.usepod.ai",
+    # The token is in the URL path, so doctor's static /models probe (built from
+    # base_url) can't reach the per-token catalog. Skip it — key presence is the
+    # meaningful "configured" signal for this provider.
+    supports_health_check=False,
+    # Best-effort offline picker list — UsePod's real catalog is dynamic and is
+    # fetched live from /proxy/<token>/v1/models whenever a key is present.
+    fallback_models=(
+        "claude-opus-4-8",
+        "claude-sonnet-4-6",
+        "gpt-5.5",
+        "deepseek-v4",
+        "glm-4-7",
+        "kimi-k2.5",
+    ),
+)
+
+register_provider(usepod)

package/agent/plugins/model-providers/usepod/plugin.yaml

@@ -0,0 +1,5 @@
+name: usepod-provider
+kind: model-provider
+version: 1.0.0
+description: UsePod (drop-in OpenAI-compatible inference marketplace)
+author: "@0xgilbert"

package/agent/scripts/release.py

@@ -45,6 +45,7 @@ ACP_REGISTRY_MANIFEST = REPO_ROOT / "acp_registry" / "agent.json"
 
 # Auto-extracted from noreply emails + manual overrides
 AUTHOR_MAP = {
+    "chris@100x.dev": "chris-gilbert",
     "ben.bartholomew@vectorize.io": "benfrank241",
     "74339271+SaguaroDev@users.noreply.github.com": "SaguaroDev",
     "subw3@mail2.sysu.edu.cn": "Subway2023",

package/agent/skills/clawpump/SKILL.md

@@ -1,20 +1,21 @@
 ---
 name: clawpump
-description: "ClawPump on Solana — create/chat with agents, trade, perps, DCA, lend, launch tokens, marketplace, predictions, intelligence via mcp_clawpump_* tools. Use when the user mentions ClawPump, launching a token, an agent's wallet/balance, swaps, perps, or DeFi on Solana."
-version: 1.0.0
+description: "ClawPump on Solana — create/chat with agents, trade, perps, DCA, lend, launch tokens, marketplace, predictions, gift cards, agent email, intelligence via mcp_clawpump_* tools. Use when the user mentions ClawPump, launching a token, an agent's wallet/balance, swaps, perps, gift cards, agent email, or DeFi on Solana."
+version: 1.3.0
 platforms: [linux, macos, windows]
 metadata:
   hermes:
-    tags: [clawpump, solana, defi, trading, perps, dca, lending, token-launch, marketplace, predictions, agents, mcp]
-    related_skills: [mcp]
+    tags: [clawpump, solana, defi, trading, perps, dca, lending, token-launch, marketplace, predictions, gift-cards, agent-mail, agents, mcp]
+    related_skills: [mcp, pay-sh]
 ---
 
 # ClawPump
 
 ClawPump is a Solana platform for AI agents: each agent has a wallet and can
-trade, run perps, DCA, lend, launch tokens, and be bought/sold on a
-marketplace. Its full feature set reaches Hermes through the **ClawPump MCP
-server** (104 tools, 10 resources, 10 prompts).
+trade, run perps, DCA, lend, launch tokens, buy gift cards, send email from
+its own inbox, and be bought/sold on a marketplace. Its full feature set
+reaches Hermes through the **ClawPump MCP server** (131 tools, 10 resources,
+10 prompts).
 
 ## Enabling ClawPump
 
@@ -43,7 +44,7 @@ Most tools act on a specific agent. Resolve it once with `list_agents`, then
 pass `agent_id`. If the user set `CLAWPUMP_DEFAULT_AGENT` (or has exactly one
 agent), `agent_id` can usually be omitted. When unsure which agent, ask.
 
-## What's available (104 tools, 17 groups)
+## What's available (131 tools, 20 groups)
 
 | Group | Representative tools |
 |-------|----------------------|
@@ -53,19 +54,22 @@ agent), `agent_id` can usually be omitted. When unsure which agent, ask.
 | Custom skills | `list_custom_skills`, `get_custom_skill`, `create_custom_skill`, `update_custom_skill`, `delete_custom_skill` |
 | Trading | `swap_quote`, `swap_execute`, `token_search`, `get_portfolio`, `get_price`, `get_market_signals`, `get_indicators`, `arbitrage_quote`/`arbitrage_prices` |
 | DCA / limits | `dca_create`, `dca_list`, `dca_cancel`, `limit_order_create`, `limit_order_cancel`, `limit_order_history` |
-| Phoenix perps | `perps_markets`, `perps_market_data`, `perps_account`, `perps_account_prepare`, `perps_trader_register`, `perps_collateral_deposit`, `perps_order_preview`, `perps_order_execute`, `perps_order_cancel` |
+| Phoenix perps | `perps_markets`, `perps_market_data`, `perps_account`, `perps_account_prepare`, `perps_trader_register`, `perps_collateral_deposit`, `perps_collateral_withdraw`, `perps_order_preview`, `perps_order_execute`, `perps_order_cancel` |
 | Lending (Jupiter) | `jup_lend_tokens`, `jup_lend_positions`, `jup_lend_deposit`, `jup_lend_withdraw` |
 | Predictions | `predictions_events`, `predictions_positions`, `predictions_open`, `predictions_close` |
 | Token launch | `get_launch_status`, `launch_token_gasless`, `launch_metaplex_genesis_token` |
 | Marketplace | `browse_marketplace`, `create_marketplace_listing`, `delist_marketplace_listing`, `browse_public_agents`, `place_bid`, `get_my_bids`, `get_received_bids`, `accept_marketplace_bid`, `reject_marketplace_bid`, `withdraw_marketplace_bid`, `get_marketplace_history` |
-| Wallet & billing | `get_balance`, `get_budget`, `get_usage`, `get_transactions`, `get_wallet_summaries`, `get_wallet_history`, `get_private_wallet_balance`, `get_balance_history`, `sync_billing` |
+| Agent cards (Laso) | `agent_card_search_merchants`, `agent_card_search_gift_cards`, `agent_card_quote`, `agent_card_create`, `agent_card_list`, `agent_card_get`, `agent_card_status`, `agent_card_data`, `agent_card_balance`, `agent_card_reveal`, `agent_card_cancel`, `agent_card_refresh`, `agent_card_withdraw`, `agent_card_withdrawals`, `agent_card_connect`, `agent_card_connect_link` |
+| Agent mail | `agent_mail_create`, `agent_mail_get_address`, `agent_mail_send`, `agent_mail_list`, `agent_mail_read` |
+| Pay.sh x402 (agent-wallet paid APIs) | `pay_sh_search`, `pay_sh_provider_details`, `pay_sh_prepare_call`, `pay_sh_execute_approved` |
+| Wallet & billing | `get_balance`, `get_budget`, `get_usage`, `get_transactions`, `get_wallet_summaries`, `get_wallet_history`, `get_private_wallet_balance`, `get_balance_history`, `sync_billing`, `wallet_transfer` |
 | Market intelligence | `intelligence_capabilities`, `intelligence_market`, `intelligence_signals`, `intelligence_macro`, `intelligence_perps` |
 | Integrations | `list_integrations`, `save_integration`, `remove_integration`, `get_linked_accounts` |
 | Account | `get_account_status`, `connect_twitter`, `configure_twitter_posting`, `set_external_wallet`, `generate_link_code`, `link_google_account`, `get_dashboard_urls` |
 | Whitelist | `get_whitelist`, `add_to_whitelist`, `remove_from_whitelist` |
 | Utility | `get_model_catalog`, `get_news_feed` |
 
-By default only the **76 read-mostly** tools are enabled. The financial ones
+By default only the **94 read-mostly** tools are enabled. The financial ones
 below are opt-in via `hermes mcp configure clawpump`.
 
 ## ⚠️ FINANCIAL & IRREVERSIBLE TOOLS — confirmation is mandatory
@@ -73,20 +77,27 @@ below are opt-in via `hermes mcp configure clawpump`.
 These move real funds on-chain or are irreversible. **Never call them without
 the user's explicit, specific go-ahead in this conversation.** Quote the exact
 action (amounts, token, agent) and wait for a clear yes. Several require an
-explicit confirm flag (e.g. `confirmRisk: true`, `confirm_launch: true`) — only
-set it after the user agrees.
+explicit confirm flag (e.g. `confirmRisk: true`, `confirm_launch: true`,
+`confirm_spend: true`, `confirm_send: true`, `confirm_transfer: true`,
+`confirm_payment: true`) — only set it after the user agrees.
 
 - Trading: `swap_execute`, `dca_create`, `dca_cancel`, `limit_order_create`, `limit_order_cancel`
-- Perps: `perps_account_prepare`, `perps_trader_register`, `perps_collateral_deposit`, `perps_order_execute`, `perps_order_cancel`
+- Perps: `perps_account_prepare`, `perps_trader_register`, `perps_collateral_deposit`, `perps_collateral_withdraw`, `perps_order_execute`, `perps_order_cancel`
 - Lending: `jup_lend_deposit`, `jup_lend_withdraw`
 - Predictions: `predictions_open`, `predictions_close`
 - Marketplace (funds/ownership): `place_bid`, `accept_marketplace_bid`, `reject_marketplace_bid`, `withdraw_marketplace_bid`, `delist_marketplace_listing`
 - Token launch: `launch_token_gasless`, `launch_metaplex_genesis_token`
 - Account / lifecycle: `set_external_wallet`, `delete_agent`, `delete_automation`, `delete_custom_skill`, `cancel_agent_run`, `remove_integration`, `remove_from_whitelist`
+- Agent cards (Laso): `agent_card_create` (pays USDC from the agent wallet — quote first), `agent_card_withdraw`, `agent_card_cancel`, `agent_card_reveal` (exposes the card number / redemption secret)
+- Agent mail: `agent_mail_create` (one-time ~$2 USDC from the agent wallet), `agent_mail_send` (outward-facing email; paid per send via x402 from the agent wallet)
+- Wallet: `wallet_transfer` (irreversible on-chain send; destination must be on the agent's whitelist via `add_to_whitelist`; quote the exact amount, token, and address, then `confirm_transfer: true`)
+- Pay.sh x402: `pay_sh_execute_approved` (pays USDC from the agent wallet via x402 — always `pay_sh_prepare_call` first; quote the exact endpoint + price; approval codes expire in 10 minutes; requires the `x402` skill on the agent)
 
 **Always get a quote/preview first** (`swap_quote` before `swap_execute`,
-`perps_order_preview` before `perps_order_execute`) and show it to the user
-before executing. Report tx signatures back when a call succeeds.
+`perps_order_preview` before `perps_order_execute`, `agent_card_quote` before
+`agent_card_create`, `pay_sh_prepare_call` before `pay_sh_execute_approved`)
+and show it to the user before executing. Report tx signatures back when a
+call succeeds.
 
 ## Resources (read with the MCP resource reader)
 
@@ -120,3 +131,8 @@ Common patterns:
 - **Launch a token:** `get_launch_status` → confirm details → `launch_token_gasless` (gasless) or `launch_metaplex_genesis_token`.
 - **Check portfolio:** `get_balance` + `get_portfolio` + `get_wallet_summaries`.
 - **Perps:** `perps_markets`/`perps_market_data` → `perps_order_preview` → (confirm) → `perps_order_execute`.
+- **Gift card:** `agent_card_search_merchants`/`agent_card_search_gift_cards` → `agent_card_quote` → (confirm) → `agent_card_create` → `agent_card_status`; `agent_card_reveal` only when the user asks for the card details.
+- **Agent email:** `agent_mail_get_address`; no inbox → (confirm ~$2 USDC) `agent_mail_create`; then `agent_mail_send` (confirm) or `agent_mail_list` → `agent_mail_read`.
+  - **Deliverability (avoid spam):** write genuine, complete messages — a specific subject, a greeting, 2–4 sentences of real purpose, and a sign-off. Never send one-word/empty bodies or test-like "hello": low-content mail from a fresh sender domain is the #1 spam trigger. Do **not** use fake-urgent or deceptive subjects ("IMPORTANT!!", "URGENT") to game filters — that backfires and is deceptive. Tell first-time recipients to mark "Not spam" + add the address to contacts; that trains their inbox fastest.
+- **Fund an external wallet (e.g. a pay.sh allowance):** `get_balance` → `add_to_whitelist` (user-approved address) → (confirm) `wallet_transfer`. See the `pay-sh` skill.
+- **Paid x402 API call (agent wallet pays):** `pay_sh_search` → `pay_sh_provider_details` (price) → `pay_sh_prepare_call` → (confirm price with user) → `pay_sh_execute_approved`. The agent needs the `x402` skill (`update_agent` with `enabled_skills`).

package/agent/skills/pay-sh/SKILL.md

@@ -0,0 +1,66 @@
+---
+name: pay-sh
+description: "Pay.sh / x402 paid APIs paid with the ClawPump agent wallet — search a catalog of pay-per-call services (images, data, email, voice…) and pay per call in USDC straight from the agent's custodial wallet via the ClawPump MCP. Use when the user mentions pay.sh, x402, 402 payments, or paying for an API/service with the agent's funds."
+version: 2.0.0
+platforms: [linux, macos, windows]
+metadata:
+  hermes:
+    tags: [pay-sh, x402, solana, payments, usdc, apis, mcp, clawpump]
+    related_skills: [clawpump, mcp]
+---
+
+# Pay.sh (x402 paid APIs) — paid by the ClawPump wallet
+
+Pay.sh is a catalog of APIs gated by stablecoin payments instead of accounts
+and keys: call an endpoint, get HTTP 402 with a price, pay in USDC, get the
+response. ClawPump pays these **from the agent's own custodial wallet** — there
+is no separate wallet to create or fund.
+
+## Use the ClawPump MCP tools — nothing else
+
+These come from the ClawPump MCP (`mcp_clawpump_*` / `mcp_clawpump-stdio_*`):
+
+- `pay_sh_search` — find providers (free)
+- `pay_sh_provider_details` — endpoints + per-call price for one provider (free)
+- `pay_sh_prepare_call` — balance preflight + payment preview + a 10-minute
+  approval code; **pays nothing**
+- `pay_sh_execute_approved` — pays from the agent wallet via x402 and returns
+  the response; needs the approval code + `confirm_payment: true`
+
+## ⛔ Never do this
+
+- **Do NOT run the `pay` CLI** (`npx @solana/pay …`) — `pay setup`,
+  `pay account new`, `pay topup`, `pay curl`, etc. That creates a *separate
+  local wallet*, which is exactly what we are avoiding. The user wants the
+  **ClawPump agent wallet** to pay.
+- **Do NOT** create, fund, or transfer to any local/external pay wallet for
+  this. No `wallet_transfer` "allowance" hop either.
+- If the ClawPump pay_sh tools are missing, tell the user to enable them
+  (`hermes mcp configure clawpump`, opt in `pay_sh_execute_approved`) and that
+  the agent needs the `x402` skill — do **not** fall back to the CLI.
+
+## Requirement: the `x402` skill
+
+`pay_sh_prepare_call` / `pay_sh_execute_approved` require the ClawPump agent to
+have the **`x402`** skill enabled. If a call is rejected for capability, enable
+it with `update_agent` (`enabled_skills` += `x402`), then retry — never reach
+for the CLI.
+
+## ⚠️ Spending rules
+
+`pay_sh_execute_approved` spends real USDC. Before it:
+
+1. Get the price first — `pay_sh_provider_details` / the `pay_sh_prepare_call`
+   preview include per-call pricing.
+2. Tell the user the exact endpoint and price; wait for a clear yes.
+3. Only then call `pay_sh_execute_approved` with the approval code and
+   `confirm_payment: true`. Never loop paid calls without telling the user the
+   total.
+4. Report what was spent and the result.
+
+## Pattern
+
+`pay_sh_search` → `pay_sh_provider_details` (price) → quote it to the user →
+`pay_sh_prepare_call` → (user approves) → `pay_sh_execute_approved`. All paid
+from the agent's ClawPump wallet. See the `clawpump` skill for the full tool
+reference.

package/package.json

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