@elisym/cli 0.25.1 → 0.26.0

package/dist/index.js

@@ -2,27 +2,27 @@
 import { ReadableStream } from 'node:stream/web';
 import { readFileSync, existsSync, readdirSync, statSync, renameSync, chmodSync, mkdirSync, writeFileSync, appendFileSync, unlinkSync, rmdirSync, realpathSync } from 'node:fs';
 import { dirname, join, resolve, basename, extname, relative, sep } from 'node:path';
-import { SolanaPaymentStrategy, validateAgentName, RELAYS, ElisymIdentity, formatSol, formatAssetAmount, USDC_SOLANA_DEVNET, signerFromSecretKeyBase58, ElisymClient, KIND_EXTERNAL_IDENTITIES, POLICY_D_TAG_PREFIX, KIND_LONG_FORM_ARTICLE, jobRequestKind, DEFAULT_KIND_OFFSET, toDTag, DEFAULTS, createBlossomTransport, verifyAgentIdentities, generateSolanaWallet, getProtocolConfig, getProtocolProgramId, calculateProtocolFee, LIMITS, makeCensor, DEFAULT_REDACT_PATHS, POLICY_T_TAG, SESSION_ID_REGEX, createSlidingWindowLimiter, utf8ByteLength, readAcceptedTransports, decodeJobPayload, BoundedSet, KIND_JOB_FEEDBACK, GITHUB_USERNAME_REGEX, X_USERNAME_REGEX, normalizeNip05Identifier, splitNip05Identifier, encodeSecretKeyBase58, NATIVE_SOL, GIST_ID_REGEX, TWEET_ID_REGEX } from '@elisym/sdk';
-import { ElisymYamlSchema, resolveInHome, resolveInProject, createAgentDir, writeYamlInitial, writeExampleSkillTemplate, writeSecrets, listAgents, loadAgent, writeYaml, agentPaths, readMediaCache, loadPoliciesFromDir, ensureGitignoreHasIrohEntry, ensureGitignoreHasX402Entries, ensureGitignoreHasSessionsEntry, lookupCachedUrl, newCacheEntry, writeMediaCache } from '@elisym/sdk/agent-store';
-import { isAddress, createSolanaRpc, address } from '@solana/kit';
+import { SolanaPaymentStrategy, validateAgentName, RELAYS, ElisymIdentity, formatSol, formatAssetAmount, USDC_SOLANA_DEVNET, signerFromSecretKeyBase58, ElisymClient, KIND_EXTERNAL_IDENTITIES, POLICY_D_TAG_PREFIX, KIND_LONG_FORM_ARTICLE, jobRequestKind, DEFAULT_KIND_OFFSET, toDTag, DEFAULTS, createBlossomTransport, generateSolanaWallet, verifyAgentIdentities, getProtocolConfig, getProtocolProgramId, calculateProtocolFee, LIMITS, makeCensor, DEFAULT_REDACT_PATHS, POLICY_T_TAG, SESSION_ID_REGEX, createSlidingWindowLimiter, utf8ByteLength, readAcceptedTransports, resolveDelegationAsset, MAX_PROOF_TTL_SECS, PROOF_CLOCK_SKEW_SECS, verifyDelegationAuthProof, deriveOwnerDelegationAta, getDelegation, buildDelegatedTransfer, buildSignedPull, sendConfirmToTerminal, parseDelegatedPayment, confirmPullToTerminal, isDefinitelyUnpaid, decodeJobPayload, BoundedSet, KIND_JOB_FEEDBACK, encodeSecretKeyBase58, GITHUB_USERNAME_REGEX, X_USERNAME_REGEX, normalizeNip05Identifier, splitNip05Identifier, NATIVE_SOL, GIST_ID_REGEX, TWEET_ID_REGEX } from '@elisym/sdk';
+import { ElisymYamlSchema, resolveInHome, resolveInProject, createAgentDir, writeYamlInitial, writeExampleSkillTemplate, writeSecrets, listAgents, loadAgent, writeYaml, agentPaths, readMediaCache, loadPoliciesFromDir, ensureGitignoreHasIrohEntry, ensureGitignoreHasX402Entries, ensureGitignoreHasSessionsEntry, ensureGitignoreHasDelegationNoncesEntry, lookupCachedUrl, newCacheEntry, writeMediaCache } from '@elisym/sdk/agent-store';
+import { isAddress, createSolanaRpc, address, signature } from '@solana/kit';
 import { generateSecretKey, getPublicKey, nip19, verifyEvent } from 'nostr-tools';
-import YAML from 'yaml';
+import YAML2 from 'yaml';
 import { Command } from 'commander';
+import { mkdir, writeFile, readFile, mkdtemp, rm, rename, stat } from 'node:fs/promises';
+import { parseSkillMd, validateSkillFrontmatter, DEFAULT_X402_MAX_INPUT_BYTES, resolveInsidePathReal, DEFAULT_SCRIPT_TIMEOUT_MS, DynamicScriptSkill as DynamicScriptSkill$1, StaticScriptSkill as StaticScriptSkill$1, StaticFileSkill as StaticFileSkill$1, ScriptSkill as ScriptSkill$1 } from '@elisym/sdk/skills';
+import chalk from 'chalk';
+import Decimal from 'decimal.js-light';
+import { decodePaymentRequiredHeader } from '@x402/core/http';
 import { createHash } from 'node:crypto';
 import { LlmHealthMonitor, startLlmRecovery, createFreeLlmLimiterSet, ScriptBillingExhaustedError, ScriptExecutionError, FREE_LLM_GLOBAL_KEY, freeLlmCustomerKey, LlmHealthError } from '@elisym/sdk/llm-health';
 import { createIrohTransport } from '@elisym/sdk/node';
 import { lookup } from 'node:dns/promises';
 import { Socket } from 'node:net';
 import pino from 'pino';
-import { mkdir, writeFile, readFile, mkdtemp, rm, rename, stat } from 'node:fs/promises';
 import { tmpdir } from 'node:os';
 import pLimit from 'p-limit';
-import { parseSkillMd, validateSkillFrontmatter, DEFAULT_X402_MAX_INPUT_BYTES, resolveInsidePathReal, DEFAULT_SCRIPT_TIMEOUT_MS, DynamicScriptSkill as DynamicScriptSkill$1, StaticScriptSkill as StaticScriptSkill$1, StaticFileSkill as StaticFileSkill$1, ScriptSkill as ScriptSkill$1 } from '@elisym/sdk/skills';
 import { x402Client, wrapFetchWithPayment } from '@x402/fetch';
 import { ExactSvmScheme } from '@x402/svm';
-import { decodePaymentRequiredHeader } from '@x402/core/http';
-import chalk from 'chalk';
-import Decimal from 'decimal.js-light';
 import { fileURLToPath } from 'node:url';
 
 var __defProp = Object.defineProperty;
