@agentlayer.tech/wallet 0.1.34 → 0.1.35

package/.openclaw/extensions/agent-wallet/openclaw.plugin.json

@@ -2,7 +2,7 @@
   "id": "agent-wallet",
   "name": "Agent Wallet",
   "description": "Official OpenClaw plugin bridge for the agent-wallet backends, including Solana, local BTC, and local EVM.",
-  "version": "0.1.34",
+  "version": "0.1.35",
   "contracts": {
     "tools": [
       "close_empty_token_accounts",

package/.openclaw/extensions/agent-wallet/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentlayertech/agent-wallet-plugin",
-  "version": "0.1.34",
+  "version": "0.1.35",
   "description": "OpenClaw plugin bridge for the AgentLayer wallet runtime.",
   "type": "module",
   "license": "SEE LICENSE IN ../../../LICENSE",

package/CHANGELOG.md

@@ -2,6 +2,28 @@
 
 ## Unreleased
 
+## v0.1.35 - 2026-06-03
+
+- Hardened the Codex / Claude Code MCP wallet bridge:
+  - Run the blocking wallet CLI subprocess off the event loop
+    (`asyncio.to_thread`) so a slow or hung wallet op no longer freezes the MCP
+    server — `tools/list`, read-only calls, and cancellation stay responsive.
+    The approval-preview cache is now guarded by a lock for concurrent calls.
+  - Consume the approved preview after a successful execute, so a duplicate
+    execute call cannot silently re-run the operation from stale 15-min approval
+    context. A failed execute keeps the preview so retries still work.
+  - `set_wallet_backend` commits session network/backend selection only after
+    the validating call succeeds, preventing a stale backend + new network mix.
+  - Fixed an off-by-one in the Claude Code launcher's sibling-codex fallback
+    path so a local checkout resolves `codex/server.py`.
+  - Replaced the `py_compile` self-check with a non-writing `ast.parse` check so
+    a read-only install dir cannot trigger a false "runtime broken" error.
+  - Parse `AGENT_WALLET_CODEX_TIMEOUT` defensively and surface a clean timeout
+    error instead of the raw `TimeoutExpired` repr (which echoed argv, including
+    the approval token). CLI stdout parsing now tolerates a stray line ahead of
+    the JSON result.
+  - Codex skill doc parity (`set_wallet_backend` / `set_evm_network`).
+
 ## v0.1.34 - 2026-06-02
 
 - Added native ETH support to EVM (Velora) swaps in the wallet runtime.

package/VERSION

@@ -1 +1 @@
-0.1.34
+0.1.35

package/agent-wallet/agent_wallet/__init__.py

@@ -2,7 +2,7 @@
 
 # Keep in sync with package.json, pyproject.toml, and the npm installer version.
 # scripts/check_release_version.mjs enforces this on release.
-__version__ = "0.1.34"
+__version__ = "0.1.35"
 
 __all__ = [
     "config",

package/agent-wallet/openclaw.plugin.json

@@ -2,7 +2,7 @@
   "id": "agent-wallet",
   "name": "Agent Wallet",
   "description": "Plugin-friendly wallet backend for OpenClaw agents with safe wallet tools and runtime instructions across Solana, local BTC, and local EVM.",
-  "version": "0.1.34",
+  "version": "0.1.35",
   "skills": ["skills/wallet-operator"],
   "configSchema": {
     "type": "object",

package/agent-wallet/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "openclaw-agent-wallet"
-version = "0.1.34"
+version = "0.1.35"
 description = "Plugin-friendly wallet backend for OpenClaw agents"
 requires-python = ">=3.10"
 dependencies = [

package/claude-code/plugins/agent-wallet/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "agent-wallet",
   "displayName": "Agent Wallet",
-  "version": "0.1.34",
+  "version": "0.1.35",
   "description": "Claude Code bridge for the existing AgentLayer wallet runtime. Connects to Solana, Bitcoin, and EVM wallets without creating a new one.",
   "author": {
     "name": "AgentLayer"

package/claude-code/plugins/agent-wallet/scripts/run_mcp.sh

@@ -10,13 +10,13 @@ PACKAGE_ROOT=${AGENT_WALLET_PACKAGE_ROOT:-${OPENCLAW_AGENT_WALLET_PACKAGE_ROOT:-
 # relative sibling paths below no longer resolve, so fall back to the codex
 # plugin copy inside the installed runtime package, which is always present.
 LOCAL_SERVER="$PLUGIN_ROOT/server.py"
-CODEX_SERVER="$PLUGIN_ROOT/../../codex/plugins/agent-wallet/server.py"
+CODEX_SERVER="$PLUGIN_ROOT/../../../codex/plugins/agent-wallet/server.py"
 RUNTIME_CODEX_DIR="$OPENCLAW_HOME/agent-wallet-runtime/current/codex/plugins/agent-wallet"
 
 if [ -f "$LOCAL_SERVER" ]; then
   SERVER_PY="$LOCAL_SERVER"
 elif [ -f "$CODEX_SERVER" ]; then
-  SERVER_PY=$(CDPATH= cd -- "$PLUGIN_ROOT/../../codex/plugins/agent-wallet" && pwd)/server.py
+  SERVER_PY=$(CDPATH= cd -- "$PLUGIN_ROOT/../../../codex/plugins/agent-wallet" && pwd)/server.py
 elif [ -f "$RUNTIME_CODEX_DIR/server.py" ]; then
   SERVER_PY=$(CDPATH= cd -- "$RUNTIME_CODEX_DIR" && pwd)/server.py
 else
@@ -37,7 +37,9 @@ else
 fi
 
 # Fail loudly (not -32000) if the resolved server cannot even be parsed.
-if ! "$PYTHON_BIN" -m py_compile "$SERVER_PY" 2>/dev/null; then
+# Use ast.parse (no bytecode written) so a read-only install dir cannot trigger
+# a false "runtime broken" error from py_compile failing to write __pycache__.
+if ! "$PYTHON_BIN" -c 'import sys, ast; ast.parse(open(sys.argv[1], encoding="utf-8").read())' "$SERVER_PY" 2>/dev/null; then
   "$PYTHON_BIN" - "$SERVER_PY" >&2 <<'PY'
 import json, sys
 print(json.dumps({

package/codex/plugins/agent-wallet/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-wallet",
-  "version": "0.1.34",
+  "version": "0.1.35",
   "description": "Codex plugin bridge for the AgentLayer wallet runtime.",
   "author": {
     "name": "AgentLayer"

package/codex/plugins/agent-wallet/scripts/run_mcp.sh

@@ -24,7 +24,9 @@ if [ ! -f "$PLUGIN_ROOT/server.py" ]; then
 fi
 
 # Fail loudly (not -32000) if the resolved server cannot even be parsed.
-if ! "$PYTHON_BIN" -m py_compile "$PLUGIN_ROOT/server.py" 2>/dev/null; then
+# Use ast.parse (no bytecode written) so a read-only install dir cannot trigger
+# a false "runtime broken" error from py_compile failing to write __pycache__.
+if ! "$PYTHON_BIN" -c 'import sys, ast; ast.parse(open(sys.argv[1], encoding="utf-8").read())' "$PLUGIN_ROOT/server.py" 2>/dev/null; then
   "$PYTHON_BIN" - "$PLUGIN_ROOT/server.py" >&2 <<'PY'
 import json, sys
 print(json.dumps({

package/codex/plugins/agent-wallet/server.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import asyncio
 import copy
 import base64
 import hashlib
@@ -9,6 +10,7 @@ import json
 import os
 import subprocess
 import sys
+import threading
 import time
 from functools import lru_cache
 from pathlib import Path
@@ -71,6 +73,9 @@ selected_solana_network: str | None = None
 selected_evm_network: str | None = None
 selected_btc_network: str | None = None
 approval_preview_cache: dict[str, dict[str, Any]] = {}
+# Guards approval_preview_cache against races once wallet calls run concurrently
+# via asyncio.to_thread. Reentrant so prune helpers can be nested under writers.
+_approval_cache_lock = threading.RLock()
 
 
 class WalletCliError(RuntimeError):
@@ -94,6 +99,8 @@ def _openclaw_home() -> Path:
 
 @lru_cache(maxsize=1)
 def _openclaw_plugin_config() -> dict[str, Any]:
+    # Cached for the process lifetime: openclaw.json is read once per MCP server
+    # start. Edits to plugin config require restarting the bridge to take effect.
     config_path = _openclaw_home() / "openclaw.json"
     try:
         payload = json.loads(config_path.read_text(encoding="utf-8"))
@@ -212,9 +219,10 @@ def _approval_preview_tool_name(tool_name: str) -> str:
 
 def _prune_approval_preview_cache() -> None:
     now = time.time()
-    for key in list(approval_preview_cache):
-        if float(approval_preview_cache[key].get("expires_at") or 0) <= now:
-            approval_preview_cache.pop(key, None)
+    with _approval_cache_lock:
+        for key in list(approval_preview_cache):
+            if float(approval_preview_cache[key].get("expires_at") or 0) <= now:
+                approval_preview_cache.pop(key, None)
 
 
 def _cache_preview_for_approval(user_id: str, tool_name: str, payload: dict[str, Any]) -> None:
@@ -231,18 +239,35 @@ def _cache_preview_for_approval(user_id: str, tool_name: str, payload: dict[str,
     summary = data.get("confirmation_summary")
     if not isinstance(summary, dict):
         return
-    _prune_approval_preview_cache()
-    approval_preview_cache[_approval_cache_key(user_id, cache_tool_name)] = {
-        "digest": _preview_digest(data),
-        "expires_at": time.time() + PREVIEW_CACHE_TTL_SECONDS,
-        "preview": data,
-        "summary": summary,
-    }
+    with _approval_cache_lock:
+        _prune_approval_preview_cache()
+        approval_preview_cache[_approval_cache_key(user_id, cache_tool_name)] = {
+            "digest": _preview_digest(data),
+            "expires_at": time.time() + PREVIEW_CACHE_TTL_SECONDS,
+            "preview": data,
+            "summary": summary,
+        }
 
 
 def _latest_cached_preview(user_id: str, tool_name: str) -> dict[str, Any] | None:
-    _prune_approval_preview_cache()
-    return approval_preview_cache.get(_approval_cache_key(user_id, _approval_preview_tool_name(tool_name)))
+    with _approval_cache_lock:
+        _prune_approval_preview_cache()
+        return approval_preview_cache.get(_approval_cache_key(user_id, _approval_preview_tool_name(tool_name)))
+
+
+def _consume_cached_preview(user_id: str, tool_name: str) -> None:
+    """Drop the cached preview once a successful execute has consumed it.
+
+    Without this, a preview lingers for the full TTL and a duplicate execute
+    call could re-run the operation from stale approval context — the runtime's
+    single-use nonce registry cannot stop it, because the bridge runs each
+    invoke in a fresh subprocess (empty registry) and mints a new token per
+    execute. Requiring a fresh preview before the next execute is the safe rule.
+    """
+    with _approval_cache_lock:
+        approval_preview_cache.pop(
+            _approval_cache_key(user_id, _approval_preview_tool_name(tool_name)), None
+        )
 
 
 def _approval_token_preview_digest(token: str) -> str:
@@ -509,28 +534,55 @@ def _parse_cli_error(text: str) -> WalletCliError:
     )
 
 
+def _cli_timeout_seconds() -> float:
+    """Parse the CLI timeout from env, falling back to 180s on bad values."""
+    raw = os.getenv("AGENT_WALLET_CODEX_TIMEOUT", "180")
+    try:
+        value = float(raw)
+    except (TypeError, ValueError):
+        return 180.0
+    return value if value > 0 else 180.0
+
+
 def _call_wallet_cli(command: str, extra_args: list[str]) -> dict[str, Any]:
     package_root = _resolve_package_root()
-    completed = subprocess.run(
-        [
-            _python_bin(package_root),
-            "-m",
-            "agent_wallet.openclaw_cli",
-            command,
-            *extra_args,
-        ],
-        cwd=str(package_root),
-        env=_cli_env(package_root),
-        text=True,
-        capture_output=True,
-        timeout=float(os.getenv("AGENT_WALLET_CODEX_TIMEOUT", "180")),
-        check=False,
-    )
+    timeout_seconds = _cli_timeout_seconds()
+    try:
+        completed = subprocess.run(
+            [
+                _python_bin(package_root),
+                "-m",
+                "agent_wallet.openclaw_cli",
+                command,
+                *extra_args,
+            ],
+            cwd=str(package_root),
+            env=_cli_env(package_root),
+            text=True,
+            capture_output=True,
+            timeout=timeout_seconds,
+            check=False,
+        )
+    except subprocess.TimeoutExpired as exc:
+        # Surface a clean, actionable message instead of the raw TimeoutExpired
+        # repr, which would echo the full argv (approval_token, config JSON).
+        raise WalletCliError(
+            f"agent-wallet CLI '{command}' timed out after {timeout_seconds:g}s. "
+            "Retry, or raise AGENT_WALLET_CODEX_TIMEOUT if the network is slow.",
+            code="timeout",
+        ) from exc
     if completed.returncode != 0:
         detail = completed.stderr.strip() or completed.stdout.strip()
         raise _parse_cli_error(detail)
+    # The CLI contract is a single JSON line on stdout. Parse the last non-empty
+    # line so a stray print/warning ahead of it from the runtime cannot break an
+    # otherwise-successful call.
+    stdout = completed.stdout.strip()
+    if not stdout:
+        return {}
+    last_line = stdout.splitlines()[-1].strip()
     try:
-        return json.loads(completed.stdout.strip() or "{}")
+        return json.loads(last_line)
     except json.JSONDecodeError as exc:
         raise WalletCliError(f"agent-wallet CLI returned invalid JSON: {exc}") from exc
 
@@ -824,26 +876,38 @@ async def _handle_set_wallet_backend(params: dict[str, Any]) -> dict[str, Any]:
 
     requested = params.get("backend", params.get("wallet"))
     backend = _normalize_wallet_backend(requested)
+    # Resolve the target network into a local first; only commit to the session
+    # globals after the validating wallet call succeeds, so a failed switch never
+    # leaves a stale backend paired with a freshly mutated network selection.
     if backend == "wdk_evm_local":
         implied = params.get("network") or selected_evm_network or _default_evm_network() or "ethereum"
-        selected_evm_network = _normalize_selectable_evm_network(implied)
+        resolved_network = _normalize_selectable_evm_network(implied)
     elif backend == "wdk_btc_local":
-        selected_btc_network = _normalize_btc_network(
+        resolved_network = _normalize_btc_network(
             params.get("network") or selected_btc_network or _default_btc_network()
         )
     else:
-        selected_solana_network = _normalize_solana_network(
+        resolved_network = _normalize_solana_network(
             params.get("network") or selected_solana_network or _default_solana_network()
         )
 
-    config = _effective_config_for_backend(backend)
-    payload = _invoke_tool(
+    config = _host_default_config()
+    config["backend"] = backend
+    config["network"] = resolved_network
+    payload = await asyncio.to_thread(
+        _invoke_tool,
         "get_evm_network" if backend == "wdk_evm_local" else "get_wallet_capabilities",
         {} if backend != "wdk_evm_local" else {"network": config["network"]},
         config,
     )
     if payload.get("ok") is False:
         raise RuntimeError(str(payload.get("error") or "set_wallet_backend failed"))
+    if backend == "wdk_evm_local":
+        selected_evm_network = resolved_network
+    elif backend == "wdk_btc_local":
+        selected_btc_network = resolved_network
+    else:
+        selected_solana_network = resolved_network
     selected_wallet_backend = backend
     return {
         "selected_backend": backend,
@@ -866,7 +930,7 @@ async def _handle_set_evm_network(params: dict[str, Any]) -> dict[str, Any]:
     network = _normalize_selectable_evm_network(params.get("network"))
     config = _effective_config_for_backend("wdk_evm_local")
     config["network"] = network
-    payload = _invoke_tool("get_evm_network", {"network": network}, config)
+    payload = await asyncio.to_thread(_invoke_tool, "get_evm_network", {"network": network}, config)
     if payload.get("ok") is False:
         raise RuntimeError(str(payload.get("error") or "set_evm_network failed"))
     selected_wallet_backend = "wdk_evm_local"
@@ -885,6 +949,30 @@ async def _handle_set_evm_network(params: dict[str, Any]) -> dict[str, Any]:
     }
 
 
+def _invoke_wallet_tool_blocking(
+    tool_name: str,
+    config: dict[str, Any],
+    effective_params: dict[str, Any],
+) -> dict[str, Any]:
+    """Synchronous wallet invocation: approval attach + CLI subprocess + cache.
+
+    Runs off the event loop via ``asyncio.to_thread`` so a slow or hung wallet
+    call never freezes the MCP server (tools/list, read-only calls, and
+    cancellation stay responsive).
+    """
+    used_cache = _attach_approval_for_execute(tool_name, config, effective_params)
+    try:
+        payload = _invoke_tool(tool_name, effective_params, config)
+    except Exception as exc:
+        raise _normalize_approval_context_error(exc) from exc
+    _cache_preview_for_approval(_user_id(), tool_name, payload)
+    # A bridge-managed preview that was just executed successfully is single-use:
+    # drop it so a duplicate execute cannot silently re-run the operation.
+    if used_cache is not None and payload.get("ok") is not False:
+        _consume_cached_preview(_user_id(), tool_name)
+    return payload
+
+
 async def _handle_wallet_tool(tool_name: str, params: dict[str, Any]) -> dict[str, Any]:
     config = _base_config(params, tool_name=tool_name)
     backend = _normalize_wallet_backend(config.get("backend"))
@@ -893,14 +981,10 @@ async def _handle_wallet_tool(tool_name: str, params: dict[str, Any]) -> dict[st
         config["network"] = selected_evm_network
 
     effective_params = dict(params)
-    _attach_approval_for_execute(tool_name, config, effective_params)
-
-    try:
-        payload = _invoke_tool(tool_name, effective_params, config)
-    except Exception as exc:
-        raise _normalize_approval_context_error(exc) from exc
+    payload = await asyncio.to_thread(
+        _invoke_wallet_tool_blocking, tool_name, config, effective_params
+    )
 
-    _cache_preview_for_approval(_user_id(), tool_name, payload)
     if payload.get("ok") is False:
         raise RuntimeError(str(payload.get("error") or f"{tool_name} failed"))
     return payload.get("data", {})

package/codex/plugins/agent-wallet/skills/wallet-operator/SKILL.md

@@ -16,3 +16,4 @@ Rules:
 - On mainnet, restate the network, asset, amount, and destination before execute.
 - Do not ask the user for `approval_token`. The bridge manages approval binding internally.
 - If approval context is missing or stale, repeat preview instead of improvising.
+- Use `set_wallet_backend` to switch between Solana, EVM, and Bitcoin wallets within a session, and `set_evm_network` to pick ethereum or base.

package/hermes/plugins/agent_wallet/plugin.yaml

@@ -1,5 +1,5 @@
 name: agent-wallet
-version: 0.1.34
+version: 0.1.35
 description: Thin Hermes Agent bridge to the existing AgentLayer/OpenClaw wallet backend
 provides_tools:
   - agent_wallet_tools

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentlayer.tech/wallet",
-  "version": "0.1.34",
+  "version": "0.1.35",
   "description": "NPM installer for the OpenClaw Agent Wallet local runtime.",
   "type": "module",
   "repository": {

package/wdk-btc-wallet/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wdk-btc-wallet",
-  "version": "0.1.34",
+  "version": "0.1.35",
   "private": true,
   "type": "module",
   "description": "Separate BTC-only wallet service built on Tether WDK.",

package/wdk-evm-wallet/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wdk-evm-wallet",
-  "version": "0.1.34",
+  "version": "0.1.35",
   "private": true,
   "type": "module",
   "description": "Separate EVM wallet service built on Tether WDK.",