@fased/fased 0.1.61 → 0.1.64

package/dist/agents/tools/wallet-action-tool.js

@@ -6,13 +6,14 @@ import { assertValidSolanaAddress } from "../../wallet/solana-address.js";
 import { applyWalletPolicyConfig, isWalletToolAllowed, resolveWalletRecurringTransferPolicy, upsertWalletPolicyConfig, validateWalletTxPolicy } from "../../wallet/wallet-policy.js";
 import { resolveAgentWalletSelection } from "../../wallet/wallet-agent-selection.js";
 import { createWalletProviderAdapter, resolveScopedRpcUrlForWallet } from "../../wallet/wallet-provider-resolver.js";
-import { SOLANA_NATIVE_MINT, executeSolanaSwapApprovalPayload, fetchJupiterSwapOrder, inspectAndValidateSolanaSwapOrder, validateSolanaSwapIntentPolicy } from "../../wallet/solana-swap.js";
+import { SOLANA_NATIVE_MINT, executeSolanaSwapApprovalPayload, fetchJupiterSwapOrder, inspectAndValidateSolanaSwapOrder, prepareSolanaSwapSignerReview, validateSolanaSwapIntentPolicy } from "../../wallet/solana-swap.js";
 import { appendWalletAuditEntry } from "../../wallet/wallet-audit-log.js";
 import { simulateWalletPolicy } from "../../wallet/wallet-policy-simulation.js";
-import { createWalletSendApprovalRequest } from "../../wallet/wallet-send-approvals.js";
+import { bindSignerReviewToWalletApprovalPayload, createSignerReviewApprovalRequest, createWalletSendApprovalRequest } from "../../wallet/wallet-send-approvals.js";
 import { enforceWalletSkillAccessEnabled, enforceWalletSkillPolicy, readSkillWalletActionPermissions } from "./wallet-skill-policy.js";
 import { normalizeTokenAmountToBaseUnits, resolveSolanaToken } from "../../wallet/solana-token-resolver.js";
 import { cancelJupiterTriggerOrder, createJupiterTriggerLimitOrder, listJupiterTriggerOrders, readJupiterTriggerPositiveNumber, validateJupiterTriggerLimitOrderIntent } from "../../wallet/solana-trigger.js";
+import { createHash } from "node:crypto";
 import { Type } from "@sinclair/typebox";
 
 //#region src/agents/tools/wallet-action-tool.ts
