@clawpump/claw-agent 0.1.14 → 0.1.16

package/agent/apps/desktop/package.json

@@ -2,7 +2,7 @@
   "name": "hermes",
   "productName": "Claw Agent",
   "private": true,
-  "version": "0.15.4",
+  "version": "0.15.7",
   "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/apps/desktop/src/app/chat/sidebar/index.tsx

@@ -95,7 +95,7 @@ import {
   sessionPinId
 } from '@/store/session'
 
-import { type AppView, ARTIFACTS_ROUTE, MESSAGING_ROUTE, SKILLS_ROUTE, WALLET_ROUTE, X402_ROUTE } from '../../routes'
+import { type AppView, ARTIFACTS_ROUTE, MCP_ROUTE, MESSAGING_ROUTE, SKILLS_ROUTE, WALLET_ROUTE, X402_ROUTE } from '../../routes'
 import { SidebarPanelLabel } from '../../shell/sidebar-label'
 import type { SidebarNavItem } from '../../types'
 
@@ -133,7 +133,8 @@ const SIDEBAR_NAV: SidebarNavItem[] = [
   { id: 'messaging', label: '', icon: props => <Codicon name="comment" {...props} />, route: MESSAGING_ROUTE },
   { id: 'artifacts', label: '', icon: props => <Codicon name="files" {...props} />, route: ARTIFACTS_ROUTE },
   { id: 'wallet', label: 'Wallet', icon: props => <Codicon name="credit-card" {...props} />, route: WALLET_ROUTE },
-  { id: 'x402', label: 'x402', icon: props => <Codicon name="zap" {...props} />, route: X402_ROUTE }
+  { id: 'x402', label: 'x402', icon: props => <Codicon name="zap" {...props} />, route: X402_ROUTE },
+  { id: 'mcp', label: 'MCP', icon: props => <Codicon name="plug" {...props} />, route: MCP_ROUTE }
 ]
 
 const WORKSPACE_PAGE = 5

package/agent/apps/desktop/src/app/desktop-controller.tsx

