@agentlayer.tech/wallet 0.1.64 → 0.1.66

package/agent-wallet/agent_wallet/user_wallets.py

@@ -52,13 +52,27 @@ def resolve_user_wallet_path(user_id: str, network: str | None = None) -> Path:
     return user_dir / f"solana-{effective_network}-agent.json"
 
 
-def _user_wallet_metadata(user_id: str, address: str, network: str | None = None) -> dict[str, str]:
+def _user_wallet_metadata(
+    user_id: str,
+    address: str,
+    network: str | None = None,
+    key_scope: str | None = None,
+) -> dict[str, str]:
     effective_network = normalize_solana_network(network or settings.solana_network)
-    return {
+    metadata = {
         "address": address,
         "user_id": user_id,
         "network": effective_network,
     }
+    # Record which master-key scope encrypted this envelope so the loader can
+    # try the matching candidate first instead of paying a wasted KDF on the
+    # wrong one. Writes through _resolve_user_wallet_master_key follow
+    # use_per_user_key_derivation(), so that is the accurate default.
+    effective_scope = key_scope or (
+        "per-user-derived" if use_per_user_key_derivation() else "global-master"
+    )
+    metadata["key_scope"] = effective_scope
+    return metadata
 
 
 def _resolve_effective_network(network: str | None = None) -> str:
@@ -126,12 +140,25 @@ def _load_user_wallet_secret_material(
     if not is_encrypted_wallet_payload(raw_text):
         return raw_text, "plaintext", None
 
-    last_exc: WalletBackendError | None = None
-    for key_scope, candidate in _candidate_user_wallet_master_keys(
+    candidates = _candidate_user_wallet_master_keys(
         user_id,
         network,
         raw_master_key=raw_master_key,
-    ):
+    )
+    # Try the scope recorded at encryption time first: a mismatched candidate
+    # costs a full (failed) KDF before the right one is attempted. Files
+    # without the marker keep the legacy order.
+    try:
+        import json as _json
+
+        recorded_scope = (_json.loads(raw_text).get("metadata") or {}).get("key_scope")
+    except Exception:
+        recorded_scope = None
+    if isinstance(recorded_scope, str) and recorded_scope:
+        candidates.sort(key=lambda item: item[0] != recorded_scope)
+
+    last_exc: WalletBackendError | None = None
+    for key_scope, candidate in candidates:
         try:
             return (
                 decrypt_secret_material(raw_text, master_key=candidate),
@@ -147,6 +174,58 @@ def _load_user_wallet_secret_material(
     )
 
 
+def _maybe_migrate_wallet_envelope_kdf(
+    path: Path,
+    secret_material: str,
+    *,
+    user_id: str,
+    network: str,
+    key_scope: str | None,
+    address: str,
+) -> None:
+    """Lazily rewrite an argon2id wallet envelope as hkdf-sha256.
+
+    Re-encrypts with the SAME key scope that just decrypted the file, so this
+    never performs a scope migration through the back door. Best-effort: any
+    failure leaves the (still readable) argon2id file untouched. Kill switch:
+    AGENT_WALLET_ENVELOPE_KDF_MIGRATION=0.
+    """
+    from agent_wallet.config import envelope_kdf_migration_enabled
+    from agent_wallet.encrypted_storage import (
+        KDF_ARGON2ID,
+        _default_write_kdf,
+        envelope_kdf,
+    )
+
+    try:
+        if not envelope_kdf_migration_enabled():
+            return
+        if _default_write_kdf() == KDF_ARGON2ID:
+            return  # forced-argon2id installs must not rewrite in place forever
+        if key_scope not in {"per-user-derived", "global-master"}:
+            return
+        if envelope_kdf(path.read_text(encoding="utf-8")) != KDF_ARGON2ID:
+            return
+        if key_scope == "per-user-derived":
+            master_key = _derive_user_scoped_key(
+                resolve_wallet_master_key(), user_id=user_id, network=network
+            )
+        else:
+            master_key = resolve_wallet_master_key()
+        if not master_key.strip():
+            return
+        write_encrypted_wallet_file(
+            path,
+            secret_material,
+            master_key=master_key,
+            metadata=_user_wallet_metadata(
+                user_id, address, network=network, key_scope=key_scope
+            ),
+        )
+    except Exception:
+        pass
+
+
 def ensure_user_solana_wallet(
     user_id: str,
     network: str | None = None,
@@ -206,6 +285,15 @@ def ensure_user_solana_wallet(
                 metadata=_user_wallet_metadata(user_id, signer.address, network=effective_network),
             )
             key_scope = "per-user-derived"
+        elif storage_format == "encrypted":
+            _maybe_migrate_wallet_envelope_kdf(
+                path,
+                secret_material,
+                user_id=user_id,
+                network=effective_network,
+                key_scope=key_scope,
+                address=signer.address,
+            )
         return {
             "user_id": user_id,
             "address": signer.address,

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.64",
+  "version": "0.1.66",
   "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.64"
+version = "0.1.66"
 description = "Plugin-friendly wallet backend for OpenClaw agents"
 requires-python = ">=3.10"
 dependencies = [

package/agent-wallet/scripts/build_release_bundle.py

@@ -19,15 +19,23 @@ INCLUDED_ROOT_FILES = [
     "LICENSE",
     "README.md",
     "RELEASING.md",
+    "VERSION",
     "install-from-github.sh",
     "requirements.txt",
     "setup.sh",
 ]
+# Must cover every setup.sh require_path and mirror the npm package `files`
+# allowlist (RELEASING.md "What Ships") — the bundle is the same runtime users
+# get from npx, just delivered as a GitHub Release asset.
 INCLUDED_TOP_LEVEL_DIRS = [
-    "codex",
+    ".claude-plugin",
     ".openclaw",
-    "agent-a2a-gateway",
     "agent-wallet",
+    "bin",
+    "claude-code",
+    "codex",
+    "hermes",
+    "scripts",
     "wdk-btc-wallet",
     "wdk-evm-wallet",
 ]

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

@@ -1,6 +1,6 @@
 ---
 name: wallet-operator
-description: Use when operating OpenClaw wallet tools: balances, transfers, swaps, LI.FI cross-chain swaps, Jupiter swaps, Velora EVM swaps, BTC transfers, staking, Kamino lending, Bags launches, and wallet execution safety.
+description: Use whenever the user's own funds are involved, even if they never say "wallet": balances, portfolio, transfers, swaps, LI.FI cross-chain swaps, Jupiter swaps, Velora EVM swaps, BTC transfers, staking, Kamino lending, Bags launches, and wallet execution safety.
 ---
 
 # Wallet Operator

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

@@ -1,7 +1,7 @@
 {
   "name": "agent-wallet",
   "displayName": "Agent Wallet",
-  "version": "0.1.64",
+  "version": "0.1.66",
   "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/skills/wallet-operator/SKILL.md

@@ -1,5 +1,5 @@
 ---
-description: "Use when the user asks Claude Code to interact with the local AgentLayer wallet runtime: check balances, transfer tokens, swap, DeFi operations, or x402 payments. Prefer wallet tools over shell commands. Preview writes first and execute only after explicit user confirmation."
+description: "Use whenever the user's own funds or wallet are involved — balances, portfolio, transfers, swaps, bridging, staking, lending, or x402 payments — even if the user never says \"wallet\". Trigger phrases include \"my balance\", \"how much SOL/ETH/BTC/USDC do I have\", \"send/transfer X to\", \"swap\", \"bridge\", \"stake\", \"my portfolio\", \"pay for this API\", \"x402\". Prefer agent-wallet MCP tools over shell commands, raw RPC, or crypto data servers. Preview writes first and execute only after explicit user confirmation."
 ---
 
 # Agent Wallet Operator

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

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

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

@@ -78,6 +78,9 @@ APPROVAL_CONTEXT_MISSING_MESSAGE = (
     "operation again, wait for explicit user confirmation, then retry execute. Do not ask the "
     "user for a manual approval token."
 )
+# Tools served by the long-lived resident read worker instead of a cold CLI
+# subprocess. Seeded with the legacy floor; _build_tool_definitions() extends
+# it with every adapter-declared read-only tool at server start.
 RESIDENT_READ_ONLY_TOOLS = {
     "get_wallet_balance",
     "get_wallet_portfolio",
@@ -270,6 +273,44 @@ def _cache_preview_for_approval(user_id: str, tool_name: str, payload: dict[str,
         }
 
 
+X402_PREVIEW_REUSE_TTL_SECONDS = 300
+
+
+def _cache_x402_preview_payload(user_id: str, payload: dict[str, Any]) -> None:
+    """Cache a paid-endpoint preview so x402_pay_request can skip its unpaid probe.
+
+    x402 previews run on the read-only resident-worker path, so they never reach
+    _cache_preview_for_approval (and preview-mode annotation strips
+    confirmation_summary anyway). Stored under the x402_preview_request key that
+    the pay alias resolves to. The wallet runtime revalidates the payload by
+    request fingerprint and falls back to a fresh probe on any mismatch, so a
+    stale or unrelated cached preview can never redirect a payment.
+    """
+    if not isinstance(payload, dict) or payload.get("ok") is False:
+        return
+    data = payload.get("data")
+    if not isinstance(data, dict):
+        return
+    if not data.get("payment_required") or not str(data.get("request_fingerprint") or "").strip():
+        return
+    with _approval_cache_lock:
+        _prune_approval_preview_cache()
+        approval_preview_cache[_approval_cache_key(user_id, "x402_preview_request")] = {
+            "digest": _preview_digest(data),
+            "expires_at": time.time() + X402_PREVIEW_REUSE_TTL_SECONDS,
+            "preview": data,
+            "summary": None,
+        }
+
+
+def _attach_x402_approved_preview(tool_name: str, effective_params: dict[str, Any]) -> None:
+    if tool_name != "x402_pay_request" or "_approved_preview" in effective_params:
+        return
+    cached = _latest_cached_preview(_user_id(), tool_name)
+    if cached and isinstance(cached.get("preview"), dict):
+        effective_params["_approved_preview"] = cached["preview"]
+
+
 def _latest_cached_preview(user_id: str, tool_name: str) -> dict[str, Any] | None:
     with _approval_cache_lock:
         _prune_approval_preview_cache()
@@ -622,20 +663,31 @@ def _call_wallet_cli(command: str, extra_args: list[str]) -> dict[str, Any]:
         raise WalletCliError(f"agent-wallet CLI returned invalid JSON: {exc}") from exc
 
 
-def _invoke_tool(tool_name: str, arguments: dict[str, Any], config: dict[str, Any]) -> dict[str, Any]:
-    return _call_wallet_cli(
-        "invoke",
-        [
-            "--user-id",
-            _user_id(),
-            "--tool",
-            tool_name,
-            "--arguments-json",
-            json.dumps(arguments),
-            "--config-json",
-            json.dumps(config),
-        ],
-    )
+def _invoke_tool(
+    tool_name: str,
+    arguments: dict[str, Any],
+    config: dict[str, Any],
+    *,
+    approval_summary: dict[str, Any] | None = None,
+    approval_mainnet_confirmed: bool = False,
+) -> dict[str, Any]:
+    extra_args = [
+        "--user-id",
+        _user_id(),
+        "--tool",
+        tool_name,
+        "--arguments-json",
+        json.dumps(arguments),
+        "--config-json",
+        json.dumps(config),
+    ]
+    if approval_summary is not None:
+        # The invoke subprocess mints the approval token itself, so an execute
+        # costs one cold start instead of two (issue-approval + invoke).
+        extra_args.extend(["--approval-summary-json", json.dumps(approval_summary)])
+        if approval_mainnet_confirmed:
+            extra_args.append("--approval-mainnet-confirmed")
+    return _call_wallet_cli("invoke", extra_args)
 
 
 class _ResidentReadWorker:
@@ -943,33 +995,16 @@ def _prewarm_resident_read_worker() -> None:
     ).start()
 
 
-def _issue_approval_token(
-    tool_name: str,
-    config: dict[str, Any],
-    preview_payload: dict[str, Any],
-) -> str:
+def _approval_summary_for_preview(tool_name: str, preview_payload: dict[str, Any]) -> dict[str, Any]:
+    """Build the digest-bound confirmation summary the invoke subprocess will
+    mint an approval token from (in-process, replacing the old standalone
+    issue-approval subprocess round trip)."""
     summary = preview_payload.get("confirmation_summary")
     if not isinstance(summary, dict):
         raise RuntimeError(f"No confirmation_summary available for {tool_name}.")
     summary_for_token = dict(summary)
     summary_for_token["_preview_digest"] = _preview_digest(preview_payload)
-    extra_args = [
-        "--user-id",
-        _user_id(),
-        "--tool",
-        tool_name,
-        "--summary-json",
-        json.dumps(summary_for_token),
-        "--config-json",
-        json.dumps(config),
-    ]
-    if preview_payload.get("is_mainnet") is True:
-        extra_args.append("--mainnet-confirmed")
-    payload = _call_wallet_cli("issue-approval", extra_args)
-    token = str(payload.get("approval_token") or "").strip()
-    if not token:
-        raise RuntimeError(f"issue-approval did not return an approval_token for {tool_name}.")
-    return token
+    return summary_for_token
 
 
 def _invoke_resident_read_tool(tool_name: str, arguments: dict[str, Any], config: dict[str, Any]) -> dict[str, Any]:
@@ -1041,10 +1076,17 @@ def _attach_approval_for_execute(
     tool_name: str,
     config: dict[str, Any],
     effective_params: dict[str, Any],
-) -> dict[str, Any] | None:
+) -> tuple[dict[str, Any] | None, dict[str, Any] | None]:
+    """Prepare approval context for an execute call.
+
+    Returns ``(used_cache, approval_args)``: ``used_cache`` is the consumed
+    bridge-managed preview (if any); ``approval_args`` carries the
+    digest-bound summary the invoke subprocess mints its own token from,
+    so no separate issue-approval subprocess is spawned.
+    """
     mode = str(effective_params.get("mode") or "")
     if mode not in {"execute", "intent_execute"}:
-        return None
+        return None, None
     if tool_name == "swap_solana_tokens" and mode == "execute":
         raise RuntimeError(
             "Legacy exact-preview execute is disabled for Solana Jupiter swaps in Codex. "
@@ -1053,19 +1095,22 @@ def _attach_approval_for_execute(
     cached = _latest_cached_preview(_user_id(), tool_name)
     if cached and isinstance(cached.get("preview"), dict):
         preview = cached["preview"]
-        effective_params["approval_token"] = _issue_approval_token(tool_name, config, preview)
+        approval_args = {
+            "summary": _approval_summary_for_preview(tool_name, preview),
+            "mainnet_confirmed": preview.get("is_mainnet") is True,
+        }
         if _requires_approved_preview_payload(tool_name, effective_params):
             effective_params["_approved_preview"] = preview
-        return cached
+        return cached, approval_args
     approval_token = str(effective_params.get("approval_token") or "").strip()
     if approval_token and _requires_approved_preview_payload(tool_name, effective_params):
         cached_preview = _cached_preview_for_token(_user_id(), tool_name, approval_token)
         if cached_preview is not None and "_approved_preview" not in effective_params:
             effective_params["_approved_preview"] = cached_preview
     if effective_params.get("approval_token"):
-        return None
+        return None, None
     if _should_let_backend_authorize_autonomous_execution(tool_name, effective_params, config):
-        return None
+        return None, None
     raise RuntimeError(APPROVAL_CONTEXT_MISSING_MESSAGE)
 
 
@@ -1242,6 +1287,13 @@ def _build_tool_definitions() -> list[dict[str, Any]]:
             merged.setdefault(spec["name"], spec)
     for spec in merged.values():
         spec["input_schema"] = _sanitize_schema(spec["input_schema"])
+        if spec.get("read_only") is True:
+            # Route every adapter-declared read-only tool through the resident
+            # read worker: reads then cost one warm request instead of a cold
+            # interpreter boot + onboarding per call. The worker enforces the
+            # same read_only contract on its side, and transport failures fall
+            # back to the cold subprocess path.
+            RESIDENT_READ_ONLY_TOOLS.add(spec["name"])
         if spec.get("read_only") is False:
             spec["description"] = (
                 f"{spec['description']} Preview first when supported. Execute reuses cached "
@@ -1388,11 +1440,22 @@ def _invoke_wallet_tool_blocking(
     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)
+    used_cache, approval_args = _attach_approval_for_execute(tool_name, config, effective_params)
+    _attach_x402_approved_preview(tool_name, effective_params)
     try:
-        payload = _invoke_tool(tool_name, effective_params, config)
+        payload = _invoke_tool(
+            tool_name,
+            effective_params,
+            config,
+            approval_summary=(approval_args or {}).get("summary"),
+            approval_mainnet_confirmed=bool((approval_args or {}).get("mainnet_confirmed")),
+        )
     except Exception as exc:
         raise _normalize_approval_context_error(exc) from exc
+    if tool_name == "x402_pay_request":
+        # The cached x402 preview quote is single-use: whether the payment
+        # succeeded or the endpoint re-priced, the next pay must re-preview.
+        _consume_cached_preview(_user_id(), tool_name)
     _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.
@@ -1431,15 +1494,21 @@ async def _handle_wallet_tool(tool_name: str, params: dict[str, Any]) -> dict[st
             _invoke_wallet_tool_blocking, tool_name, config, effective_params
         )
 
+    if tool_name == "x402_preview_request":
+        _cache_x402_preview_payload(_user_id(), payload)
     if payload.get("ok") is False:
         raise RuntimeError(str(payload.get("error") or f"{tool_name} failed"))
     return payload.get("data", {})
 
 
 BASE_INSTRUCTIONS = (
-    "Use the local AgentLayer wallet runtime through explicit wallet tools. Keep wallet "
-    "secrets local. Preview writes first when supported, and execute only after explicit "
-    "user confirmation."
+    "This server is the user's own local AgentLayer wallet (Solana, EVM, Bitcoin). Use its "
+    "tools whenever the user asks about their balances, portfolio, addresses, transfers, "
+    "swaps, bridging, staking, lending, or x402 payments — even when they never say the "
+    "word 'wallet'. For anything touching the user's own funds, prefer these tools over "
+    "shell commands, raw RPC calls, or other crypto data servers (those are for arbitrary "
+    "addresses and market data, not the user's wallet). Keep wallet secrets local. Preview "
+    "writes first when supported, and execute only after explicit user confirmation."
 )
 
 

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

@@ -1,6 +1,6 @@
 ---
 name: "wallet-operator"
-description: "Use when the user asks Codex to interact with the local AgentLayer wallet runtime. Prefer wallet tools over shell commands, preview writes first, and keep approval/signing semantics intact."
+description: "Use whenever the user's own funds or wallet are involved — balances, portfolio, transfers, swaps, bridging, staking, lending, or x402 payments — even if the user never says \"wallet\". Trigger phrases include \"my balance\", \"how much SOL/ETH/BTC/USDC do I have\", \"send/transfer X to\", \"swap\", \"bridge\", \"stake\", \"my portfolio\". Prefer wallet tools over shell commands, preview writes first, and keep approval/signing semantics intact."
 ---
 
 # Agent Wallet Operator

package/hermes/plugins/agent_wallet/plugin.yaml

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

package/install-from-github.sh

@@ -120,9 +120,15 @@ if [ -z "$SOURCE_ROOT" ] || [ ! -d "$SOURCE_ROOT" ]; then
   exit 1
 fi
 
+# Pre-flight must be a superset of setup.sh's require_path list: everything is
+# checked on the EXTRACTED temp tree, before the destructive swap below. A
+# bundle that would fail setup.sh must never replace the user's runtime.
 require_path "$SOURCE_ROOT/setup.sh" "local setup entrypoint"
 require_path "$SOURCE_ROOT/agent-wallet" "agent-wallet package"
+require_path "$SOURCE_ROOT/agent-wallet/scripts/install_agent_wallet.py" "Python installer"
 require_path "$SOURCE_ROOT/.openclaw/extensions/agent-wallet" "OpenClaw extension"
+require_path "$SOURCE_ROOT/codex/plugins/agent-wallet/.codex-plugin/plugin.json" "Codex plugin"
+require_path "$SOURCE_ROOT/claude-code/plugins/agent-wallet/.claude-plugin/plugin.json" "Claude Code plugin"
 require_path "$SOURCE_ROOT/wdk-btc-wallet/package.json" "wdk-btc-wallet runtime"
 require_path "$SOURCE_ROOT/wdk-evm-wallet/package.json" "wdk-evm-wallet runtime"
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentlayer.tech/wallet",
-  "version": "0.1.64",
+  "version": "0.1.66",
   "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.64",
+  "version": "0.1.66",
   "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.64",
+  "version": "0.1.66",
   "private": true,
   "type": "module",
   "description": "Separate EVM wallet service built on Tether WDK.",