@@ -1102,14 +1102,14 @@ async function cmdInit(nameArg, options = {}) {
   if (options.config) {
     const configPath = resolve(cwd, options.config);
     const raw = readFileSync(configPath, "utf-8");
-    template = ElisymYamlSchema.parse(YAML.parse(raw) ?? {});
+    template = ElisymYamlSchema.parse(YAML2.parse(raw) ?? {});
     console.log(`  Loaded template from ${configPath}
 `);
   } else if (options.defaults) {
     template = buildDefaultYaml();
     console.log("  Using default skeleton (no LLM, no payments). Edit later via `profile`.\n");
   }
-  const agentName = await resolveAgentName(nameArg, inquirer);
+  const agentName = await resolveAgentName2(nameArg, inquirer);
   const target = pickTarget(options);
   const sameLocation = target === "home" ? resolveInHome(agentName) : resolveInProject(agentName, cwd);
   if (sameLocation) {
@@ -1291,7 +1291,7 @@ async function cmdInit(nameArg, options = {}) {
   }
   console.log();
 }
-async function resolveAgentName(nameArg, inquirer) {
+async function resolveAgentName2(nameArg, inquirer) {
   if (nameArg) {
     validateAgentName(nameArg);
     return nameArg;
@@ -1442,103 +1442,928 @@ var init_init = __esm({
     init_llm();
   }
 });
-var IDENTITY_PLATFORMS = ["github", "x", "website"];
-var X_PROOF_URL_HOSTS = /* @__PURE__ */ new Set([
-  "x.com",
-  "www.x.com",
-  "mobile.x.com",
-  "twitter.com",
-  "www.twitter.com",
-  "mobile.twitter.com"
-]);
-function githubProofText(npub) {
-  return `Verifying that I control the following Nostr public key: ${npub}`;
-}
-function xProofText(npub) {
-  return `Verifying my account on nostr My Public Key: "${npub}"`;
-}
-function websiteNostrJson(local, pubkeyHex) {
-  return JSON.stringify({ names: { [local]: pubkeyHex } }, null, 2);
-}
-function parseIdentityPlatform(raw) {
-  const lowered = raw.trim().toLowerCase();
-  const match = IDENTITY_PLATFORMS.find((platform) => platform === lowered);
-  if (match === void 0) {
-    throw new Error(`Unknown platform "${raw}". Expected github, x, or website.`);
+var MAX_CONCURRENT_JOBS = 10;
+var RECOVERY_MAX_RETRIES = 5;
+var RECOVERY_INTERVAL_SECS = 60;
+var WATCHDOG_PROBE_INTERVAL_MS = 5 * 60 * 1e3;
+var WATCHDOG_PROBE_TIMEOUT_MS = 1e4;
+var WATCHDOG_SELF_PING_INTERVAL_MS = 10 * 60 * 1e3;
+var WATCHDOG_SELF_PING_TIMEOUT_MS = 15e3;
+var WATCHDOG_SLEEP_DETECT_MULTIPLIER = 2;
+function getRpcUrl(_network) {
+  const envUrl = process.env.SOLANA_RPC_URL;
+  if (envUrl) {
+    return envUrl;
   }
-  return match;
+  return "https://api.devnet.solana.com";
 }
-function parseGithubProofInput(raw) {
-  const trimmed = raw.trim();
-  const bareId = trimmed.toLowerCase();
-  if (GIST_ID_REGEX.test(bareId)) {
-    return { proofId: bareId };
+async function fetchUsdcBalance(rpc, owner) {
+  const mint = USDC_SOLANA_DEVNET.mint;
+  if (!mint) {
+    return 0n;
   }
-  let url;
   try {
-    url = new URL(trimmed);
+    const response = await rpc.getTokenAccountsByOwner(
+      owner,
+      { mint: address(mint) },
+      { encoding: "jsonParsed", commitment: "confirmed" }
+    ).send();
+    let total = 0n;
+    for (const entry of response.value) {
+      const parsed = entry.account.data;
+      const raw = parsed?.parsed?.info?.tokenAmount?.amount;
+      if (typeof raw === "string") {
+        total += BigInt(raw);
+      }
+    }
+    return total;
   } catch {
-    return null;
+    return 0n;
   }
-  if (url.protocol !== "https:" || url.hostname.toLowerCase() !== "gist.github.com") {
+}
+
+// src/x402/constants.ts
+var X402_SOLANA_DEVNET_CAIP2 = "solana:EtWTRABZaYq6iMfeYKouRu166VU2xqa1";
+var X402_SOLANA_DEVNET_V1 = "solana-devnet";
+var X402_GET_INPUT_MAX_ENCODED_BYTES = 2048;
+var X402_MAX_RESPONSE_BYTES = 10 * 1024 * 1024;
+var X402_MAX_CHALLENGE_BYTES = 256 * 1024;
+var X402_PROBE_TTL_MS = 3e4;
+var X402_MAX_PAID_ATTEMPTS = 2;
+var X402_MAX_PAYMENT_SIGNATURES = 2 * X402_MAX_PAID_ATTEMPTS;
+var X402_FREE_RETRY_DELAYS_MS = [1e3, 3e3];
+var X402_REFUNDED_RETRIES = 1;
+var X402_CACHE_TTL_MS = 7 * 24 * 60 * 60 * 1e3;
+
+// src/x402/matcher.ts
+function requirementAmount(requirement) {
+  const v1Amount = requirement.maxAmountRequired;
+  const raw = requirement.amount ?? v1Amount;
+  if (typeof raw !== "string" || !/^[0-9]+$/.test(raw)) {
     return null;
   }
-  const segments = url.pathname.split("/").filter((segment) => segment.length > 0);
-  const [userSegment, gistSegment] = segments;
-  if (userSegment === void 0 || gistSegment === void 0) {
-    return null;
+  return BigInt(raw);
+}
+function isAcceptableRequirement(requirement, rule) {
+  if (requirement.scheme !== "exact") {
+    return false;
   }
-  const username = userSegment.toLowerCase();
-  const gistId = gistSegment.toLowerCase();
-  if (!GITHUB_USERNAME_REGEX.test(username) || !GIST_ID_REGEX.test(gistId)) {
-    return null;
+  const network = requirement.network;
+  if (network !== X402_SOLANA_DEVNET_CAIP2 && network !== X402_SOLANA_DEVNET_V1) {
+    return false;
   }
-  return { proofId: gistId, username };
+  if (USDC_SOLANA_DEVNET.mint === void 0 || requirement.asset !== USDC_SOLANA_DEVNET.mint) {
+    return false;
+  }
+  const amount = requirementAmount(requirement);
+  if (amount === null) {
+    return false;
+  }
+  return amount <= rule.maxUpstreamSubunits;
 }
-function parseXProofInput(raw) {
-  const trimmed = raw.trim();
-  if (TWEET_ID_REGEX.test(trimmed)) {
-    return { proofId: trimmed };
+function selectAcceptableRequirement(accepts, rule) {
+  return accepts.find((requirement) => isAcceptableRequirement(requirement, rule));
+}
+function maxAcceptableQuote(accepts, rule) {
+  let worst = null;
+  for (const requirement of accepts) {
+    if (!isAcceptableRequirement(requirement, rule)) {
+      continue;
+    }
+    const amount = requirementAmount(requirement);
+    if (amount === null) {
+      continue;
+    }
+    if (worst === null || amount > worst) {
+      worst = amount;
+    }
   }
-  let url;
+  return worst;
+}
+function buildRequirementsPolicy(rule) {
+  return function filterAcceptableRequirements(_x402Version, paymentRequirements) {
+    return paymentRequirements.filter((requirement) => isAcceptableRequirement(requirement, rule));
+  };
+}
+var PROBE_TIMEOUT_MS = 1e4;
+var MAX_PROBE_BODY_BYTES = 256 * 1024;
+var PROBE_CACHE_MAX_ENTRIES = 256;
+async function readTextCapped(response, maxBytes) {
+  const reader = response.body?.getReader();
+  if (reader === void 0) {
+    const buffer = await response.arrayBuffer();
+    if (buffer.byteLength > maxBytes) {
+      throw new X402ProbeError(`402 body exceeds ${maxBytes} bytes`, 402);
+    }
+    return new TextDecoder().decode(buffer);
+  }
+  const chunks = [];
+  let total = 0;
+  while (true) {
+    const { done, value } = await reader.read();
+    if (done) {
+      break;
+    }
+    total += value.byteLength;
+    if (total > maxBytes) {
+      await reader.cancel().catch(() => {
+      });
+      throw new X402ProbeError(`402 body exceeds ${maxBytes} bytes`, 402);
+    }
+    chunks.push(value);
+  }
+  const combined = new Uint8Array(total);
+  let offset = 0;
+  for (const chunk of chunks) {
+    combined.set(chunk, offset);
+    offset += chunk.byteLength;
+  }
+  return new TextDecoder().decode(combined);
+}
+var X402ProbeError = class extends Error {
+  status;
+  constructor(message, status) {
+    super(message);
+    this.name = "X402ProbeError";
+    this.status = status;
+  }
+};
+function normalizeV1Requirement(raw) {
+  return {
+    scheme: typeof raw.scheme === "string" ? raw.scheme : "",
+    network: typeof raw.network === "string" ? raw.network : "unknown:unknown",
+    asset: typeof raw.asset === "string" ? raw.asset : "",
+    payTo: typeof raw.payTo === "string" ? raw.payTo : "",
+    amount: typeof raw.maxAmountRequired === "string" ? raw.maxAmountRequired : "",
+    maxTimeoutSeconds: typeof raw.maxTimeoutSeconds === "number" ? raw.maxTimeoutSeconds : 60,
+    extra: raw.extra ?? {}
+  };
+}
+function parseV1Body(bodyText) {
+  let parsed;
   try {
-    url = new URL(trimmed);
+    parsed = JSON.parse(bodyText);
   } catch {
     return null;
   }
-  if (url.protocol !== "https:" || !X_PROOF_URL_HOSTS.has(url.hostname.toLowerCase())) {
+  if (typeof parsed !== "object" || parsed === null) {
     return null;
   }
-  const segments = url.pathname.split("/").filter((segment) => segment.length > 0);
-  const [userSegment, statusLiteral, idSegment] = segments;
-  if (userSegment === void 0 || statusLiteral !== "status" || idSegment === void 0) {
+  const body = parsed;
+  if (body.x402Version !== 1 || !Array.isArray(body.accepts) || body.accepts.length === 0) {
     return null;
   }
-  const username = userSegment.toLowerCase();
-  if (!X_USERNAME_REGEX.test(username) || !TWEET_ID_REGEX.test(idSegment)) {
+  const rawRequirements = body.accepts.filter(
+    (item) => typeof item === "object" && item !== null
+  );
+  if (rawRequirements.length === 0) {
     return null;
   }
-  return { proofId: idSegment, username };
+  const accepts = rawRequirements.map(normalizeV1Requirement);
+  const first = rawRequirements[0];
+  return {
+    x402Version: 1,
+    accepts,
+    resource: {
+      url: typeof first.resource === "string" ? first.resource : void 0,
+      description: typeof first.description === "string" ? first.description : void 0,
+      mimeType: typeof first.mimeType === "string" ? first.mimeType : void 0
+    }
+  };
 }
-function buildIdentityClaimInputs(identities) {
-  const claims = [];
-  if (identities?.github !== void 0) {
-    claims.push({
-      platform: "github",
-      handle: identities.github.username,
-      proofId: identities.github.gist
+async function probePaymentRequired(url, method, signal) {
+  const probeSignal = AbortSignal.timeout(PROBE_TIMEOUT_MS);
+  const response = await fetch(url, { method, signal: probeSignal, redirect: "error" });
+  if (response.status !== 402) {
+    await response.body?.cancel().catch(() => {
     });
+    throw new X402ProbeError(
+      `expected HTTP 402 from ${url}, got ${response.status} - not an x402-paid endpoint (or it validates the request before the paywall; try the other method)`,
+      response.status
+    );
+  }
+  const headerValue = response.headers.get("PAYMENT-REQUIRED");
+  if (headerValue !== null) {
+    await response.body?.cancel().catch(() => {
+    });
+    try {
+      const paymentRequired = decodePaymentRequiredHeader(headerValue);
+      return {
+        x402Version: paymentRequired.x402Version,
+        accepts: paymentRequired.accepts,
+        resource: paymentRequired.resource
+      };
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      throw new X402ProbeError(`could not decode PAYMENT-REQUIRED header: ${message}`, 402);
+    }
+  }
+  const bodyText = await readTextCapped(response, MAX_PROBE_BODY_BYTES).catch((error) => {
+    if (error instanceof X402ProbeError) {
+      throw error;
+    }
+    return "";
+  });
+  const v1 = parseV1Body(bodyText);
+  if (v1 !== null) {
+    return v1;
+  }
+  throw new X402ProbeError(
+    "got HTTP 402 but neither a v2 PAYMENT-REQUIRED header nor a v1 JSON body was parseable",
+    402
+  );
+}
+var PROBE_CACHE = /* @__PURE__ */ new Map();
+async function probePaymentRequiredCached(url, method, ttlMs) {
+  const key = `${method} ${url}`;
+  const cached = PROBE_CACHE.get(key);
+  const now = Date.now();
+  if (cached !== void 0 && now - cached.at < ttlMs) {
+    return cached.result;
+  }
+  const result = await probePaymentRequired(url, method);
+  PROBE_CACHE.delete(key);
+  PROBE_CACHE.set(key, { at: now, result });
+  while (PROBE_CACHE.size > PROBE_CACHE_MAX_ENTRIES) {
+    const oldest = PROBE_CACHE.keys().next().value;
+    if (oldest === void 0) {
+      break;
+    }
+    PROBE_CACHE.delete(oldest);
+  }
+  return result;
+}
+
+// src/commands/x402-add.ts
+var BPS_DENOMINATOR = 1e4;
+var DEFAULT_MARGIN_BPS = 1e3;
+var SOLANA_MAINNET_CAIP2 = "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp";
+var CIRCLE_FAUCET_URL = "https://faucet.circle.com";
+function fail(message) {
+  console.error(`
+  ! ${message}
+`);
+  process.exit(1);
+}
+function sanitizeUpstreamText(raw, maxLength) {
+  let withoutControls = "";
+  for (const char of raw) {
+    const code = char.codePointAt(0) ?? 0;
+    withoutControls += code < 32 || code === 127 ? " " : char;
+  }
+  return withoutControls.replace(/—/g, "-").replace(/\s+/g, " ").trim().slice(0, maxLength).trim();
+}
+function slugFromUrl(url) {
+  const pathPart = url.pathname.replace(/\/+$/, "").split("/").filter(Boolean).pop() ?? "";
+  const host = url.hostname.replace(/^www\./, "").split(".")[0] ?? "x402";
+  return pathPart.length > 0 ? `${host}-${pathPart}` : host;
+}
+function parseMarginBps(raw) {
+  if (raw === void 0) {
+    return DEFAULT_MARGIN_BPS;
+  }
+  const value = Number(raw);
+  if (!Number.isInteger(value) || value < 0 || value > 1e5) {
+    fail(`--margin-bps must be a non-negative integer (bps, 100 = 1%); got "${raw}"`);
+  }
+  return value;
+}
+async function parseImportedSecret(input) {
+  const trimmed = input.trim();
+  if (existsSync(trimmed)) {
+    const content = await readFile(trimmed, "utf-8");
+    let parsed;
+    try {
+      parsed = JSON.parse(content);
+    } catch {
+      throw new Error(`${trimmed} is not a valid solana-keygen JSON file`);
+    }
+    if (!Array.isArray(parsed) || parsed.length !== 64 || parsed.some(
+      (byte) => typeof byte !== "number" || !Number.isInteger(byte) || byte < 0 || byte > 255
+    )) {
+      throw new Error(`${trimmed} must contain a JSON array of 64 bytes (solana-keygen format)`);
+    }
+    return encodeSecretKeyBase58(new Uint8Array(parsed));
+  }
+  try {
+    await signerFromSecretKeyBase58(trimmed);
+  } catch {
+    throw new Error("not a readable file and not a valid base58-encoded 64-byte secret key");
+  }
+  return trimmed;
+}
+function computeBridgePriceSubunits(quote, marginBps, feeBps) {
+  if (feeBps >= BPS_DENOMINATOR) {
+    throw new Error(`feeBps ${feeBps} >= ${BPS_DENOMINATOR} - refusing zero/negative denominator`);
+  }
+  return BigInt(
+    new Decimal(quote.toString()).mul(BPS_DENOMINATOR + marginBps).div(BPS_DENOMINATOR - feeBps).toDecimalPlaces(0, Decimal.ROUND_CEIL).toString()
+  );
+}
+function buildSkillMd(input) {
+  const frontmatter = {
+    name: input.skillName,
+    description: input.description,
+    capabilities: input.capabilities,
+    price: input.priceDisplay,
+    token: "usdc",
+    mode: "x402",
+    x402_url: input.url,
+    x402_method: input.method,
+    ...input.queryParam !== void 0 ? { x402_query_param: input.queryParam } : {},
+    x402_max_upstream: Number(input.quote),
+    // GET input is dominated by the ~2KB percent-encoded query-string limit,
+    // so the byte cap is written for POST bridges only.
+    ...input.method === "POST" ? { x402_max_input_bytes: DEFAULT_X402_MAX_INPUT_BYTES } : {}
+  };
+  const bodyLines = [
+    `# ${input.skillName}`,
+    "",
+    "Operator notes for this x402 bridge skill (the executor ignores this body):",
+    "",
+    `- Upstream: ${input.url} (${input.method})`,
+    `- Upstream quote at generation time: ${formatAssetAmount(USDC_SOLANA_DEVNET, input.quote)} (= x402_max_upstream, the signing ceiling)`,
+    `- Price: ${input.priceDisplay} USDC (margin ${input.marginPercent}%, protocol fee ${input.feePercent}% at generation time)`,
+    "- To reprice after an upstream change, re-run:",
+    "",
+    "```bash",
+    `npx @elisym/cli x402 add ${input.url}`,
+    "```"
+  ];
+  return `---
+${YAML2.stringify(frontmatter)}---
+
+${bodyLines.join("\n")}
+`;
+}
+function scanExistingSkills(skillsDir, candidateDTag, url) {
+  const scan = {};
+  let entries;
+  try {
+    entries = readdirSync(skillsDir);
+  } catch {
+    return scan;
+  }
+  for (const entry of entries) {
+    const skillMdPath = join(skillsDir, entry, "SKILL.md");
+    try {
+      if (!statSync(join(skillsDir, entry)).isDirectory()) {
+        continue;
+      }
+      const { frontmatter } = parseSkillMd(readFileSync(skillMdPath, "utf-8"));
+      if (typeof frontmatter.name !== "string") {
+        continue;
+      }
+      if (typeof frontmatter.x402_url === "string" && frontmatter.x402_url === url) {
+        scan.sameUrlDir = join(skillsDir, entry);
+        scan.sameUrlName = frontmatter.name;
+        continue;
+      }
+      let existingDTag;
+      try {
+        existingDTag = toDTag(frontmatter.name);
+      } catch {
+        continue;
+      }
+      if (existingDTag === candidateDTag) {
+        scan.dTagCollision = frontmatter.name;
+      }
+    } catch {
+      continue;
+    }
+  }
+  return scan;
+}
+function describeUnacceptableAccepts(probe) {
+  const networks = [...new Set(probe.accepts.map((requirement) => String(requirement.network)))];
+  if (networks.length > 0 && networks.every((network) => network.startsWith("eip155:"))) {
+    return `the service accepts only EVM networks (${networks.join(", ")}) - not supported yet`;
+  }
+  if (networks.some((network) => network === SOLANA_MAINNET_CAIP2 || network === "solana")) {
+    return "the service settles on Solana mainnet - elisym currently runs on devnet (mainnet is on the roadmap)";
+  }
+  return `no exact-scheme devnet-USDC requirement found (service accepts: ${networks.join(", ") || "nothing parseable"})`;
+}
+async function cmdX402Add(url, agentName, options) {
+  const cwd = process.cwd();
+  const { default: inquirer } = await import('inquirer');
+  let parsedUrl;
+  try {
+    parsedUrl = new URL(url);
+  } catch {
+    fail(`"${url}" is not a valid URL`);
+  }
+  const isLoopback = ["localhost", "127.0.0.1", "[::1]"].includes(parsedUrl.hostname);
+  if (parsedUrl.protocol !== "https:" && !(parsedUrl.protocol === "http:" && isLoopback)) {
+    fail("the upstream must be an https:// URL (plain http is allowed for localhost only)");
+  }
+  const methodRaw = (options.method ?? "POST").toUpperCase();
+  if (methodRaw !== "GET" && methodRaw !== "POST") {
+    fail(`--method must be GET or POST; got "${options.method}"`);
+  }
+  const method = methodRaw;
+  const marginBps = parseMarginBps(options.marginBps);
+  if (!agentName) {
+    const agents = await listAgents(cwd);
+    if (agents.length === 0) {
+      fail("no agents found - create one first: npx @elisym/cli init");
+    }
+    if (options.yes) {
+      fail("--yes needs an explicit agent argument: elisym x402 add <url> <agent> --yes");
+    }
+    const { selected } = await inquirer.prompt([
+      {
+        type: "list",
+        name: "selected",
+        message: "Add the bridge skill to which agent?",
+        choices: agents.map((agent) => ({
+          name: `${agent.name} (${agent.source})`,
+          value: agent.name
+        }))
+      }
+    ]);
+    agentName = selected;
+  }
+  const passphrase = process.env.ELISYM_PASSPHRASE;
+  const loaded = await loadAgent(agentName, cwd, passphrase);
+  console.log(`
+  Probing ${url} (${method}, unpaid)...`);
+  let probe;
+  try {
+    probe = await probePaymentRequired(url, method);
+  } catch (error) {
+    if (error instanceof X402ProbeError) {
+      fail(error.message);
+    }
+    const message = error instanceof Error ? error.message : String(error);
+    fail(`upstream unreachable: ${message}`);
+  }
+  const anyCeiling = { maxUpstreamSubunits: BigInt(Number.MAX_SAFE_INTEGER) };
+  const requirement = selectAcceptableRequirement(probe.accepts, anyCeiling);
+  if (requirement === void 0) {
+    fail(describeUnacceptableAccepts(probe));
+  }
+  const quote = requirementAmount(requirement);
+  if (quote === null || quote <= 0n) {
+    fail("the upstream quote is not a positive integer amount");
+  }
+  let solanaSecretKey = loaded.secrets.solana_secret_key;
+  if (solanaSecretKey === void 0 || solanaSecretKey.length === 0) {
+    let choice;
+    if (options.yes || options.generateWallet) {
+      if (!options.generateWallet) {
+        fail(
+          "this agent has no Solana wallet key. Run interactively to generate/import one, or pass --generate-wallet (a money-holding key is never created silently under --yes)."
+        );
+      }
+      choice = "generate";
+    } else {
+      const { walletChoice } = await inquirer.prompt([
+        {
+          type: "list",
+          name: "walletChoice",
+          message: "The bridge pays the upstream from the agent wallet, but .secrets.json has no solana_secret_key:",
+          choices: [
+            { name: "Generate a new wallet", value: "generate" },
+            { name: "Import an existing one (solana-keygen JSON file or base58)", value: "import" }
+          ]
+        }
+      ]);
+      choice = walletChoice;
+    }
+    if (choice === "generate") {
+      const wallet = await generateSolanaWallet();
+      solanaSecretKey = wallet.secretKeyBase58;
+    } else {
+      const { imported } = await inquirer.prompt([
+        {
+          // Masked: a pasted base58 secret key must not echo to the terminal
+          // scrollback (matches every other secret prompt in the CLI). A file
+          // path can still be pasted/drag-dropped under the mask.
+          type: "password",
+          mask: "*",
+          name: "imported",
+          message: "Path to a solana-keygen JSON file (or paste a base58 secret key):"
+        }
+      ]);
+      try {
+        solanaSecretKey = await parseImportedSecret(imported);
+      } catch (error) {
+        fail(error instanceof Error ? error.message : String(error));
+      }
+    }
+    if (loaded.secrets.solana_delegate_secret_key) {
+      const paymentSigner = await signerFromSecretKeyBase58(solanaSecretKey);
+      const delegateSigner = await signerFromSecretKeyBase58(
+        loaded.secrets.solana_delegate_secret_key
+      );
+      if (paymentSigner.address === delegateSigner.address) {
+        fail(
+          "the wallet key equals this agent delegate key (solana_delegate_secret_key). They must differ for blast-radius isolation - import a different wallet key or rotate the delegate key."
+        );
+      }
+    }
+    await writeSecrets(
+      loaded.dir,
+      { ...loaded.secrets, solana_secret_key: solanaSecretKey },
+      passphrase
+    );
+    console.log("  Wallet key saved to .secrets.json");
+  }
+  const signer = await signerFromSecretKeyBase58(solanaSecretKey);
+  const solPayment = loaded.yaml.payments.find((entry) => entry.chain === "solana");
+  if (solPayment !== void 0 && solPayment.address !== signer.address) {
+    fail(
+      `wallet invariant violated: elisym.yaml payments[].address (${solPayment.address}) differs from the solana_secret_key address (${signer.address}).
+    Revenue must land in the wallet the bridge spends from, or the float never refills.
+    Fix: set payments[].address to the key address, or import the matching key.`
+    );
+  }
+  if (solPayment === void 0) {
+    console.log(
+      `  elisym.yaml has no Solana payments entry; adding address ${signer.address} (devnet).`
+    );
+    await writeYaml(loaded.dir, {
+      ...loaded.yaml,
+      payments: [
+        ...loaded.yaml.payments,
+        { chain: "solana", network: "devnet", address: signer.address }
+      ]
+    });
+  }
+  const rpc = createSolanaRpc(getRpcUrl());
+  const balance = await fetchUsdcBalance(rpc, address(signer.address));
+  let feeBps;
+  try {
+    const protocolConfig = await getProtocolConfig(rpc, getProtocolProgramId("devnet"), {
+      forceRefresh: true
+    });
+    feeBps = protocolConfig.feeBps;
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    fail(`could not read the on-chain protocol config (fee): ${message}`);
+  }
+  if (feeBps >= BPS_DENOMINATOR) {
+    fail(
+      `protocol fee is ${feeBps} bps (>= 100%) - price math would divide by zero or go negative`
+    );
+  }
+  const priceSubunits = computeBridgePriceSubunits(quote, marginBps, feeBps);
+  const priceDisplay = new Decimal(priceSubunits.toString()).div(new Decimal(10).pow(USDC_SOLANA_DEVNET.decimals)).toString();
+  const protocolFee = calculateProtocolFee(Number(priceSubunits), feeBps);
+  const netMargin = priceSubunits - BigInt(protocolFee) - quote;
+  const fallbackName = slugFromUrl(parsedUrl);
+  const rawName = options.name ?? probe.resource?.serviceName ?? fallbackName;
+  const skillName = sanitizeUpstreamText(rawName, LIMITS.MAX_AGENT_NAME_LENGTH);
+  if (!/[a-zA-Z0-9]/.test(skillName)) {
+    fail(
+      `the upstream service name ("${rawName}") has no ASCII letters or digits - pass an explicit --name <skill-name>`
+    );
+  }
+  const candidateDTag = toDTag(skillName);
+  const description = sanitizeUpstreamText(
+    probe.resource?.description ?? `x402 bridge to ${parsedUrl.hostname}`,
+    LIMITS.MAX_DESCRIPTION_LENGTH
+  );
+  const capabilities = [candidateDTag];
+  const skillsDir = join(loaded.dir, "skills");
+  const scan = scanExistingSkills(skillsDir, candidateDTag, url);
+  let targetDir = join(skillsDir, candidateDTag);
+  if (scan.sameUrlDir !== void 0) {
+    if (!options.yes) {
+      const { update } = await inquirer.prompt([
+        {
+          type: "confirm",
+          name: "update",
+          message: `Skill "${scan.sameUrlName}" already bridges this URL - regenerate it with the fresh quote?`,
+          default: true
+        }
+      ]);
+      if (!update) {
+        fail("aborted");
+      }
+    }
+    targetDir = scan.sameUrlDir;
+  } else if (scan.dTagCollision !== void 0) {
+    fail(
+      `the generated name "${skillName}" collides with existing skill "${scan.dTagCollision}" (both map to d-tag "${candidateDTag}", which would replace its live discovery card) - pass a distinct --name`
+    );
+  } else if (existsSync(targetDir)) {
+    fail(`skill directory ${targetDir} already exists - pass a distinct --name`);
+  }
+  let queryParam = options.queryParam;
+  if (method === "GET" && queryParam === void 0 && !options.yes) {
+    const { param } = await inquirer.prompt([
+      {
+        type: "input",
+        name: "param",
+        message: "GET upstream: which query parameter should carry the buyer input? (empty = the skill takes no input)"
+      }
+    ]);
+    queryParam = param.trim() === "" ? void 0 : param.trim();
+  }
+  if (queryParam !== void 0 && parsedUrl.searchParams.has(queryParam)) {
+    fail(`--query-param "${queryParam}" collides with a parameter already present in the URL`);
+  }
+  if (method === "POST" && queryParam !== void 0) {
+    fail("--query-param only applies to GET upstreams (POST maps the input to the request body)");
+  }
+  const noInput = method === "GET" && queryParam === void 0;
+  const feePercent = new Decimal(feeBps).div(100).toString();
+  const marginPercent = new Decimal(marginBps).div(100).toString();
+  console.log("");
+  console.log(`  ${chalk.bold(skillName)}`);
+  console.log(`  ${description}`);
+  console.log("");
+  console.log(
+    `  Upstream     ${url} (${method}${queryParam !== void 0 ? `, input in ?${queryParam}=` : ""}${noInput ? ", no buyer input" : ""})`
+  );
+  console.log(`  Quote        ${formatAssetAmount(USDC_SOLANA_DEVNET, quote)}`);
+  console.log(
+    `  Your price   ${formatAssetAmount(USDC_SOLANA_DEVNET, priceSubunits)}  (margin ${marginPercent}% + protocol fee ${feePercent}%)`
+  );
+  console.log(`  Net margin   ${formatAssetAmount(USDC_SOLANA_DEVNET, netMargin)} per job`);
+  console.log(
+    `  Float        ${formatAssetAmount(USDC_SOLANA_DEVNET, balance)} in ${signer.address}`
+  );
+  if (balance < quote) {
+    console.log(
+      chalk.yellow(
+        `  ! Float below one upstream quote - fund the wallet with devnet USDC: ${CIRCLE_FAUCET_URL}`
+      )
+    );
+  }
+  console.log(`  Skill dir    ${targetDir}`);
+  console.log("");
+  if (!options.yes) {
+    const { confirmed } = await inquirer.prompt([
+      { type: "confirm", name: "confirmed", message: "Write the skill?", default: true }
+    ]);
+    if (!confirmed) {
+      fail("aborted");
+    }
+  }
+  const content = buildSkillMd({
+    skillName,
+    description,
+    capabilities,
+    priceDisplay,
+    url,
+    method,
+    queryParam,
+    quote,
+    marginPercent,
+    feePercent
+  });
+  const roundTrip = parseSkillMd(content);
+  validateSkillFrontmatter(roundTrip.frontmatter, roundTrip.systemPrompt, {
+    allowFreeSkills: false,
+    allowX402Skills: true
+  });
+  await mkdir(targetDir, { recursive: true });
+  await writeFile(join(targetDir, "SKILL.md"), content, "utf-8");
+  await ensureGitignoreHasX402Entries(dirname(loaded.dir));
+  console.log(`
+  Wrote ${join(targetDir, "SKILL.md")}`);
+  if (balance < quote) {
+    console.log(`  Next: fund the float (devnet USDC): ${CIRCLE_FAUCET_URL}`);
+  }
+  console.log(`  Start the agent: npx @elisym/cli start ${agentName}
+`);
+}
+
+// src/commands/delegate-key.ts
+async function resolveAgentName(name, cwd, nonInteractive) {
+  if (name) {
+    return name;
+  }
+  if (nonInteractive) {
+    console.error("--yes needs an explicit agent argument: elisym delegate-key <agent> --yes");
+    process.exit(1);
+  }
+  const agents = await listAgents(cwd);
+  if (agents.length === 0) {
+    console.error("No agents found.");
+    process.exit(1);
+  }
+  const { default: inquirer } = await import('inquirer');
+  const { selected } = await inquirer.prompt([
+    {
+      type: "list",
+      name: "selected",
+      message: "Select agent:",
+      choices: agents.map((agent) => ({
+        name: `${agent.name} (${agent.source})`,
+        value: agent.name
+      }))
+    }
+  ]);
+  return selected;
+}
+async function printDelegateStatus(delegateSecretKey, network) {
+  const signer = await signerFromSecretKeyBase58(delegateSecretKey);
+  const rpc = createSolanaRpc(getRpcUrl());
+  let gasLine = "";
+  try {
+    const { value: balance } = await rpc.getBalance(address(signer.address)).send();
+    gasLine = `  SOL (gas):     ${formatSol(Number(balance))} (${balance} lamports)`;
+  } catch {
+    gasLine = "  SOL (gas):     <balance unavailable>";
+  }
+  console.log(`
+  Delegate key (spl-approve):`);
+  console.log(`  Pubkey:        ${signer.address}`);
+  console.log(gasLine);
+  console.log(
+    `
+  Fund this address with a small amount of SOL for transaction gas.
+  It is published on this agent's capability cards that declare delegation.
+`
+  );
+}
+async function cmdDelegateKey(name, options) {
+  const cwd = process.cwd();
+  const agentName = await resolveAgentName(name, cwd, options.yes === true);
+  const passphrase = process.env.ELISYM_PASSPHRASE;
+  const loaded = await loadAgent(agentName, cwd, passphrase);
+  loaded.yaml.payments.find((entry) => entry.chain === "solana")?.network ?? "devnet";
+  const existing = loaded.secrets.solana_delegate_secret_key;
+  if (options.show) {
+    if (!existing) {
+      console.error(
+        `Agent "${agentName}" has no delegate key. Run \`elisym delegate-key ${agentName}\` to create one.`
+      );
+      process.exit(1);
+    }
+    await printDelegateStatus(existing);
+    return;
+  }
+  if (existing && !options.rotate) {
+    console.log(`  Agent "${agentName}" already has a delegate key.`);
+    await printDelegateStatus(existing);
+    console.log("  Use --rotate to replace it (this invalidates outstanding owner approvals).");
+    return;
+  }
+  const nonInteractive = options.yes === true;
+  if (options.rotate && existing && !nonInteractive) {
+    const { default: inquirer } = await import('inquirer');
+    const { confirmRotate } = await inquirer.prompt([
+      {
+        type: "confirm",
+        name: "confirmRotate",
+        default: false,
+        message: "Rotating the delegate key invalidates every outstanding owner approval (owners must re-approve the new key). Continue?"
+      }
+    ]);
+    if (!confirmRotate) {
+      console.log("  Aborted. Delegate key unchanged.");
+      return;
+    }
+  }
+  let delegateSecretKey;
+  if (options.import) {
+    if (nonInteractive) {
+      console.error(
+        "Import is interactive (it prompts for the key). Re-run without --yes to import."
+      );
+      process.exit(1);
+    }
+    const { default: inquirer } = await import('inquirer');
+    const { imported } = await inquirer.prompt([
+      {
+        type: "password",
+        mask: "*",
+        name: "imported",
+        message: "Path to a solana-keygen JSON file (or paste a base58 secret key):"
+      }
+    ]);
+    try {
+      delegateSecretKey = await parseImportedSecret(imported);
+    } catch (error) {
+      console.error(error instanceof Error ? error.message : String(error));
+      process.exit(1);
+    }
+  } else {
+    const wallet = await generateSolanaWallet();
+    delegateSecretKey = wallet.secretKeyBase58;
+  }
+  if (loaded.secrets.solana_secret_key) {
+    const paymentSigner = await signerFromSecretKeyBase58(loaded.secrets.solana_secret_key);
+    const delegateSigner = await signerFromSecretKeyBase58(delegateSecretKey);
+    if (paymentSigner.address === delegateSigner.address) {
+      console.error(
+        "The delegate key must differ from the agent payment key (solana_secret_key) for blast-radius isolation."
+      );
+      process.exit(1);
+    }
+  }
+  await writeSecrets(
+    loaded.dir,
+    { ...loaded.secrets, solana_delegate_secret_key: delegateSecretKey },
+    passphrase
+  );
+  console.log(
+    existing ? "\n  Delegate key rotated and saved." : "\n  Delegate key generated and saved."
+  );
+  await printDelegateStatus(delegateSecretKey);
+}
+var IDENTITY_PLATFORMS = ["github", "x", "website"];
+var X_PROOF_URL_HOSTS = /* @__PURE__ */ new Set([
+  "x.com",
+  "www.x.com",
+  "mobile.x.com",
+  "twitter.com",
+  "www.twitter.com",
+  "mobile.twitter.com"
+]);
+function githubProofText(npub) {
+  return `Verifying that I control the following Nostr public key: ${npub}`;
+}
+function xProofText(npub) {
+  return `Verifying my account on nostr My Public Key: "${npub}"`;
+}
+function websiteNostrJson(local, pubkeyHex) {
+  return JSON.stringify({ names: { [local]: pubkeyHex } }, null, 2);
+}
+function parseIdentityPlatform(raw) {
+  const lowered = raw.trim().toLowerCase();
+  const match = IDENTITY_PLATFORMS.find((platform) => platform === lowered);
+  if (match === void 0) {
+    throw new Error(`Unknown platform "${raw}". Expected github, x, or website.`);
+  }
+  return match;
+}
+function parseGithubProofInput(raw) {
+  const trimmed = raw.trim();
+  const bareId = trimmed.toLowerCase();
+  if (GIST_ID_REGEX.test(bareId)) {
+    return { proofId: bareId };
+  }
+  let url;
+  try {
+    url = new URL(trimmed);
+  } catch {
+    return null;
+  }
+  if (url.protocol !== "https:" || url.hostname.toLowerCase() !== "gist.github.com") {
+    return null;
+  }
+  const segments = url.pathname.split("/").filter((segment) => segment.length > 0);
+  const [userSegment, gistSegment] = segments;
+  if (userSegment === void 0 || gistSegment === void 0) {
+    return null;
+  }
+  const username = userSegment.toLowerCase();
+  const gistId = gistSegment.toLowerCase();
+  if (!GITHUB_USERNAME_REGEX.test(username) || !GIST_ID_REGEX.test(gistId)) {
+    return null;
+  }
+  return { proofId: gistId, username };
+}
+function parseXProofInput(raw) {
+  const trimmed = raw.trim();
+  if (TWEET_ID_REGEX.test(trimmed)) {
+    return { proofId: trimmed };
+  }
+  let url;
+  try {
+    url = new URL(trimmed);
+  } catch {
+    return null;
+  }
+  if (url.protocol !== "https:" || !X_PROOF_URL_HOSTS.has(url.hostname.toLowerCase())) {
+    return null;
+  }
+  const segments = url.pathname.split("/").filter((segment) => segment.length > 0);
+  const [userSegment, statusLiteral, idSegment] = segments;
+  if (userSegment === void 0 || statusLiteral !== "status" || idSegment === void 0) {
+    return null;
+  }
+  const username = userSegment.toLowerCase();
+  if (!X_USERNAME_REGEX.test(username) || !TWEET_ID_REGEX.test(idSegment)) {
+    return null;
+  }
+  return { proofId: idSegment, username };
+}
+function buildIdentityClaimInputs(identities) {
+  const claims = [];
+  if (identities?.github !== void 0) {
+    claims.push({
+      platform: "github",
+      handle: identities.github.username,
+      proofId: identities.github.gist
+    });
+  }
+  if (identities?.x !== void 0) {
+    claims.push({ platform: "x", handle: identities.x.username, proofId: identities.x.tweet });
+  }
+  return claims;
+}
+function identitiesFromYaml(identities) {
+  const claims = [];
+  if (identities === void 0) {
+    return claims;
   }
-  if (identities?.x !== void 0) {
-    claims.push({ platform: "x", handle: identities.x.username, proofId: identities.x.tweet });
-  }
-  return claims;
-}
-function identitiesFromYaml(identities) {
-  const claims = [];
-  if (identities === void 0) {
-    return claims;
-  }
   if (identities.github !== void 0) {
     claims.push({
       platform: "github",
@@ -2262,74 +3087,35 @@ async function probeRelays(relays, logger, timeoutMs = TCP_PROBE_TIMEOUT_MS) {
       continue;
     }
     const { host, port } = parsed;
-    let ips = [];
-    try {
-      const resolved = await lookup(host, { all: true });
-      ips = resolved.map((entry) => entry.address);
-    } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      logger.debug(
-        { event: "net_diag_dns_failed", url, host, error: message },
-        "DNS lookup failed"
-      );
-      results.push({ url, host, port, ips: [], error: `dns: ${message}` });
-      continue;
-    }
-    const probe = await tcpProbe(host, port, timeoutMs);
-    if ("openMs" in probe) {
-      logger.debug(
-        { event: "net_diag_tcp_open", url, host, port, ips, tcpOpenMs: probe.openMs },
-        "TCP open"
-      );
-      results.push({ url, host, port, ips, tcpOpenMs: probe.openMs });
-    } else {
-      logger.debug(
-        { event: "net_diag_tcp_failed", url, host, port, ips, error: probe.error },
-        "TCP probe failed"
-      );
-      results.push({ url, host, port, ips, error: `tcp: ${probe.error}` });
-    }
-  }
-  return results;
-}
-var MAX_CONCURRENT_JOBS = 10;
-var RECOVERY_MAX_RETRIES = 5;
-var RECOVERY_INTERVAL_SECS = 60;
-var WATCHDOG_PROBE_INTERVAL_MS = 5 * 60 * 1e3;
-var WATCHDOG_PROBE_TIMEOUT_MS = 1e4;
-var WATCHDOG_SELF_PING_INTERVAL_MS = 10 * 60 * 1e3;
-var WATCHDOG_SELF_PING_TIMEOUT_MS = 15e3;
-var WATCHDOG_SLEEP_DETECT_MULTIPLIER = 2;
-function getRpcUrl(_network) {
-  const envUrl = process.env.SOLANA_RPC_URL;
-  if (envUrl) {
-    return envUrl;
-  }
-  return "https://api.devnet.solana.com";
-}
-async function fetchUsdcBalance(rpc, owner) {
-  const mint = USDC_SOLANA_DEVNET.mint;
-  if (!mint) {
-    return 0n;
-  }
-  try {
-    const response = await rpc.getTokenAccountsByOwner(
-      owner,
-      { mint: address(mint) },
-      { encoding: "jsonParsed", commitment: "confirmed" }
-    ).send();
-    let total = 0n;
-    for (const entry of response.value) {
-      const parsed = entry.account.data;
-      const raw = parsed?.parsed?.info?.tokenAmount?.amount;
-      if (typeof raw === "string") {
-        total += BigInt(raw);
-      }
+    let ips = [];
+    try {
+      const resolved = await lookup(host, { all: true });
+      ips = resolved.map((entry) => entry.address);
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      logger.debug(
+        { event: "net_diag_dns_failed", url, host, error: message },
+        "DNS lookup failed"
+      );
+      results.push({ url, host, port, ips: [], error: `dns: ${message}` });
+      continue;
+    }
+    const probe = await tcpProbe(host, port, timeoutMs);
+    if ("openMs" in probe) {
+      logger.debug(
+        { event: "net_diag_tcp_open", url, host, port, ips, tcpOpenMs: probe.openMs },
+        "TCP open"
+      );
+      results.push({ url, host, port, ips, tcpOpenMs: probe.openMs });
+    } else {
+      logger.debug(
+        { event: "net_diag_tcp_failed", url, host, port, ips, error: probe.error },
+        "TCP probe failed"
+      );
+      results.push({ url, host, port, ips, error: `tcp: ${probe.error}` });
     }
-    return total;
-  } catch {
-    return 0n;
   }
+  return results;
 }
 var LEDGER_DIR_MODE = 448;
 var LEDGER_FILE_MODE = 384;
@@ -2398,6 +3184,40 @@ var JobLedger = class {
       this.flush();
     }
   }
+  /** Flush the delegated discriminator (called inside the atomic nonce mark). */
+  markDelegated(jobId) {
+    const entry = this.entries.get(jobId);
+    if (entry) {
+      entry.delegated = true;
+      this.flush();
+    }
+  }
+  /**
+   * Persist a delegated job's result text BEFORE the pull, while status stays
+   * `paid`. MUST be flushed strictly before `recordPullSignature` so a
+   * persisted pull signature always implies the result is recoverable.
+   */
+  recordDeliveredContent(jobId, deliveredContent) {
+    const entry = this.entries.get(jobId);
+    if (entry) {
+      entry.delivered_content = deliveredContent;
+      this.flush();
+    }
+  }
+  /**
+   * Phase-A persist of the two-phase pull: the signature (durable idempotency
+   * key), its blockhash terminal bound, and the amount the pull moves - one
+   * flush, BEFORE any bytes hit the network.
+   */
+  recordPullSignature(jobId, pullSignature, pullLastValidBlockHeight, netAmount) {
+    const entry = this.entries.get(jobId);
+    if (entry) {
+      entry.pull_signature = pullSignature;
+      entry.pull_last_valid_block_height = pullLastValidBlockHeight;
+      entry.net_amount = netAmount;
+      this.flush();
+    }
+  }
   /** Attempt a state transition. Returns the entry if valid, undefined otherwise. */
   transition(jobId, to) {
     const entry = this.entries.get(jobId);
@@ -2438,6 +3258,7 @@ var JobLedger = class {
     const entry = this.transition(jobId, "delivered");
     if (entry) {
       entry.result = void 0;
+      entry.delivered_content = void 0;
       this.flush();
     }
   }
@@ -2445,6 +3266,7 @@ var JobLedger = class {
     const entry = this.transition(jobId, "failed");
     if (entry) {
       entry.result = void 0;
+      entry.delivered_content = void 0;
       try {
         this.flush();
       } catch {
@@ -2464,6 +3286,10 @@ var JobLedger = class {
   pendingJobs() {
     return [...this.entries.values()].filter((e) => e.status === "paid" || e.status === "executed");
   }
+  /** Every entry, any status. Used to reconcile the used-nonce set on restart. */
+  allEntries() {
+    return [...this.entries.values()];
+  }
   /** Remove old delivered/failed entries (default: 7 days). */
   gc(maxAgeSecs = 7 * 24 * 60 * 60) {
     this.pruneOldEntries(maxAgeSecs * 1e3);
@@ -2491,6 +3317,92 @@ var JobLedger = class {
     return deleted;
   }
 };
+var NONCE_STORE_MAX_ENTRIES = 1e4;
+var UsedNonceStore = class {
+  /** key -> retain-until (unix seconds). Map order doubles as mark order for evict-oldest. */
+  entries = /* @__PURE__ */ new Map();
+  path;
+  maxEntries;
+  constructor(noncePath, maxEntries = NONCE_STORE_MAX_ENTRIES) {
+    this.path = noncePath;
+    this.maxEntries = maxEntries;
+    this.load();
+  }
+  load() {
+    try {
+      const raw = readFileSync(this.path, "utf-8");
+      const data = JSON.parse(raw);
+      for (const [key, retainUntil] of Object.entries(data)) {
+        if (typeof retainUntil === "number" && Number.isFinite(retainUntil)) {
+          this.entries.set(key, retainUntil);
+        }
+      }
+    } catch (e) {
+      if (e?.code !== "ENOENT") {
+        console.warn(`  ! Nonce store load warning: ${e?.message ?? "unknown error"}`);
+        try {
+          const backupPath = this.path + ".corrupt." + Date.now();
+          renameSync(this.path, backupPath);
+          chmodSync(backupPath, LEDGER_FILE_MODE);
+        } catch {
+        }
+      }
+    }
+  }
+  flush() {
+    const dir = dirname(this.path);
+    mkdirSync(dir, { recursive: true, mode: LEDGER_DIR_MODE });
+    const obj = Object.fromEntries(this.entries);
+    const tmp = this.path + ".tmp";
+    writeFileSync(tmp, JSON.stringify(obj), { mode: LEDGER_FILE_MODE });
+    renameSync(tmp, this.path);
+    chmodSync(this.path, LEDGER_FILE_MODE);
+  }
+  has(key) {
+    return this.entries.has(key);
+  }
+  /**
+   * Burn a nonce. Flushes by default; pass `persist: false` during bulk
+   * restart reconciliation and call {@link flush} once at the end. Evicts the
+   * oldest entry on overflow rather than rejecting.
+   */
+  markUsed(key, retainUntilSecs, opts = {}) {
+    while (this.entries.size >= this.maxEntries) {
+      const oldest = this.entries.keys().next();
+      if (oldest.done) {
+        break;
+      }
+      this.entries.delete(oldest.value);
+    }
+    this.entries.set(key, retainUntilSecs);
+    if (opts.persist !== false) {
+      try {
+        this.flush();
+      } catch {
+      }
+    }
+  }
+  /** Drop entries past their retain-until. Returns the number pruned. */
+  prune(nowSecs = Math.floor(Date.now() / 1e3)) {
+    let pruned = 0;
+    for (const [key, retainUntil] of this.entries) {
+      if (retainUntil <= nowSecs) {
+        this.entries.delete(key);
+        pruned += 1;
+      }
+    }
+    if (pruned > 0) {
+      try {
+        this.flush();
+      } catch {
+      }
+    }
+    return pruned;
+  }
+  size() {
+    return this.entries.size;
+  }
+};
 
 // src/commands/start.ts
 init_llm();
@@ -3532,6 +4444,8 @@ function resolveHealthPair(skill) {
   }
   return null;
 }
+var DELEGATED_REJECTED_PREFIX = "Delegated payment rejected";
+var RECONCILE_RECHECK_ATTEMPTS = 6;
 var RATE_LIMIT_WINDOW_MS = 10 * 60 * 1e3;
 var FREE_MAX_JOBS_PER_CUSTOMER = 20;
 var FREE_GLOBAL_MAX_JOBS_PER_WINDOW = 200;
@@ -3540,7 +4454,7 @@ var PAID_GLOBAL_MAX_JOBS_PER_WINDOW = 2e3;
 var MAX_TRACKED_CUSTOMERS = 1e3;
 var GLOBAL_LIMITER_KEY = "__global__";
 var AgentRuntime = class {
-  constructor(transport, skills, skillCtx, config, ledger, callbacks = {}, healthMonitor, irohTransport, identity2, blossomTransport, sessionStore) {
+  constructor(transport, skills, skillCtx, config, ledger, callbacks = {}, healthMonitor, irohTransport, identity2, blossomTransport, sessionStore, nonceStore) {
     this.transport = transport;
     this.skills = skills;
     this.skillCtx = skillCtx;
@@ -3552,6 +4466,7 @@ var AgentRuntime = class {
     this.identity = identity2;
     this.blossomTransport = blossomTransport;
     this.sessionStore = sessionStore;
+    this.nonceStore = nonceStore;
     this.limit = pLimit(config.maxConcurrentJobs);
     this.maxQueueSize = config.maxQueueSize ?? config.maxConcurrentJobs * 10;
   }
@@ -3599,6 +4514,13 @@ var AgentRuntime = class {
    * the operator's API key.
    */
   freeLlmLimiters = createFreeLlmLimiterSet();
+  /**
+   * Per-owner in-flight delegated reservations (subunits). A concurrency gate,
+   * NOT a budget: released on success AND failure (unlike the MCP session-spend
+   * reservation, which sticks on success). Process-local by design - the
+   * on-chain `delegated_amount` is the real ceiling.
+   */
+  delegationInFlight = /* @__PURE__ */ new Map();
   /**
    * Whether a job takes the session path: session ref present (transport only
    * populates it for NIP-44-encrypted requests) AND the matched skill opted in
@@ -3840,6 +4762,7 @@ var AgentRuntime = class {
     const log = this.callbacks.onLog ?? console.log;
     this.ledger.pruneOldEntries(LEDGER_RETENTION_MS);
     this.sessionStore?.init();
+    this.reconcileUsedNonces();
     await this.recoverPendingJobs();
     this.recoveryInterval = setInterval(
       () => this.recoverPendingJobs().catch((e) => log(`Recovery error: ${e}`)),
@@ -3856,6 +4779,11 @@ var AgentRuntime = class {
       } catch (e) {
         log(`Session GC error: ${e.message}`);
       }
+      try {
+        this.nonceStore?.prune();
+      } catch (e) {
+        log(`Nonce GC error: ${e.message}`);
+      }
       this.cleanupRateLimits();
       if (!this.transport.isHealthy()) {
         log("Warning: no events received in 30+ minutes. Check relay connectivity.");
@@ -4112,120 +5040,476 @@ var AgentRuntime = class {
       raw_event_json: JSON.stringify(job.rawEvent),
       created_at: Math.floor(Date.now() / 1e3)
     });
-    if (jobPrice > 0) {
+    const claimsDelegated = job.delegated !== void 0 || job.delegatedRejected !== void 0;
+    let delegatedPull;
+    if (claimsDelegated) {
+      delegatedPull = await this.delegatedPreCheck(job, matched, log);
+      if (delegatedPull === void 0) {
+        return;
+      }
+      netAmount = Number(delegatedPull.priceSubunits);
+    } else if (jobPrice > 0) {
       const result = await this.collectPayment(job, jobPrice, jobAsset, signal);
       netAmount = result.netAmount;
       paymentRequest = result.paymentRequest;
       this.ledger.updatePayment(job.jobId, netAmount, paymentRequest);
       log(
-        `[${job.jobId.slice(0, 8)}] Payment confirmed: ${formatAssetAmount(
-          jobAsset,
-          BigInt(netAmount)
-        )}`
+        `[${job.jobId.slice(0, 8)}] Payment confirmed: ${formatAssetAmount(
+          jobAsset,
+          BigInt(netAmount)
+        )}`
+      );
+      this.callbacks.onPaymentReceived?.(job.jobId, netAmount);
+    }
+    try {
+      const inputFile = await this.resolveInputFile(job.attachment, job.customerId, signal);
+      await this.transport.sendFeedback(job, { type: "processing" }).catch(() => {
+      });
+      const skill = this.skills.route(job.tags);
+      if (!skill) {
+        throw new Error("No skill matched for tags: " + job.tags.join(", "));
+      }
+      log(`[${job.jobId.slice(0, 8)}] Executing skill: ${skill.name}`);
+      const budgetMs = this.resolveExecutionBudgetMs(skill);
+      const jobSession = this.resolveJobSession(job, skill);
+      const runExecution = async (history) => {
+        let budgetExceeded = false;
+        const execAbort = new AbortController();
+        const onOuterAbort = () => execAbort.abort();
+        if (signal) {
+          if (signal.aborted) {
+            execAbort.abort();
+          } else {
+            signal.addEventListener("abort", onOuterAbort);
+          }
+        }
+        let budgetTimer;
+        try {
+          const execPromise = skill.execute(
+            {
+              data: inputFile?.inlineText ?? job.input,
+              inputType: job.inputType,
+              tags: job.tags,
+              jobId: job.jobId,
+              filePath: inputFile?.filePath,
+              history,
+              ...jobSession !== null ? { sessionId: jobSession.sessionId } : {}
+            },
+            { ...this.skillCtx, signal: execAbort.signal }
+          );
+          execPromise.catch(() => {
+          });
+          if (budgetMs > 0) {
+            return await Promise.race([
+              execPromise,
+              new Promise((_resolve, reject) => {
+                budgetTimer = setTimeout(() => {
+                  budgetExceeded = true;
+                  execAbort.abort();
+                  reject(new ExecutionBudgetExceededError(budgetMs));
+                }, budgetMs);
+              })
+            ]);
+          }
+          return await execPromise;
+        } catch (err) {
+          if (budgetExceeded) {
+            log(`[${job.jobId.slice(0, 8)}] Execution exceeded budget (${budgetMs / 1e3}s)`);
+            throw new ExecutionBudgetExceededError(budgetMs);
+          }
+          const flippedToUnhealthy = this.markHealthFromExecuteError(skill, err, log, job.jobId);
+          if (flippedToUnhealthy) {
+            throw new AgentUnavailableError();
+          }
+          throw err;
+        } finally {
+          if (budgetTimer) {
+            clearTimeout(budgetTimer);
+          }
+          if (signal) {
+            signal.removeEventListener("abort", onOuterAbort);
+          }
+          if (inputFile) {
+            await inputFile.cleanup().catch(() => {
+            });
+          }
+        }
+      };
+      const output = jobSession === null ? await runExecution() : await this.runSessionExchange({
+        session: jobSession,
+        jobId: job.jobId,
+        userRecord: buildUserRecord(
+          inputFile?.inlineText ?? job.input,
+          inputFile?.filePath !== void 0 ? job.attachment?.name ?? "attachment" : void 0
+        ),
+        signal,
+        log,
+        execute: runExecution
+      });
+      const { attachments, deliveredContent } = await this.buildResultAttachment(
+        job.jobId,
+        output,
+        job.customerId,
+        readAcceptedTransports(job.rawEvent.tags)
+      );
+      if (delegatedPull !== void 0) {
+        if (deliveredContent === "" && attachments.length === 0) {
+          this.ledger.markFailed(job.jobId);
+          await this.transport.sendFeedback(job, {
+            type: "error",
+            message: `${DELEGATED_REJECTED_PREFIX}: the skill produced empty output - you were not charged. Please re-submit.`
+          }).catch(() => {
+          });
+          return;
+        }
+        this.ledger.recordDeliveredContent(job.jobId, deliveredContent);
+        const outcome = await this.executeDelegatedPull(job, delegatedPull, log);
+        if (outcome === "dead") {
+          this.ledger.markFailed(job.jobId);
+          await this.transport.sendFeedback(job, {
+            type: "error",
+            message: `${DELEGATED_REJECTED_PREFIX}: the delegated transfer did not land - you were not charged. Please re-submit.`
+          }).catch(() => {
+          });
+          return;
+        }
+        if (outcome === "unresolved") {
+          log(
+            `[${job.jobId.slice(0, 8)}] Delegated pull unresolved before terminal; recovery will reconcile.`
+          );
+          return;
+        }
+      }
+      this.ledger.markExecuted(job.jobId, deliveredContent);
+      log(`[${job.jobId.slice(0, 8)}] Skill completed, delivering result`);
+      const eventId = await this.transport.deliverResult(
+        job,
+        deliveredContent,
+        netAmount,
+        attachments.length > 0 ? attachments : void 0,
+        delegatedPull?.pullSignature
+      );
+      this.ledger.markDelivered(job.jobId);
+      log(`[${job.jobId.slice(0, 8)}] Delivered: ${eventId.slice(0, 16)}...`);
+      this.callbacks.onJobCompleted?.(job.jobId, output.data);
+    } finally {
+      if (delegatedPull !== void 0) {
+        this.releaseDelegationReservation(delegatedPull.request.owner, delegatedPull.priceSubunits);
+      }
+    }
+  }
+  reserveDelegation(owner, amount) {
+    this.delegationInFlight.set(owner, (this.delegationInFlight.get(owner) ?? 0n) + amount);
+  }
+  /** Saturates at zero; drops the key when the owner has nothing in flight. */
+  releaseDelegationReservation(owner, amount) {
+    const current = this.delegationInFlight.get(owner) ?? 0n;
+    const next = current > amount ? current - amount : 0n;
+    if (next === 0n) {
+      this.delegationInFlight.delete(owner);
+    } else {
+      this.delegationInFlight.set(owner, next);
+    }
+  }
+  /**
+   * Delegated pre-check: fail-closed gates from format to funds, then the
+   * atomic nonce burn, then the on-chain delegation check + per-owner
+   * reservation. Returns the pull context, or `undefined` after rejecting
+   * (entry marked failed + error feedback sent). Runs AFTER `recordPaid`, so
+   * every reject must `markFailed` to avoid a dangling `paid` entry.
+   */
+  async delegatedPreCheck(job, skill, log) {
+    const reject = async (operatorDetail, customerReason) => {
+      log(`[${job.jobId.slice(0, 8)}] Delegated payment rejected: ${operatorDetail}`);
+      this.ledger.markFailed(job.jobId);
+      await this.transport.sendFeedback(job, {
+        type: "error",
+        message: `${DELEGATED_REJECTED_PREFIX}: ${customerReason}`
+      }).catch(() => {
+      });
+      return void 0;
+    };
+    if (job.delegatedRejected !== void 0 || job.delegated === void 0) {
+      return reject(
+        `malformed delegation tags (${job.delegatedRejected ?? "missing struct"})`,
+        "malformed delegation tags."
+      );
+    }
+    const request = job.delegated;
+    const delegateSigner = this.config.delegateSigner;
+    if (delegateSigner === void 0 || this.nonceStore === void 0) {
+      return reject(
+        "agent has no delegate key configured",
+        "this agent does not accept delegated payment."
+      );
+    }
+    if (this.config.network !== "devnet") {
+      return reject(
+        `delegation is devnet-only (network: ${this.config.network})`,
+        "this agent does not accept delegated payment."
+      );
+    }
+    const network = this.config.network;
+    if (!skill || skill.delegation === void 0 || skill.priceSubunits <= 0) {
+      return reject(
+        "skill does not accept delegated payment",
+        "this skill does not accept delegated payment."
+      );
+    }
+    const delegationAsset = resolveDelegationAsset(network);
+    if (skill.asset.mint !== delegationAsset.mint) {
+      return reject(
+        `skill asset ${skill.asset.symbol} is not the delegation asset`,
+        "this skill does not accept delegated payment."
+      );
+    }
+    if (!this.config.solanaAddress) {
+      return reject(
+        "no solana payment address configured",
+        "this agent does not accept delegated payment."
+      );
+    }
+    const nowSecs = Math.floor(Date.now() / 1e3);
+    if (request.expiryUnix <= nowSecs) {
+      return reject("proof expired", "the payment proof has expired - re-submit the job.");
+    }
+    if (request.expiryUnix > nowSecs + MAX_PROOF_TTL_SECS + PROOF_CLOCK_SKEW_SECS) {
+      return reject(
+        "proof expiry beyond the allowed horizon",
+        "the payment proof expiry is too far in the future."
+      );
+    }
+    const proofValid = await verifyDelegationAuthProof({
+      agentDelegate: delegateSigner.address,
+      nostrAuthor: job.customerId,
+      owner: request.owner,
+      expiryUnix: request.expiryUnix,
+      nonce: request.nonce,
+      proof: request.proof
+    });
+    if (!proofValid) {
+      return reject("proof verification failed", "invalid payment proof.");
+    }
+    const nonceKey = `${request.owner}:${request.nonce}`;
+    if (this.nonceStore.has(nonceKey)) {
+      return reject("nonce already used", "this payment proof was already used.");
+    }
+    this.nonceStore.markUsed(nonceKey, request.expiryUnix + PROOF_CLOCK_SKEW_SECS);
+    this.ledger.markDelegated(job.jobId);
+    let ownerAta;
+    try {
+      ownerAta = await deriveOwnerDelegationAta(request.owner, network);
+    } catch (error) {
+      return reject(
+        `owner ATA derivation failed: ${error instanceof Error ? error.message : String(error)}`,
+        "invalid delegation owner address."
+      );
+    }
+    const rpc = createSolanaRpc(getRpcUrl(this.config.network));
+    let status;
+    try {
+      status = await getDelegation(rpc, ownerAta);
+    } catch (error) {
+      return reject(
+        `getDelegation failed: ${error instanceof Error ? error.message : String(error)}`,
+        "could not verify the delegation on-chain - try again later."
+      );
+    }
+    if (status === null || status.delegate !== delegateSigner.address) {
+      return reject(
+        `no active delegation for this delegate (current: ${status?.delegate ?? "none"})`,
+        "no active delegation for this agent - approve it first."
+      );
+    }
+    const priceSubunits = BigInt(skill.priceSubunits);
+    const otherInFlight = this.delegationInFlight.get(request.owner) ?? 0n;
+    if (status.remainingCap - otherInFlight < priceSubunits) {
+      return reject(
+        `remaining cap ${status.remainingCap} minus in-flight ${otherInFlight} below price ${priceSubunits}`,
+        "the remaining delegated allowance is below this skill price."
+      );
+    }
+    if (status.balance < priceSubunits) {
+      return reject(
+        `owner balance ${status.balance} below price ${priceSubunits}`,
+        "the delegation account balance is below this skill price."
+      );
+    }
+    this.reserveDelegation(request.owner, priceSubunits);
+    log(
+      `[${job.jobId.slice(0, 8)}] Delegated pre-check ok: ${formatAssetAmount(
+        delegationAsset,
+        priceSubunits
+      )} from ${request.owner.slice(0, 8)}... (pull after work)`
+    );
+    return { request, delegateSigner, ownerAta, priceSubunits, rpc, network };
+  }
+  /**
+   * The two-phase pull - the ONLY money move of a delegated job. Phase A signs
+   * and PERSISTS `{signature, lastValidBlockHeight}` (+ the amount) before any
+   * bytes hit the network; phase B sends and polls to a provable terminal.
+   * Never throws past phase A: the outcome routes the caller.
+   */
+  async executeDelegatedPull(job, ctx, log) {
+    if (!this.config.solanaAddress) {
+      throw new Error("Solana address not configured");
+    }
+    const destinationAta = await deriveOwnerDelegationAta(this.config.solanaAddress, ctx.network);
+    const instructions = await buildDelegatedTransfer({
+      delegate: ctx.delegateSigner,
+      source: ctx.ownerAta,
+      destination: destinationAta,
+      amount: ctx.priceSubunits,
+      network: ctx.network,
+      // Idempotent create (delegate-paid rent) so a fresh provider wallet's
+      // first delegated job does not dead-letter on a missing ATA.
+      ensureDestination: { owner: this.config.solanaAddress }
+    });
+    const pull = await buildSignedPull(ctx.rpc, ctx.delegateSigner, instructions);
+    this.ledger.recordPullSignature(
+      job.jobId,
+      pull.signature,
+      Number(pull.lastValidBlockHeight),
+      Number(ctx.priceSubunits)
+    );
+    ctx.pullSignature = pull.signature;
+    const outcome = await sendConfirmToTerminal(ctx.rpc, pull, {});
+    log(`[${job.jobId.slice(0, 8)}] Delegated pull ${outcome}: ${pull.signature.slice(0, 16)}...`);
+    return outcome;
+  }
+  /**
+   * Restart reconciliation of the durable used-nonce set: re-burn every nonce
+   * found in persisted raw events (any status - a nonce is burned the moment
+   * its event entered the ledger's delegated path; fail-closed re-covers even
+   * pre-mark rejects). Runs BEFORE `transport.start`.
+   */
+  reconcileUsedNonces() {
+    if (this.nonceStore === void 0) {
+      return;
+    }
+    const nowSecs = Math.floor(Date.now() / 1e3);
+    let changed = false;
+    for (const entry of this.ledger.allEntries()) {
+      if (entry.raw_event_json === void 0) {
+        continue;
+      }
+      try {
+        const parsed = parseDelegatedPayment(JSON.parse(entry.raw_event_json));
+        if (parsed === null) {
+          continue;
+        }
+        const retainUntil = parsed.expiryUnix + PROOF_CLOCK_SKEW_SECS;
+        if (retainUntil <= nowSecs) {
+          continue;
+        }
+        const key = `${parsed.owner}:${parsed.nonce}`;
+        if (!this.nonceStore.has(key)) {
+          this.nonceStore.markUsed(key, retainUntil, { persist: false });
+          changed = true;
+        }
+      } catch {
+      }
+    }
+    if (changed) {
+      try {
+        this.nonceStore.flush();
+      } catch {
+      }
+    }
+  }
+  /**
+   * Delegated discriminator for recovery routing. The ledger flag is primary;
+   * the persisted raw event's top-level `payment` tag is the fallback for an
+   * entry whose flag write was lost.
+   */
+  isDelegatedEntry(entry) {
+    if (entry.delegated === true) {
+      return true;
+    }
+    if (entry.raw_event_json === void 0) {
+      return false;
+    }
+    try {
+      const raw = JSON.parse(entry.raw_event_json);
+      return Array.isArray(raw.tags) && raw.tags.some((tag) => Array.isArray(tag) && tag[0] === "payment" && tag[1] === "delegated");
+    } catch {
+      return false;
+    }
+  }
+  /**
+   * Reconcile a delegated `paid` entry to its terminal - the FIRST action in
+   * the recovery `paid` branch, BEFORE skill.route/health/preflight gates: a
+   * renamed skill or an unhealthy LLM must never strand an already-charged
+   * pull, and redelivering a persisted result needs none of them. Operates
+   * purely on persisted state - never re-executes, never re-signs.
+   */
+  async reconcileDelegatedEntry(entry, fakeJob, log) {
+    if (entry.pull_signature === void 0) {
+      log(`[${entry.job_id.slice(0, 8)}] Recovery: delegated entry has no pull, marking failed`);
+      this.ledger.markFailed(entry.job_id);
+      await this.transport.sendFeedback(fakeJob, {
+        type: "error",
+        message: `${DELEGATED_REJECTED_PREFIX}: the job did not complete - you were not charged. Please re-submit.`
+      }).catch(() => {
+      });
+      return;
+    }
+    const rpc = createSolanaRpc(getRpcUrl(this.config.network));
+    const pullSignature = signature(entry.pull_signature);
+    let outcome;
+    if (entry.pull_last_valid_block_height !== void 0) {
+      outcome = await confirmPullToTerminal(
+        rpc,
+        pullSignature,
+        BigInt(entry.pull_last_valid_block_height),
+        { recheckAttempts: RECONCILE_RECHECK_ATTEMPTS }
+      );
+    } else {
+      outcome = await isDefinitelyUnpaid(rpc, pullSignature, {
+        recheckAttempts: RECONCILE_RECHECK_ATTEMPTS
+      }) ? "dead" : "assume-landed";
+    }
+    if (outcome === "unresolved") {
+      log(
+        `[${entry.job_id.slice(0, 8)}] Recovery: delegated pull still unresolved; retrying next tick`
+      );
+      return;
+    }
+    if (outcome === "dead") {
+      log(`[${entry.job_id.slice(0, 8)}] Recovery: delegated pull provably dead, marking failed`);
+      this.ledger.markFailed(entry.job_id);
+      await this.transport.sendFeedback(fakeJob, {
+        type: "error",
+        message: `${DELEGATED_REJECTED_PREFIX}: the delegated transfer did not land - you were not charged. Please re-submit.`
+      }).catch(() => {
+      });
+      return;
+    }
+    let attachments;
+    try {
+      attachments = await this.reShareResultAttachments(entry);
+    } catch {
+      log(
+        `[${entry.job_id.slice(0, 8)}] Recovery: delegated result blob unavailable, marking failed`
       );
-      this.callbacks.onPaymentReceived?.(job.jobId, netAmount);
+      this.ledger.markFailed(entry.job_id);
+      await this.transport.sendFeedback(fakeJob, {
+        type: "error",
+        message: `Job permanently failed: the result could not be recovered after an agent restart. The delegated transfer landed (tx ${pullSignature}) - contact the provider to resolve.`
+      }).catch(() => {
+      });
+      return;
     }
-    const inputFile = await this.resolveInputFile(job.attachment, job.customerId, signal);
-    await this.transport.sendFeedback(job, { type: "processing" }).catch(() => {
-    });
-    const skill = this.skills.route(job.tags);
-    if (!skill) {
-      throw new Error("No skill matched for tags: " + job.tags.join(", "));
-    }
-    log(`[${job.jobId.slice(0, 8)}] Executing skill: ${skill.name}`);
-    const budgetMs = this.resolveExecutionBudgetMs(skill);
-    const jobSession = this.resolveJobSession(job, skill);
-    const runExecution = async (history) => {
-      let budgetExceeded = false;
-      const execAbort = new AbortController();
-      const onOuterAbort = () => execAbort.abort();
-      if (signal) {
-        if (signal.aborted) {
-          execAbort.abort();
-        } else {
-          signal.addEventListener("abort", onOuterAbort);
-        }
-      }
-      let budgetTimer;
-      try {
-        const execPromise = skill.execute(
-          {
-            data: inputFile?.inlineText ?? job.input,
-            inputType: job.inputType,
-            tags: job.tags,
-            jobId: job.jobId,
-            filePath: inputFile?.filePath,
-            history,
-            ...jobSession !== null ? { sessionId: jobSession.sessionId } : {}
-          },
-          { ...this.skillCtx, signal: execAbort.signal }
-        );
-        execPromise.catch(() => {
-        });
-        if (budgetMs > 0) {
-          return await Promise.race([
-            execPromise,
-            new Promise((_resolve, reject) => {
-              budgetTimer = setTimeout(() => {
-                budgetExceeded = true;
-                execAbort.abort();
-                reject(new ExecutionBudgetExceededError(budgetMs));
-              }, budgetMs);
-            })
-          ]);
-        }
-        return await execPromise;
-      } catch (err) {
-        if (budgetExceeded) {
-          log(`[${job.jobId.slice(0, 8)}] Execution exceeded budget (${budgetMs / 1e3}s)`);
-          throw new ExecutionBudgetExceededError(budgetMs);
-        }
-        const flippedToUnhealthy = this.markHealthFromExecuteError(skill, err, log, job.jobId);
-        if (flippedToUnhealthy) {
-          throw new AgentUnavailableError();
-        }
-        throw err;
-      } finally {
-        if (budgetTimer) {
-          clearTimeout(budgetTimer);
-        }
-        if (signal) {
-          signal.removeEventListener("abort", onOuterAbort);
-        }
-        if (inputFile) {
-          await inputFile.cleanup().catch(() => {
-          });
-        }
-      }
-    };
-    const output = jobSession === null ? await runExecution() : await this.runSessionExchange({
-      session: jobSession,
-      jobId: job.jobId,
-      userRecord: buildUserRecord(
-        inputFile?.inlineText ?? job.input,
-        inputFile?.filePath !== void 0 ? job.attachment?.name ?? "attachment" : void 0
-      ),
-      signal,
-      log,
-      execute: runExecution
-    });
-    const { attachments, deliveredContent } = await this.buildResultAttachment(
-      job.jobId,
-      output,
-      job.customerId,
-      readAcceptedTransports(job.rawEvent.tags)
+    this.ledger.markExecuted(entry.job_id, entry.delivered_content ?? "");
+    await this.transport.deliverResult(
+      fakeJob,
+      entry.delivered_content ?? "",
+      entry.net_amount,
+      attachments.length > 0 ? attachments : void 0,
+      entry.pull_signature
     );
-    this.ledger.markExecuted(job.jobId, deliveredContent);
-    log(`[${job.jobId.slice(0, 8)}] Skill completed, delivering result`);
-    const eventId = await this.transport.deliverResult(
-      job,
-      deliveredContent,
-      netAmount,
-      attachments.length > 0 ? attachments : void 0
-    );
-    this.ledger.markDelivered(job.jobId);
-    log(`[${job.jobId.slice(0, 8)}] Delivered: ${eventId.slice(0, 16)}...`);
-    this.callbacks.onJobCompleted?.(job.jobId, output.data);
+    this.ledger.markDelivered(entry.job_id);
+    log(`[${entry.job_id.slice(0, 8)}] Recovery: delegated pull ${outcome}, result delivered`);
   }
   /**
    * Seed a result blob through iroh, timing it and converting any failure (incl. the
@@ -4792,7 +6076,8 @@ var AgentRuntime = class {
       const ageMs = (Math.floor(Date.now() / 1e3) - entry.created_at) * 1e3;
       const expired = ageMs > MAX_PAID_AGE_MS;
       const exhaustedRetries = entry.status === "paid" && entry.retry_count >= this.config.recoveryMaxRetries;
-      if (expired || exhaustedRetries) {
+      const hasPullSignature = entry.pull_signature !== void 0;
+      if ((expired || exhaustedRetries) && !hasPullSignature) {
         this.ledger.markFailed(entry.job_id);
         const reason = expired ? "Job permanently failed: agent did not recover within 24 hours" : "Job permanently failed after maximum retries";
         if (entry.raw_event_json) {
@@ -4861,17 +6146,27 @@ var AgentRuntime = class {
         } catch {
           log(`[${entry.job_id.slice(0, 8)}] Recovery: result blob unavailable, marking failed`);
           this.ledger.markFailed(entry.job_id);
+          await this.transport.sendFeedback(fakeJob, {
+            type: "error",
+            message: "Job permanently failed: the result data was lost after an agent restart - contact the provider to resolve."
+          }).catch(() => {
+          });
           return;
         }
         await this.transport.deliverResult(
           fakeJob,
           entry.result,
           entry.net_amount,
-          attachments.length > 0 ? attachments : void 0
+          attachments.length > 0 ? attachments : void 0,
+          entry.pull_signature
         );
         this.ledger.markDelivered(entry.job_id);
         log(`[${entry.job_id.slice(0, 8)}] Recovery: re-delivered`);
       } else if (entry.status === "paid") {
+        if (this.isDelegatedEntry(entry)) {
+          await this.reconcileDelegatedEntry(entry, fakeJob, log);
+          return;
+        }
         const skill = this.skills.route(entry.tags);
         if (!skill) {
           log(`[${entry.job_id.slice(0, 8)}] Recovery: no skill for tags, marking failed`);
@@ -5504,6 +6799,9 @@ function buildCliSkill(parsed, entryPath, scriptEnv) {
   if (parsed.executionTimeoutSecs !== void 0) {
     skill.executionTimeoutSecs = parsed.executionTimeoutSecs;
   }
+  if (parsed.delegation) {
+    skill.delegation = parsed.delegation;
+  }
   return skill;
 }
 function loadSkillsFromDir(skillsDir, options = {}) {
@@ -5600,6 +6898,13 @@ var NostrTransport = class {
         } catch {
           return;
         }
+        let delegated;
+        let delegatedRejected;
+        try {
+          delegated = parseDelegatedPayment(event) ?? void 0;
+        } catch (error) {
+          delegatedRejected = error instanceof Error ? error.message : String(error);
+        }
         onJob({
           jobId: event.id,
           input,
@@ -5610,7 +6915,9 @@ var NostrTransport = class {
           encrypted,
           rawEvent: event,
           attachment,
-          session
+          session,
+          delegated,
+          delegatedRejected
         });
       }
     );
@@ -5707,8 +7014,12 @@ var NostrTransport = class {
       );
     }
   }
-  /** Deliver result to customer. Retries with exponential backoff via SDK. */
-  async deliverResult(job, content, amount, attachments, retries = 3) {
+  /**
+   * Deliver result to customer. Retries with exponential backoff via SDK.
+   * `paymentTx` attaches an on-chain settlement signature (the delegated pull)
+   * to the result event for customer-side transparency.
+   */
+  async deliverResult(job, content, amount, attachments, paymentTx, retries = 3) {
     return this.client.marketplace.submitJobResultWithRetry(
       this.identity,
       job.rawEvent,
@@ -5716,7 +7027,8 @@ var NostrTransport = class {
       amount,
       retries,
       void 0,
-      attachments
+      attachments,
+      paymentTx !== void 0 ? { paymentTx } : void 0
     );
   }
   /** Returns true if an event was received within the given idle window. */
@@ -5852,216 +7164,6 @@ function startWatchdog(deps) {
     }
   };
 }
-
-// src/x402/constants.ts
-var X402_SOLANA_DEVNET_CAIP2 = "solana:EtWTRABZaYq6iMfeYKouRu166VU2xqa1";
-var X402_SOLANA_DEVNET_V1 = "solana-devnet";
-var X402_GET_INPUT_MAX_ENCODED_BYTES = 2048;
-var X402_MAX_RESPONSE_BYTES = 10 * 1024 * 1024;
-var X402_MAX_CHALLENGE_BYTES = 256 * 1024;
-var X402_PROBE_TTL_MS = 3e4;
-var X402_MAX_PAID_ATTEMPTS = 2;
-var X402_MAX_PAYMENT_SIGNATURES = 2 * X402_MAX_PAID_ATTEMPTS;
-var X402_FREE_RETRY_DELAYS_MS = [1e3, 3e3];
-var X402_REFUNDED_RETRIES = 1;
-var X402_CACHE_TTL_MS = 7 * 24 * 60 * 60 * 1e3;
-function requirementAmount(requirement) {
-  const v1Amount = requirement.maxAmountRequired;
-  const raw = requirement.amount ?? v1Amount;
-  if (typeof raw !== "string" || !/^[0-9]+$/.test(raw)) {
-    return null;
-  }
-  return BigInt(raw);
-}
-function isAcceptableRequirement(requirement, rule) {
-  if (requirement.scheme !== "exact") {
-    return false;
-  }
-  const network = requirement.network;
-  if (network !== X402_SOLANA_DEVNET_CAIP2 && network !== X402_SOLANA_DEVNET_V1) {
-    return false;
-  }
-  if (USDC_SOLANA_DEVNET.mint === void 0 || requirement.asset !== USDC_SOLANA_DEVNET.mint) {
-    return false;
-  }
-  const amount = requirementAmount(requirement);
-  if (amount === null) {
-    return false;
-  }
-  return amount <= rule.maxUpstreamSubunits;
-}
-function selectAcceptableRequirement(accepts, rule) {
-  return accepts.find((requirement) => isAcceptableRequirement(requirement, rule));
-}
-function maxAcceptableQuote(accepts, rule) {
-  let worst = null;
-  for (const requirement of accepts) {
-    if (!isAcceptableRequirement(requirement, rule)) {
-      continue;
-    }
-    const amount = requirementAmount(requirement);
-    if (amount === null) {
-      continue;
-    }
-    if (worst === null || amount > worst) {
-      worst = amount;
-    }
-  }
-  return worst;
-}
-function buildRequirementsPolicy(rule) {
-  return function filterAcceptableRequirements(_x402Version, paymentRequirements) {
-    return paymentRequirements.filter((requirement) => isAcceptableRequirement(requirement, rule));
-  };
-}
-var PROBE_TIMEOUT_MS = 1e4;
-var MAX_PROBE_BODY_BYTES = 256 * 1024;
-var PROBE_CACHE_MAX_ENTRIES = 256;
-async function readTextCapped(response, maxBytes) {
-  const reader = response.body?.getReader();
-  if (reader === void 0) {
-    const buffer = await response.arrayBuffer();
-    if (buffer.byteLength > maxBytes) {
-      throw new X402ProbeError(`402 body exceeds ${maxBytes} bytes`, 402);
-    }
-    return new TextDecoder().decode(buffer);
-  }
-  const chunks = [];
-  let total = 0;
-  while (true) {
-    const { done, value } = await reader.read();
-    if (done) {
-      break;
-    }
-    total += value.byteLength;
-    if (total > maxBytes) {
-      await reader.cancel().catch(() => {
-      });
-      throw new X402ProbeError(`402 body exceeds ${maxBytes} bytes`, 402);
-    }
-    chunks.push(value);
-  }
-  const combined = new Uint8Array(total);
-  let offset = 0;
-  for (const chunk of chunks) {
-    combined.set(chunk, offset);
-    offset += chunk.byteLength;
-  }
-  return new TextDecoder().decode(combined);
-}
-var X402ProbeError = class extends Error {
-  status;
-  constructor(message, status) {
-    super(message);
-    this.name = "X402ProbeError";
-    this.status = status;
-  }
-};
-function normalizeV1Requirement(raw) {
-  return {
-    scheme: typeof raw.scheme === "string" ? raw.scheme : "",
-    network: typeof raw.network === "string" ? raw.network : "unknown:unknown",
-    asset: typeof raw.asset === "string" ? raw.asset : "",
-    payTo: typeof raw.payTo === "string" ? raw.payTo : "",
-    amount: typeof raw.maxAmountRequired === "string" ? raw.maxAmountRequired : "",
-    maxTimeoutSeconds: typeof raw.maxTimeoutSeconds === "number" ? raw.maxTimeoutSeconds : 60,
-    extra: raw.extra ?? {}
-  };
-}
-function parseV1Body(bodyText) {
-  let parsed;
-  try {
-    parsed = JSON.parse(bodyText);
-  } catch {
-    return null;
-  }
-  if (typeof parsed !== "object" || parsed === null) {
-    return null;
-  }
-  const body = parsed;
-  if (body.x402Version !== 1 || !Array.isArray(body.accepts) || body.accepts.length === 0) {
-    return null;
-  }
-  const rawRequirements = body.accepts.filter(
-    (item) => typeof item === "object" && item !== null
-  );
-  if (rawRequirements.length === 0) {
-    return null;
-  }
-  const accepts = rawRequirements.map(normalizeV1Requirement);
-  const first = rawRequirements[0];
-  return {
-    x402Version: 1,
-    accepts,
-    resource: {
-      url: typeof first.resource === "string" ? first.resource : void 0,
-      description: typeof first.description === "string" ? first.description : void 0,
-      mimeType: typeof first.mimeType === "string" ? first.mimeType : void 0
-    }
-  };
-}
-async function probePaymentRequired(url, method, signal) {
-  const probeSignal = AbortSignal.timeout(PROBE_TIMEOUT_MS);
-  const response = await fetch(url, { method, signal: probeSignal, redirect: "error" });
-  if (response.status !== 402) {
-    await response.body?.cancel().catch(() => {
-    });
-    throw new X402ProbeError(
-      `expected HTTP 402 from ${url}, got ${response.status} - not an x402-paid endpoint (or it validates the request before the paywall; try the other method)`,
-      response.status
-    );
-  }
-  const headerValue = response.headers.get("PAYMENT-REQUIRED");
-  if (headerValue !== null) {
-    await response.body?.cancel().catch(() => {
-    });
-    try {
-      const paymentRequired = decodePaymentRequiredHeader(headerValue);
-      return {
-        x402Version: paymentRequired.x402Version,
-        accepts: paymentRequired.accepts,
-        resource: paymentRequired.resource
-      };
-    } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      throw new X402ProbeError(`could not decode PAYMENT-REQUIRED header: ${message}`, 402);
-    }
-  }
-  const bodyText = await readTextCapped(response, MAX_PROBE_BODY_BYTES).catch((error) => {
-    if (error instanceof X402ProbeError) {
-      throw error;
-    }
-    return "";
-  });
-  const v1 = parseV1Body(bodyText);
-  if (v1 !== null) {
-    return v1;
-  }
-  throw new X402ProbeError(
-    "got HTTP 402 but neither a v2 PAYMENT-REQUIRED header nor a v1 JSON body was parseable",
-    402
-  );
-}
-var PROBE_CACHE = /* @__PURE__ */ new Map();
-async function probePaymentRequiredCached(url, method, ttlMs) {
-  const key = `${method} ${url}`;
-  const cached = PROBE_CACHE.get(key);
-  const now = Date.now();
-  if (cached !== void 0 && now - cached.at < ttlMs) {
-    return cached.result;
-  }
-  const result = await probePaymentRequired(url, method);
-  PROBE_CACHE.delete(key);
-  PROBE_CACHE.set(key, { at: now, result });
-  while (PROBE_CACHE.size > PROBE_CACHE_MAX_ENTRIES) {
-    const oldest = PROBE_CACHE.keys().next().value;
-    if (oldest === void 0) {
-      break;
-    }
-    PROBE_CACHE.delete(oldest);
-  }
-  return result;
-}
 var X402_JOBS_FILE = ".x402-jobs.json";
 var X402_RESULTS_DIR = ".x402-results";
 function sanitizeJobId(jobId) {
@@ -6691,18 +7793,7 @@ async function cmdStart(nameArg, options = {}) {
 `);
     }
   }
-  const scriptEnv = { ...process.env };
-  delete scriptEnv.ELISYM_PASSPHRASE;
-  if (scriptEnv.SOLANA_RPC_URL !== void 0 && !isPublicSolanaRpcUrl(scriptEnv.SOLANA_RPC_URL)) {
-    delete scriptEnv.SOLANA_RPC_URL;
-  }
-  const llmKeys = loaded.secrets.llm_api_keys ?? {};
-  for (const descriptor of listLlmProviders()) {
-    const secretValue = llmKeys[descriptor.id];
-    if (typeof secretValue === "string" && secretValue.length > 0) {
-      scriptEnv[descriptor.envVar] = secretValue;
-    }
-  }
+  const scriptEnv = buildScriptEnv(loaded.secrets);
   const paths = agentPaths(loaded.dir);
   const skillsDir = paths.skills;
   const allSkills = loadSkillsFromDir(skillsDir, { scriptEnv });
@@ -7122,6 +8213,46 @@ async function cmdStart(nameArg, options = {}) {
     }
   }
   const kinds = [jobRequestKind(DEFAULT_KIND_OFFSET)];
+  const declaresDelegation = allSkills.some((skill) => skill.delegation !== void 0);
+  let delegatePubkey;
+  let delegateSigner;
+  if (declaresDelegation && walletNetwork !== "devnet") {
+    console.warn(
+      `  ! A skill declares delegation but it is devnet-only today (network: ${walletNetwork}) - omitted from its card(s).`
+    );
+  } else if (declaresDelegation) {
+    const delegateSecret = loaded.secrets.solana_delegate_secret_key;
+    if (delegateSecret && delegateSecret.length > 0) {
+      try {
+        delegateSigner = await signerFromSecretKeyBase58(delegateSecret);
+        delegatePubkey = delegateSigner.address;
+        console.log(`  Delegate (spl-approve)  ${delegatePubkey}`);
+        try {
+          const { value: delegateLamports } = await createSolanaRpc(getRpcUrl(walletNetwork)).getBalance(address(delegatePubkey)).send();
+          if (delegateLamports === 0n) {
+            console.warn(
+              "  ! Delegate key holds no SOL - delegated job pulls will fail on tx fees. Fund it: https://faucet.solana.com"
+            );
+          }
+        } catch {
+        }
+      } catch (error) {
+        delegateSigner = void 0;
+        delegatePubkey = void 0;
+        console.warn(
+          `  ! Delegate key is present but unreadable - the delegation field is omitted from its card(s). ${error instanceof Error ? error.message : String(error)}`
+        );
+        console.warn(
+          `  ! Run \`npx @elisym/cli delegate-key ${loaded.name} --rotate\` to replace it.`
+        );
+      }
+    } else {
+      console.warn(
+        "  ! A skill declares delegation but this agent has no delegate key - the delegation field is omitted from its card(s)."
+      );
+      console.warn(`  ! Run \`npx @elisym/cli delegate-key ${loaded.name}\` to enable it.`);
+    }
+  }
   function buildCard(skill) {
     const isStatic = skill.mode === "static-file" || skill.mode === "static-script" || skill.noInput === true;
     return {
@@ -7138,6 +8269,10 @@ async function cmdStart(nameArg, options = {}) {
       // Conversation-context flag: clients gate chat affordances (session-carrying
       // sends) on it. Strict true only - the read side coerces anything else away.
       ...skill.context === true ? { context: true } : {},
+      // Delegation descriptor: only when the skill opts in AND a delegate key
+      // exists (delegatePubkey resolved). The pubkey is injected here, never
+      // taken from the SKILL.md - the operator declares only the cap/mechanism.
+      ...skill.delegation && delegatePubkey ? { delegation: { ...skill.delegation, delegate_pubkey: delegatePubkey } } : {},
       payment: solanaAddress ? {
         chain: "solana",
         network: walletNetwork,
@@ -7247,8 +8382,15 @@ async function cmdStart(nameArg, options = {}) {
     solanaAddress,
     // Agent-level default execution budget; per-skill `max_execution_secs`
     // overrides it. Undefined => unlimited (operator-owned, no protocol default).
-    executionTimeoutSecs: loaded.yaml.execution_timeout_secs
+    executionTimeoutSecs: loaded.yaml.execution_timeout_secs,
+    // Delegated job payment: the runtime holds ONLY the delegate signer (never
+    // the payment key) to execute post-work pulls from customer delegations.
+    delegateSigner
   };
+  const nonceStore = delegateSigner !== void 0 ? new UsedNonceStore(join(loaded.dir, ".delegation-nonces.json")) : void 0;
+  if (nonceStore !== void 0) {
+    await ensureGitignoreHasDelegationNoncesEntry(dirname(loaded.dir));
+  }
   const rpcUrlForLog = stripRpcSecrets(process.env.SOLANA_RPC_URL ?? getRpcUrl());
   logger.debug(
     {
@@ -7321,11 +8463,27 @@ async function cmdStart(nameArg, options = {}) {
     irohTransport,
     identity2,
     blossomTransport,
-    sessionStore
+    sessionStore,
+    nonceStore
   );
   console.log("  * Running. Press Ctrl+C to stop.\n");
   await runtime.run();
 }
+function buildScriptEnv(secrets) {
+  const scriptEnv = { ...process.env };
+  delete scriptEnv.ELISYM_PASSPHRASE;
+  if (scriptEnv.SOLANA_RPC_URL !== void 0 && !isPublicSolanaRpcUrl(scriptEnv.SOLANA_RPC_URL)) {
+    delete scriptEnv.SOLANA_RPC_URL;
+  }
+  const llmKeys = secrets.llm_api_keys ?? {};
+  for (const descriptor of listLlmProviders()) {
+    const secretValue = llmKeys[descriptor.id];
+    if (typeof secretValue === "string" && secretValue.length > 0) {
+      scriptEnv[descriptor.envVar] = secretValue;
+    }
+  }
+  return scriptEnv;
+}
 var PUBLIC_SOLANA_RPC_HOSTS = /* @__PURE__ */ new Set([
   "api.devnet.solana.com",
   "api.mainnet-beta.solana.com",
@@ -7502,468 +8660,43 @@ async function loadAgentWithPrompt(name, cwd) {
 async function cmdWallet(name) {
   const cwd = process.cwd();
   if (!name) {
-    const agents = await listAgents(cwd);
-    if (agents.length === 0) {
-      console.error("No agents found.");
-      process.exit(1);
-    }
-    const { default: inquirer } = await import('inquirer');
-    const { selected } = await inquirer.prompt([
-      {
-        type: "list",
-        name: "selected",
-        message: "Select agent:",
-        choices: agents.map((agent) => ({
-          name: `${agent.name} (${agent.source})`,
-          value: agent.name
-        }))
-      }
-    ]);
-    name = selected;
-  }
-  const passphrase = process.env.ELISYM_PASSPHRASE;
-  const loaded = await loadAgent(name, cwd, passphrase);
-  const solPayment = loaded.yaml.payments.find((entry) => entry.chain === "solana");
-  if (!solPayment?.address) {
-    console.error("Solana address not configured for this agent.");
-    process.exit(1);
-  }
-  const rpcUrl = getRpcUrl(solPayment.network);
-  const rpc = createSolanaRpc(rpcUrl);
-  const walletAddress = address(solPayment.address);
-  const { value: balance } = await rpc.getBalance(walletAddress).send();
-  const usdcBalance = await fetchUsdcBalance(rpc, walletAddress);
-  console.log(`
-  Agent: ${name}`);
-  console.log(`  Network: ${solPayment.network}`);
-  console.log(`  Address: ${solPayment.address}`);
-  console.log(`  SOL balance: ${formatSol(Number(balance))} (${balance} lamports)`);
-  console.log(`  USDC balance: ${formatAssetAmount(USDC_SOLANA_DEVNET, usdcBalance)}
-`);
-}
-var BPS_DENOMINATOR = 1e4;
-var DEFAULT_MARGIN_BPS = 1e3;
-var SOLANA_MAINNET_CAIP2 = "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp";
-var CIRCLE_FAUCET_URL = "https://faucet.circle.com";
-function fail(message) {
-  console.error(`
-  ! ${message}
-`);
-  process.exit(1);
-}
-function sanitizeUpstreamText(raw, maxLength) {
-  let withoutControls = "";
-  for (const char of raw) {
-    const code = char.codePointAt(0) ?? 0;
-    withoutControls += code < 32 || code === 127 ? " " : char;
-  }
-  return withoutControls.replace(/—/g, "-").replace(/\s+/g, " ").trim().slice(0, maxLength).trim();
-}
-function slugFromUrl(url) {
-  const pathPart = url.pathname.replace(/\/+$/, "").split("/").filter(Boolean).pop() ?? "";
-  const host = url.hostname.replace(/^www\./, "").split(".")[0] ?? "x402";
-  return pathPart.length > 0 ? `${host}-${pathPart}` : host;
-}
-function parseMarginBps(raw) {
-  if (raw === void 0) {
-    return DEFAULT_MARGIN_BPS;
-  }
-  const value = Number(raw);
-  if (!Number.isInteger(value) || value < 0 || value > 1e5) {
-    fail(`--margin-bps must be a non-negative integer (bps, 100 = 1%); got "${raw}"`);
-  }
-  return value;
-}
-async function parseImportedSecret(input) {
-  const trimmed = input.trim();
-  if (existsSync(trimmed)) {
-    const content = await readFile(trimmed, "utf-8");
-    let parsed;
-    try {
-      parsed = JSON.parse(content);
-    } catch {
-      throw new Error(`${trimmed} is not a valid solana-keygen JSON file`);
-    }
-    if (!Array.isArray(parsed) || parsed.length !== 64 || parsed.some(
-      (byte) => typeof byte !== "number" || !Number.isInteger(byte) || byte < 0 || byte > 255
-    )) {
-      throw new Error(`${trimmed} must contain a JSON array of 64 bytes (solana-keygen format)`);
-    }
-    return encodeSecretKeyBase58(new Uint8Array(parsed));
-  }
-  try {
-    await signerFromSecretKeyBase58(trimmed);
-  } catch {
-    throw new Error("not a readable file and not a valid base58-encoded 64-byte secret key");
-  }
-  return trimmed;
-}
-function computeBridgePriceSubunits(quote, marginBps, feeBps) {
-  if (feeBps >= BPS_DENOMINATOR) {
-    throw new Error(`feeBps ${feeBps} >= ${BPS_DENOMINATOR} - refusing zero/negative denominator`);
-  }
-  return BigInt(
-    new Decimal(quote.toString()).mul(BPS_DENOMINATOR + marginBps).div(BPS_DENOMINATOR - feeBps).toDecimalPlaces(0, Decimal.ROUND_CEIL).toString()
-  );
-}
-function buildSkillMd(input) {
-  const frontmatter = {
-    name: input.skillName,
-    description: input.description,
-    capabilities: input.capabilities,
-    price: input.priceDisplay,
-    token: "usdc",
-    mode: "x402",
-    x402_url: input.url,
-    x402_method: input.method,
-    ...input.queryParam !== void 0 ? { x402_query_param: input.queryParam } : {},
-    x402_max_upstream: Number(input.quote),
-    // GET input is dominated by the ~2KB percent-encoded query-string limit,
-    // so the byte cap is written for POST bridges only.
-    ...input.method === "POST" ? { x402_max_input_bytes: DEFAULT_X402_MAX_INPUT_BYTES } : {}
-  };
-  const bodyLines = [
-    `# ${input.skillName}`,
-    "",
-    "Operator notes for this x402 bridge skill (the executor ignores this body):",
-    "",
-    `- Upstream: ${input.url} (${input.method})`,
-    `- Upstream quote at generation time: ${formatAssetAmount(USDC_SOLANA_DEVNET, input.quote)} (= x402_max_upstream, the signing ceiling)`,
-    `- Price: ${input.priceDisplay} USDC (margin ${input.marginPercent}%, protocol fee ${input.feePercent}% at generation time)`,
-    "- To reprice after an upstream change, re-run:",
-    "",
-    "```bash",
-    `npx @elisym/cli x402 add ${input.url}`,
-    "```"
-  ];
-  return `---
-${YAML.stringify(frontmatter)}---
-
-${bodyLines.join("\n")}
-`;
-}
-function scanExistingSkills(skillsDir, candidateDTag, url) {
-  const scan = {};
-  let entries;
-  try {
-    entries = readdirSync(skillsDir);
-  } catch {
-    return scan;
-  }
-  for (const entry of entries) {
-    const skillMdPath = join(skillsDir, entry, "SKILL.md");
-    try {
-      if (!statSync(join(skillsDir, entry)).isDirectory()) {
-        continue;
-      }
-      const { frontmatter } = parseSkillMd(readFileSync(skillMdPath, "utf-8"));
-      if (typeof frontmatter.name !== "string") {
-        continue;
-      }
-      if (typeof frontmatter.x402_url === "string" && frontmatter.x402_url === url) {
-        scan.sameUrlDir = join(skillsDir, entry);
-        scan.sameUrlName = frontmatter.name;
-        continue;
-      }
-      let existingDTag;
-      try {
-        existingDTag = toDTag(frontmatter.name);
-      } catch {
-        continue;
-      }
-      if (existingDTag === candidateDTag) {
-        scan.dTagCollision = frontmatter.name;
-      }
-    } catch {
-      continue;
-    }
-  }
-  return scan;
-}
-function describeUnacceptableAccepts(probe) {
-  const networks = [...new Set(probe.accepts.map((requirement) => String(requirement.network)))];
-  if (networks.length > 0 && networks.every((network) => network.startsWith("eip155:"))) {
-    return `the service accepts only EVM networks (${networks.join(", ")}) - not supported yet`;
-  }
-  if (networks.some((network) => network === SOLANA_MAINNET_CAIP2 || network === "solana")) {
-    return "the service settles on Solana mainnet - elisym currently runs on devnet (mainnet is on the roadmap)";
-  }
-  return `no exact-scheme devnet-USDC requirement found (service accepts: ${networks.join(", ") || "nothing parseable"})`;
-}
-async function cmdX402Add(url, agentName, options) {
-  const cwd = process.cwd();
-  const { default: inquirer } = await import('inquirer');
-  let parsedUrl;
-  try {
-    parsedUrl = new URL(url);
-  } catch {
-    fail(`"${url}" is not a valid URL`);
-  }
-  const isLoopback = ["localhost", "127.0.0.1", "[::1]"].includes(parsedUrl.hostname);
-  if (parsedUrl.protocol !== "https:" && !(parsedUrl.protocol === "http:" && isLoopback)) {
-    fail("the upstream must be an https:// URL (plain http is allowed for localhost only)");
-  }
-  const methodRaw = (options.method ?? "POST").toUpperCase();
-  if (methodRaw !== "GET" && methodRaw !== "POST") {
-    fail(`--method must be GET or POST; got "${options.method}"`);
-  }
-  const method = methodRaw;
-  const marginBps = parseMarginBps(options.marginBps);
-  if (!agentName) {
-    const agents = await listAgents(cwd);
-    if (agents.length === 0) {
-      fail("no agents found - create one first: npx @elisym/cli init");
-    }
-    if (options.yes) {
-      fail("--yes needs an explicit agent argument: elisym x402 add <url> <agent> --yes");
+    const agents = await listAgents(cwd);
+    if (agents.length === 0) {
+      console.error("No agents found.");
+      process.exit(1);
     }
+    const { default: inquirer } = await import('inquirer');
     const { selected } = await inquirer.prompt([
       {
         type: "list",
         name: "selected",
-        message: "Add the bridge skill to which agent?",
+        message: "Select agent:",
         choices: agents.map((agent) => ({
           name: `${agent.name} (${agent.source})`,
           value: agent.name
         }))
       }
     ]);
-    agentName = selected;
+    name = selected;
   }
   const passphrase = process.env.ELISYM_PASSPHRASE;
-  const loaded = await loadAgent(agentName, cwd, passphrase);
-  console.log(`
-  Probing ${url} (${method}, unpaid)...`);
-  let probe;
-  try {
-    probe = await probePaymentRequired(url, method);
-  } catch (error) {
-    if (error instanceof X402ProbeError) {
-      fail(error.message);
-    }
-    const message = error instanceof Error ? error.message : String(error);
-    fail(`upstream unreachable: ${message}`);
-  }
-  const anyCeiling = { maxUpstreamSubunits: BigInt(Number.MAX_SAFE_INTEGER) };
-  const requirement = selectAcceptableRequirement(probe.accepts, anyCeiling);
-  if (requirement === void 0) {
-    fail(describeUnacceptableAccepts(probe));
-  }
-  const quote = requirementAmount(requirement);
-  if (quote === null || quote <= 0n) {
-    fail("the upstream quote is not a positive integer amount");
-  }
-  let solanaSecretKey = loaded.secrets.solana_secret_key;
-  if (solanaSecretKey === void 0 || solanaSecretKey.length === 0) {
-    let choice;
-    if (options.yes || options.generateWallet) {
-      if (!options.generateWallet) {
-        fail(
-          "this agent has no Solana wallet key. Run interactively to generate/import one, or pass --generate-wallet (a money-holding key is never created silently under --yes)."
-        );
-      }
-      choice = "generate";
-    } else {
-      const { walletChoice } = await inquirer.prompt([
-        {
-          type: "list",
-          name: "walletChoice",
-          message: "The bridge pays the upstream from the agent wallet, but .secrets.json has no solana_secret_key:",
-          choices: [
-            { name: "Generate a new wallet", value: "generate" },
-            { name: "Import an existing one (solana-keygen JSON file or base58)", value: "import" }
-          ]
-        }
-      ]);
-      choice = walletChoice;
-    }
-    if (choice === "generate") {
-      const wallet = await generateSolanaWallet();
-      solanaSecretKey = wallet.secretKeyBase58;
-    } else {
-      const { imported } = await inquirer.prompt([
-        {
-          // Masked: a pasted base58 secret key must not echo to the terminal
-          // scrollback (matches every other secret prompt in the CLI). A file
-          // path can still be pasted/drag-dropped under the mask.
-          type: "password",
-          mask: "*",
-          name: "imported",
-          message: "Path to a solana-keygen JSON file (or paste a base58 secret key):"
-        }
-      ]);
-      try {
-        solanaSecretKey = await parseImportedSecret(imported);
-      } catch (error) {
-        fail(error instanceof Error ? error.message : String(error));
-      }
-    }
-    await writeSecrets(
-      loaded.dir,
-      { ...loaded.secrets, solana_secret_key: solanaSecretKey },
-      passphrase
-    );
-    console.log("  Wallet key saved to .secrets.json");
-  }
-  const signer = await signerFromSecretKeyBase58(solanaSecretKey);
+  const loaded = await loadAgent(name, cwd, passphrase);
   const solPayment = loaded.yaml.payments.find((entry) => entry.chain === "solana");
-  if (solPayment !== void 0 && solPayment.address !== signer.address) {
-    fail(
-      `wallet invariant violated: elisym.yaml payments[].address (${solPayment.address}) differs from the solana_secret_key address (${signer.address}).
-    Revenue must land in the wallet the bridge spends from, or the float never refills.
-    Fix: set payments[].address to the key address, or import the matching key.`
-    );
-  }
-  if (solPayment === void 0) {
-    console.log(
-      `  elisym.yaml has no Solana payments entry; adding address ${signer.address} (devnet).`
-    );
-    await writeYaml(loaded.dir, {
-      ...loaded.yaml,
-      payments: [
-        ...loaded.yaml.payments,
-        { chain: "solana", network: "devnet", address: signer.address }
-      ]
-    });
-  }
-  const rpc = createSolanaRpc(getRpcUrl());
-  const balance = await fetchUsdcBalance(rpc, address(signer.address));
-  let feeBps;
-  try {
-    const protocolConfig = await getProtocolConfig(rpc, getProtocolProgramId("devnet"), {
-      forceRefresh: true
-    });
-    feeBps = protocolConfig.feeBps;
-  } catch (error) {
-    const message = error instanceof Error ? error.message : String(error);
-    fail(`could not read the on-chain protocol config (fee): ${message}`);
-  }
-  if (feeBps >= BPS_DENOMINATOR) {
-    fail(
-      `protocol fee is ${feeBps} bps (>= 100%) - price math would divide by zero or go negative`
-    );
-  }
-  const priceSubunits = computeBridgePriceSubunits(quote, marginBps, feeBps);
-  const priceDisplay = new Decimal(priceSubunits.toString()).div(new Decimal(10).pow(USDC_SOLANA_DEVNET.decimals)).toString();
-  const protocolFee = calculateProtocolFee(Number(priceSubunits), feeBps);
-  const netMargin = priceSubunits - BigInt(protocolFee) - quote;
-  const fallbackName = slugFromUrl(parsedUrl);
-  const rawName = options.name ?? probe.resource?.serviceName ?? fallbackName;
-  const skillName = sanitizeUpstreamText(rawName, LIMITS.MAX_AGENT_NAME_LENGTH);
-  if (!/[a-zA-Z0-9]/.test(skillName)) {
-    fail(
-      `the upstream service name ("${rawName}") has no ASCII letters or digits - pass an explicit --name <skill-name>`
-    );
-  }
-  const candidateDTag = toDTag(skillName);
-  const description = sanitizeUpstreamText(
-    probe.resource?.description ?? `x402 bridge to ${parsedUrl.hostname}`,
-    LIMITS.MAX_DESCRIPTION_LENGTH
-  );
-  const capabilities = [candidateDTag];
-  const skillsDir = join(loaded.dir, "skills");
-  const scan = scanExistingSkills(skillsDir, candidateDTag, url);
-  let targetDir = join(skillsDir, candidateDTag);
-  if (scan.sameUrlDir !== void 0) {
-    if (!options.yes) {
-      const { update } = await inquirer.prompt([
-        {
-          type: "confirm",
-          name: "update",
-          message: `Skill "${scan.sameUrlName}" already bridges this URL - regenerate it with the fresh quote?`,
-          default: true
-        }
-      ]);
-      if (!update) {
-        fail("aborted");
-      }
-    }
-    targetDir = scan.sameUrlDir;
-  } else if (scan.dTagCollision !== void 0) {
-    fail(
-      `the generated name "${skillName}" collides with existing skill "${scan.dTagCollision}" (both map to d-tag "${candidateDTag}", which would replace its live discovery card) - pass a distinct --name`
-    );
-  } else if (existsSync(targetDir)) {
-    fail(`skill directory ${targetDir} already exists - pass a distinct --name`);
-  }
-  let queryParam = options.queryParam;
-  if (method === "GET" && queryParam === void 0 && !options.yes) {
-    const { param } = await inquirer.prompt([
-      {
-        type: "input",
-        name: "param",
-        message: "GET upstream: which query parameter should carry the buyer input? (empty = the skill takes no input)"
-      }
-    ]);
-    queryParam = param.trim() === "" ? void 0 : param.trim();
-  }
-  if (queryParam !== void 0 && parsedUrl.searchParams.has(queryParam)) {
-    fail(`--query-param "${queryParam}" collides with a parameter already present in the URL`);
-  }
-  if (method === "POST" && queryParam !== void 0) {
-    fail("--query-param only applies to GET upstreams (POST maps the input to the request body)");
-  }
-  const noInput = method === "GET" && queryParam === void 0;
-  const feePercent = new Decimal(feeBps).div(100).toString();
-  const marginPercent = new Decimal(marginBps).div(100).toString();
-  console.log("");
-  console.log(`  ${chalk.bold(skillName)}`);
-  console.log(`  ${description}`);
-  console.log("");
-  console.log(
-    `  Upstream     ${url} (${method}${queryParam !== void 0 ? `, input in ?${queryParam}=` : ""}${noInput ? ", no buyer input" : ""})`
-  );
-  console.log(`  Quote        ${formatAssetAmount(USDC_SOLANA_DEVNET, quote)}`);
-  console.log(
-    `  Your price   ${formatAssetAmount(USDC_SOLANA_DEVNET, priceSubunits)}  (margin ${marginPercent}% + protocol fee ${feePercent}%)`
-  );
-  console.log(`  Net margin   ${formatAssetAmount(USDC_SOLANA_DEVNET, netMargin)} per job`);
-  console.log(
-    `  Float        ${formatAssetAmount(USDC_SOLANA_DEVNET, balance)} in ${signer.address}`
-  );
-  if (balance < quote) {
-    console.log(
-      chalk.yellow(
-        `  ! Float below one upstream quote - fund the wallet with devnet USDC: ${CIRCLE_FAUCET_URL}`
-      )
-    );
-  }
-  console.log(`  Skill dir    ${targetDir}`);
-  console.log("");
-  if (!options.yes) {
-    const { confirmed } = await inquirer.prompt([
-      { type: "confirm", name: "confirmed", message: "Write the skill?", default: true }
-    ]);
-    if (!confirmed) {
-      fail("aborted");
-    }
+  if (!solPayment?.address) {
+    console.error("Solana address not configured for this agent.");
+    process.exit(1);
   }
-  const content = buildSkillMd({
-    skillName,
-    description,
-    capabilities,
-    priceDisplay,
-    url,
-    method,
-    queryParam,
-    quote,
-    marginPercent,
-    feePercent
-  });
-  const roundTrip = parseSkillMd(content);
-  validateSkillFrontmatter(roundTrip.frontmatter, roundTrip.systemPrompt, {
-    allowFreeSkills: false,
-    allowX402Skills: true
-  });
-  await mkdir(targetDir, { recursive: true });
-  await writeFile(join(targetDir, "SKILL.md"), content, "utf-8");
-  await ensureGitignoreHasX402Entries(dirname(loaded.dir));
+  const rpcUrl = getRpcUrl(solPayment.network);
+  const rpc = createSolanaRpc(rpcUrl);
+  const walletAddress = address(solPayment.address);
+  const { value: balance } = await rpc.getBalance(walletAddress).send();
+  const usdcBalance = await fetchUsdcBalance(rpc, walletAddress);
   console.log(`
-  Wrote ${join(targetDir, "SKILL.md")}`);
-  if (balance < quote) {
-    console.log(`  Next: fund the float (devnet USDC): ${CIRCLE_FAUCET_URL}`);
-  }
-  console.log(`  Start the agent: npx @elisym/cli start ${agentName}
+  Agent: ${name}`);
+  console.log(`  Network: ${solPayment.network}`);
+  console.log(`  Address: ${solPayment.address}`);
+  console.log(`  SOL balance: ${formatSol(Number(balance))} (${balance} lamports)`);
+  console.log(`  USDC balance: ${formatAssetAmount(USDC_SOLANA_DEVNET, usdcBalance)}
 `);
 }
 function readPackageVersion() {
@@ -8039,6 +8772,14 @@ program.command("list").description("List all agents (project-local and home-glo
   })
 );
 program.command("wallet [name]").description("Show wallet balance").action(safe(cmdWallet));
+program.command("delegate-key [name]").description("Generate, show, or rotate the agent's dedicated delegate signing key (spl-approve)").option("--show", "Print the existing delegate pubkey/address only").option(
+  "--import",
+  "Import an existing key (solana-keygen JSON path or base58) instead of generating"
+).option("--rotate", "Replace an existing delegate key (invalidates outstanding owner approvals)").option("--yes", "Skip confirmation prompts (requires an explicit agent argument)").action(
+  safe(async (name, options) => {
+    await cmdDelegateKey(name, options);
+  })
+);
 var identity = program.command("identity").description("Link, verify, and unlink external identities (GitHub, X, website)");
 identity.command("link <platform> [agent]").description(
   "Link a github|x|website identity: prints the NIP-39 proof template, verifies the proof live, writes elisym.yaml, and publishes the claim (kind 10011 / kind-0 nip05)"