@vapi-network/cli 0.9.0 → 0.9.2

package/dist/index.js

@@ -28987,365 +28987,6 @@ function date4(params) {
   return _coercedDate(ZodDate, params);
 }
 
-// ../core/src/marketplace-contracts.ts
-var MARKETPLACE_DISCOVERY_PROTOCOL = "vapi.marketplace.discovery/1";
-var MARKETPLACE_RANKING_VERSION = "marketplace-ranking-v1";
-var MARKETPLACE_KINDS = ["api", "service_offer", "open_request"];
-var MARKETPLACE_EXECUTION_METHODS = [
-  "GET",
-  "HEAD",
-  "POST",
-  "PUT",
-  "PATCH",
-  "DELETE"
-];
-var marketplaceExecutionMethodSchema = external_exports.enum(MARKETPLACE_EXECUTION_METHODS);
-var marketplaceKindSchema = external_exports.enum(MARKETPLACE_KINDS);
-var EXECUTION_MODES = ["direct", "gateway"];
-var executionModeSchema = external_exports.enum(EXECUTION_MODES);
-var PROVENANCES = ["indexed", "self_listed", "partner"];
-var provenanceSchema = external_exports.enum(PROVENANCES);
-var FIRST_PARTY_PROVENANCES = ["self_listed", "partner"];
-var firstPartyProvenanceSchema = external_exports.enum(FIRST_PARTY_PROVENANCES);
-var LISTING_GROUPS = ["vapi", "added", "partner", "external"];
-var listingGroupSchema = external_exports.enum(LISTING_GROUPS);
-var listingFeeSchema = external_exports.looseObject({
-  bps: external_exports.number().int().min(0),
-  label: external_exports.string()
-});
-var LISTING_VERIFICATIONS = ["none", "requested", "verified"];
-var listingVerificationSchema = external_exports.enum(LISTING_VERIFICATIONS);
-var listingVerificationFieldSchema = listingVerificationSchema.default("none").catch("none");
-var listingLivenessSchema = external_exports.looseObject({
-  uptime7d: external_exports.number().min(0).max(1),
-  latencyP50Ms: external_exports.number().nonnegative().nullable(),
-  latencyP95Ms: external_exports.number().nonnegative().nullable(),
-  checks7d: external_exports.number().int().nonnegative()
-});
-var listingConformanceSchema = external_exports.looseObject({
-  declaredVersion: external_exports.union([external_exports.literal(1), external_exports.literal(2)]).nullable(),
-  versionConformant: external_exports.boolean(),
-  offerTransport: external_exports.enum(["body", "header", "both"]),
-  issues: external_exports.array(external_exports.string())
-});
-var listingIdentitySchema = external_exports.looseObject({
-  erc8004Id: external_exports.string().trim().min(1),
-  reputation: external_exports.looseObject({
-    score: external_exports.number().finite(),
-    count: external_exports.number().int().nonnegative()
-  }).optional().catch(void 0)
-});
-var listingDisclosureShape = {
-  group: listingGroupSchema.optional(),
-  fee: listingFeeSchema.optional(),
-  verification: listingVerificationFieldSchema,
-  liveness: listingLivenessSchema.optional().catch(void 0),
-  conformance: listingConformanceSchema.optional().catch(void 0),
-  identity: listingIdentitySchema.optional().catch(void 0)
-};
-var marketplaceBadgeCodeSchema = external_exports.enum([
-  "live_x402",
-  "partner",
-  "payout_wallet_confirmed",
-  "vapi_verified",
-  "external_catalog",
-  "approved_vendor"
-]);
-var marketplaceBadgeSchema = external_exports.looseObject({
-  code: marketplaceBadgeCodeSchema,
-  label: external_exports.string().trim().min(1).max(80)
-});
-var marketplacePublicFactSchema = external_exports.looseObject({
-  label: external_exports.string().trim().min(1).max(80),
-  value: external_exports.string().trim().min(1).max(160)
-});
-var marketplaceHrefSchema = external_exports.union([
-  external_exports.string().trim().min(1).max(2048).regex(/^\/(?!\/)/),
-  external_exports.url().max(2048).regex(/^https:\/\//)
-]);
-var marketplaceCardSchema = external_exports.looseObject({
-  title: external_exports.string().trim().min(1).max(160),
-  summary: external_exports.string().trim().min(1).max(1e3),
-  byline: external_exports.string().trim().min(1).max(160).optional(),
-  bylineHref: marketplaceHrefSchema.optional(),
-  badges: external_exports.array(marketplaceBadgeSchema).max(8),
-  facts: external_exports.array(marketplacePublicFactSchema).max(12)
-});
-var marketplaceHitBase = {
-  ref: external_exports.string().trim().min(1).max(512),
-  card: marketplaceCardSchema,
-  ...listingDisclosureShape
-};
-var invokeApiActionSchema = external_exports.looseObject({
-  type: external_exports.literal("invoke_api"),
-  href: marketplaceHrefSchema
-});
-var firstPartyApiMarketplaceHitSchema = external_exports.looseObject({
-  ...marketplaceHitBase,
-  kind: external_exports.literal("api"),
-  provenance: firstPartyProvenanceSchema,
-  execution: external_exports.looseObject({
-    mode: executionModeSchema
-  }),
-  action: invokeApiActionSchema
-});
-var mirroredApiMarketplaceHitSchema = external_exports.looseObject({
-  ...marketplaceHitBase,
-  kind: external_exports.literal("api"),
-  provenance: external_exports.literal("indexed"),
-  execution: external_exports.looseObject({
-    mode: external_exports.literal("direct"),
-    url: external_exports.url().max(2048).regex(/^https:\/\/(?![^/?#]*@)/),
-    method: marketplaceExecutionMethodSchema.nullable(),
-    network: external_exports.string().trim().max(160).regex(/^eip155:[1-9]\d*$/)
-  }),
-  action: invokeApiActionSchema
-});
-var apiMarketplaceHitSchema = external_exports.discriminatedUnion("provenance", [
-  firstPartyApiMarketplaceHitSchema,
-  mirroredApiMarketplaceHitSchema
-]);
-var serviceOfferMarketplaceHitSchema = external_exports.looseObject({
-  ...marketplaceHitBase,
-  kind: external_exports.literal("service_offer"),
-  action: external_exports.looseObject({
-    type: external_exports.literal("start_engagement"),
-    href: marketplaceHrefSchema
-  })
-});
-var openRequestMarketplaceHitSchema = external_exports.looseObject({
-  ...marketplaceHitBase,
-  kind: external_exports.literal("open_request"),
-  action: external_exports.looseObject({
-    type: external_exports.literal("propose_to_request"),
-    href: marketplaceHrefSchema
-  })
-});
-var marketplaceHitSchema = external_exports.union([
-  apiMarketplaceHitSchema,
-  serviceOfferMarketplaceHitSchema,
-  openRequestMarketplaceHitSchema
-]);
-var marketplaceDiscoveryInputSchema = external_exports.strictObject({
-  q: external_exports.string().trim().max(200).optional(),
-  kinds: external_exports.array(marketplaceKindSchema).min(1).max(MARKETPLACE_KINDS.length).optional(),
-  network: external_exports.string().trim().min(1).max(160).optional(),
-  cursor: external_exports.string().trim().min(1).max(4096).optional(),
-  limit: external_exports.number().int().min(1).max(50).optional(),
-  includeUnverified: external_exports.boolean().optional()
-}).superRefine((input2, context) => {
-  if (input2.kinds && new Set(input2.kinds).size !== input2.kinds.length) {
-    context.addIssue({
-      code: "custom",
-      path: ["kinds"],
-      message: "Marketplace kinds must be unique"
-    });
-  }
-});
-function isMirroredHit(hit) {
-  return hit.kind === "api" && hit.provenance === "indexed";
-}
-var marketplaceDiscoveryPageSchema = external_exports.looseObject({
-  protocol: external_exports.literal(MARKETPLACE_DISCOVERY_PROTOCOL),
-  items: external_exports.array(marketplaceHitSchema),
-  nextCursor: external_exports.string().min(1).max(4096).nullable(),
-  unavailableKinds: external_exports.array(marketplaceKindSchema).max(MARKETPLACE_KINDS.length),
-  rankingVersion: external_exports.literal(MARKETPLACE_RANKING_VERSION)
-});
-
-// ../core/src/call-contracts-wire.ts
-var CALLABLE_CATEGORIES = ["ai", "data", "crypto", "compute", "search"];
-var callableCategorySchema = external_exports.enum(CALLABLE_CATEGORIES);
-var DISCOVERY_CATEGORIES = [...CALLABLE_CATEGORIES, "other"];
-var discoveryCategorySchema = external_exports.enum(DISCOVERY_CATEGORIES);
-var CALLABLE_CATEGORY_SET = new Set(CALLABLE_CATEGORIES);
-var serviceTierSchema = external_exports.enum(["listed", "verified", "partner"]);
-var discoveryEndpointSchema = external_exports.looseObject({
-  name: external_exports.string(),
-  method: external_exports.string(),
-  url: external_exports.url(),
-  price: external_exports.string(),
-  description: external_exports.string(),
-  operationId: external_exports.string().trim().min(1).optional(),
-  requestContentType: external_exports.string().trim().min(1).optional(),
-  requestSchema: external_exports.json().optional(),
-  responseContentType: external_exports.string().trim().min(1).optional(),
-  pathTemplate: external_exports.string().trim().min(1).optional(),
-  pathParameters: external_exports.array(external_exports.string().trim().min(1)).optional(),
-  payment: external_exports.looseObject({
-    scheme: external_exports.literal("exact"),
-    network: external_exports.string().regex(/^eip155:\d+$/),
-    asset: external_exports.string().regex(/^0x[0-9a-fA-F]{40}$/),
-    payTo: external_exports.string().regex(/^0x[0-9a-fA-F]{40}$/),
-    checkedAt: external_exports.iso.datetime()
-  }).optional()
-});
-var serviceSummarySchema = external_exports.looseObject({
-  id: external_exports.string(),
-  name: external_exports.string(),
-  description: external_exports.string(),
-  category: discoveryCategorySchema,
-  tier: serviceTierSchema,
-  ...listingDisclosureShape,
-  verified: external_exports.boolean(),
-  wrapped: external_exports.boolean(),
-  price: external_exports.string(),
-  networks: external_exports.array(external_exports.string()),
-  endpoints: external_exports.array(discoveryEndpointSchema)
-});
-var searchServicesResponseSchema = external_exports.looseObject({
-  services: external_exports.array(serviceSummarySchema)
-});
-var discoveryResponseSchema = searchServicesResponseSchema;
-
-// ../core/src/call-contracts.ts
-var DiscoveryCatalogError = class extends Error {
-  name = "DiscoveryCatalogError";
-  code;
-  serviceId;
-  constructor(code, message, serviceId) {
-    super(message);
-    this.code = code;
-    this.serviceId = serviceId;
-  }
-};
-function parseDiscovery(raw) {
-  const parsed = discoveryResponseSchema.safeParse(raw);
-  if (!parsed.success) {
-    const malformedUrl = parsed.error.issues.find(
-      (issue2) => issue2.path.at(-1) === "url" && issue2.path.includes("endpoints")
-    );
-    if (malformedUrl) {
-      const serviceIndex = pathIndexAfter(malformedUrl.path, "services");
-      const serviceId = rawServiceId(raw, serviceIndex);
-      throw new DiscoveryCatalogError(
-        "malformed_url",
-        `Service ${JSON.stringify(serviceId ?? "unknown")} has a malformed endpoint URL.`,
-        serviceId
-      );
-    }
-    throw new DiscoveryCatalogError("invalid_discovery", "Discovery response is malformed.");
-  }
-  for (const service of parsed.data.services) {
-    buildTargets(service);
-  }
-  const resolveListing = (serviceId, endpointName) => {
-    const service = parsed.data.services.find((candidate) => candidate.id === serviceId);
-    if (!service) {
-      throw new DiscoveryCatalogError(
-        "service_not_found",
-        `No payable endpoint found for service ${JSON.stringify(serviceId)}.`,
-        serviceId
-      );
-    }
-    return { service, endpoint: resolveTarget(service, endpointName) };
-  };
-  return {
-    services: parsed.data.services,
-    resolve: (serviceId, endpointName) => resolveListing(serviceId, endpointName).endpoint,
-    resolveListing
-  };
-}
-function resolveTarget(service, endpointName) {
-  const { targets, targetsByName } = buildTargets(service);
-  if (endpointName !== void 0) {
-    const selected = targetsByName.get(endpointName.trim());
-    if (!selected) {
-      throw new DiscoveryCatalogError(
-        "endpoint_not_found",
-        `Service ${JSON.stringify(service.id)} has no endpoint ${JSON.stringify(endpointName)}. Available endpoints: ${[...targetsByName.keys()].join(", ")}.`,
-        service.id
-      );
-    }
-    return { ...selected };
-  }
-  if (targets.size !== 1) {
-    throw new DiscoveryCatalogError(
-      "ambiguous_default",
-      `Service ${JSON.stringify(service.id)} has ${targets.size} distinct payable endpoints. Choose one with endpoint: ${[...targetsByName.keys()].join(", ")}.`,
-      service.id
-    );
-  }
-  return targets.values().next().value;
-}
-function buildTargets(service) {
-  if (service.endpoints.length === 0) {
-    throw new DiscoveryCatalogError(
-      "no_endpoint",
-      `Service ${JSON.stringify(service.id)} has no payable endpoint.`,
-      service.id
-    );
-  }
-  const namedEndpoints = [...service.endpoints].sort(
-    (left, right) => compareNames(left.name.trim(), right.name.trim())
-  );
-  const names = /* @__PURE__ */ new Set();
-  const targets = /* @__PURE__ */ new Map();
-  const targetsByName = /* @__PURE__ */ new Map();
-  for (const endpoint of namedEndpoints) {
-    const name = endpoint.name.trim();
-    if (!name) {
-      throw new DiscoveryCatalogError(
-        "invalid_endpoint_name",
-        `Service ${JSON.stringify(service.id)} has a blank endpoint name.`,
-        service.id
-      );
-    }
-    if (names.has(name)) {
-      throw new DiscoveryCatalogError(
-        "duplicate_endpoint_name",
-        `Service ${JSON.stringify(service.id)} has duplicate endpoint name ${JSON.stringify(name)}.`,
-        service.id
-      );
-    }
-    names.add(name);
-    const method = endpoint.method.trim().toUpperCase();
-    if (!method) {
-      throw new DiscoveryCatalogError(
-        "blank_method",
-        `Service ${JSON.stringify(service.id)} has a blank endpoint method.`,
-        service.id
-      );
-    }
-    const url2 = new URL(endpoint.url);
-    if (url2.protocol !== "http:" && url2.protocol !== "https:") {
-      throw new DiscoveryCatalogError(
-        "malformed_url",
-        `Service ${JSON.stringify(service.id)} has a non-HTTP endpoint URL.`,
-        service.id
-      );
-    }
-    const transportKey = `${method}\0${endpoint.url}`;
-    const normalized = { ...endpoint, name, method };
-    targetsByName.set(name, normalized);
-    if (!targets.has(transportKey)) targets.set(transportKey, normalized);
-  }
-  return { targets, targetsByName };
-}
-function compareNames(left, right) {
-  return left < right ? -1 : left > right ? 1 : 0;
-}
-function pathIndexAfter(path, key2) {
-  const keyIndex = path.indexOf(key2);
-  const candidate = path[keyIndex + 1];
-  return typeof candidate === "number" ? candidate : void 0;
-}
-function rawServiceId(raw, serviceIndex) {
-  if (serviceIndex === void 0 || typeof raw !== "object" || raw === null) {
-    return void 0;
-  }
-  const services = Reflect.get(raw, "services");
-  if (!Array.isArray(services)) {
-    return void 0;
-  }
-  const service = services[serviceIndex];
-  if (typeof service !== "object" || service === null) {
-    return void 0;
-  }
-  const id2 = Reflect.get(service, "id");
-  return typeof id2 === "string" ? id2 : void 0;
-}
-
 // ../../node_modules/.pnpm/viem@2.56.1_typescript@6.0.3_zod@4.5.4/node_modules/viem/_esm/index.js
 init_exports();
 
@@ -39622,6 +39263,7 @@ var ARC_MAINNET_CAIP2 = "eip155:5042";
 var ARC_TESTNET_CAIP2 = "eip155:5042002";
 var SOLANA_MAINNET_CAIP2 = "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdpKuc147dw2N9d";
 var X402_SOLANA_MAINNET_CAIP2 = "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp";
+var SOLANA_DEVNET_CAIP2 = "solana:EtWTRABZaYq6iMfeYKouRu166VU2xqa1";
 var SOLANA_MAINNET_USDC = "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v";
 function canonicalIdentity(usdc, eip712Domain) {
   return Object.freeze({
@@ -39665,375 +39307,184 @@ var BROWSER_ENABLED_X402_NETWORK_CONFIG = Object.freeze({
   [ARC_TESTNET_CAIP2]: browserNetwork(arcTestnetUsdc)
 });
 
-// ../core/src/net-guard.ts
-import { lookup as dnsLookup } from "node:dns/promises";
-import { request as httpRequest } from "node:http";
-import { request as httpsRequest } from "node:https";
-import { isIP } from "node:net";
-import { Readable } from "node:stream";
-var defaultLookup = async (hostname3) => {
-  const addresses = await dnsLookup(hostname3, { all: true });
-  return addresses.map(({ address: address4 }) => address4);
+// ../core/src/marketplace-contracts.ts
+var MARKETPLACE_DISCOVERY_PROTOCOL = "vapi.marketplace.discovery/1";
+var MARKETPLACE_RANKING_VERSION = "marketplace-ranking-v1";
+var MARKETPLACE_KINDS = ["api", "service_offer", "open_request"];
+var MARKETPLACE_EXECUTION_METHODS = [
+  "GET",
+  "HEAD",
+  "POST",
+  "PUT",
+  "PATCH",
+  "DELETE"
+];
+var marketplaceExecutionMethodSchema = external_exports.enum(MARKETPLACE_EXECUTION_METHODS);
+var marketplaceKindSchema = external_exports.enum(MARKETPLACE_KINDS);
+var EXECUTION_MODES = ["direct", "gateway"];
+var executionModeSchema = external_exports.enum(EXECUTION_MODES);
+var PROVENANCES = ["indexed", "self_listed", "partner"];
+var provenanceSchema = external_exports.enum(PROVENANCES);
+var FIRST_PARTY_PROVENANCES = ["self_listed", "partner"];
+var firstPartyProvenanceSchema = external_exports.enum(FIRST_PARTY_PROVENANCES);
+var LISTING_GROUPS = ["vapi", "added", "partner", "external"];
+var listingGroupSchema = external_exports.enum(LISTING_GROUPS);
+var listingFeeSchema = external_exports.looseObject({
+  bps: external_exports.number().int().min(0),
+  label: external_exports.string()
+});
+var LISTING_VERIFICATIONS = ["none", "requested", "verified"];
+var listingVerificationSchema = external_exports.enum(LISTING_VERIFICATIONS);
+var listingVerificationFieldSchema = listingVerificationSchema.default("none").catch("none");
+var listingLivenessSchema = external_exports.looseObject({
+  uptime7d: external_exports.number().min(0).max(1),
+  latencyP50Ms: external_exports.number().nonnegative().nullable(),
+  latencyP95Ms: external_exports.number().nonnegative().nullable(),
+  checks7d: external_exports.number().int().nonnegative()
+});
+var listingConformanceSchema = external_exports.looseObject({
+  declaredVersion: external_exports.union([external_exports.literal(1), external_exports.literal(2)]).nullable(),
+  versionConformant: external_exports.boolean(),
+  offerTransport: external_exports.enum(["body", "header", "both"]),
+  issues: external_exports.array(external_exports.string())
+});
+var listingIdentitySchema = external_exports.looseObject({
+  erc8004Id: external_exports.string().trim().min(1),
+  reputation: external_exports.looseObject({
+    score: external_exports.number().finite(),
+    count: external_exports.number().int().nonnegative()
+  }).optional().catch(void 0)
+});
+var listingDisclosureShape = {
+  group: listingGroupSchema.optional(),
+  fee: listingFeeSchema.optional(),
+  verification: listingVerificationFieldSchema,
+  liveness: listingLivenessSchema.optional().catch(void 0),
+  conformance: listingConformanceSchema.optional().catch(void 0),
+  identity: listingIdentitySchema.optional().catch(void 0)
 };
-async function assertPublicUrl(url2, options) {
-  if (url2.username || url2.password) {
-    throw guardError(url2);
-  }
-  if (url2.protocol !== "http:" && url2.protocol !== "https:") {
-    throw guardError(url2);
-  }
-  if (options.allowPrivateNetwork) {
-    return;
-  }
-  const hostname3 = normalizeHostname(url2.hostname);
-  const lowercaseHostname = hostname3.toLowerCase();
-  if (!lowercaseHostname || lowercaseHostname === "localhost" || lowercaseHostname.endsWith(".localhost") || lowercaseHostname.endsWith(".local") || lowercaseHostname.endsWith(".internal")) {
-    throw guardError(url2);
-  }
-  if (isIP(hostname3)) {
-    if (isNonPublicAddress(hostname3)) {
-      throw guardError(url2);
-    }
-    return;
-  }
-  let addresses;
-  try {
-    addresses = await withTimeout2(
-      (options.lookup ?? defaultLookup)(hostname3),
-      options.timeoutMs ?? 5e3
-    );
-  } catch {
-    throw guardError(url2);
-  }
-  if (addresses.length === 0 || addresses.some(isNonPublicAddress)) {
-    throw guardError(url2);
-  }
-}
-function createPublicFetch(options) {
-  const lookupFn = options.lookup ?? defaultLookup;
-  return (async (input2, init) => {
-    const url2 = new URL(input2 instanceof Request ? input2.url : input2);
-    await assertPublicUrl(url2, {
-      allowPrivateNetwork: options.allowPrivateNetwork,
-      lookup: lookupFn,
-      timeoutMs: 5e3
-    });
-    const normalized = new Request(input2, init);
-    const bytes = normalized.body ? Buffer.from(await normalized.arrayBuffer()) : null;
-    return await new Promise((resolve2, reject) => {
-      const requestOptions2 = {
-        method: normalized.method,
-        headers: Object.fromEntries(normalized.headers),
-        signal: normalized.signal,
-        ...options.allowPrivateNetwork ? {} : { lookup: pinnedLookup(lookupFn) }
-      };
-      const onResponse = (incoming) => {
-        try {
-          const headers = new Headers();
-          for (const [name, value] of Object.entries(incoming.headers)) {
-            if (Array.isArray(value)) {
-              for (const item of value) headers.append(name, item);
-            } else if (value !== void 0) {
-              headers.set(name, value);
-            }
-          }
-          const status = incoming.statusCode ?? 500;
-          const bodyForbidden = normalized.method === "HEAD" || [204, 205, 304].includes(status);
-          if (bodyForbidden) incoming.resume();
-          const response = new Response(
-            bodyForbidden ? null : Readable.toWeb(incoming),
-            { status, statusText: incoming.statusMessage, headers }
-          );
-          Object.defineProperty(response, "url", { value: url2.toString() });
-          resolve2(response);
-        } catch (error61) {
-          incoming.destroy();
-          reject(error61);
-        }
-      };
-      const request = url2.protocol === "https:" ? httpsRequest(url2, requestOptions2, onResponse) : httpRequest(url2, requestOptions2, onResponse);
-      request.on("error", reject);
-      if (bytes) request.write(bytes);
-      request.end();
-    });
-  });
-}
-function pinnedLookup(lookup) {
-  return (hostname3, dnsOptions, callback) => {
-    void lookup(normalizeHostname(hostname3)).then((addresses) => {
-      if (addresses.length === 0 || addresses.some(isNonPublicAddress)) {
-        callback(guardError(new URL(`https://${hostname3}`)), "");
-        return;
-      }
-      const address4 = addresses[0];
-      const family = isIP(address4);
-      callback(
-        null,
-        dnsOptions.all ? [{ address: address4, family }] : address4,
-        dnsOptions.all ? void 0 : family
-      );
-    }).catch(
-      (error61) => callback(error61 instanceof Error ? error61 : new Error("DNS lookup failed."), "")
-    );
-  };
-}
-async function withTimeout2(operation, timeoutMs) {
-  let timeout;
-  try {
-    return await Promise.race([
-      operation,
-      new Promise((_resolve, reject) => {
-        timeout = setTimeout(() => reject(new Error("DNS lookup timed out.")), timeoutMs);
-      })
-    ]);
-  } finally {
-    if (timeout) clearTimeout(timeout);
-  }
-}
-function normalizeHostname(hostname3) {
-  const unbracketed = hostname3.startsWith("[") && hostname3.endsWith("]") ? hostname3.slice(1, -1) : hostname3;
-  return unbracketed.endsWith(".") ? unbracketed.slice(0, -1) : unbracketed;
-}
-function isNonPublicAddress(address4) {
-  const normalized = normalizeHostname(address4);
-  const version5 = isIP(normalized);
-  if (version5 === 4) {
-    return isNonPublicIpv4(parseIpv4(normalized));
-  }
-  if (version5 === 6) {
-    return isNonPublicIpv6(parseIpv6(normalized));
-  }
-  return true;
-}
-function parseIpv4(address4) {
-  const octets = address4.split(".").map(Number);
-  return [octets[0], octets[1], octets[2], octets[3]];
-}
-function isNonPublicIpv4([first, second, third]) {
-  return first === 0 || first === 10 || first === 100 && second >= 64 && second <= 127 || first === 127 || first === 169 && second === 254 || first === 172 && second >= 16 && second <= 31 || first === 192 && second === 0 && (third === 0 || third === 2) || first === 192 && second === 168 || first === 198 && second >= 18 && second <= 19 || first === 198 && second === 51 && third === 100 || first === 203 && second === 0 && third === 113 || first >= 224;
-}
-function parseIpv6(address4) {
-  let normalized = address4.toLowerCase();
-  const lastColon = normalized.lastIndexOf(":");
-  const dottedTail = normalized.slice(lastColon + 1);
-  if (dottedTail.includes(".")) {
-    const [first, second, third, fourth] = parseIpv4(dottedTail);
-    normalized = `${normalized.slice(0, lastColon + 1)}${(first << 8 | second).toString(16)}:${(third << 8 | fourth).toString(16)}`;
-  }
-  const halves = normalized.split("::");
-  const left = halves[0] ? halves[0].split(":").map(parseHex) : [];
-  const right = halves[1] ? halves[1].split(":").map(parseHex) : [];
-  const omittedCount = 8 - left.length - right.length;
-  return halves.length === 2 ? [...left, ...Array.from({ length: omittedCount }, () => 0), ...right] : left;
-}
-function parseHex(value) {
-  return Number.parseInt(value, 16);
-}
-function isNonPublicIpv6(hextets) {
-  if (hextets.slice(0, 5).every((hextet) => hextet === 0) && hextets[5] === 65535) {
-    const embeddedIpv4 = [
-      hextets[6] >> 8,
-      hextets[6] & 255,
-      hextets[7] >> 8,
-      hextets[7] & 255
-    ];
-    return isNonPublicIpv4(embeddedIpv4);
-  }
-  if (hextets.slice(0, 6).every((hextet) => hextet === 0)) {
-    const compatibleIpv4 = [
-      hextets[6] >> 8,
-      hextets[6] & 255,
-      hextets[7] >> 8,
-      hextets[7] & 255
-    ];
-    if (isNonPublicIpv4(compatibleIpv4)) return true;
-  }
-  const isUnspecified = hextets.every((hextet) => hextet === 0);
-  const isLoopback = hextets.slice(0, 7).every((hextet) => hextet === 0) && hextets[7] === 1;
-  const first = hextets[0];
-  const isUniqueLocal = first >= 64512 && first <= 65023;
-  const isLinkLocal = first >= 65152 && first <= 65215;
-  const isSiteLocal = first >= 65216 && first <= 65279;
-  const isMulticast = first >= 65280;
-  const isDocumentation = first === 8193 && hextets[1] === 3512;
-  return isUnspecified || isLoopback || isUniqueLocal || isLinkLocal || isSiteLocal || isMulticast || isDocumentation;
-}
-function guardError(url2) {
-  return new Error(
-    `URL hostname ${JSON.stringify(url2.hostname)} is not allowed; private or internal destinations require allowPrivateNetwork true in the vAPI config.`
-  );
-}
-
-// ../core/src/networks.ts
-var USDC_DECIMALS = 6;
-var DEFAULT_ARC_GAS_HEADROOM_ATOMIC = 50000n;
-var NETWORKS = {
-  [BASE_MAINNET_CAIP2]: {
-    family: "evm",
-    chainId: 8453,
-    name: "Base mainnet",
-    usdc: CANONICAL_X402_USDC_NETWORKS[BASE_MAINNET_CAIP2].usdc,
-    gasToken: "ETH",
-    rpcEnv: "BASE_RPC_URL",
-    publicRpcUrl: "https://mainnet.base.org",
-    explorerUrl: "https://basescan.org"
-  },
-  [ARC_MAINNET_CAIP2]: {
-    family: "evm",
-    chainId: 5042,
-    name: "Arc mainnet",
-    usdc: CANONICAL_X402_USDC_NETWORKS[ARC_MAINNET_CAIP2].usdc,
-    gasToken: "USDC",
-    rpcEnv: "ARC_RPC_URL",
-    publicRpcUrl: "https://rpc.mainnet.arc.io",
-    explorerUrl: "https://explorer.arc.io"
-  },
-  [ARC_TESTNET_CAIP2]: {
-    family: "evm",
-    chainId: 5042002,
-    name: "Arc testnet",
-    usdc: CANONICAL_X402_USDC_NETWORKS[ARC_TESTNET_CAIP2].usdc,
-    gasToken: "USDC",
-    rpcEnv: "ARC_TESTNET_RPC_URL"
-  },
-  [SOLANA_MAINNET_CAIP2]: {
-    family: "svm",
-    name: "Solana mainnet",
-    usdc: SOLANA_MAINNET_USDC,
-    gasToken: "SOL",
-    rpcEnv: "SOLANA_RPC_URL",
-    publicRpcUrl: "https://api.mainnet-beta.solana.com"
-  },
-  [X402_SOLANA_MAINNET_CAIP2]: {
-    family: "svm",
-    name: "Solana mainnet",
-    usdc: SOLANA_MAINNET_USDC,
-    gasToken: "SOL",
-    rpcEnv: "SOLANA_RPC_URL",
-    publicRpcUrl: "https://api.mainnet-beta.solana.com"
-  }
+var marketplaceBadgeCodeSchema = external_exports.enum([
+  "live_x402",
+  "partner",
+  "payout_wallet_confirmed",
+  "vapi_verified",
+  "external_catalog",
+  "approved_vendor"
+]);
+var marketplaceBadgeSchema = external_exports.looseObject({
+  code: marketplaceBadgeCodeSchema,
+  label: external_exports.string().trim().min(1).max(80)
+});
+var marketplacePublicFactSchema = external_exports.looseObject({
+  label: external_exports.string().trim().min(1).max(80),
+  value: external_exports.string().trim().min(1).max(160)
+});
+var marketplaceHrefSchema = external_exports.union([
+  external_exports.string().trim().min(1).max(2048).regex(/^\/(?!\/)/),
+  external_exports.url().max(2048).regex(/^https:\/\//)
+]);
+var marketplaceCardSchema = external_exports.looseObject({
+  title: external_exports.string().trim().min(1).max(160),
+  summary: external_exports.string().trim().min(1).max(1e3),
+  byline: external_exports.string().trim().min(1).max(160).optional(),
+  bylineHref: marketplaceHrefSchema.optional(),
+  badges: external_exports.array(marketplaceBadgeSchema).max(8),
+  facts: external_exports.array(marketplacePublicFactSchema).max(12)
+});
+var marketplaceHitBase = {
+  ref: external_exports.string().trim().min(1).max(512),
+  card: marketplaceCardSchema,
+  ...listingDisclosureShape
 };
-function parseEip155ChainId(network) {
-  const match = /^eip155:(\d+)$/.exec(network);
-  if (!match) {
-    throw new Error(`Unsupported network ${network}; expected eip155:<chainId>.`);
-  }
-  const chainId = Number(match[1]);
-  if (!Number.isSafeInteger(chainId) || chainId <= 0) {
-    throw new Error(`Invalid EVM chain ID in network ${network}.`);
-  }
-  return chainId;
-}
-function isSolanaNetwork(network) {
-  return network === SOLANA_MAINNET_CAIP2 || network === X402_SOLANA_MAINNET_CAIP2;
-}
-function usesUsdcGas(network) {
-  try {
-    return getNetworkDefinition(network).gasToken === "USDC";
-  } catch {
-    return false;
-  }
-}
-function explorerTransactionUrl(network, hash5) {
-  try {
-    const explorerUrl = getNetworkDefinition(network).explorerUrl;
-    return explorerUrl ? `${explorerUrl}/tx/${hash5}` : void 0;
-  } catch {
-    return void 0;
-  }
-}
-function explorerAddressUrl(network, address4) {
-  try {
-    const explorerUrl = getNetworkDefinition(network).explorerUrl;
-    return explorerUrl ? `${explorerUrl}/address/${address4}` : void 0;
-  } catch {
-    return void 0;
-  }
-}
-function areSamePaymentNetwork(left, right) {
-  return left === right || isSolanaNetwork(left) && isSolanaNetwork(right);
-}
-function isSupportedPaymentNetwork(network) {
-  if (isSolanaNetwork(network)) return true;
-  try {
-    parseEip155ChainId(network);
-    return true;
-  } catch {
-    return false;
-  }
-}
-function configuredNetworkFor(networks, network) {
-  const configured = networks[network];
-  if (configured) return configured;
-  if (network === X402_SOLANA_MAINNET_CAIP2) return networks[SOLANA_MAINNET_CAIP2];
-  if (network === SOLANA_MAINNET_CAIP2) return networks[X402_SOLANA_MAINNET_CAIP2];
-  return void 0;
-}
-function getNetworkDefinition(network) {
-  const known = NETWORKS[network];
-  if (known) {
-    return known;
-  }
-  const chainId = parseEip155ChainId(network);
-  return {
-    family: "evm",
-    chainId,
-    name: network,
-    usdc: getAddress("0x0000000000000000000000000000000000000000"),
-    gasToken: "ETH",
-    rpcEnv: ""
-  };
-}
-function requireRpcUrl(network, configured) {
-  const definition = getNetworkDefinition(network);
-  const envUrl = definition.rpcEnv ? process.env[definition.rpcEnv]?.trim() : void 0;
-  const rpcUrl = envUrl || configured.rpcUrl.trim();
-  if (rpcUrl) {
-    return rpcUrl;
-  }
-  if (network === ARC_TESTNET_CAIP2) {
-    throw new Error(
-      "Arc testnet RPC is required. Set ARC_TESTNET_RPC_URL or add rpcUrl for eip155:5042002 in config.json."
-    );
-  }
-  throw new Error(`RPC URL is required for ${network}.`);
-}
-function createChain(network, rpcUrl) {
-  const definition = getNetworkDefinition(network);
-  if (definition.family !== "evm" || definition.chainId === void 0) {
-    throw new Error(`Network ${network} is not an EVM chain.`);
+var invokeApiActionSchema = external_exports.looseObject({
+  type: external_exports.literal("invoke_api"),
+  href: marketplaceHrefSchema
+});
+var firstPartyApiMarketplaceHitSchema = external_exports.looseObject({
+  ...marketplaceHitBase,
+  kind: external_exports.literal("api"),
+  provenance: firstPartyProvenanceSchema,
+  execution: external_exports.looseObject({
+    mode: executionModeSchema
+  }),
+  action: invokeApiActionSchema
+});
+var mirroredApiMarketplaceHitSchema = external_exports.looseObject({
+  ...marketplaceHitBase,
+  kind: external_exports.literal("api"),
+  provenance: external_exports.literal("indexed"),
+  execution: external_exports.looseObject({
+    mode: external_exports.literal("direct"),
+    url: external_exports.url().max(2048).regex(/^https:\/\/(?![^/?#]*@)/),
+    method: marketplaceExecutionMethodSchema.nullable(),
+    network: external_exports.string().trim().max(160).transform((network) => {
+      if (network === "solana") return X402_SOLANA_MAINNET_CAIP2;
+      if (network === "solana-devnet") return SOLANA_DEVNET_CAIP2;
+      return network;
+    }).pipe(
+      external_exports.union([
+        external_exports.string().regex(/^[-a-z0-9]{3,8}:[-_a-zA-Z0-9]{1,32}$/),
+        // Persisted mainnet configs also use the full genesis hash.
+        external_exports.literal(SOLANA_MAINNET_CAIP2)
+      ])
+    )
+  }),
+  action: invokeApiActionSchema
+});
+var apiMarketplaceHitSchema = external_exports.discriminatedUnion("provenance", [
+  firstPartyApiMarketplaceHitSchema,
+  mirroredApiMarketplaceHitSchema
+]);
+var serviceOfferMarketplaceHitSchema = external_exports.looseObject({
+  ...marketplaceHitBase,
+  kind: external_exports.literal("service_offer"),
+  action: external_exports.looseObject({
+    type: external_exports.literal("start_engagement"),
+    href: marketplaceHrefSchema
+  })
+});
+var openRequestMarketplaceHitSchema = external_exports.looseObject({
+  ...marketplaceHitBase,
+  kind: external_exports.literal("open_request"),
+  action: external_exports.looseObject({
+    type: external_exports.literal("propose_to_request"),
+    href: marketplaceHrefSchema
+  })
+});
+var marketplaceHitSchema = external_exports.union([
+  apiMarketplaceHitSchema,
+  serviceOfferMarketplaceHitSchema,
+  openRequestMarketplaceHitSchema
+]);
+var marketplaceDiscoveryInputSchema = external_exports.strictObject({
+  q: external_exports.string().trim().max(200).optional(),
+  kinds: external_exports.array(marketplaceKindSchema).min(1).max(MARKETPLACE_KINDS.length).optional(),
+  network: external_exports.string().trim().min(1).max(160).optional(),
+  cursor: external_exports.string().trim().min(1).max(4096).optional(),
+  limit: external_exports.number().int().min(1).max(50).optional(),
+  includeUnverified: external_exports.boolean().optional()
+}).superRefine((input2, context) => {
+  if (input2.kinds && new Set(input2.kinds).size !== input2.kinds.length) {
+    context.addIssue({
+      code: "custom",
+      path: ["kinds"],
+      message: "Marketplace kinds must be unique"
+    });
   }
-  return defineChain({
-    id: definition.chainId,
-    name: definition.name,
-    nativeCurrency: definition.gasToken === "USDC" ? { name: "USDC", symbol: "USDC", decimals: USDC_DECIMALS } : { name: "Ether", symbol: "ETH", decimals: 18 },
-    rpcUrls: {
-      default: { http: [rpcUrl] }
-    },
-    ...definition.explorerUrl ? {
-      blockExplorers: {
-        default: { name: `${definition.name} explorer`, url: definition.explorerUrl }
-      }
-    } : {}
-  });
-}
-function createNetworkPublicClient(network, configured, options = {}) {
-  const rpcUrl = requireRpcUrl(network, configured);
-  return createPublicClient({
-    chain: createChain(network, rpcUrl),
-    transport: createNetworkHttpTransport(rpcUrl, options)
-  });
-}
-function createNetworkHttpTransport(rpcUrl, options = {}) {
-  const fetchFn = options.fetch ?? createPublicFetch({
-    allowPrivateNetwork: options.allowPrivateNetwork ?? false,
-    ...options.lookup ? { lookup: options.lookup } : {}
-  });
-  return http(rpcUrl, { fetchFn, fetchOptions: { redirect: "manual" } });
-}
-function formatUsdc(amountAtomic2) {
-  return formatUnits(amountAtomic2, USDC_DECIMALS);
+});
+function isMirroredHit(hit) {
+  return hit.kind === "api" && hit.provenance === "indexed";
 }
+var marketplaceDiscoveryEnvelopeSchema = external_exports.looseObject({
+  protocol: external_exports.literal(MARKETPLACE_DISCOVERY_PROTOCOL),
+  items: external_exports.array(external_exports.unknown()),
+  nextCursor: external_exports.string().min(1).max(4096).nullable(),
+  unavailableKinds: external_exports.array(marketplaceKindSchema).max(MARKETPLACE_KINDS.length),
+  rankingVersion: external_exports.literal(MARKETPLACE_RANKING_VERSION)
+});
+var marketplaceDiscoveryPageSchema = marketplaceDiscoveryEnvelopeSchema.extend({
+  items: external_exports.array(marketplaceHitSchema)
+});
 
 // ../../node_modules/.pnpm/@solana+errors@5.5.1_typescript@6.0.3/node_modules/@solana/errors/dist/index.node.mjs
 var SOLANA_ERROR__BLOCK_HEIGHT_EXCEEDED = 1;
@@ -45015,16 +44466,16 @@ var DEFAULT_COMPUTE_UNIT_PRICE_MICROLAMPORTS = 1;
 var DEFAULT_COMPUTE_UNIT_LIMIT = 2e4;
 var MAX_MEMO_BYTES = 256;
 var SOLANA_MAINNET_CAIP22 = "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp";
-var SOLANA_DEVNET_CAIP2 = "solana:EtWTRABZaYq6iMfeYKouRu166VU2xqa1";
+var SOLANA_DEVNET_CAIP22 = "solana:EtWTRABZaYq6iMfeYKouRu166VU2xqa1";
 var SOLANA_TESTNET_CAIP2 = "solana:4uhcVJyU9pJkvQyS88uRDiswHXSCkY3z";
 var V1_TO_V2_NETWORK_MAP = {
   solana: SOLANA_MAINNET_CAIP22,
-  "solana-devnet": SOLANA_DEVNET_CAIP2,
+  "solana-devnet": SOLANA_DEVNET_CAIP22,
   "solana-testnet": SOLANA_TESTNET_CAIP2
 };
 function normalizeNetwork(network) {
   if (network.includes(":")) {
-    const supported = [SOLANA_MAINNET_CAIP22, SOLANA_DEVNET_CAIP2, SOLANA_TESTNET_CAIP2];
+    const supported = [SOLANA_MAINNET_CAIP22, SOLANA_DEVNET_CAIP22, SOLANA_TESTNET_CAIP2];
     if (!supported.includes(network)) {
       throw new Error(`Unsupported SVM network: ${network}`);
     }
@@ -45072,7 +44523,7 @@ var DEFAULT_ASSETS = {
       tokenProgram: TOKEN_2022_PROGRAM_ADDRESS2
     }
   ],
-  [SOLANA_DEVNET_CAIP2]: [
+  [SOLANA_DEVNET_CAIP22]: [
     {
       asset: USDC_DEVNET_ADDRESS,
       decimals: 6,
@@ -45127,7 +44578,7 @@ var findDefaultAsset = (asset, network) => {
 function createRpcClient(network, customRpcUrl) {
   const caip2Network = normalizeNetwork(network);
   switch (caip2Network) {
-    case SOLANA_DEVNET_CAIP2: {
+    case SOLANA_DEVNET_CAIP22: {
       const url2 = customRpcUrl || DEVNET_RPC_URL;
       return createSolanaRpc(devnet(url2));
     }
@@ -45325,6 +44776,376 @@ var ExactSvmScheme = class {
 var addressEncoder = getAddressEncoder();
 var compiledMessageDecoder = getCompiledTransactionMessageDecoder();
 
+// ../core/src/net-guard.ts
+import { lookup as dnsLookup } from "node:dns/promises";
+import { request as httpRequest } from "node:http";
+import { request as httpsRequest } from "node:https";
+import { isIP } from "node:net";
+import { Readable } from "node:stream";
+var defaultLookup = async (hostname3) => {
+  const addresses = await dnsLookup(hostname3, { all: true });
+  return addresses.map(({ address: address4 }) => address4);
+};
+async function assertPublicUrl(url2, options) {
+  if (url2.username || url2.password) {
+    throw guardError(url2);
+  }
+  if (url2.protocol !== "http:" && url2.protocol !== "https:") {
+    throw guardError(url2);
+  }
+  if (options.allowPrivateNetwork) {
+    return;
+  }
+  const hostname3 = normalizeHostname(url2.hostname);
+  const lowercaseHostname = hostname3.toLowerCase();
+  if (!lowercaseHostname || lowercaseHostname === "localhost" || lowercaseHostname.endsWith(".localhost") || lowercaseHostname.endsWith(".local") || lowercaseHostname.endsWith(".internal")) {
+    throw guardError(url2);
+  }
+  if (isIP(hostname3)) {
+    if (isNonPublicAddress(hostname3)) {
+      throw guardError(url2);
+    }
+    return;
+  }
+  let addresses;
+  try {
+    addresses = await withTimeout2(
+      (options.lookup ?? defaultLookup)(hostname3),
+      options.timeoutMs ?? 5e3
+    );
+  } catch {
+    throw guardError(url2);
+  }
+  if (addresses.length === 0 || addresses.some(isNonPublicAddress)) {
+    throw guardError(url2);
+  }
+}
+function createPublicFetch(options) {
+  const lookupFn = options.lookup ?? defaultLookup;
+  return (async (input2, init) => {
+    const url2 = new URL(input2 instanceof Request ? input2.url : input2);
+    await assertPublicUrl(url2, {
+      allowPrivateNetwork: options.allowPrivateNetwork,
+      lookup: lookupFn,
+      timeoutMs: 5e3
+    });
+    const normalized = new Request(input2, init);
+    const bytes = normalized.body ? Buffer.from(await normalized.arrayBuffer()) : null;
+    return await new Promise((resolve2, reject) => {
+      const requestOptions2 = {
+        method: normalized.method,
+        headers: Object.fromEntries(normalized.headers),
+        signal: normalized.signal,
+        ...options.allowPrivateNetwork ? {} : { lookup: pinnedLookup(lookupFn) }
+      };
+      const onResponse = (incoming) => {
+        try {
+          const headers = new Headers();
+          for (const [name, value] of Object.entries(incoming.headers)) {
+            if (Array.isArray(value)) {
+              for (const item of value) headers.append(name, item);
+            } else if (value !== void 0) {
+              headers.set(name, value);
+            }
+          }
+          const status = incoming.statusCode ?? 500;
+          const bodyForbidden = normalized.method === "HEAD" || [204, 205, 304].includes(status);
+          if (bodyForbidden) incoming.resume();
+          const response = new Response(
+            bodyForbidden ? null : Readable.toWeb(incoming),
+            { status, statusText: incoming.statusMessage, headers }
+          );
+          Object.defineProperty(response, "url", { value: url2.toString() });
+          resolve2(response);
+        } catch (error61) {
+          incoming.destroy();
+          reject(error61);
+        }
+      };
+      const request = url2.protocol === "https:" ? httpsRequest(url2, requestOptions2, onResponse) : httpRequest(url2, requestOptions2, onResponse);
+      request.on("error", reject);
+      if (bytes) request.write(bytes);
+      request.end();
+    });
+  });
+}
+function pinnedLookup(lookup) {
+  return (hostname3, dnsOptions, callback) => {
+    void lookup(normalizeHostname(hostname3)).then((addresses) => {
+      if (addresses.length === 0 || addresses.some(isNonPublicAddress)) {
+        callback(guardError(new URL(`https://${hostname3}`)), "");
+        return;
+      }
+      const address4 = addresses[0];
+      const family = isIP(address4);
+      callback(
+        null,
+        dnsOptions.all ? [{ address: address4, family }] : address4,
+        dnsOptions.all ? void 0 : family
+      );
+    }).catch(
+      (error61) => callback(error61 instanceof Error ? error61 : new Error("DNS lookup failed."), "")
+    );
+  };
+}
+async function withTimeout2(operation, timeoutMs) {
+  let timeout;
+  try {
+    return await Promise.race([
+      operation,
+      new Promise((_resolve, reject) => {
+        timeout = setTimeout(() => reject(new Error("DNS lookup timed out.")), timeoutMs);
+      })
+    ]);
+  } finally {
+    if (timeout) clearTimeout(timeout);
+  }
+}
+function normalizeHostname(hostname3) {
+  const unbracketed = hostname3.startsWith("[") && hostname3.endsWith("]") ? hostname3.slice(1, -1) : hostname3;
+  return unbracketed.endsWith(".") ? unbracketed.slice(0, -1) : unbracketed;
+}
+function isNonPublicAddress(address4) {
+  const normalized = normalizeHostname(address4);
+  const version5 = isIP(normalized);
+  if (version5 === 4) {
+    return isNonPublicIpv4(parseIpv4(normalized));
+  }
+  if (version5 === 6) {
+    return isNonPublicIpv6(parseIpv6(normalized));
+  }
+  return true;
+}
+function parseIpv4(address4) {
+  const octets = address4.split(".").map(Number);
+  return [octets[0], octets[1], octets[2], octets[3]];
+}
+function isNonPublicIpv4([first, second, third]) {
+  return first === 0 || first === 10 || first === 100 && second >= 64 && second <= 127 || first === 127 || first === 169 && second === 254 || first === 172 && second >= 16 && second <= 31 || first === 192 && second === 0 && (third === 0 || third === 2) || first === 192 && second === 168 || first === 198 && second >= 18 && second <= 19 || first === 198 && second === 51 && third === 100 || first === 203 && second === 0 && third === 113 || first >= 224;
+}
+function parseIpv6(address4) {
+  let normalized = address4.toLowerCase();
+  const lastColon = normalized.lastIndexOf(":");
+  const dottedTail = normalized.slice(lastColon + 1);
+  if (dottedTail.includes(".")) {
+    const [first, second, third, fourth] = parseIpv4(dottedTail);
+    normalized = `${normalized.slice(0, lastColon + 1)}${(first << 8 | second).toString(16)}:${(third << 8 | fourth).toString(16)}`;
+  }
+  const halves = normalized.split("::");
+  const left = halves[0] ? halves[0].split(":").map(parseHex) : [];
+  const right = halves[1] ? halves[1].split(":").map(parseHex) : [];
+  const omittedCount = 8 - left.length - right.length;
+  return halves.length === 2 ? [...left, ...Array.from({ length: omittedCount }, () => 0), ...right] : left;
+}
+function parseHex(value) {
+  return Number.parseInt(value, 16);
+}
+function isNonPublicIpv6(hextets) {
+  if (hextets.slice(0, 5).every((hextet) => hextet === 0) && hextets[5] === 65535) {
+    const embeddedIpv4 = [
+      hextets[6] >> 8,
+      hextets[6] & 255,
+      hextets[7] >> 8,
+      hextets[7] & 255
+    ];
+    return isNonPublicIpv4(embeddedIpv4);
+  }
+  if (hextets.slice(0, 6).every((hextet) => hextet === 0)) {
+    const compatibleIpv4 = [
+      hextets[6] >> 8,
+      hextets[6] & 255,
+      hextets[7] >> 8,
+      hextets[7] & 255
+    ];
+    if (isNonPublicIpv4(compatibleIpv4)) return true;
+  }
+  const isUnspecified = hextets.every((hextet) => hextet === 0);
+  const isLoopback = hextets.slice(0, 7).every((hextet) => hextet === 0) && hextets[7] === 1;
+  const first = hextets[0];
+  const isUniqueLocal = first >= 64512 && first <= 65023;
+  const isLinkLocal = first >= 65152 && first <= 65215;
+  const isSiteLocal = first >= 65216 && first <= 65279;
+  const isMulticast = first >= 65280;
+  const isDocumentation = first === 8193 && hextets[1] === 3512;
+  return isUnspecified || isLoopback || isUniqueLocal || isLinkLocal || isSiteLocal || isMulticast || isDocumentation;
+}
+function guardError(url2) {
+  return new Error(
+    `URL hostname ${JSON.stringify(url2.hostname)} is not allowed; private or internal destinations require allowPrivateNetwork true in the vAPI config.`
+  );
+}
+
+// ../core/src/networks.ts
+var USDC_DECIMALS = 6;
+var DEFAULT_ARC_GAS_HEADROOM_ATOMIC = 50000n;
+var NETWORKS2 = {
+  [BASE_MAINNET_CAIP2]: {
+    family: "evm",
+    chainId: 8453,
+    name: "Base mainnet",
+    usdc: CANONICAL_X402_USDC_NETWORKS[BASE_MAINNET_CAIP2].usdc,
+    gasToken: "ETH",
+    rpcEnv: "BASE_RPC_URL",
+    publicRpcUrl: "https://mainnet.base.org",
+    explorerUrl: "https://basescan.org"
+  },
+  [ARC_MAINNET_CAIP2]: {
+    family: "evm",
+    chainId: 5042,
+    name: "Arc mainnet",
+    usdc: CANONICAL_X402_USDC_NETWORKS[ARC_MAINNET_CAIP2].usdc,
+    gasToken: "USDC",
+    rpcEnv: "ARC_RPC_URL",
+    publicRpcUrl: "https://rpc.mainnet.arc.io",
+    explorerUrl: "https://explorer.arc.io"
+  },
+  [ARC_TESTNET_CAIP2]: {
+    family: "evm",
+    chainId: 5042002,
+    name: "Arc testnet",
+    usdc: CANONICAL_X402_USDC_NETWORKS[ARC_TESTNET_CAIP2].usdc,
+    gasToken: "USDC",
+    rpcEnv: "ARC_TESTNET_RPC_URL"
+  },
+  [SOLANA_MAINNET_CAIP2]: {
+    family: "svm",
+    name: "Solana mainnet",
+    usdc: SOLANA_MAINNET_USDC,
+    gasToken: "SOL",
+    rpcEnv: "SOLANA_RPC_URL",
+    publicRpcUrl: "https://api.mainnet-beta.solana.com"
+  },
+  [X402_SOLANA_MAINNET_CAIP2]: {
+    family: "svm",
+    name: "Solana mainnet",
+    usdc: SOLANA_MAINNET_USDC,
+    gasToken: "SOL",
+    rpcEnv: "SOLANA_RPC_URL",
+    publicRpcUrl: "https://api.mainnet-beta.solana.com"
+  }
+};
+function parseEip155ChainId(network) {
+  const match = /^eip155:(\d+)$/.exec(network);
+  if (!match) {
+    throw new Error(`Unsupported network ${network}; expected eip155:<chainId>.`);
+  }
+  const chainId = Number(match[1]);
+  if (!Number.isSafeInteger(chainId) || chainId <= 0) {
+    throw new Error(`Invalid EVM chain ID in network ${network}.`);
+  }
+  return chainId;
+}
+function isSolanaNetwork(network) {
+  return network === SOLANA_MAINNET_CAIP2 || network === X402_SOLANA_MAINNET_CAIP2;
+}
+function usesUsdcGas(network) {
+  try {
+    return getNetworkDefinition(network).gasToken === "USDC";
+  } catch {
+    return false;
+  }
+}
+function explorerTransactionUrl(network, hash5) {
+  try {
+    const explorerUrl = getNetworkDefinition(network).explorerUrl;
+    return explorerUrl ? `${explorerUrl}/tx/${hash5}` : void 0;
+  } catch {
+    return void 0;
+  }
+}
+function explorerAddressUrl(network, address4) {
+  try {
+    const explorerUrl = getNetworkDefinition(network).explorerUrl;
+    return explorerUrl ? `${explorerUrl}/address/${address4}` : void 0;
+  } catch {
+    return void 0;
+  }
+}
+function areSamePaymentNetwork(left, right) {
+  return left === right || isSolanaNetwork(left) && isSolanaNetwork(right);
+}
+function isSupportedPaymentNetwork(network) {
+  if (isSolanaNetwork(network)) return true;
+  try {
+    parseEip155ChainId(network);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function configuredNetworkFor(networks, network) {
+  const configured = networks[network];
+  if (configured) return configured;
+  if (network === X402_SOLANA_MAINNET_CAIP2) return networks[SOLANA_MAINNET_CAIP2];
+  if (network === SOLANA_MAINNET_CAIP2) return networks[X402_SOLANA_MAINNET_CAIP2];
+  return void 0;
+}
+function getNetworkDefinition(network) {
+  const known = NETWORKS2[network];
+  if (known) {
+    return known;
+  }
+  const chainId = parseEip155ChainId(network);
+  return {
+    family: "evm",
+    chainId,
+    name: network,
+    usdc: getAddress("0x0000000000000000000000000000000000000000"),
+    gasToken: "ETH",
+    rpcEnv: ""
+  };
+}
+function requireRpcUrl(network, configured) {
+  const definition = getNetworkDefinition(network);
+  const envUrl = definition.rpcEnv ? process.env[definition.rpcEnv]?.trim() : void 0;
+  const rpcUrl = envUrl || configured.rpcUrl.trim();
+  if (rpcUrl) {
+    return rpcUrl;
+  }
+  if (network === ARC_TESTNET_CAIP2) {
+    throw new Error(
+      "Arc testnet RPC is required. Set ARC_TESTNET_RPC_URL or add rpcUrl for eip155:5042002 in config.json."
+    );
+  }
+  throw new Error(`RPC URL is required for ${network}.`);
+}
+function createChain(network, rpcUrl) {
+  const definition = getNetworkDefinition(network);
+  if (definition.family !== "evm" || definition.chainId === void 0) {
+    throw new Error(`Network ${network} is not an EVM chain.`);
+  }
+  return defineChain({
+    id: definition.chainId,
+    name: definition.name,
+    nativeCurrency: definition.gasToken === "USDC" ? { name: "USDC", symbol: "USDC", decimals: USDC_DECIMALS } : { name: "Ether", symbol: "ETH", decimals: 18 },
+    rpcUrls: {
+      default: { http: [rpcUrl] }
+    },
+    ...definition.explorerUrl ? {
+      blockExplorers: {
+        default: { name: `${definition.name} explorer`, url: definition.explorerUrl }
+      }
+    } : {}
+  });
+}
+function createNetworkPublicClient(network, configured, options = {}) {
+  const rpcUrl = requireRpcUrl(network, configured);
+  return createPublicClient({
+    chain: createChain(network, rpcUrl),
+    transport: createNetworkHttpTransport(rpcUrl, options)
+  });
+}
+function createNetworkHttpTransport(rpcUrl, options = {}) {
+  const fetchFn = options.fetch ?? createPublicFetch({
+    allowPrivateNetwork: options.allowPrivateNetwork ?? false,
+    ...options.lookup ? { lookup: options.lookup } : {}
+  });
+  return http(rpcUrl, { fetchFn, fetchOptions: { redirect: "manual" } });
+}
+function formatUsdc(amountAtomic2) {
+  return formatUnits(amountAtomic2, USDC_DECIMALS);
+}
+
 // ../core/src/x402.ts
 var MAX_CHALLENGE_BYTES = 1048576;
 var MAX_UINT256 = (1n << 256n) - 1n;
@@ -46184,6 +46005,224 @@ function isRecord2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
+// ../core/src/call-contracts-wire.ts
+var CALLABLE_CATEGORIES = ["ai", "data", "crypto", "compute", "search"];
+var callableCategorySchema = external_exports.enum(CALLABLE_CATEGORIES);
+var DISCOVERY_CATEGORIES = [...CALLABLE_CATEGORIES, "other"];
+var discoveryCategorySchema = external_exports.enum(DISCOVERY_CATEGORIES);
+var CALLABLE_CATEGORY_SET = new Set(CALLABLE_CATEGORIES);
+var serviceTierSchema = external_exports.enum(["listed", "verified", "partner"]);
+var discoveryEndpointSchema = external_exports.looseObject({
+  name: external_exports.string(),
+  method: external_exports.string(),
+  url: external_exports.url(),
+  price: external_exports.string(),
+  description: external_exports.string(),
+  operationId: external_exports.string().trim().min(1).optional(),
+  requestContentType: external_exports.string().trim().min(1).optional(),
+  requestSchema: external_exports.json().optional(),
+  responseContentType: external_exports.string().trim().min(1).optional(),
+  pathTemplate: external_exports.string().trim().min(1).optional(),
+  pathParameters: external_exports.array(external_exports.string().trim().min(1)).optional(),
+  payment: external_exports.union([
+    external_exports.looseObject({
+      scheme: external_exports.literal("exact"),
+      network: external_exports.string().regex(/^eip155:\d+$/),
+      asset: external_exports.string().regex(/^0x[0-9a-fA-F]{40}$/),
+      payTo: external_exports.string().regex(/^0x[0-9a-fA-F]{40}$/),
+      checkedAt: external_exports.iso.datetime()
+    }),
+    external_exports.looseObject({
+      scheme: external_exports.literal("exact"),
+      network: external_exports.union([
+        external_exports.string().regex(/^solana:[-_a-zA-Z0-9]{1,32}$/),
+        external_exports.literal(SOLANA_MAINNET_CAIP2)
+      ]),
+      asset: external_exports.string().refine(isSolanaAddress, "Expected a Solana base58 address."),
+      payTo: external_exports.string().refine(isSolanaAddress, "Expected a Solana base58 address."),
+      checkedAt: external_exports.iso.datetime()
+    })
+  ]).optional()
+});
+var serviceSummarySchema = external_exports.looseObject({
+  id: external_exports.string(),
+  name: external_exports.string(),
+  description: external_exports.string(),
+  category: discoveryCategorySchema,
+  tier: serviceTierSchema,
+  ...listingDisclosureShape,
+  verified: external_exports.boolean(),
+  wrapped: external_exports.boolean(),
+  price: external_exports.string(),
+  networks: external_exports.array(external_exports.string()),
+  endpoints: external_exports.array(discoveryEndpointSchema)
+});
+var searchServicesResponseSchema = external_exports.looseObject({
+  services: external_exports.array(serviceSummarySchema)
+});
+var discoveryResponseSchema = searchServicesResponseSchema;
+
+// ../core/src/call-contracts.ts
+var DiscoveryCatalogError = class extends Error {
+  constructor(code, message, serviceId, paymentNetworks) {
+    super(message);
+    this.paymentNetworks = paymentNetworks;
+    this.code = code;
+    this.serviceId = serviceId;
+  }
+  paymentNetworks;
+  name = "DiscoveryCatalogError";
+  code;
+  serviceId;
+};
+function isDiscoveryCatalogError(error61) {
+  if (!(error61 instanceof Error) || error61.name !== "DiscoveryCatalogError" || !("code" in error61) || typeof error61.code !== "string") {
+    return false;
+  }
+  const networks = Reflect.get(error61, "paymentNetworks");
+  return networks === void 0 || Array.isArray(networks) && networks.every((network) => typeof network === "string");
+}
+function parseDiscovery(raw) {
+  const parsed = discoveryResponseSchema.safeParse(raw);
+  if (!parsed.success) {
+    const malformedUrl = parsed.error.issues.find(
+      (issue2) => issue2.path.at(-1) === "url" && issue2.path.includes("endpoints")
+    );
+    if (malformedUrl) {
+      const serviceIndex = pathIndexAfter(malformedUrl.path, "services");
+      const serviceId = rawServiceId(raw, serviceIndex);
+      throw new DiscoveryCatalogError(
+        "malformed_url",
+        `Service ${JSON.stringify(serviceId ?? "unknown")} has a malformed endpoint URL.`,
+        serviceId
+      );
+    }
+    throw new DiscoveryCatalogError("invalid_discovery", "Discovery response is malformed.");
+  }
+  for (const service of parsed.data.services) {
+    buildTargets(service);
+  }
+  const resolveListing = (serviceId, endpointName) => {
+    const service = parsed.data.services.find((candidate) => candidate.id === serviceId);
+    if (!service) {
+      throw new DiscoveryCatalogError(
+        "service_not_found",
+        `No payable endpoint found for service ${JSON.stringify(serviceId)}.`,
+        serviceId
+      );
+    }
+    return { service, endpoint: resolveTarget(service, endpointName) };
+  };
+  return {
+    services: parsed.data.services,
+    resolve: (serviceId, endpointName) => resolveListing(serviceId, endpointName).endpoint,
+    resolveListing
+  };
+}
+function resolveTarget(service, endpointName) {
+  const { targets, targetsByName } = buildTargets(service);
+  if (endpointName !== void 0) {
+    const selected = targetsByName.get(endpointName.trim());
+    if (!selected) {
+      throw new DiscoveryCatalogError(
+        "endpoint_not_found",
+        `Service ${JSON.stringify(service.id)} has no endpoint ${JSON.stringify(endpointName)}. Available endpoints: ${[...targetsByName.keys()].join(", ")}.`,
+        service.id
+      );
+    }
+    return { ...selected };
+  }
+  if (targets.size !== 1) {
+    const paymentNetworks = service.endpoints.flatMap(
+      (endpoint) => endpoint.payment ? [endpoint.payment.network] : []
+    );
+    throw new DiscoveryCatalogError(
+      "ambiguous_default",
+      `Service ${JSON.stringify(service.id)} has ${targets.size} distinct payable endpoints. Choose one with endpoint: ${[...targetsByName.keys()].join(", ")}.`,
+      service.id,
+      paymentNetworks.length === service.endpoints.length ? paymentNetworks : void 0
+    );
+  }
+  return targets.values().next().value;
+}
+function buildTargets(service) {
+  if (service.endpoints.length === 0) {
+    throw new DiscoveryCatalogError(
+      "no_endpoint",
+      `Service ${JSON.stringify(service.id)} has no payable endpoint.`,
+      service.id
+    );
+  }
+  const namedEndpoints = [...service.endpoints].sort(
+    (left, right) => compareNames(left.name.trim(), right.name.trim())
+  );
+  const names = /* @__PURE__ */ new Set();
+  const targets = /* @__PURE__ */ new Map();
+  const targetsByName = /* @__PURE__ */ new Map();
+  for (const endpoint of namedEndpoints) {
+    const name = endpoint.name.trim();
+    if (!name) {
+      throw new DiscoveryCatalogError(
+        "invalid_endpoint_name",
+        `Service ${JSON.stringify(service.id)} has a blank endpoint name.`,
+        service.id
+      );
+    }
+    if (names.has(name)) {
+      throw new DiscoveryCatalogError(
+        "duplicate_endpoint_name",
+        `Service ${JSON.stringify(service.id)} has duplicate endpoint name ${JSON.stringify(name)}.`,
+        service.id
+      );
+    }
+    names.add(name);
+    const method = endpoint.method.trim().toUpperCase();
+    if (!method) {
+      throw new DiscoveryCatalogError(
+        "blank_method",
+        `Service ${JSON.stringify(service.id)} has a blank endpoint method.`,
+        service.id
+      );
+    }
+    const url2 = new URL(endpoint.url);
+    if (url2.protocol !== "http:" && url2.protocol !== "https:") {
+      throw new DiscoveryCatalogError(
+        "malformed_url",
+        `Service ${JSON.stringify(service.id)} has a non-HTTP endpoint URL.`,
+        service.id
+      );
+    }
+    const transportKey = `${method}\0${endpoint.url}`;
+    const normalized = { ...endpoint, name, method };
+    targetsByName.set(name, normalized);
+    if (!targets.has(transportKey)) targets.set(transportKey, normalized);
+  }
+  return { targets, targetsByName };
+}
+function compareNames(left, right) {
+  return left < right ? -1 : left > right ? 1 : 0;
+}
+function pathIndexAfter(path, key2) {
+  const keyIndex = path.indexOf(key2);
+  const candidate = path[keyIndex + 1];
+  return typeof candidate === "number" ? candidate : void 0;
+}
+function rawServiceId(raw, serviceIndex) {
+  if (serviceIndex === void 0 || typeof raw !== "object" || raw === null) {
+    return void 0;
+  }
+  const services = Reflect.get(raw, "services");
+  if (!Array.isArray(services)) {
+    return void 0;
+  }
+  const service = services[serviceIndex];
+  if (typeof service !== "object" || service === null) {
+    return void 0;
+  }
+  const id2 = Reflect.get(service, "id");
+  return typeof id2 === "string" ? id2 : void 0;
+}
+
 // ../core/src/sweep.ts
 var ERC20_ABI = [
   {
@@ -47032,7 +47071,7 @@ var configSchema = external_exports.object({
   }
   for (const [network, configured] of Object.entries(config2.networks)) {
     if (isSolanaNetwork(network)) {
-      if (configured.usdc !== NETWORKS[SOLANA_MAINNET_CAIP2].usdc) {
+      if (configured.usdc !== NETWORKS2[SOLANA_MAINNET_CAIP2].usdc) {
         context.addIssue({
           code: "custom",
           path: ["networks", network, "usdc"],
@@ -47043,7 +47082,7 @@ var configSchema = external_exports.object({
     }
     try {
       const usdc = getAddress(configured.usdc);
-      if ((network === ARC_MAINNET_CAIP2 || network === ARC_TESTNET_CAIP2) && usdc !== getAddress(NETWORKS[network].usdc)) {
+      if ((network === ARC_MAINNET_CAIP2 || network === ARC_TESTNET_CAIP2) && usdc !== getAddress(NETWORKS2[network].usdc)) {
         context.addIssue({
           code: "custom",
           path: ["networks", network, "usdc"],
@@ -47195,15 +47234,15 @@ function getDefaultConfig(source = process.env, options = {}) {
   const tasksEscrowFactoryOverrides = tasksFactoryOverridesFromEnv(source);
   if (requested.has("base") || requested.has(BASE_MAINNET_CAIP2)) {
     networks[BASE_MAINNET_CAIP2] = {
-      rpcUrl: source.BASE_RPC_URL?.trim() || NETWORKS[BASE_MAINNET_CAIP2].publicRpcUrl,
-      usdc: NETWORKS[BASE_MAINNET_CAIP2].usdc
+      rpcUrl: source.BASE_RPC_URL?.trim() || NETWORKS2[BASE_MAINNET_CAIP2].publicRpcUrl,
+      usdc: NETWORKS2[BASE_MAINNET_CAIP2].usdc
     };
   }
   const arcMainnetRpcUrl = source.ARC_RPC_URL?.trim();
   if (arcMainnetRpcUrl || requested.has("arc") || requested.has(ARC_MAINNET_CAIP2)) {
     networks[ARC_MAINNET_CAIP2] = {
-      rpcUrl: arcMainnetRpcUrl || NETWORKS[ARC_MAINNET_CAIP2].publicRpcUrl,
-      usdc: NETWORKS[ARC_MAINNET_CAIP2].usdc
+      rpcUrl: arcMainnetRpcUrl || NETWORKS2[ARC_MAINNET_CAIP2].publicRpcUrl,
+      usdc: NETWORKS2[ARC_MAINNET_CAIP2].usdc
     };
   }
   const arcTestnetRpcUrl = source.ARC_TESTNET_RPC_URL?.trim();
@@ -47215,14 +47254,14 @@ function getDefaultConfig(source = process.env, options = {}) {
     }
     networks[ARC_TESTNET_CAIP2] = {
       rpcUrl: arcTestnetRpcUrl,
-      usdc: NETWORKS[ARC_TESTNET_CAIP2].usdc
+      usdc: NETWORKS2[ARC_TESTNET_CAIP2].usdc
     };
   }
   const solanaRpcUrl = source.SOLANA_RPC_URL?.trim();
   if (solanaRpcUrl || requested.has("solana") || requested.has(SOLANA_MAINNET_CAIP2)) {
     networks[SOLANA_MAINNET_CAIP2] = {
-      rpcUrl: solanaRpcUrl || NETWORKS[SOLANA_MAINNET_CAIP2].publicRpcUrl,
-      usdc: NETWORKS[SOLANA_MAINNET_CAIP2].usdc
+      rpcUrl: solanaRpcUrl || NETWORKS2[SOLANA_MAINNET_CAIP2].publicRpcUrl,
+      usdc: NETWORKS2[SOLANA_MAINNET_CAIP2].usdc
     };
   }
   return {
@@ -47280,21 +47319,21 @@ Run vapi init to write the new URLs to ${path}.`
   if (arcMainnetRpcUrl) {
     const existing = config2.networks[ARC_MAINNET_CAIP2];
     config2.networks[ARC_MAINNET_CAIP2] = {
-      ...existing ?? { usdc: NETWORKS[ARC_MAINNET_CAIP2].usdc },
+      ...existing ?? { usdc: NETWORKS2[ARC_MAINNET_CAIP2].usdc },
       rpcUrl: arcMainnetRpcUrl
     };
   }
   if (arcTestnetRpcUrl) {
     const existing = config2.networks[ARC_TESTNET_CAIP2];
     config2.networks[ARC_TESTNET_CAIP2] = {
-      ...existing ?? { usdc: NETWORKS[ARC_TESTNET_CAIP2].usdc },
+      ...existing ?? { usdc: NETWORKS2[ARC_TESTNET_CAIP2].usdc },
       rpcUrl: arcTestnetRpcUrl
     };
   }
   if (solanaRpcUrl) {
     config2.networks[SOLANA_MAINNET_CAIP2] = {
       rpcUrl: solanaRpcUrl,
-      usdc: config2.networks[SOLANA_MAINNET_CAIP2]?.usdc ?? NETWORKS[SOLANA_MAINNET_CAIP2].usdc
+      usdc: config2.networks[SOLANA_MAINNET_CAIP2]?.usdc ?? NETWORKS2[SOLANA_MAINNET_CAIP2].usdc
     };
   }
   if (registryUrl) {
@@ -47307,7 +47346,7 @@ Run vapi init to write the new URLs to ${path}.`
   for (const [network, configured] of Object.entries(config2.networks)) {
     configured.rpcUrl = configured.rpcUrl.trim();
     configured.usdc = configured.usdc.trim();
-    if (isSolanaNetwork(network) && configured.usdc !== NETWORKS[SOLANA_MAINNET_CAIP2].usdc) {
+    if (isSolanaNetwork(network) && configured.usdc !== NETWORKS2[SOLANA_MAINNET_CAIP2].usdc) {
       throw new Error(`Network ${network} must use canonical Solana mainnet USDC.`);
     }
     if (!configured.rpcUrl) delete config2.networks[network];
@@ -47363,14 +47402,14 @@ async function enableDefaultNetwork(network, path = getVapiPaths().config, sourc
   const config2 = await loadConfig(path, source);
   if (network === "solana") {
     config2.networks[SOLANA_MAINNET_CAIP2] = {
-      rpcUrl: source.SOLANA_RPC_URL?.trim() || NETWORKS[SOLANA_MAINNET_CAIP2].publicRpcUrl,
-      usdc: NETWORKS[SOLANA_MAINNET_CAIP2].usdc
+      rpcUrl: source.SOLANA_RPC_URL?.trim() || NETWORKS2[SOLANA_MAINNET_CAIP2].publicRpcUrl,
+      usdc: NETWORKS2[SOLANA_MAINNET_CAIP2].usdc
     };
   } else {
     const existing = config2.networks[ARC_MAINNET_CAIP2];
     config2.networks[ARC_MAINNET_CAIP2] = {
-      ...existing ?? { usdc: NETWORKS[ARC_MAINNET_CAIP2].usdc },
-      rpcUrl: source.ARC_RPC_URL?.trim() || NETWORKS[ARC_MAINNET_CAIP2].publicRpcUrl
+      ...existing ?? { usdc: NETWORKS2[ARC_MAINNET_CAIP2].usdc },
+      rpcUrl: source.ARC_RPC_URL?.trim() || NETWORKS2[ARC_MAINNET_CAIP2].publicRpcUrl
     };
   }
   await writeConfigFile(path, config2);
@@ -77483,7 +77522,7 @@ function createRunBudget(args) {
 import { mkdir as mkdir15, writeFile as writeFile8 } from "node:fs/promises";
 import { arch, platform, release } from "node:os";
 import { join as join13 } from "node:path";
-var VAPI_CLIENT_VERSION = "0.9.0";
+var VAPI_CLIENT_VERSION = "0.9.2";
 async function createSupportReport(options) {
   const message = options.message.trim();
   if (!message) throw new Error("Support report message must not be empty.");
@@ -78996,6 +79035,7 @@ var missingTasksChain = {
 
 // ../core/src/tasks/types.ts
 var uuidSchema = external_exports.uuid();
+var profileIdSchema = external_exports.string().min(1).max(64).regex(/^[A-Za-z0-9_-]+$/);
 var isoDateTimeSchema = external_exports.iso.datetime();
 var addressSchema5 = external_exports.string().regex(/^0x[0-9a-fA-F]{40}$/).transform((value) => value.toLowerCase());
 var bytes32Schema = external_exports.string().regex(/^0x[0-9a-fA-F]{64}$/).transform((value) => value.toLowerCase());
@@ -79333,7 +79373,7 @@ var deliveryResponseSchema = external_exports.looseObject({
   version: external_exports.number().int().positive(),
   manifest: manifestResponseSchema,
   manifestHash: bytes32Schema,
-  submittedByProfileId: uuidSchema,
+  submittedByProfileId: profileIdSchema,
   createdAt: isoDateTimeSchema
 });
 var orderDeliveryResponseSchema = external_exports.looseObject({
@@ -79439,7 +79479,7 @@ var reviewResponseSchema = external_exports.looseObject({
   id: uuidSchema,
   workOrderId: uuidSchema,
   clientAddress: addressSchema5,
-  vendorProfileId: uuidSchema,
+  vendorProfileId: profileIdSchema,
   rating: external_exports.number().int().min(1).max(5),
   body: external_exports.string(),
   subRatings: external_exports.json().nullable(),
@@ -79982,12 +80022,15 @@ function createTasksClient(options) {
         const parsed2 = serverErrorSchema.safeParse(errorBody);
         const server = parsed2.success ? parsed2.data : void 0;
         const nested = typeof server?.error === "object" ? server.error : void 0;
-        const message = (typeof server?.error === "string" ? server.error : nested?.message) || server?.message || response.statusText || `HTTP ${response.status}`;
+        const serverCode = nested?.code ?? server?.code;
+        const serverMessage = (typeof server?.error === "string" ? server.error : nested?.message) || server?.message;
+        const fallback = response.statusText || `HTTP ${response.status}`;
+        const message = response.status === 401 || response.status === 403 ? serverCode ?? fallback : serverMessage || (errorBody === void 0 && raw.trim() ? raw.replace(/\s+/gu, " ").trim().slice(0, 300) : fallback);
         throw new TasksClientError(
           "http",
           message,
           response.status,
-          nested?.code ?? server?.code,
+          serverCode,
           response.headers.get("Retry-After") ?? void 0
         );
       }
@@ -80390,9 +80433,10 @@ function safeTasksChainError(cause, broadcast, authorizationExposed, txHash) {
   let message = "Task chain operation failed.";
   if (cause instanceof TasksValidationError || cause instanceof TasksChainError)
     message = cause.message;
-  else if (cause instanceof TasksClientError)
-    message = `Tasks service request failed${cause.status === void 0 ? "" : ` (status ${cause.status})`}.`;
-  else if (cause instanceof Error) {
+  else if (cause instanceof TasksClientError) {
+    const code = cause.serverCode ?? (cause.status ? `http_${cause.status}` : cause.code);
+    message = cause.status === 401 || cause.status === 403 ? `${code} (status ${cause.status})` : `${code}: ${cause.message}`;
+  } else if (cause instanceof Error) {
     const short = "shortMessage" in cause && typeof cause.shortMessage === "string" ? cause.shortMessage : void 0;
     let statusCode;
     const seen = /* @__PURE__ */ new Set();
@@ -81200,6 +81244,44 @@ function createTasksChain(options) {
       return idempotencyKey;
     });
   }
+  async function prepareOrResume(prepare, expected, idempotencyKey, kind, steps, authorizationExposed = false, beforeSign) {
+    let prepared;
+    let resumedFromServer = false;
+    try {
+      prepared = await prepare();
+    } catch (error61) {
+      if (!uncertainPreparation(error61)) throw error61;
+      const fresh = await order(expected.milestone.workOrderId);
+      const matches = fresh.milestones.filter((item) => item.id === expected.milestone.id);
+      if (matches.length !== 1 || matches[0].workOrderId !== fresh.id)
+        throw new TasksValidationError("The task milestone does not match its parent order.");
+      const selected = matches[0];
+      const operation = selected.chainOperation;
+      if (expected.verb === "deliver" && selected.delivery && !operation)
+        throw new TasksValidationError(
+          "The server recorded this delivery but has no chain operation for it; open the task in the console to continue."
+        );
+      if (!operation || operation.kind !== kind || !(typeof steps === "string" ? [steps] : steps).includes(operation.step) || !["prepared", "submitted", "confirmed"].includes(operation.state))
+        throw error61;
+      if (expected.verb === "deliver" && selected.delivery && selected.delivery.manifestHash !== expected.manifestHash)
+        throw new TasksValidationError(
+          "The server recorded a different delivery manifest; refusing to continue."
+        );
+      prepared = {
+        operation,
+        milestone: { id: selected.id, workOrderId: selected.workOrderId }
+      };
+      resumedFromServer = true;
+    }
+    const result = await execute(
+      prepared,
+      expected,
+      idempotencyKey,
+      authorizationExposed,
+      beforeSign
+    );
+    return resumedFromServer ? { ...result, resumedFromServer: true } : result;
+  }
   async function verifyReceipt(operation, expected, hash5) {
     const rpc = rpcFor(expected.deployment.chainId);
     const receipt = await rpc.waitForTransactionReceipt({ hash: hash5, confirmations });
@@ -81241,6 +81323,7 @@ function createTasksChain(options) {
       throw new TasksValidationError(
         "The RPC transaction input does not match the verified task plan."
       );
+    return receipt.blockNumber.toString();
   }
   async function retryConflict(call2) {
     let waited = 0;
@@ -81268,6 +81351,7 @@ function createTasksChain(options) {
       current = { ...initial, operation: live };
     let broadcast = current.operation.state === "submitted";
     let txHash = current.operation.transactionHash ?? void 0;
+    let blockNumber;
     const operationId = initial.operation.id;
     function checkTransition(previous, next) {
       if (previous !== next && !(previous === "approve-usdc" && next === afterApproval))
@@ -81303,7 +81387,7 @@ function createTasksChain(options) {
           if (!operation.transactionHash)
             throw new TasksValidationError("The confirmed task operation has no transaction hash.");
           if (!checkpoint) {
-            await verifyReceipt(operation, expected, operation.transactionHash);
+            blockNumber = await verifyReceipt(operation, expected, operation.transactionHash);
             await pending.complete(operation.id, operation.step, current);
           }
           const fresh = await order(expected.milestone.workOrderId);
@@ -81312,7 +81396,12 @@ function createTasksChain(options) {
           );
           if (!resultMilestone)
             throw new TasksValidationError("The reconciled task milestone is unavailable.");
-          return { txHash: operation.transactionHash, operation, milestone: resultMilestone };
+          return {
+            txHash: operation.transactionHash,
+            operation,
+            milestone: resultMilestone,
+            blockNumber
+          };
         }
         const rpc = rpcFor(expected.deployment.chainId);
         if (operation.state === "prepared") {
@@ -81508,7 +81597,7 @@ function createTasksChain(options) {
         }
         if (operation.state !== "submitted" || !operation.transactionHash)
           throw new TasksValidationError("The task operation has no submitted transaction.");
-        await verifyReceipt(operation, expected, operation.transactionHash);
+        blockNumber = await verifyReceipt(operation, expected, operation.transactionHash);
         const reconciled = await retryConflict(
           () => client.reconcileOperation(
             operation.id,
@@ -81531,6 +81620,7 @@ function createTasksChain(options) {
         if (reconciled.operation.state !== "confirmed" && !(operation.step === "approve-usdc" && reconciled.operation.state === "prepared" && reconciled.operation.step === afterApproval))
           throw new TasksValidationError("The task transaction was not reconciled.");
         await pending.complete(operation.id, operation.step, reconciled);
+        if (reconciled.operation.step !== operation.step) blockNumber = void 0;
         current = reconciled;
       }
       throw new TasksValidationError("The task operation exceeded its allowed step transitions.");
@@ -81565,14 +81655,16 @@ function createTasksChain(options) {
         );
       const prepareKey = await preparation(input2, verb, { evidenceHash: input2.evidenceHash });
       const call2 = verb === "dispute" ? client.disputeEscrow.bind(client) : client.counterEvidenceEscrow.bind(client);
-      return await execute(
-        await call2(
+      return await prepareOrResume(
+        () => call2(
           input2.escrowId,
           { evidenceHash: input2.evidenceHash },
           { idempotencyKey: prepareKey }
         ),
         { ...expected, evidenceHash: input2.evidenceHash },
         prepareKey,
+        verb === "dispute" ? "escrow-dispute" : "escrow-counter-evidence",
+        expected.steps,
         exposed,
         input2.beforeSign
       );
@@ -81592,11 +81684,34 @@ function createTasksChain(options) {
       await options.bindings.put(binding);
     },
     createEscrow: (input2) => safe(async () => {
-      const workOrder = await order(input2.orderId);
+      let workOrder = await order(input2.orderId);
       const ready = await deployment();
-      const prepared = await client.createEscrow(input2.orderId, {
-        idempotencyKey: input2.idempotencyKey
-      });
+      let prepared;
+      let resumedFromServer = false;
+      try {
+        prepared = await client.createEscrow(input2.orderId, {
+          idempotencyKey: input2.idempotencyKey
+        });
+      } catch (error61) {
+        if (!uncertainPreparation(error61)) throw error61;
+        const fresh = await order(input2.orderId);
+        const candidates = fresh.milestones.filter((item) => {
+          const previous = workOrder.milestones.find((prior) => prior.id === item.id);
+          const operation = item.chainOperation;
+          return item.workOrderId === input2.orderId && previous && operation && operation.kind === "escrow-create" && operation.step === "create-escrow" && (previous.escrowState === null || previous.chainOperation?.id === operation.id);
+        });
+        if (candidates.length !== 1) throw error61;
+        const selected2 = candidates[0];
+        prepared = {
+          operation: selected2.chainOperation,
+          milestone: {
+            id: selected2.id,
+            workOrderId: selected2.workOrderId
+          }
+        };
+        workOrder = fresh;
+        resumedFromServer = true;
+      }
       const selected = workOrder.milestones.find((item) => item.id === prepared.milestone.id);
       if (!selected || selected.workOrderId !== input2.orderId)
         throw new TasksValidationError(
@@ -81606,11 +81721,12 @@ function createTasksChain(options) {
         { escrowId: selected.id, idempotencyKey: input2.idempotencyKey },
         "createEscrow"
       );
-      return await execute(
+      const result = await execute(
         prepared,
         await expectation(selected, ready, "createEscrow", ["create-escrow"], input2.counterparty),
         prepareKey
       );
+      return resumedFromServer ? { ...result, resumedFromServer: true } : result;
     }),
     async fund(input2) {
       let exposed = true;
@@ -81698,10 +81814,14 @@ function createTasksChain(options) {
         }
         exposed = true;
         await pending.markExposure(selected.id);
-        const prepared = await client.fundEscrow(input2.escrowId, body, {
-          idempotencyKey: prepareKey
-        });
-        return await execute(prepared, expected, prepareKey, exposed);
+        return await prepareOrResume(
+          () => client.fundEscrow(input2.escrowId, body, { idempotencyKey: prepareKey }),
+          expected,
+          prepareKey,
+          "escrow-funding",
+          expected.steps,
+          exposed
+        );
       } catch (cause) {
         throw chainError(cause, false, exposed);
       }
@@ -81726,22 +81846,26 @@ function createTasksChain(options) {
         manifest: frozen.manifest,
         note: input2.note
       });
-      const prepared = await client.deliverEscrow(
-        input2.escrowId,
-        { fileIds: frozen.manifest.files.map((file2) => file2.fileId), note: input2.note },
-        { idempotencyKey: prepareKey }
-      );
-      if (prepared.delivery.manifestHash !== frozen.manifestHash)
-        throw new TasksValidationError(
-          "The server task delivery manifest hash does not match the local manifest."
-        );
-      return await execute(
-        prepared,
+      return await prepareOrResume(
+        async () => {
+          const prepared = await client.deliverEscrow(
+            input2.escrowId,
+            { fileIds: frozen.manifest.files.map((file2) => file2.fileId), note: input2.note },
+            { idempotencyKey: prepareKey }
+          );
+          if (prepared.delivery.manifestHash !== frozen.manifestHash)
+            throw new TasksValidationError(
+              "The server task delivery manifest hash does not match the local manifest."
+            );
+          return prepared;
+        },
         {
           ...expected,
           manifestHash: frozen.manifestHash
         },
-        prepareKey
+        prepareKey,
+        "escrow-delivery",
+        "submit-delivery"
       );
     }),
     release: (input2) => safe(async () => {
@@ -81755,10 +81879,12 @@ function createTasksChain(options) {
         input2.counterparty
       );
       const prepareKey = await preparation(input2, "release");
-      return await execute(
-        await client.releaseEscrow(input2.escrowId, { idempotencyKey: prepareKey }),
+      return await prepareOrResume(
+        () => client.releaseEscrow(input2.escrowId, { idempotencyKey: prepareKey }),
         expected,
-        prepareKey
+        prepareKey,
+        "escrow-release",
+        "release-funds"
       );
     }),
     refund: (input2) => safe(async () => {
@@ -81772,10 +81898,12 @@ function createTasksChain(options) {
         input2.counterparty
       );
       const prepareKey = await preparation(input2, "refund");
-      return await execute(
-        await client.refundEscrow(input2.escrowId, { idempotencyKey: prepareKey }),
+      return await prepareOrResume(
+        () => client.refundEscrow(input2.escrowId, { idempotencyKey: prepareKey }),
         expected,
-        prepareKey
+        prepareKey,
+        "escrow-release",
+        "refund-buyer"
       );
     }),
     disputeFee: (input2) => safe(async () => {
@@ -81803,16 +81931,21 @@ function createTasksChain(options) {
         input2.counterparty
       );
       const prepareKey = await preparation(input2, "resolve-unmatched");
-      return execute(
-        await client.resolveUnmatchedEscrow(input2.escrowId, { idempotencyKey: prepareKey }),
+      return prepareOrResume(
+        () => client.resolveUnmatchedEscrow(input2.escrowId, { idempotencyKey: prepareKey }),
         expected,
-        prepareKey
+        prepareKey,
+        "escrow-unmatched-resolution",
+        "resolve-unmatched-dispute"
       );
     }),
     signScopeMessage: (message) => safe(() => account.signMessage({ message }))
   };
 }
 var chainError = safeTasksChainError;
+function uncertainPreparation(error61) {
+  return error61 instanceof TasksClientError && ((error61.status ?? 0) >= 400 || error61.code === "network" || error61.code === "timeout");
+}
 function retryDelay(header, now) {
   if (/^\d+(?:\.\d+)?$/u.test(header.trim())) return Math.max(1, Math.ceil(Number(header) * 1e3));
   const date5 = Date.parse(header);
@@ -81829,6 +81962,60 @@ function alreadySent(error61) {
   return error61 instanceof Error && /already known|known transaction|nonce (?:is )?too low/iu.test(error61.message);
 }
 
+// ../core/src/tasks/wait.ts
+async function waitForMilestone(client, input2) {
+  const timeoutMs = input2.timeoutMs ?? 12e4;
+  const intervalMs = input2.intervalMs ?? 3e3;
+  if (!Number.isFinite(timeoutMs) || timeoutMs < 0)
+    throw new RangeError("The milestone wait timeout must be non-negative and finite.");
+  if (!Number.isFinite(intervalMs) || intervalMs <= 0)
+    throw new RangeError("The milestone wait interval must be positive and finite.");
+  const sleep = input2.sleep ?? ((ms) => new Promise((resolve2) => setTimeout(resolve2, ms)));
+  const now = input2.now ?? (() => /* @__PURE__ */ new Date());
+  const started = now().getTime();
+  const deadline = started + timeoutMs;
+  let polls = 0;
+  let milestone;
+  function result(reached) {
+    return { reached, milestone, polls, elapsedMs: now().getTime() - started };
+  }
+  for (; ; ) {
+    const remaining = deadline - now().getTime();
+    if (remaining <= 0) return result(false);
+    const controller = new AbortController();
+    const timer = setTimeout(() => controller.abort(), remaining);
+    let response;
+    polls++;
+    try {
+      response = await client.getOrder(input2.orderId, { signal: controller.signal });
+    } catch (error61) {
+      if (controller.signal.aborted) return result(false);
+      throw error61;
+    } finally {
+      clearTimeout(timer);
+    }
+    if (controller.signal.aborted || now().getTime() >= deadline) return result(false);
+    const { workOrder } = response;
+    milestone = workOrder.id === input2.orderId && workOrder.version === "work-order-view-v1" ? workOrder.milestones.find(
+      (item) => item.id === input2.milestoneId && item.workOrderId === input2.orderId
+    ) : void 0;
+    if (milestone && reachedTarget(milestone, input2.target)) return result(true);
+    await sleep(Math.min(intervalMs, deadline - now().getTime()));
+  }
+}
+function reachedTarget(milestone, target) {
+  switch (target) {
+    case "created":
+      return milestone.escrowState !== null;
+    case "locked":
+      return ["locked", "submitted", "disputed", "resolved"].includes(milestone.escrowState ?? "");
+    case "delivered":
+      return ["submitted", "disputed", "resolved"].includes(milestone.escrowState ?? "");
+    case "released":
+      return milestone.escrowState === "resolved";
+  }
+}
+
 // ../core/src/tasks/rpc.ts
 function createTasksRpcFor(config2, options = {}) {
   const clients = /* @__PURE__ */ new Map();
@@ -82945,7 +83132,10 @@ async function taskRequest(verb, route, operation, options) {
           "not_signed_in",
           `${verb} needs sign-in. ${options.signInHint}`
         );
-      throw new TaskOperationError(error61.serverCode ?? error61.code, error61.message);
+      throw new TaskOperationError(
+        error61.serverCode ?? (error61.status ? `http_${error61.status}` : error61.code),
+        error61.message
+      );
     }
     throw error61;
   }
@@ -83066,7 +83256,8 @@ function proposalTerms(id2, address4, deployment, terms) {
   return {
     version: "work-proposal-v1",
     workOrderId: id2,
-    providerAddress: address4,
+    // The server lowercases addresses before canonicalizing the signed payload.
+    providerAddress: address4.toLowerCase(),
     pricingModel: "fixed",
     milestones: [
       {
@@ -83453,6 +83644,55 @@ async function showTask(context, input2) {
   };
 }
 async function taskStatus(context, input2) {
+  if (input2.signedIn) {
+    const chainState = await taskRequest(
+      "status",
+      "chainState",
+      async () => {
+        try {
+          return await context.client.chainState(input2.id);
+        } catch (error61) {
+          if (error61 instanceof TasksClientError && error61.status === 404) {
+            if (isMissingTaskEntity(error61.serverCode, error61.message))
+              throw new TaskOperationError("not_found", error61.message);
+            throw new TaskOperationError(
+              "not_available",
+              "GET /v1/work-orders/:id/chain-state is not available on this server."
+            );
+          }
+          throw error61;
+        }
+      },
+      context
+    );
+    if (chainState.workOrderId !== input2.id)
+      throw new TaskOperationError("invalid_response", "The response belongs to a different task.");
+    const page = await taskRequest(
+      "status",
+      "events",
+      async () => {
+        try {
+          return await context.client.events(input2.id, { wait: 0 });
+        } catch (error61) {
+          if (error61 instanceof TasksClientError && error61.status === 404) {
+            if (isMissingTaskEntity(error61.serverCode, error61.message)) return null;
+            throw new TaskOperationError(
+              "not_available",
+              "GET /v1/work-orders/:id/events is not available on this server."
+            );
+          }
+          throw error61;
+        }
+      },
+      context
+    );
+    return {
+      task: { id: input2.id },
+      chainState,
+      events: page ? [...page.events].sort((a, b) => a.sequence - b.sequence) : null,
+      nextAfter: page?.nextAfter ?? null
+    };
+  }
   const task = await taskRequest(
     "status",
     "publicTask",
@@ -83808,6 +84048,7 @@ var searchEventSchema = external_exports.strictObject({
       source: external_exports.string().min(1),
       latencyMs: external_exports.number().nonnegative().finite(),
       count: external_exports.number().int().nonnegative(),
+      dropped: external_exports.number().int().nonnegative().optional(),
       error: external_exports.string().optional()
     })
   ),
@@ -86879,7 +87120,7 @@ var memberBundleConfigSchema = external_exports.unknown().refine((value) => !has
       external_exports.strictObject({ usdc: external_exports.string() })
     ).refine(
       (networks) => Object.entries(networks).every(
-        ([id2, network]) => isMemberBundleNetwork(id2) && network.usdc === NETWORKS[id2].usdc
+        ([id2, network]) => isMemberBundleNetwork(id2) && network.usdc === NETWORKS2[id2].usdc
       ),
       { message: "Expected the canonical USDC token of each network." }
     ).refine((networks) => Object.keys(networks).length === 1, {
@@ -86918,14 +87159,14 @@ function memberBundleConfig(owner, network) {
   return {
     discoveryUrl,
     marketplaceDiscoveryUrl,
-    networks: { [network]: { usdc: NETWORKS[network].usdc } }
+    networks: { [network]: { usdc: NETWORKS2[network].usdc } }
   };
 }
 function headlessConfigFromBundle(config2) {
   const networks = {};
   for (const [id2, network] of Object.entries(config2.networks)) {
     if (!isMemberBundleNetwork(id2) || network === void 0) continue;
-    networks[id2] = { rpcUrl: NETWORKS[id2].publicRpcUrl, usdc: network.usdc };
+    networks[id2] = { rpcUrl: NETWORKS2[id2].publicRpcUrl, usdc: network.usdc };
   }
   return configSchema.parse({
     discoveryUrl: config2.discoveryUrl,
@@ -87018,7 +87259,7 @@ function parseStoredTokens(value) {
   }
 }
 function isMemberBundleNetwork(id2) {
-  return Object.hasOwn(NETWORKS, id2) && typeof NETWORKS[id2].publicRpcUrl === "string";
+  return Object.hasOwn(NETWORKS2, id2) && typeof NETWORKS2[id2].publicRpcUrl === "string";
 }
 function hasForbiddenConfigKey(value) {
   if (Array.isArray(value)) return value.some(hasForbiddenConfigKey);
@@ -87320,11 +87561,28 @@ async function searchMarketplace(input2, config2, fetchImpl, options = {}) {
         }
       }
     });
-    const page = marketplaceDiscoveryPageSchema.parse(await response.json());
-    mergedCount = page.items.length;
+    const envelope = marketplaceDiscoveryEnvelopeSchema.parse(await response.json());
+    const items = [];
+    let dropped = 0;
+    for (const [index2, rawItem] of envelope.items.entries()) {
+      const parsed = marketplaceHitSchema.safeParse(rawItem);
+      if (parsed.success) {
+        items.push(parsed.data);
+        continue;
+      }
+      dropped += 1;
+      try {
+        options.debug?.(`vAPI marketplace discovery dropped invalid row at index ${index2}.`);
+      } catch {
+      }
+    }
+    mergedCount = items.length;
     const attempt = attempts.at(-1);
-    if (attempt) attempt.count = mergedCount;
-    return page;
+    if (attempt) {
+      attempt.count = mergedCount;
+      if (dropped > 0) attempt.dropped = dropped;
+    }
+    return { ...envelope, items };
   } finally {
     if (options.searchesPath) {
       await appendSearchEvent(
@@ -87450,6 +87708,34 @@ var VapiCallError = class extends Error {
   paymentRejection;
   confirmedSettlement;
 };
+var SOLANA_PAYMENTS_UNSUPPORTED_MESSAGE = "Solana payments are not supported in this version of vAPI yet; they arrive in a later release.";
+function isSolanaCaip2(network) {
+  return network.startsWith("solana:");
+}
+function listingPaymentNetwork(endpointNetwork, serviceNetworks) {
+  if (endpointNetwork !== void 0) return endpointNetwork;
+  return serviceNetworks?.length && serviceNetworks.every(isSolanaCaip2) ? serviceNetworks[0] : void 0;
+}
+function assertSupportedListingNetwork(network) {
+  if (network !== void 0 && isSolanaCaip2(network)) {
+    throw new VapiCallError(
+      "unsupported_network",
+      `${SOLANA_PAYMENTS_UNSUPPORTED_MESSAGE} This listing pays on ${network}.`
+    );
+  }
+}
+function assertSupportedListingResolution(error61) {
+  if (isDiscoveryCatalogError(error61) && error61.code === "ambiguous_default" && error61.paymentNetworks?.length && error61.paymentNetworks.every(isSolanaCaip2)) {
+    assertSupportedListingNetwork(error61.paymentNetworks[0]);
+  }
+}
+function payableConfig(config2, account) {
+  if (account.solana !== void 0) return config2;
+  const networks = Object.fromEntries(
+    Object.entries(config2.networks).filter(([network]) => !isSolanaCaip2(network))
+  );
+  return { ...config2, networks };
+}
 var MAX_RESPONSE_BYTES = 1048576;
 var BODY_HEADER_NAMES = [
   "content-encoding",
@@ -87464,7 +87750,9 @@ async function callService(args) {
   try {
     execution = await executeCallService(args, trace);
   } catch (error61) {
-    await recordCallError(args, error61, trace).catch(() => void 0);
+    if (!(error61 instanceof VapiCallError && error61.code === "unsupported_network")) {
+      await recordCallError(args, error61, trace).catch(() => void 0);
+    }
     throw error61;
   }
   try {
@@ -87512,10 +87800,16 @@ async function executeCallService(args, trace) {
         config2,
         fetchImpl
       );
+    } catch (error61) {
+      assertSupportedListingResolution(error61);
+      throw error61;
     } finally {
       trace.phases.discoverMs = elapsed2(trace, discoverStarted);
     }
   }
+  assertSupportedListingNetwork(
+    listingPaymentNetwork(endpoint?.payment?.network, endpoint?.serviceNetworks)
+  );
   const requestedNetwork = normalizeRequiredNetwork(input2.network);
   const listingNetwork = endpoint?.payment?.network;
   if (requestedNetwork && listingNetwork && !areSamePaymentNetwork(requestedNetwork, listingNetwork)) {
@@ -87731,7 +88025,7 @@ async function executeCallService(args, trace) {
       challenge: challengeAttempt,
       account,
       caps: args.spendCaps ?? config2.spendCaps,
-      config: config2,
+      config: payableConfig(config2, account),
       send: async (paidRequest) => {
         paidAttempt = await fetchWithGuardedRedirects(paidRequest, false);
         return paidAttempt;
@@ -87981,7 +88275,7 @@ async function resolveCallEndpoint(id2, endpointName, marketplaceHit, config2, f
     try {
       return registeredEndpoint(await resolveServiceListing(id2, config2, fetchImpl, endpointName));
     } catch (error61) {
-      if (!(error61 instanceof DiscoveryCatalogError) || error61.code !== "service_not_found") {
+      if (!isDiscoveryCatalogError(error61) || error61.code !== "service_not_found") {
         throw error61;
       }
       const discovered = await findMarketplaceApiByRef(id2, config2, fetchImpl);
@@ -88021,6 +88315,7 @@ function registeredEndpoint(listing, verification) {
   return {
     ...listing.endpoint,
     verification: verification ?? listing.service.verification,
+    serviceNetworks: listing.service.networks,
     registered: true,
     resolvedListing: true
   };
@@ -88259,14 +88554,17 @@ async function inspectService(input2, config2, fetchImpl) {
   try {
     listing = await resolveServiceListing(input2.id, config2, fetchImpl, input2.endpoint);
   } catch (error61) {
-    if (input2.endpoint || !(error61 instanceof DiscoveryCatalogError) || error61.code !== "service_not_found") {
+    assertSupportedListingResolution(error61);
+    if (input2.endpoint || !isDiscoveryCatalogError(error61) || error61.code !== "service_not_found") {
       throw error61;
     }
     const hit = await findMarketplaceApiByRef(input2.id, config2, fetchImpl);
     if (!hit || hit.kind !== "api" || hit.provenance !== "indexed") throw error61;
+    assertSupportedListingNetwork(hit.execution.network);
     return inspectIndexedHit(hit);
   }
   const { endpoint, service } = listing;
+  assertSupportedListingNetwork(listingPaymentNetwork(endpoint.payment?.network, service.networks));
   return {
     name: endpoint.name,
     method: endpoint.method,
@@ -92036,6 +92334,7 @@ var moneyParticipant = {
     "Checksummed 0x address of the other party, taken from tasks.show (the poster's clientAddress when you are the worker; the accepted proposal's providerAddress when you are the poster). The human must supply it; it is compared with the signed scope and stored as local consent. Without it tasks.sign refuses and no local party binding is created, so tasks.fund/deliver/release cannot run from this machine."
   ).optional()
 };
+var waitForIndexer = external_exports.boolean().default(true).describe("Wait up to 60 seconds for vAPI to index the chain result before returning.");
 var cursor = external_exports.number().int().nonnegative().max(Number.MAX_SAFE_INTEGER);
 function usdWithinEscrow(value, positive = false) {
   try {
@@ -92082,7 +92381,10 @@ var tasksPostTool = descriptor(
     deadline: external_exports.string(),
     intake: external_exports.enum(["proposals", "submissions"]).optional(),
     maxAwards: external_exports.number().int().min(TASK_LIMITS.maxAwardsMin).max(TASK_LIMITS.maxAwardsMax).optional(),
-    webhookUrl: httpsUrl.optional()
+    webhookUrl: httpsUrl.optional(),
+    vendor: external_exports.string().regex(/^0x[0-9a-fA-F]{40}$/u).describe(
+      "Optional 0x address of a vendor to invite directly; the task is addressed to that wallet and shows up for them. Anyone may still propose."
+    ).optional()
   }
 );
 var tasksProposeTool = descriptor(
@@ -92107,42 +92409,43 @@ var tasksAwardTool = descriptor(
   { ...participant, proposalId: id }
 );
 var tasksSignTool = descriptor(
-  "Does not move money. Sign the current counterparty scope locally after the human confirms the money direction via counterparty; a worker may also create the unfunded escrow with the local vault wallet.",
-  moneyParticipant
+  "Signs the user's own task scope locally with the user's vault wallet after the human confirms the money direction via counterparty; a worker may also create the unfunded escrow; nothing is custodial. Does not move money. Waits up to 60 seconds for vAPI to index a created escrow by default.",
+  { ...moneyParticipant, wait: waitForIndexer }
 );
 var tasksFundTool = descriptor(
-  "Moves money: locks the task amount in USDC escrow subject to the acting wallet's policy and daily cap. MCP cannot grant human approval; amounts above the approval threshold are refused with approval:true.",
-  moneyParticipant
+  "Executes the user's own funding of this task from the user's vault wallet, within the spend policy the user configured; nothing is custodial. MCP cannot grant human approval; amounts above the approval threshold are refused with approval:true. Waits up to 60 seconds for vAPI to index the locked escrow by default.",
+  { ...moneyParticipant, wait: waitForIndexer }
 );
 var tasksDeliverTool = descriptor(
-  "Does not move money. Upload local delivery files, freeze the manifest and record delivery with the local vault wallet.",
+  "Does not move money. Upload local delivery files, freeze the manifest and record delivery with the local vault wallet. Waits up to 60 seconds for vAPI to index the delivery by default.",
   {
     ...moneyParticipant,
+    wait: waitForIndexer,
     files: external_exports.array(localPath).min(TASK_LIMITS.deliveryFilesMin).max(TASK_LIMITS.deliveryFilesMax),
     note: external_exports.string().max(TASK_LIMITS.deliveryNoteMax).refine((value) => value.trim().length > 0)
   }
 );
 var tasksReleaseTool = descriptor(
-  "Moves money: pays the worker from escrow with the local vault wallet. Returns gross \xB7 fee \xB7 net using the deployed fee.",
-  moneyParticipant
+  "Executes the user's own payment to the worker from task escrow with the user's vault wallet; nothing is custodial. Returns gross \xB7 fee \xB7 net using the deployed fee. Waits up to 60 seconds for vAPI to index the release by default.",
+  { ...moneyParticipant, wait: waitForIndexer }
 );
 var tasksRefundTool = descriptor(
-  "Moves money: returns escrowed USDC to the poster with the local vault wallet. Returns gross \xB7 fee \xB7 net using the deployed fee.",
+  "Executes the user's own refund of escrowed USDC to the poster with the user's vault wallet; nothing is custodial. Returns gross \xB7 fee \xB7 net using the deployed fee.",
   moneyParticipant
 );
 var tasksDisputeTool = descriptor(
-  "Moves money: approves the verified dispute fee and raises a dispute with the local vault wallet. Applies task and daily caps; MCP refuses human approval with approval:true. Accepts a precomputed evidence hash.",
+  "Executes the user's own approval of the verified dispute fee and raises a dispute with the user's vault wallet; nothing is custodial. Applies task and daily caps; MCP refuses human approval with approval:true. Accepts a precomputed evidence hash.",
   {
     ...moneyParticipant,
     evidenceHash: external_exports.string().regex(TASK_LIMITS.disputeEvidenceHash)
   }
 );
 var tasksCounterEvidenceTool = descriptor(
-  "Moves money: approves the verified dispute fee and submits counter-evidence as the non-opener before the onchain deadline. Applies task and daily caps; MCP refuses human approval with approval:true.",
+  "Executes the user's own counter-evidence submission and approval of the verified dispute fee with the user's vault wallet as the non-opener before the onchain deadline; nothing is custodial. Applies task and daily caps; MCP refuses human approval with approval:true.",
   { ...moneyParticipant, evidenceHash: external_exports.string().regex(TASK_LIMITS.disputeEvidenceHash) }
 );
 var tasksResolveUnmatchedTool = descriptor(
-  "Moves money: resolves an unmatched dispute after the onchain counter-evidence deadline when no counter-evidence was submitted.",
+  "Executes the user's own resolution of an unmatched dispute with the user's vault wallet after the onchain counter-evidence deadline when no counter-evidence was submitted; nothing is custodial.",
   moneyParticipant
 );
 var tasksMessageTool = descriptor(
@@ -92166,8 +92469,8 @@ var tasksWatchTool = descriptor(
   }
 );
 var tasksStatusTool = descriptor(
-  "Does not move money. Read the public task card and receipt URL when settled; sign-in is not required.",
-  { id }
+  "Does not move money. Read signed-in chain state and participant events, or the public task card without sign-in.",
+  participant
 );
 var signInHint = "Call auth.link for the acting wallet.";
 function lazyTasksChain(factory, pending) {
@@ -92307,6 +92610,22 @@ function createTasksTools(options) {
       };
     };
   }
+  async function waitAfterChain(ctx, orderId, milestoneId, target) {
+    return await taskRequest(
+      target,
+      "getOrder",
+      () => waitForMilestone(ctx.client, {
+        orderId,
+        milestoneId,
+        target,
+        timeoutMs: 6e4,
+        intervalMs: 3e3,
+        ...options.sleep === void 0 ? {} : { sleep: options.sleep },
+        now
+      }),
+      ctx
+    );
+  }
   async function feeAction(verb, input2) {
     const ctx = await acting(input2.wallet);
     const policy = await taskPolicyForWallet({
@@ -92349,7 +92668,12 @@ function createTasksTools(options) {
         throw new TaskInputError("deadline must be at least 10 minutes from now.");
       const ctx = await acting(input2.wallet);
       const outcome = await postTask(ctx, {
-        order: { title: input2.title, description: input2.brief, policyFamily: "general-digital" },
+        order: {
+          title: input2.title,
+          description: input2.brief,
+          policyFamily: "general-digital",
+          ...input2.vendor === void 0 ? {} : { invitedProviderAddress: input2.vendor }
+        },
         amount: parseUsdToBaseUnits(input2.amountUsd),
         deadlineAt: new Date(postedAt.getTime() + deadlineDuration).toISOString(),
         ...input2.intake === void 0 ? {} : { intake: input2.intake },
@@ -92407,15 +92731,15 @@ function createTasksTools(options) {
       const ctx = await acting(input2.wallet);
       const signerAddress = (await options.session.addressesFor(ctx.selected.name)).address;
       try {
-        return taskResult(
-          await signTaskScope(ctx, {
-            id: input2.id,
-            counterparty: input2.counterparty,
-            signerAddress,
-            bindings: createScopeBindings(home),
-            signMessage: async (message) => (await unlock(ctx.selected.name)()).signMessage(message)
-          })
-        );
+        const outcome = await signTaskScope(ctx, {
+          id: input2.id,
+          counterparty: input2.counterparty,
+          signerAddress,
+          bindings: createScopeBindings(home),
+          signMessage: async (message) => (await unlock(ctx.selected.name)()).signMessage(message)
+        });
+        const wait2 = input2.wait && outcome.escrowCreation ? await waitAfterChain(ctx, input2.id, outcome.escrowCreation.milestone.id, "created") : null;
+        return taskResult({ ...outcome, wait: wait2 });
       } catch (error61) {
         if (!(error61 instanceof TasksScopeCreationError)) throw error61;
         try {
@@ -92451,28 +92775,31 @@ function createTasksTools(options) {
         // Stdio has no human approval channel. Model arguments cannot grant approval.
         approval: { granted: false }
       });
-      return taskResult(outcome, !outcome.ok);
+      const wait2 = input2.wait && outcome.ok ? await waitAfterChain(ctx, input2.id, outcome.result.milestone.id, "locked") : null;
+      return taskResult({ ...outcome, wait: wait2 }, !outcome.ok);
     },
     async deliver(input2) {
       const files = (await Promise.all(input2.files.map(readTaskFile))).map(
         ({ fileName: name, bytes, contentType }) => ({ name, bytes, contentType })
       );
-      return taskResult(
-        await deliverTaskOperation(await acting(input2.wallet), {
-          id: input2.id,
-          ...input2.counterparty === void 0 ? {} : { counterparty: input2.counterparty },
-          files,
-          note: input2.note
-        })
-      );
+      const ctx = await acting(input2.wallet);
+      const outcome = await deliverTaskOperation(ctx, {
+        id: input2.id,
+        ...input2.counterparty === void 0 ? {} : { counterparty: input2.counterparty },
+        files,
+        note: input2.note
+      });
+      const wait2 = input2.wait ? await waitAfterChain(ctx, input2.id, outcome.result.milestone.id, "delivered") : null;
+      return taskResult({ ...outcome, wait: wait2 });
     },
     async release(input2) {
-      return taskResult(
-        await releaseTaskOperation(await acting(input2.wallet), {
-          id: input2.id,
-          ...input2.counterparty === void 0 ? {} : { counterparty: input2.counterparty }
-        })
-      );
+      const ctx = await acting(input2.wallet);
+      const outcome = await releaseTaskOperation(ctx, {
+        id: input2.id,
+        ...input2.counterparty === void 0 ? {} : { counterparty: input2.counterparty }
+      });
+      const wait2 = input2.wait ? await waitAfterChain(ctx, input2.id, outcome.result.milestone.id, "released") : null;
+      return taskResult({ ...outcome, wait: wait2 });
     },
     async refund(input2) {
       return taskResult(
@@ -92539,7 +92866,11 @@ function createTasksTools(options) {
       }
     },
     async status(input2) {
-      return taskResult(await taskStatus(await context(void 0, true), { id: input2.id }));
+      await options.wallets?.reload();
+      const publicOnly = input2.wallet === void 0 && options.session.activeName === void 0 && options.wallets !== void 0 && options.wallets.names().length === 0;
+      const candidate = await context(input2.wallet, publicOnly);
+      const ctx = candidate.token || publicOnly ? candidate : await context(void 0, true);
+      return taskResult(await taskStatus(ctx, { id: input2.id, signedIn: Boolean(ctx.token) }));
     }
   };
 }
@@ -93296,6 +93627,11 @@ var statsToolResultSchema = external_exports.object({
     )
   })
 });
+function objectOutputSchema(schema) {
+  if (!schema) return {};
+  const json2 = external_exports.toJSONSchema(schema);
+  return json2.type === "object" ? { outputSchema: json2 } : {};
+}
 var VapiMcpServer = class {
   #tools = /* @__PURE__ */ new Map();
   #onClose;
@@ -93319,7 +93655,7 @@ var VapiMcpServer = class {
         name,
         ...tool.description ? { description: tool.description } : {},
         inputSchema: external_exports.toJSONSchema(tool.inputSchema),
-        ...tool.outputSchema ? { outputSchema: external_exports.toJSONSchema(tool.outputSchema) } : {}
+        ...objectOutputSchema(tool.outputSchema)
       }))
     };
   }
@@ -97681,7 +98017,7 @@ async function readProcessStdin() {
 }
 
 // src/version.ts
-var CLI_VERSION = "0.9.0";
+var CLI_VERSION = "0.9.2";
 
 // src/status.ts
 async function statusCommand(argv, json2, io, dependencies) {
@@ -102630,10 +102966,10 @@ var TASK_HELP = `Usage:
   vapi task propose <id> --price <usd> --duration <duration> --note <text> [--account <name>] [--json]
   vapi task submit <id> --proof <https-url> [--proof <https-url>...] [--file <path>...] [--account <name>] [--json]
   vapi task award <id> <proposalId> [--account <name>] [--json]
-  vapi task sign <id> [--yes] [--counterparty <0x\u2026>] [--account <name>] [--json]
-  vapi task fund <id> [--yes] [--counterparty <0x\u2026>] [--account <name>] [--json]
-  vapi task deliver <id> --files <path...> --note <text> [--counterparty <0x\u2026>] [--account <name>] [--json]
-  vapi task release <id> [--counterparty <0x\u2026>] [--account <name>] [--json]
+  vapi task sign <id> [--yes] [--no-wait] [--timeout 120s] [--counterparty <0x\u2026>] [--account <name>] [--json]
+  vapi task fund <id> [--yes] [--no-wait] [--timeout 120s] [--counterparty <0x\u2026>] [--account <name>] [--json]
+  vapi task deliver <id> --files <path...> --note <text> [--no-wait] [--timeout 120s] [--counterparty <0x\u2026>] [--account <name>] [--json]
+  vapi task release <id> [--no-wait] [--timeout 120s] [--counterparty <0x\u2026>] [--account <name>] [--json]
   vapi task refund <id> [--counterparty <0x\u2026>] [--account <name>] [--json]
   vapi task dispute <id> --evidence-hash <0x + 64 hex> [--yes] [--counterparty <0x\u2026>] [--account <name>] [--json]
   vapi task counter-evidence <id> --evidence-hash <0x + 64 hex> [--yes] [--counterparty <0x\u2026>] [--account <name>] [--json]
@@ -102656,23 +102992,25 @@ Exit codes:
   2  policy refusal only (JSON ok:false with reason policy.perTask or policy.perDay)
   3  approval needed in non-interactive mode
 
-Fund, deliver, release, refund, dispute, counter-evidence, resolve-unmatched and watch auto-release sign with the local vault wallet. The CLI waits for two confirmations and records pending transactions for recovery. It never retries a chain mutation automatically.`;
+Fund, deliver, release, refund, dispute, counter-evidence, resolve-unmatched and watch auto-release sign with the local vault wallet. The CLI waits for two confirmations and records pending transactions for recovery. It never retries a chain mutation automatically. Sign, fund, deliver and release wait up to 120s for vAPI to index a confirmed transaction unless --no-wait is set; an indexing timeout keeps exit code 0.`;
 var IMPLEMENTED_VERBS = TASKS_CLIENT_VERBS;
 var USAGE = `Usage: vapi task <${IMPLEMENTED_VERBS.join("|")}>. Run vapi task --help.`;
 var TaskCommandError = class extends Error {
-  constructor(code, message, manifestHash) {
+  constructor(code, message, manifestHash, prefixCode = false) {
     super(message);
     this.code = code;
     this.manifestHash = manifestHash;
+    this.prefixCode = prefixCode;
     this.name = "TaskCommandError";
   }
   code;
   manifestHash;
+  prefixCode;
 };
 function mapTaskError(error61) {
   if (error61 instanceof TaskInputError) return new UsageError(error61.message);
   if (error61 instanceof TaskOperationError)
-    return new TaskCommandError(error61.code, error61.message, error61.manifestHash);
+    return new TaskCommandError(error61.code, error61.message, error61.manifestHash, true);
   return error61;
 }
 async function mapped(operation) {
@@ -102891,11 +103229,13 @@ async function taskCommandInner(argv, json2, io, dependencies) {
         "--intake",
         "--max-awards",
         "--webhook"
-      ] : verb === "propose" ? ["--price", "--duration", "--note"] : verb === "submit" ? ["--proof", "--file"] : verb === "thread" ? ["--after"] : verb === "deliver" ? ["--files", "--note"] : ["dispute", "counter-evidence"].includes(verb) ? ["--evidence-hash"] : verb === "watch" ? ["--until", "--timeout", "--interval"] : []
+      ] : verb === "propose" ? ["--price", "--duration", "--note"] : verb === "submit" ? ["--proof", "--file"] : verb === "thread" ? ["--after"] : verb === "deliver" ? ["--files", "--note"] : ["dispute", "counter-evidence"].includes(verb) ? ["--evidence-hash"] : verb === "watch" ? ["--until", "--timeout", "--interval"] : [],
+      ...["sign", "fund", "deliver", "release"].includes(verb) ? ["--timeout"] : []
     ]),
     booleanOptions: /* @__PURE__ */ new Set([
       ...verb === "search" ? ["--open"] : [],
       ...["sign", "fund", "dispute", "counter-evidence"].includes(verb) ? ["--yes"] : [],
+      ...["sign", "fund", "deliver", "release"].includes(verb) ? ["--no-wait"] : [],
       ...verb === "watch" ? ["--auto-release"] : []
     ]),
     repeatableOptions: /* @__PURE__ */ new Set([
@@ -103051,7 +103391,7 @@ async function taskCommandInner(argv, json2, io, dependencies) {
       throw new UsageError("message needs text between 1 and 10000 characters.");
   }
   if (verb === "thread") cursor2 = optionalInteger(parsed.one("--after"), "--after");
-  const context = await taskContext(parsed, io, dependencies, verb === "status");
+  const context = await taskContext(parsed, io, dependencies);
   if (verb === "show" || verb === "status") {
     if (verb === "show" && context.token) {
       const result = await showTask(context, { id: id2, signedIn: true });
@@ -103061,7 +103401,21 @@ async function taskCommandInner(argv, json2, io, dependencies) {
         ...receipts.map((receipt) => `Receipt (from escrow): ${receipt.receiptUrl}`)
       ]);
     } else {
-      const result = verb === "status" ? await taskStatus(context, { id: id2 }) : await showTask(context, { id: id2, signedIn: false });
+      const result = verb === "status" ? await taskStatus(context, { id: id2, signedIn: Boolean(context.token) }) : await showTask(context, { id: id2, signedIn: false });
+      if ("chainState" in result) {
+        const milestoneLines = result.chainState.milestones.map((milestone) => {
+          const ordinal = "ordinal" in milestone && typeof milestone.ordinal === "number" && Number.isFinite(milestone.ordinal) ? milestone.ordinal : milestone.milestoneId;
+          const state = "state" in milestone.read ? ` ${milestone.read.state}` : "";
+          const explorer = milestone.explorerUrl ? ` ${milestone.explorerUrl}` : "";
+          return `milestone ${ordinal}: ${milestone.read.status}${state}${explorer}`;
+        });
+        const eventLines = (result.events ?? []).slice(-10).map((event) => {
+          const createdAt = "createdAt" in event && typeof event.createdAt === "string" ? event.createdAt : event.at;
+          return `${event.sequence} ${event.type} ${createdAt}`;
+        });
+        taskOutput(io, json2, context, verb, result, [...milestoneLines, ...eventLines]);
+        return;
+      }
       const task = result.task;
       taskOutput(
         io,
@@ -103105,6 +103459,11 @@ async function taskCommandInner(argv, json2, io, dependencies) {
 async function escrowTaskCommand(verb, id2, parsed, json2, io, dependencies, now) {
   taskCounterparty(parsed);
   if (verb === "watch") return await watchTask(id2, parsed, json2, io, dependencies, now);
+  const waitsForIndex = ["sign", "fund", "deliver", "release"].includes(verb);
+  const waitTimeoutText = parsed.one("--timeout") ?? "120s";
+  const waitTimeoutMs = waitsForIndex ? parseTaskDuration2(waitTimeoutText, now) : void 0;
+  if (waitTimeoutMs !== void 0 && waitTimeoutMs <= 0)
+    throw new UsageError("--timeout must be positive.");
   const disputeEvidenceHash = ["dispute", "counter-evidence"].includes(verb) ? required3(parsed, "--evidence-hash") : void 0;
   const counterparty = taskCounterparty(parsed);
   if (disputeEvidenceHash !== void 0 && !TASK_LIMITS.disputeEvidenceHash.test(disputeEvidenceHash))
@@ -103154,9 +103513,24 @@ async function escrowTaskCommand(verb, id2, parsed, json2, io, dependencies, now
           return await account.signMessage({ message });
         }
       });
-      taskOutput(io, json2, displayContext, verb, result2, [
+      if (!json2 && result2.escrowCreation?.resumedFromServer)
+        io.stdout("The server had already prepared escrow creation; resumed from it.");
+      const wait3 = result2.escrowCreation ? await waitForTaskIndex(
+        context,
+        dependencies,
+        parsed,
+        json2,
+        io,
+        id2,
+        result2.escrowCreation,
+        "created",
+        "escrow creation",
+        waitTimeoutText,
+        waitTimeoutMs
+      ) : null;
+      taskOutput(io, json2, displayContext, verb, { ...result2, wait: wait3 }, [
         `Accepted scope for task ${id2}.`,
-        ...result2.escrowCreation ? ["Created the task escrow."] : []
+        ...result2.escrowCreation && (wait3 === null || wait3.reached) ? ["escrow created"] : []
       ]);
       return;
     } catch (error61) {
@@ -103190,7 +103564,23 @@ async function escrowTaskCommand(verb, id2, parsed, json2, io, dependencies, now
           taskOutput(io, false, context, verb, {}, [`Prepared delivery manifest ${manifestHash}.`]);
       }
     });
-    taskOutput(io, json2, context, verb, outcome, [`Delivered task ${id2}.`]);
+    const wait3 = await waitForTaskIndex(
+      context,
+      dependencies,
+      parsed,
+      json2,
+      io,
+      id2,
+      outcome.result,
+      "delivered",
+      "delivery",
+      waitTimeoutText,
+      waitTimeoutMs
+    );
+    taskOutput(io, json2, context, verb, { ...outcome, wait: wait3 }, [
+      ...wait3 === null || wait3.reached ? ["delivery recorded"] : [],
+      ...outcome.result.resumedFromServer === true ? ["The server had already recorded this delivery; resumed from it."] : []
+    ]);
     return;
   }
   const snapshot = await taskMoneySnapshot(context.client, id2, void 0, {
@@ -103253,15 +103643,82 @@ async function escrowTaskCommand(verb, id2, parsed, json2, io, dependencies, now
     }
     if (!outcome.ok && "declined" in outcome)
       throw new TaskCommandError("not_approved", "Not approved; nothing was signed.");
-    taskOutput(io, json2, context, verb, outcome, [
-      verb === "fund" ? `Funded task ${id2}.` : `Completed task ${verb} for ${id2}.`
-    ]);
+    if (!json2 && outcome.result.resumedFromServer)
+      io.stdout("The server had already prepared this task operation; resumed from it.");
+    const wait3 = verb === "fund" ? await waitForTaskIndex(
+      context,
+      dependencies,
+      parsed,
+      json2,
+      io,
+      id2,
+      outcome.result,
+      "locked",
+      "funding",
+      waitTimeoutText,
+      waitTimeoutMs
+    ) : void 0;
+    taskOutput(
+      io,
+      json2,
+      context,
+      verb,
+      wait3 === void 0 ? outcome : { ...outcome, wait: wait3 },
+      verb === "fund" ? wait3 === null || wait3?.reached ? ["escrow funded"] : [] : [`Completed task ${verb} for ${id2}.`]
+    );
     return;
   }
   if (!json2) io.stdout("Policy: explicit user instruction.");
   const settlementInput = { id: id2, snapshot, ...counterparty === void 0 ? {} : { counterparty } };
   const result = verb === "release" ? await releaseTaskOperation(context, settlementInput) : verb === "refund" ? await refundTaskOperation(context, settlementInput) : await resolveUnmatchedTaskOperation(context, settlementInput);
-  taskOutput(io, json2, context, verb, result, [`Completed task ${verb} for ${id2}.`]);
+  if (!json2 && result.result.resumedFromServer)
+    io.stdout("The server had already prepared this task operation; resumed from it.");
+  const wait2 = verb === "release" ? await waitForTaskIndex(
+    context,
+    dependencies,
+    parsed,
+    json2,
+    io,
+    id2,
+    result.result,
+    "released",
+    "release",
+    waitTimeoutText,
+    waitTimeoutMs
+  ) : void 0;
+  taskOutput(
+    io,
+    json2,
+    context,
+    verb,
+    wait2 === void 0 ? result : { ...result, wait: wait2 },
+    verb === "release" ? wait2 === null || wait2?.reached ? ["funds released"] : [] : [`Completed task ${verb} for ${id2}.`]
+  );
+}
+async function waitForTaskIndex(context, dependencies, parsed, json2, io, orderId, result, target, description, timeoutText, timeoutMs) {
+  if (parsed.has("--no-wait")) return null;
+  if (!json2)
+    io.stdout(
+      `confirmed on chain${result.blockNumber === void 0 ? "" : ` in block ${result.blockNumber}`}, waiting for vAPI to index\u2026`
+    );
+  const wait2 = await taskRequest2(
+    description,
+    "getOrder",
+    () => waitForMilestone(context.client, {
+      orderId,
+      milestoneId: result.milestone.id,
+      target,
+      timeoutMs,
+      intervalMs: 3e3,
+      sleep: context.sleep,
+      now: dependencies.now ?? (() => /* @__PURE__ */ new Date())
+    })
+  );
+  if (!wait2.reached)
+    io.stderr(
+      `vAPI has not indexed the ${description} yet after ${timeoutText}; run vapi task status ${orderId} later.`
+    );
+  return wait2;
 }
 var ScopeApprovalNeeded = class extends Error {
   constructor(terms) {
@@ -105193,6 +105650,7 @@ async function runCli(argv = process.argv.slice(2), io = processIo, dependencies
             error: message,
             exitCode: code,
             ...error61 instanceof RuntimeError ? { code: error61.code } : {},
+            ...error61 instanceof VapiCallError ? { code: error61.code } : {},
             ...error61 instanceof DocsError ? { code: error61.code } : {},
             ...error61 instanceof RemoteKeyRefusedError ? { code: error61.code } : {},
             ...error61 instanceof TransferError ? { code: error61.code, moneyMoved: error61.moneyMoved } : {}
@@ -105200,7 +105658,10 @@ async function runCli(argv = process.argv.slice(2), io = processIo, dependencies
         );
       }
     } else {
-      runIo.stderr(message);
+      const errorCode2 = taskInvocation && error61 instanceof TaskCommandError && error61.prefixCode ? errorCodeOf(error61) : void 0;
+      runIo.stderr(
+        errorCode2 !== void 0 && !message.startsWith(`${errorCode2}: `) ? `${errorCode2}: ${message}` : message
+      );
     }
     if (shouldAutoUploadAfterFailure(argv.filter((argument) => argument !== "--json"))) {
       await autoUploadBackup(io, json2, dependencies);