@@ -139,6 +139,7 @@ const SettingsView = lazy(async () => ({ default: (await import('./settings')).S
 const SkillsView = lazy(async () => ({ default: (await import('./skills')).SkillsView }))
 const WalletView = lazy(async () => ({ default: (await import('./wallet')).WalletView }))
 const X402View = lazy(async () => ({ default: (await import('./x402')).X402View }))
+const McpView = lazy(async () => ({ default: (await import('./mcp')).McpView }))
 
 // Latest cron-job sessions surfaced in the collapsed "Cron jobs" section. The
 // Cron sessions are written by a background scheduler tick (the desktop
@@ -1203,6 +1204,14 @@ export function DesktopController() {
             }
             path="x402"
           />
+          <Route
+            element={
+              <Suspense fallback={null}>
+                <McpView setStatusbarItemGroup={setStatusbarItemGroup} />
+              </Suspense>
+            }
+            path="mcp"
+          />
           <Route element={null} path="cron" />
           <Route element={null} path="profiles" />
           <Route element={null} path="settings" />

package/agent/apps/desktop/src/app/mcp/index.tsx

@@ -0,0 +1,123 @@
+import { useQuery } from '@tanstack/react-query'
+
+import { Badge } from '@/components/ui/badge'
+import { Button } from '@/components/ui/button'
+import { getMcpServers, type McpServer } from '@/hermes'
+import { Check, ExternalLink, Loader2, Zap } from '@/lib/icons'
+
+import type { SetStatusbarItemGroup } from '../shell/statusbar-controls'
+
+// Where an unauthenticated user goes to connect the ClawPump MCP — the gateway
+// (browser login / cpk_* key). Shown prominently when not connected.
+const CLAWPUMP_GATEWAY_URL = 'https://agents.clawpump.tech/dashboard/api'
+const CLAWPUMP_NAMES = new Set(['clawpump', 'clawpump-agents', 'clawpump-stdio'])
+
+const isClawpump = (s: McpServer) => CLAWPUMP_NAMES.has(s.name)
+
+interface McpViewProps extends React.ComponentProps<'section'> {
+  setStatusbarItemGroup?: SetStatusbarItemGroup
+}
+
+export function McpView({ setStatusbarItemGroup: _setStatusbarItemGroup, ...props }: McpViewProps) {
+  const query = useQuery({ queryKey: ['mcp-servers'], queryFn: getMcpServers, staleTime: 15_000 })
+  const servers = query.data?.servers ?? []
+  const clawpump = servers.find(isClawpump)
+  const others = servers.filter(s => !isClawpump(s))
+
+  // authenticated === true → OAuth tokens are on disk (the same session chat
+  // uses), so the MCP is genuinely connected. === false → needs sign-in.
+  const clawpumpConnected = clawpump?.authenticated === true
+  const clawpumpNeedsAuth = clawpump != null && clawpump.authenticated === false
+
+  const openGateway = () => void window.hermesDesktop?.openExternal?.(CLAWPUMP_GATEWAY_URL)
+
+  return (
+    <section {...props} className="flex h-full min-h-0 flex-col">
+      <div className="min-h-0 flex-1 overflow-y-auto">
+        <div className="mx-auto max-w-3xl space-y-4 px-5 py-4">
+          <header className="flex items-center gap-2">
+            <Zap className="size-5 text-primary" />
+            <h1 className="text-lg font-semibold">MCP Servers</h1>
+          </header>
+          <p className="text-sm text-muted-foreground">
+            Model Context Protocol servers wired into your agent. The ClawPump MCP brings 133 tools —
+            wallet, trading, marketplace, perps, token launch.
+          </p>
+
+          {query.isPending && (
+            <div className="flex items-center gap-2 text-sm text-muted-foreground">
+              <Loader2 className="size-4 animate-spin" /> Loading…
+            </div>
+          )}
+
+          {clawpump && (
+            <div className="rounded-lg border p-4">
+              <div className="flex items-center justify-between gap-2">
+                <div className="flex items-center gap-2">
+                  <span className="font-medium">ClawPump MCP</span>
+                  <span className="text-xs text-muted-foreground">{clawpump.name}</span>
+                </div>
+                {clawpumpConnected ? (
+                  <Badge className="gap-1">
+                    <Check className="size-3" /> Connected
+                  </Badge>
+                ) : (
+                  <Badge variant="outline">Not connected</Badge>
+                )}
+              </div>
+              {clawpumpNeedsAuth && (
+                <div className="mt-3 space-y-2">
+                  <p className="text-sm text-muted-foreground">
+                    Sign in at the ClawPump gateway to connect — then your 133 ClawPump tools come
+                    online in chat and across the app.
+                  </p>
+                  <div className="flex flex-wrap items-center gap-2">
+                    <Button onClick={openGateway} size="sm">
+                      <ExternalLink className="size-4" /> Connect at the gateway
+                    </Button>
+                    <code className="rounded bg-muted px-2 py-1 text-xs">claw clawpump login</code>
+                  </div>
+                  <p className="break-all text-xs text-muted-foreground">{CLAWPUMP_GATEWAY_URL}</p>
+                </div>
+              )}
+            </div>
+          )}
+
+          {!query.isPending && !clawpump && (
+            <div className="space-y-2 rounded-lg border p-4">
+              <p className="text-sm text-muted-foreground">
+                The ClawPump MCP isn&apos;t installed yet. Connect it at the gateway to unlock the 133
+                tools.
+              </p>
+              <div className="flex flex-wrap items-center gap-2">
+                <Button onClick={openGateway} size="sm">
+                  <ExternalLink className="size-4" /> Open the ClawPump gateway
+                </Button>
+                <code className="rounded bg-muted px-2 py-1 text-xs">claw clawpump setup</code>
+              </div>
+              <p className="break-all text-xs text-muted-foreground">{CLAWPUMP_GATEWAY_URL}</p>
+            </div>
+          )}
+
+          {others.length > 0 && (
+            <div className="space-y-2">
+              <h2 className="text-sm font-medium text-muted-foreground">Other servers</h2>
+              {others.map(s => (
+                <div
+                  className="flex items-center justify-between rounded-md border px-3 py-2"
+                  key={s.name}
+                >
+                  <div className="flex items-center gap-2">
+                    <span className="text-sm font-medium">{s.name}</span>
+                    <span className="text-xs text-muted-foreground">{s.transport}</span>
+                  </div>
+                  {s.enabled ? <Badge>Enabled</Badge> : <Badge variant="outline">Disabled</Badge>}
+                </div>
+              ))}
+            </div>
+          )}
+        </div>
+      </div>
+    </section>
+  )
+}

package/agent/apps/desktop/src/app/routes.ts

@@ -10,6 +10,7 @@ export const PROFILES_ROUTE = '/profiles'
 export const AGENTS_ROUTE = '/agents'
 export const WALLET_ROUTE = '/wallet'
 export const X402_ROUTE = '/x402'
+export const MCP_ROUTE = '/mcp'
 
 export type AppView =
   | 'agents'
@@ -17,6 +18,7 @@ export type AppView =
   | 'chat'
   | 'command-center'
   | 'cron'
+  | 'mcp'
   | 'messaging'
   | 'profiles'
   | 'settings'
@@ -29,6 +31,7 @@ export type AppRouteId =
   | 'artifacts'
   | 'command-center'
   | 'cron'
+  | 'mcp'
   | 'messaging'
   | 'new'
   | 'profiles'
@@ -54,7 +57,8 @@ export const APP_ROUTES = [
   { id: 'profiles', path: PROFILES_ROUTE, view: 'profiles' },
   { id: 'agents', path: AGENTS_ROUTE, view: 'agents' },
   { id: 'wallet', path: WALLET_ROUTE, view: 'wallet' },
-  { id: 'x402', path: X402_ROUTE, view: 'x402' }
+  { id: 'x402', path: X402_ROUTE, view: 'x402' },
+  { id: 'mcp', path: MCP_ROUTE, view: 'mcp' }
 ] as const satisfies readonly AppRoute[]
 
 const APP_VIEW_BY_PATH = new Map<string, AppView>(APP_ROUTES.map(route => [route.path, route.view]))

package/agent/apps/desktop/src/app/types.ts

@@ -125,6 +125,7 @@ export type CommandDispatchResponse =
 export type SidebarNavId =
   | 'artifacts'
   | 'command-center'
+  | 'mcp'
   | 'messaging'
   | 'new-session'
   | 'settings'

package/agent/apps/desktop/src/hermes.ts

@@ -771,6 +771,25 @@ export function getPodStatus(): Promise<{ connected: boolean; balance_usdc?: num
   })
 }
 
+export interface McpServer {
+  name: string
+  transport: string
+  url?: string | null
+  command?: string | null
+  enabled: boolean
+  /** OAuth servers: true/false once tokens are checked; null when not applicable. */
+  authenticated?: boolean | null
+  tools?: string[] | null
+}
+
+/** Configured MCP servers + their connection state (for the sidebar MCP page). */
+export function getMcpServers(): Promise<{ servers: McpServer[] }> {
+  return window.hermesDesktop.api<{ servers: McpServer[] }>({
+    ...profileScoped(),
+    path: '/api/mcp/servers'
+  })
+}
+
 /** ClawPump agent wallets (id + name + USDC balance) for the Pod funding picker. */
 export function getPodWallets(): Promise<{ ok: boolean; wallets: PodWallet[]; error?: string }> {
   return window.hermesDesktop.api<{ ok: boolean; wallets: PodWallet[]; error?: string }>({

package/agent/hermes_cli/distribution.py

@@ -488,7 +488,15 @@ def _clawpump_mcp_config():
         from hermes_cli.mcp_config import _get_mcp_servers, _resolve_mcp_server_config
 
         servers = _get_mcp_servers()
-        name = next((n for n in ("clawpump", "clawpump-stdio") if n in servers), None)
+        # Match the dashboard's _clawpump_mcp(): known names first, then any
+        # clawpump* entry (e.g. clawpump-agents), so every ClawPump MCP variant
+        # the agent can load is also resolvable here.
+        name = next(
+            (n for n in ("clawpump", "clawpump-stdio", "clawpump-agents") if n in servers),
+            None,
+        )
+        if not name:
+            name = next((n for n in servers if n.startswith("clawpump")), None)
         if not name:
             return (None, None)
         return (name, _resolve_mcp_server_config(servers[name]))

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/hermes_cli/web_server.py

@@ -7983,6 +7983,24 @@ def _redact_mcp_env(env: Dict[str, Any]) -> Dict[str, str]:
     return out
 
 
+def _mcp_server_authenticated(name: str, cfg: Dict[str, Any]) -> Optional[bool]:
+    """True/False if this server uses OAuth and we can tell whether tokens are
+    on disk; None when auth state isn't applicable/known (stdio key servers).
+
+    Lets the GUI render a real "Connected" vs "Connect" state for the ClawPump
+    MCP instead of guessing — the OAuth token is shared on disk, so the sidebar
+    reflects the same authenticated session the chat agent uses.
+    """
+    is_oauth = cfg.get("auth") == "oauth" or (cfg.get("url") and not cfg.get("command"))
+    if not is_oauth:
+        return None
+    try:
+        from hermes_cli.mcp_config import _oauth_tokens_present
+        return bool(_oauth_tokens_present(name))
+    except Exception:
+        return None
+
+
 def _mcp_server_summary(name: str, cfg: Dict[str, Any]) -> Dict[str, Any]:
     transport = "http" if cfg.get("url") else ("stdio" if cfg.get("command") else "unknown")
     return {
@@ -7994,6 +8012,7 @@ def _mcp_server_summary(name: str, cfg: Dict[str, Any]) -> Dict[str, Any]:
         "env": _redact_mcp_env(cfg.get("env") or {}),
         "auth": cfg.get("auth"),
         "enabled": cfg.get("enabled", True) is not False,
+        "authenticated": _mcp_server_authenticated(name, cfg),
         # Tool selection: list of enabled tool names, or None = all.
         "tools": cfg.get("tools"),
     }
@@ -12048,11 +12067,25 @@ async def set_dashboard_theme(body: ThemeSetBody):
 # in the vetted catalog (the font's webfont URL is injected as a <link>,
 # so we never accept an arbitrary user-supplied id/URL here).
 def _clawpump_mcp():
-    """Return (server_name, config) for the configured ClawPump MCP, else (None, None)."""
+    """Return (server_name, config) for the configured ClawPump MCP, else (None, None).
+
+    The chat agent loads EVERY configured MCP server, so the ClawPump tools work
+    in chat under whatever entry name the user installed — ``clawpump`` (remote
+    OAuth), ``clawpump-stdio``, or ``clawpump-agents`` (``npx @clawpump/agents``).
+    The dashboard must recognise the SAME entry, otherwise chat works while every
+    sidebar MCP page (wallet / x402 / pod / mail) reports "not configured". Try
+    the known names in preference order, then fall back to any ``clawpump*``
+    server so a future/renamed entry still resolves.
+    """
     from hermes_cli.mcp_config import _get_mcp_servers
 
     servers = _get_mcp_servers()
-    name = next((n for n in ("clawpump", "clawpump-stdio") if n in servers), None)
+    name = next(
+        (n for n in ("clawpump", "clawpump-stdio", "clawpump-agents") if n in servers),
+        None,
+    )
+    if name is None:
+        name = next((n for n in servers if n.startswith("clawpump")), None)
     return (name, servers[name]) if name else (None, None)
 
 

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/package.json

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