@@ -59,10 +60,11 @@ const WalletActionToolSchema = Type.Object({
 	triggerToken: Type.Optional(Type.String()),
 	triggerSymbol: Type.Optional(Type.String()),
 	triggerCondition: Type.Optional(optionalStringEnum(WALLET_ACTION_TRIGGER_CONDITIONS)),
-	triggerPriceUsd: Type.Optional(Type.Number()),
-	expiresAt: Type.Optional(Type.Number()),
+	triggerPriceUsd: Type.Optional(Type.Union([Type.Number(), Type.String()])),
+	expiresAt: Type.Optional(Type.Union([Type.Number(), Type.String()])),
 	expirySeconds: Type.Optional(Type.Number()),
 	orderId: Type.Optional(Type.String()),
+	intentId: Type.Optional(Type.String()),
 	state: Type.Optional(optionalStringEnum(WALLET_ACTION_LIMIT_HISTORY_STATES)),
 	mint: Type.Optional(Type.String()),
 	limit: Type.Optional(Type.Number()),
@@ -120,7 +122,7 @@ function scheduleMessageForTransferPlan(plan) {
 		"Use the wallet tool only. Do not use raw signing tools or substitute display wallet names for handles.",
 		"If amountMode is fixed, call wallet.send with amountFormat=base and the exact base-unit amount.",
 		"If amountMode is percentage, first call wallet.balance for the source wallet and asset, subtract keepAmount, apply percentage, skip when below minAmount, then call wallet.send with amountFormat=base.",
-		"If balance, policy, custody, signer, or send fails, report the failure and do not retry with different wallets, destinations, mints, or amounts.",
+		"If balance, policy, signer, or send fails, report the failure and do not retry with different wallets, destinations, mints, or amounts.",
 		"",
 		"walletTransferSchedule:",
 		JSON.stringify(plan, null, 2)
@@ -130,16 +132,19 @@ function readPositivePercent(value) {
 	const raw = typeof value === "number" && Number.isFinite(value) ? value : 100;
 	return Math.max(1, Math.min(100, Math.floor(raw)));
 }
+function cronRunExecutionIntentId(sessionKey) {
+	const normalized = sessionKey?.trim();
+	if (!normalized || !normalized.includes(":cron:") || !normalized.includes(":run:")) {
+		return undefined;
+	}
+	return `cron-run:${createHash("sha256").update(normalized).digest("hex")}`;
+}
 function publicJupiterTriggerOrder(order) {
 	return {
 		id: order.id,
-		txSignature: order.txSignature
-	};
-}
-function publicJupiterTriggerVault(vault) {
-	return {
-		userPubkey: typeof vault.userPubkey === "string" ? vault.userPubkey : undefined,
-		vaultPubkey: typeof vault.vaultPubkey === "string" ? vault.vaultPubkey : undefined
+		txSignature: order.txSignature,
+		state: order.state,
+		provider: order.provider
 	};
 }
 function normalizeScheduleDestination(toRaw) {
@@ -197,7 +202,7 @@ function createWalletActionTool(opts) {
 		name: "wallet_action",
 		description: "Plan, quote, execute Solana swaps, schedule sends, and manage Jupiter Trigger limit orders through Fased policy. Use Agent wallets only. For normal SOL/token decimal amounts like 0.01, pass amountFormat=human; decimal amounts are treated as human units when amountFormat is omitted. For scheduled actions, create the schedule with cron using the schedule_plan or schedule_send output.",
 		parameters: WalletActionToolSchema,
-		execute: async (_toolCallId, args) => {
+		execute: async (toolCallId, args) => {
 			if (!access.ok) {
 				throw new Error(access.code ?? "wallet action access denied");
 			}
@@ -211,6 +216,14 @@ function createWalletActionTool(opts) {
 			const slippageBps = typeof params.slippageBps === "number" && Number.isFinite(params.slippageBps) ? Math.floor(params.slippageBps) : 50;
 			const mode = readStringParam(params, "mode") === "manual" ? "manual" : "autonomous";
 			const autonomous = mode === "autonomous";
+			const toolCallExecutionIntentId = (() => {
+				const normalized = toolCallId?.trim();
+				if (!normalized) {
+					return undefined;
+				}
+				return `tool-call:${createHash("sha256").update(`${opts?.agentSessionKey?.trim() ?? "unknown-session"}\0${normalized}`).digest("hex")}`;
+			})();
+			const executionIntentId = readStringParam(params, "intentId") ?? cronRunExecutionIntentId(opts?.agentSessionKey) ?? toolCallExecutionIntentId;
 			const scheduled = action === "schedule_plan";
 			const requesterSkillId = opts?.requesterSkillId?.trim() || null;
 			const permissions = readSkillWalletActionPermissions(cfg, requesterSkillId);
@@ -398,7 +411,7 @@ function createWalletActionTool(opts) {
 						"fixed amount or percentage rule",
 						"minimum and keep balance for percentage schedules",
 						"per-wallet SOL caps or per-mint token caps",
-						"Agent automation and custody state"
+						"Agent automation and signer policy state"
 					],
 					message: "Review this scheduled transfer, then create it with the cron tool. It is disabled by default and runtime caps are enforced on every run."
 				});
@@ -466,6 +479,44 @@ function createWalletActionTool(opts) {
 					throw new Error("automated execution disabled by wallet policy");
 				}
 				const orderId = readStringParam(params, "orderId", { required: true });
+				if (!autonomous) {
+					const prepared = await cancelJupiterTriggerOrder({
+						provider,
+						walletId: selection.walletId,
+						walletAddress: taker,
+						orderId,
+						autonomous: false,
+						intentId: executionIntentId,
+						env: process.env
+					});
+					if (prepared.mode !== "reviewed") {
+						throw new Error("Jupiter Trigger cancellation did not return an exact signer review");
+					}
+					const request = createSignerReviewApprovalRequest({
+						review: prepared.review,
+						role: "agent",
+						walletId: selection.walletId,
+						walletName: selection.walletName,
+						requestedBy: requesterAgentId ?? ownerAgentId ?? "agent",
+						memo: `Cancel Jupiter Trigger order ${orderId}`,
+						env: process.env
+					});
+					return jsonResult({
+						ok: false,
+						approvalRequired: true,
+						code: "wallet_trigger_approval_required",
+						requestId: request.id,
+						expiresAt: request.expiresAt,
+						plan: {
+							kind: "solana_limit_cancel",
+							walletHandle: selection.walletHandle,
+							walletId: selection.walletId,
+							orderId,
+							mode
+						},
+						message: "Jupiter Trigger cancellation requires operator approval in Control UI. No cancel side effect has occurred."
+					});
+				}
 				appendWalletAuditEntry({
 					action: "send_requested",
 					actor: requesterAgentId ?? ownerAgentId ?? "agent",
@@ -485,9 +536,13 @@ function createWalletActionTool(opts) {
 					walletId: selection.walletId,
 					walletAddress: taker,
 					orderId,
-					rpcUrl,
+					autonomous: true,
+					intentId: executionIntentId,
 					env: process.env
 				});
+				if (cancelled.mode !== "autonomous") {
+					throw new Error("Jupiter Trigger autonomous cancellation returned a review");
+				}
 				appendWalletAuditEntry({
 					action: "send_executed",
 					actor: requesterAgentId ?? ownerAgentId ?? "agent",
@@ -497,7 +552,7 @@ function createWalletActionTool(opts) {
 						walletId: selection.walletId,
 						orderId,
 						mode,
-						txHash: cancelled.tx.txHash
+						txHash: cancelled.operation.signature
 					},
 					env: process.env
 				});
@@ -506,7 +561,13 @@ function createWalletActionTool(opts) {
 					cancelled: true,
 					walletHandle: selection.walletHandle,
 					orderId,
-					tx: cancelled.tx
+					order: cancelled.order,
+					tx: {
+						ok: true,
+						chain: "solana",
+						txHash: cancelled.operation.signature,
+						signer: taker
+					}
 				});
 			}
 			const inputToken = await resolveSolanaToken({
@@ -575,7 +636,8 @@ function createWalletActionTool(opts) {
 				amount,
 				amountFormat: "base",
 				slippageBps,
-				mode
+				mode,
+				executionIntentId
 			};
 			if (action === "limit_order") {
 				const triggerCondition = readStringParam(params, "triggerCondition");
@@ -592,7 +654,7 @@ function createWalletActionTool(opts) {
 					query: triggerTokenQuery,
 					rpcUrl
 				}) : inputToken;
-				const expiresAt = typeof params.expiresAt === "number" && Number.isFinite(params.expiresAt) ? Math.floor(params.expiresAt) : undefined;
+				const expiresAt = typeof params.expiresAt === "number" && Number.isFinite(params.expiresAt) ? Math.floor(params.expiresAt) : readStringParam(params, "expiresAt");
 				const expirySeconds = typeof params.expirySeconds === "number" && Number.isFinite(params.expirySeconds) ? Math.floor(params.expirySeconds) : undefined;
 				const limitPolicy = validateJupiterTriggerLimitOrderIntent({
 					config: effectiveWallet,
@@ -624,12 +686,49 @@ function createWalletActionTool(opts) {
 					triggerPriceUsd,
 					expiresAt,
 					expirySeconds,
-					externalVault: "jupiter-trigger-v2"
+					executionProvider: "jupiter-trigger-v2"
 				};
 				if (!autonomous) {
+					const prepared = await createJupiterTriggerLimitOrder({
+						provider,
+						walletId: selection.walletId,
+						walletAddress: taker,
+						config: effectiveWallet,
+						inputMint,
+						outputMint,
+						amount,
+						triggerCondition,
+						triggerPriceUsd,
+						triggerMint: triggerToken.mint,
+						slippageBps,
+						expiresAt,
+						expirySeconds,
+						autonomous: false,
+						intentId: executionIntentId,
+						rpcUrl,
+						env: process.env
+					});
+					if (prepared.mode !== "reviewed") {
+						throw new Error("Jupiter Trigger create did not return an exact signer review");
+					}
+					const request = createSignerReviewApprovalRequest({
+						review: prepared.review,
+						role: "agent",
+						walletId: selection.walletId,
+						walletName: selection.walletName,
+						assetSymbol: inputToken.symbol,
+						assetName: inputToken.name,
+						amountDisplay: amountFormat === "human" ? readStringParam(params, "amount") : undefined,
+						requestedBy: requesterAgentId ?? ownerAgentId ?? "agent",
+						memo: `Create Jupiter Trigger ${triggerCondition} ${triggerPriceUsd} USD`,
+						env: process.env
+					});
 					return jsonResult({
-						ok: true,
-						live: false,
+						ok: false,
+						approvalRequired: true,
+						code: "wallet_trigger_approval_required",
+						requestId: request.id,
+						expiresAt: request.expiresAt,
 						plan: limitPlan,
 						reviewChecklist: [
 							"wallet handle",
@@ -639,7 +738,7 @@ function createWalletActionTool(opts) {
 							"expiry",
 							"Jupiter Trigger vault custody while order is active"
 						],
-						message: "Review this limit order plan, then rerun with mode=autonomous to create the live Jupiter Trigger order."
+						message: "Jupiter Trigger create requires operator approval in Control UI. No vault, deposit, or order side effect has occurred."
 					});
 				}
 				appendWalletAuditEntry({
@@ -669,11 +768,14 @@ function createWalletActionTool(opts) {
 						expiresAt,
 						expirySeconds,
 						autonomous,
+						intentId: executionIntentId,
 						rpcUrl,
 						env: process.env
 					});
+					if (created.mode !== "autonomous") {
+						throw new Error("Jupiter Trigger autonomous create returned a review");
+					}
 					const order = publicJupiterTriggerOrder(created.order);
-					const vault = publicJupiterTriggerVault(created.vault);
 					appendWalletAuditEntry({
 						action: "send_executed",
 						actor: requesterAgentId ?? ownerAgentId ?? "agent",
@@ -681,8 +783,7 @@ function createWalletActionTool(opts) {
 							...limitPlan,
 							mode,
 							orderId: order.id,
-							txHash: order.txSignature,
-							vaultPubkey: vault.vaultPubkey
+							txHash: order.txSignature
 						},
 						env: process.env
 					});
@@ -691,8 +792,7 @@ function createWalletActionTool(opts) {
 						live: true,
 						plan: limitPlan,
 						order,
-						vault,
-						message: "Jupiter Trigger limit order created. Deposited funds sit in the Jupiter Trigger vault until fill, expiry, or cancellation."
+						message: "Jupiter Trigger limit order created through the signer-owned durable workflow."
 					});
 				} catch (err) {
 					appendWalletAuditEntry({
@@ -759,7 +859,15 @@ function createWalletActionTool(opts) {
 					message: "Review this scheduled task, then create it with the task tool. It is disabled by default."
 				});
 			}
-			const order = await fetchJupiterSwapOrder({
+			const deferAutonomousOrder = action === "swap" && autonomous;
+			const order = deferAutonomousOrder ? {
+				ok: true,
+				inputMint,
+				outputMint,
+				inAmount: amount,
+				slippageBps,
+				raw: {}
+			} : await fetchJupiterSwapOrder({
 				inputMint,
 				outputMint,
 				amount,
@@ -767,13 +875,13 @@ function createWalletActionTool(opts) {
 				taker,
 				env: process.env
 			});
-			const inspection = await inspectAndValidateSolanaSwapOrder({
+			const inspection = deferAutonomousOrder ? undefined : await inspectAndValidateSolanaSwapOrder({
 				order,
 				expectedSigner: taker,
 				rpcUrl,
 				config: effectiveWallet
 			});
-			if (!inspection.ok) {
+			if (inspection && !inspection.ok) {
 				throw new Error(inspection.message);
 			}
 			const payload = {
@@ -803,12 +911,18 @@ function createWalletActionTool(opts) {
 				slippageBps: order.slippageBps ?? slippageBps,
 				priceImpactPct: order.priceImpactPct,
 				routeLabel: order.routeLabel,
-				programIds: inspection.programIds,
-				routeProgramIds: inspection.routeProgramIds,
-				usesAddressLookupTables: inspection.usesAddressLookupTables,
-				jupiterRequestId: order.requestId
+				programIds: inspection?.ok ? inspection.programIds : undefined,
+				routeProgramIds: inspection?.ok ? inspection.routeProgramIds : undefined,
+				writableAccounts: inspection?.ok ? inspection.writableAccounts : undefined,
+				usesAddressLookupTables: inspection?.ok ? inspection.usesAddressLookupTables : undefined,
+				jupiterRequestId: order.requestId,
+				executionIntentId,
+				serializedTxBase64: order.transaction
 			};
 			if (action === "quote") {
+				if (!inspection?.ok) {
+					throw new Error("Jupiter quote inspection is unavailable");
+				}
 				return jsonResult({
 					ok: true,
 					plan,
@@ -851,6 +965,9 @@ function createWalletActionTool(opts) {
 				env: process.env
 			});
 			if (!autonomous) {
+				if (!inspection?.ok) {
+					throw new Error("reviewed Jupiter swap inspection is unavailable");
+				}
 				const simulation = simulateWalletPolicy({
 					cfg,
 					config: effectiveWallet,
@@ -866,8 +983,27 @@ function createWalletActionTool(opts) {
 					const failed = simulation.checks.find((check) => check.status === "fail");
 					throw new Error(failed?.detail ?? "wallet policy rejected");
 				}
-				const request = createWalletSendApprovalRequest({
+				if (!rpcUrl?.trim()) {
+					throw new Error("Solana RPC is required to prepare a signer-owned swap review");
+				}
+				const signerReview = await prepareSolanaSwapSignerReview({
+					provider,
+					walletId: selection.walletId,
+					owner: taker,
+					order,
+					inspection,
+					rpcUrl,
+					mode: "reviewed",
+					env: process.env
+				});
+				const reviewedPayload = bindSignerReviewToWalletApprovalPayload({
 					payload,
+					review: signerReview.review,
+					role: "agent"
+				});
+				const request = createWalletSendApprovalRequest({
+					expiresAt: signerReview.review.expiresAt,
+					payload: reviewedPayload,
 					requestedBy: requesterAgentId ?? ownerAgentId ?? "agent",
 					simulation,
 					approvalDiff: simulation.diff,

package/dist/agents/tools/wallet-skill-policy.js

@@ -1,9 +1,10 @@
 import { resolveAgentWorkspaceDir, resolveDefaultAgentId } from "../agent-scope.js";
 import { readClawHubSkillOrigin } from "../skills-clawhub.js";
+import { isMarketplaceSkillDir, marketplaceSkillProvenanceMatchesContent } from "../skills/trust.js";
 import path from "node:path";
 
 //#region src/agents/tools/wallet-skill-policy.ts
-const DEFAULT_WALLET_ACTION_REGISTRIES = ["https://clawhub.com"];
+const LOCAL_WALLET_ACTION_SOURCE = "local";
 function normalizeList(value) {
 	if (!Array.isArray(value)) {
 		return undefined;
@@ -27,13 +28,10 @@ function normalizeRegistryUrl(value) {
 	}
 }
 function normalizeRegistryList(values) {
-	const rawList = Array.isArray(values) ? values : DEFAULT_WALLET_ACTION_REGISTRIES;
-	const registries = rawList.map((entry) => normalizeRegistryUrl(String(entry))).filter((entry) => Boolean(entry));
-	return registries.length > 0 ? registries : DEFAULT_WALLET_ACTION_REGISTRIES;
-}
-function readSkillsMarketplaceAllowRegistries(cfg) {
-	const raw = cfg?.skills?.marketplace?.allowRegistries;
-	return normalizeRegistryList(raw);
+	if (!Array.isArray(values)) {
+		return [];
+	}
+	return values.map((entry) => normalizeRegistryUrl(String(entry))).filter((entry) => Boolean(entry));
 }
 function normalizeSkillPathId(skillId) {
 	const id = skillId.trim();
@@ -51,7 +49,11 @@ async function readRequesterSkillOrigin(params) {
 	const agentIds = [params.requesterAgentId?.trim() || resolveDefaultAgentId(cfg), resolveDefaultAgentId(cfg)].filter(Boolean);
 	const workspaces = [...new Set(agentIds.map((agentId) => resolveAgentWorkspaceDir(cfg, agentId)))];
 	for (const workspaceDir of workspaces) {
-		const origin = await readClawHubSkillOrigin(path.join(workspaceDir, "skills", skillPathId));
+		const skillDir = path.join(workspaceDir, "skills", skillPathId);
+		if (isMarketplaceSkillDir(skillDir) && !marketplaceSkillProvenanceMatchesContent(skillDir)) {
+			throw new Error("wallet_action_skill_marketplace_content_integrity_failed");
+		}
+		const origin = await readClawHubSkillOrigin(skillDir);
 		if (origin) {
 			return {
 				registry: origin.registry,
@@ -109,11 +111,19 @@ async function enforceWalletSkillPolicy(params) {
 		}
 		return;
 	}
-	if (permissions.actions?.length && !permissions.actions.includes(params.action)) {
+	if (!permissions.actions?.length) {
+		throw new Error("wallet_action_skill_actions_required");
+	}
+	if (!permissions.actions.includes(params.action)) {
 		throw new Error("wallet_action_skill_action_not_allowed");
 	}
-	if (params.role && permissions.roles?.length && !permissions.roles.includes(params.role)) {
-		throw new Error("wallet_action_skill_role_not_allowed");
+	if (params.role) {
+		if (!permissions.roles?.length) {
+			throw new Error("wallet_action_skill_roles_required");
+		}
+		if (!permissions.roles.includes(params.role)) {
+			throw new Error("wallet_action_skill_role_not_allowed");
+		}
 	}
 	if (!permissions.walletIds?.length) {
 		throw new Error("wallet_action_skill_wallet_required");
@@ -121,20 +131,45 @@ async function enforceWalletSkillPolicy(params) {
 	if (!params.walletId || !permissions.walletIds.includes(params.walletId)) {
 		throw new Error("wallet_action_skill_wallet_not_allowed");
 	}
-	if (params.chain && permissions.chains?.length && !permissions.chains.includes(params.chain)) {
-		throw new Error("wallet_action_skill_chain_not_allowed");
+	if (params.chain) {
+		if (!permissions.chains?.length) {
+			throw new Error("wallet_action_skill_chains_required");
+		}
+		if (!permissions.chains.includes(params.chain)) {
+			throw new Error("wallet_action_skill_chain_not_allowed");
+		}
 	}
-	if (params.inputMint && permissions.inputMints?.length && !permissions.inputMints.includes(params.inputMint)) {
-		throw new Error("wallet_action_skill_input_mint_not_allowed");
+	if (params.inputMint) {
+		if (!permissions.inputMints?.length) {
+			throw new Error("wallet_action_skill_input_mints_required");
+		}
+		if (!permissions.inputMints.includes(params.inputMint)) {
+			throw new Error("wallet_action_skill_input_mint_not_allowed");
+		}
 	}
-	if (params.outputMint && permissions.outputMints?.length && !permissions.outputMints.includes(params.outputMint)) {
-		throw new Error("wallet_action_skill_output_mint_not_allowed");
+	if (params.outputMint) {
+		if (!permissions.outputMints?.length) {
+			throw new Error("wallet_action_skill_output_mints_required");
+		}
+		if (!permissions.outputMints.includes(params.outputMint)) {
+			throw new Error("wallet_action_skill_output_mint_not_allowed");
+		}
 	}
-	if (permissions.maxAmount && params.amount && BigInt(params.amount) > BigInt(permissions.maxAmount)) {
-		throw new Error("wallet_action_skill_amount_cap_exceeded");
+	if (params.amount) {
+		if (!permissions.maxAmount) {
+			throw new Error("wallet_action_skill_amount_cap_required");
+		}
+		if (BigInt(params.amount) > BigInt(permissions.maxAmount)) {
+			throw new Error("wallet_action_skill_amount_cap_exceeded");
+		}
 	}
-	if (permissions.maxSlippageBps !== undefined && (params.slippageBps ?? 0) > permissions.maxSlippageBps) {
-		throw new Error("wallet_action_skill_slippage_cap_exceeded");
+	if (params.slippageBps !== undefined) {
+		if (permissions.maxSlippageBps === undefined) {
+			throw new Error("wallet_action_skill_slippage_cap_required");
+		}
+		if (params.slippageBps > permissions.maxSlippageBps) {
+			throw new Error("wallet_action_skill_slippage_cap_exceeded");
+		}
 	}
 	if (params.autonomous && permissions.autonomous !== true) {
 		throw new Error("wallet_action_skill_autonomous_not_allowed");
@@ -142,6 +177,9 @@ async function enforceWalletSkillPolicy(params) {
 	if (params.scheduled && permissions.cron !== true) {
 		throw new Error("wallet_action_skill_cron_not_allowed");
 	}
+	if (!permissions.registries?.length) {
+		throw new Error("wallet_action_skill_registries_required");
+	}
 	const origin = await readRequesterSkillOrigin({
 		cfg: params.cfg,
 		requesterAgentId: params.requesterAgentId,
@@ -149,9 +187,13 @@ async function enforceWalletSkillPolicy(params) {
 		env: params.env
 	});
 	if (!origin) {
+		const allowedSources = normalizeRegistryList(permissions.registries);
+		if (!allowedSources.includes(LOCAL_WALLET_ACTION_SOURCE)) {
+			throw new Error("wallet_action_skill_local_source_not_allowed");
+		}
 		return;
 	}
-	const allowedRegistries = normalizeRegistryList(permissions.registries ?? readSkillsMarketplaceAllowRegistries(params.cfg));
+	const allowedRegistries = normalizeRegistryList(permissions.registries);
 	const registry = normalizeRegistryUrl(origin.registry);
 	if (!registry || !allowedRegistries.includes(registry)) {
 		throw new Error("wallet_action_skill_registry_not_allowlisted");

package/dist/agents/tools/wallet-tool.js

@@ -28,11 +28,10 @@ const WALLET_ACTIONS = [
 const WALLET_CHAINS = ["solana"];
 const WALLET_AMOUNT_FORMATS = ["base", "human"];
 const WALLET_PROVIDERS = [
-	"embedded-keystore",
 	"local-socket-signer",
 	"alchemy",
 	"turnkey",
-	"privy"
+	"wallet-standard"
 ];
 const WalletToolSchema = Type.Object({
 	action: stringEnum(WALLET_ACTIONS),
@@ -47,9 +46,7 @@ const WalletToolSchema = Type.Object({
 	address: Type.Optional(Type.String()),
 	walletHandle: Type.Optional(Type.String()),
 	walletId: Type.Optional(Type.String()),
-	walletName: Type.Optional(Type.String()),
-	approvalToken: Type.Optional(Type.String()),
-	approvalHost: Type.Optional(Type.String())
+	walletName: Type.Optional(Type.String())
 });
 function resolveCreateOrExecuteWalletSend() {
 	const mod = wallet_send_approvals_exports;
@@ -73,11 +70,10 @@ function resolveRequesterAgentId(params) {
 }
 function parseWalletProviderId(value) {
 	switch (value) {
-		case "embedded-keystore":
 		case "local-socket-signer":
 		case "alchemy":
 		case "turnkey":
-		case "privy": return value;
+		case "wallet-standard": return value;
 		default: return undefined;
 	}
 }
@@ -643,8 +639,6 @@ function createWalletTool(opts) {
 			if (chain === "solana" && payload.program) {
 				assertValidSolanaAddress(payload.program, "SPL mint address");
 			}
-			const approvalToken = readStringParam(params, "approvalToken");
-			const approvalHost = readStringParam(params, "approvalHost");
 			const requesterSkillId = opts?.requesterSkillId?.trim() || null;
 			const permissions = readSkillWalletActionPermissions(cfg, requesterSkillId);
 			await enforceWalletSkillPolicy({
@@ -683,6 +677,9 @@ function createWalletTool(opts) {
 				throw new Error(`wallet provider ${provider.id} does not support ${action} on chain: ${chain}`);
 			}
 			if (action === "prepare") {
+				if (!provider.prepareTx) {
+					throw new Error(`wallet provider ${provider.id} does not support prepare`);
+				}
 				const result = await provider.prepareTx(payload);
 				return jsonResult({
 					ok: true,
@@ -696,12 +693,11 @@ function createWalletTool(opts) {
 			const result = await createOrExecute({
 				payload,
 				requestedBy: requesterAgentId ?? ownerAgentId,
+				executionIntentId: `agent-wallet-tool:${_toolCallId}`,
 				sendPath: "automation",
 				config: effectiveWallet,
 				runtimeConfig: cfg,
 				providerIdOverride: walletSelection.providerId,
-				approvalToken,
-				approvalHost,
 				env: process.env
 			});
 			if (!result.ok) {