@elisym/cli 0.5.1 → 0.6.0

package/dist/index.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env -S node --no-deprecation
 import { readFileSync, readdirSync, statSync, renameSync, mkdirSync, writeFileSync } from 'node:fs';
 import { dirname, join, resolve, basename, relative, sep } from 'node:path';
-import { SolanaPaymentStrategy, validateAgentName, RELAYS, ElisymIdentity, formatSol, ElisymClient, MediaService, jobRequestKind, DEFAULT_KIND_OFFSET, DEFAULTS, makeCensor, DEFAULT_REDACT_PATHS, createSlidingWindowLimiter, getProtocolProgramId, getProtocolConfig, LIMITS, calculateProtocolFee, BoundedSet } from '@elisym/sdk';
+import { SolanaPaymentStrategy, validateAgentName, RELAYS, ElisymIdentity, formatSol, formatAssetAmount, ElisymClient, MediaService, jobRequestKind, DEFAULT_KIND_OFFSET, DEFAULTS, USDC_SOLANA_DEVNET, makeCensor, DEFAULT_REDACT_PATHS, createSlidingWindowLimiter, getProtocolProgramId, getProtocolConfig, LIMITS, calculateProtocolFee, BoundedSet, NATIVE_SOL } from '@elisym/sdk';
 import { ElisymYamlSchema, resolveInHome, resolveInProject, createAgentDir, writeYaml, writeSecrets, listAgents, loadAgent, agentPaths, readMediaCache, lookupCachedUrl, newCacheEntry, writeMediaCache } from '@elisym/sdk/agent-store';
 import { isAddress, createSolanaRpc, address } from '@solana/kit';
 import { generateSecretKey, getPublicKey, nip19 } from 'nostr-tools';
@@ -268,6 +268,11 @@ async function promptYaml(inquirer) {
       }
     }
   ]);
+  if (solanaAddress) {
+    console.log(
+      "  The wallet receives every asset on Solana (SOL directly, USDC and other\n  SPL tokens via their ATA). Each skill declares its own price and token\n  in SKILL.md. Fund with SOL via `solana airdrop` or USDC via https://faucet.circle.com."
+    );
+  }
   const { llmProvider } = await inquirer.prompt([
     {
       type: "list",
@@ -815,12 +820,33 @@ async function fetchWithRetry(url, init, signal) {
     await sleepWithSignal(delay, signal);
   }
 }
+function isReasoningModel(model) {
+  return /^o\d/.test(model) || /^gpt-5(\b|[-.])/.test(model);
+}
 function createLlmClient(config) {
   if (config.provider === "anthropic") {
     return new AnthropicClient(config);
   }
   return new OpenAIClient(config);
 }
+async function verifyLlmApiKey(provider, apiKey, signal) {
+  const url = provider === "anthropic" ? "https://api.anthropic.com/v1/models?limit=1" : "https://api.openai.com/v1/models";
+  const headers = provider === "anthropic" ? { "x-api-key": apiKey, "anthropic-version": "2023-06-01" } : { Authorization: `Bearer ${apiKey}` };
+  try {
+    const res = await fetchWithTimeout(url, { method: "GET", headers }, signal);
+    if (res.ok) {
+      await res.body?.cancel().catch(() => void 0);
+      return { ok: true };
+    }
+    const body = (await res.text().catch(() => "")).slice(0, 500);
+    if (res.status === 401 || res.status === 403) {
+      return { ok: false, reason: "invalid", status: res.status, body };
+    }
+    return { ok: false, reason: "unavailable", error: `HTTP ${res.status}: ${body.slice(0, 200)}` };
+  } catch (e) {
+    return { ok: false, reason: "unavailable", error: e?.message ?? String(e) };
+  }
+}
 var AnthropicClient = class {
   constructor(config) {
     this.config = config;
@@ -945,7 +971,7 @@ var OpenAIClient = class {
     }
   }
   async complete(systemPrompt, userInput, signal) {
-    const isReasoning = /^o\d/.test(this.config.model);
+    const isReasoning = isReasoningModel(this.config.model);
     const res = await fetchWithRetry(
       "https://api.openai.com/v1/chat/completions",
       {
@@ -987,7 +1013,7 @@ var OpenAIClient = class {
         }
       }
     }));
-    const isReasoning = /^o\d/.test(this.config.model);
+    const isReasoning = isReasoningModel(this.config.model);
     const res = await fetchWithRetry(
       "https://api.openai.com/v1/chat/completions",
       {
@@ -1093,7 +1119,11 @@ var LEDGER_RETENTION_MS = 30 * 24 * 60 * 60 * 1e3;
 var TOTAL_JOB_TIMEOUT_MS = 5 * 60 * 1e3;
 function resolveJobPrice(tags, skills) {
   const skill = skills.route(tags);
-  return skill?.priceLamports ?? 0;
+  return skill?.priceSubunits ?? 0;
+}
+function resolveJobAsset(tags, skills) {
+  const skill = skills.route(tags);
+  return skill?.asset ?? NATIVE_SOL;
 }
 var RATE_LIMIT_WINDOW_MS = 10 * 60 * 1e3;
 var MAX_JOBS_PER_CUSTOMER = 20;
@@ -1203,16 +1233,18 @@ var AgentRuntime = class {
     log("Agent runtime started. Listening for jobs...");
     await new Promise((resolve3) => {
       this.abortController.signal.addEventListener("abort", () => resolve3(), { once: true });
-      process.on("SIGINT", () => {
-        log("Shutting down...");
-        this.stop();
-        setTimeout(() => process.exit(0), 3e3).unref();
-      });
-      process.on("SIGTERM", () => {
+      let shuttingDown = false;
+      const onSignal = () => {
+        if (shuttingDown) {
+          return;
+        }
+        shuttingDown = true;
         log("Shutting down...");
         this.stop();
         setTimeout(() => process.exit(0), 3e3).unref();
-      });
+      };
+      process.on("SIGINT", onSignal);
+      process.on("SIGTERM", onSignal);
     });
   }
   /** Drop expired hits from both sliding-window limiters. */
@@ -1283,6 +1315,7 @@ var AgentRuntime = class {
       throw new Error(`Input too long: ${job.input.length} chars (max ${LIMITS.MAX_INPUT_LENGTH})`);
     }
     const jobPrice = resolveJobPrice(job.tags, this.skills);
+    const jobAsset = resolveJobAsset(job.tags, this.skills);
     let netAmount;
     let paymentRequest;
     this.ledger.recordPaid({
@@ -1297,11 +1330,16 @@ var AgentRuntime = class {
       created_at: Math.floor(Date.now() / 1e3)
     });
     if (jobPrice > 0) {
-      const result = await this.collectPayment(job, jobPrice, signal);
+      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: ${netAmount} lamports`);
+      log(
+        `[${job.jobId.slice(0, 8)}] Payment confirmed: ${formatAssetAmount(
+          jobAsset,
+          BigInt(netAmount)
+        )}`
+      );
       this.callbacks.onPaymentReceived?.(job.jobId, netAmount);
     }
     await this.transport.sendFeedback(job, { type: "processing" }).catch(() => {
@@ -1331,7 +1369,7 @@ var AgentRuntime = class {
    * Collect payment for a job. Creates payment request, sends PaymentRequired feedback,
    * polls for on-chain confirmation. Aborts if signal fires.
    */
-  async collectPayment(job, jobPrice, signal) {
+  async collectPayment(job, jobPrice, jobAsset, signal) {
     const log = this.callbacks.onLog ?? console.log;
     if (!this.config.solanaAddress) {
       throw new Error("Solana address not configured");
@@ -1341,12 +1379,14 @@ var AgentRuntime = class {
       this.config.solanaAddress,
       jobPrice,
       protocolConfig,
-      { expirySecs: this.config.paymentTimeoutSecs }
+      { expirySecs: this.config.paymentTimeoutSecs, asset: jobAsset }
     );
     const requestJson = JSON.stringify(request);
     const fee = calculateProtocolFee(jobPrice, protocolConfig.feeBps);
     const netAmount = jobPrice - fee;
-    log(`[${job.jobId.slice(0, 8)}] Payment required: ${jobPrice} lamports (fee: ${fee})`);
+    log(
+      `[${job.jobId.slice(0, 8)}] Payment required: ${formatAssetAmount(jobAsset, BigInt(jobPrice))} (fee: ${formatAssetAmount(jobAsset, BigInt(fee))})`
+    );
     this.ledger.updatePayment(job.jobId, void 0, requestJson);
     await this.transport.sendFeedback(job, {
       type: "payment-required",
@@ -1471,11 +1511,11 @@ var AgentRuntime = class {
           this.ledger.markFailed(entry.job_id);
           return;
         }
-        if (skill.priceLamports > 0 && !entry.net_amount) {
+        if (skill.priceSubunits > 0 && !entry.net_amount) {
           if (entry.payment_request) {
             const verified = await this.reVerifyPayment(
               entry,
-              skill.priceLamports,
+              skill.priceSubunits,
               log,
               recoveryAbort.signal
             );
@@ -1516,7 +1556,7 @@ var AgentRuntime = class {
    * job will be marked failed. For mainnet: use monitoring, avoid extended downtime, or
    * configure an archive RPC via SOLANA_RPC_URL.
    */
-  async reVerifyPayment(entry, priceLamports, log, signal) {
+  async reVerifyPayment(entry, priceSubunits, log, signal) {
     try {
       const request = JSON.parse(entry.payment_request);
       const rpc = createSolanaRpc(getRpcUrl(this.config.network));
@@ -1550,10 +1590,10 @@ var AgentRuntime = class {
         result = await payment.verifyPayment(rpc, request, protocolConfig);
       }
       if (result.verified) {
-        const fee = calculateProtocolFee(priceLamports, protocolConfig.feeBps);
-        const netAmount = priceLamports - fee;
+        const fee = calculateProtocolFee(priceSubunits, protocolConfig.feeBps);
+        const netAmount = priceSubunits - fee;
         this.ledger.updatePayment(entry.job_id, netAmount, entry.payment_request);
-        log(`[${entry.job_id.slice(0, 8)}] Recovery: payment re-verified (${netAmount} lamports)`);
+        log(`[${entry.job_id.slice(0, 8)}] Recovery: payment re-verified (${netAmount} subunits)`);
         return true;
       }
       log(`[${entry.job_id.slice(0, 8)}] Recovery: payment not found on-chain, marking failed`);
@@ -1576,13 +1616,22 @@ var SkillRegistry = class {
     this.skills.push(skill);
   }
   route(tags) {
-    for (const skill of this.skills) {
-      for (const tag of tags) {
-        if (skill.capabilities.some((cap) => cap === tag)) {
-          return skill;
-        }
+    for (const tag of tags) {
+      const byName = this.skills.find((skill) => skill.name === tag);
+      if (byName) {
+        return byName;
       }
     }
+    for (const tag of tags) {
+      const byCap = this.skills.find((skill) => skill.capabilities.includes(tag));
+      if (byCap) {
+        return byCap;
+      }
+    }
+    const hasSpecificTag = tags.some((tag) => tag && tag !== "elisym");
+    if (hasSpecificTag) {
+      return null;
+    }
     return this.defaultIndex !== null ? this.skills[this.defaultIndex] : null;
   }
   allCapabilities() {
@@ -1599,22 +1648,49 @@ var ScriptSkill = class {
   name;
   description;
   capabilities;
-  priceLamports;
+  priceSubunits;
+  asset;
   image;
   imageFile;
   inner;
-  constructor(name, description, capabilities, priceLamports, image, imageFile, skillDir, systemPrompt, tools, maxToolRounds) {
+  constructor(name, description, capabilities, priceSubunits, assetOrImage, imageOrImageFile, imageFileOrDir, dirOrPrompt, promptOrTools, toolsOrRounds, rounds) {
+    let asset;
+    let image;
+    let imageFile;
+    let skillDir;
+    let systemPrompt;
+    let tools;
+    let maxToolRounds;
+    if (assetOrImage !== void 0 && typeof assetOrImage === "object" && "token" in assetOrImage) {
+      asset = assetOrImage;
+      image = imageOrImageFile;
+      imageFile = imageFileOrDir;
+      skillDir = dirOrPrompt;
+      systemPrompt = promptOrTools;
+      tools = toolsOrRounds;
+      maxToolRounds = rounds;
+    } else {
+      asset = NATIVE_SOL;
+      image = assetOrImage;
+      imageFile = imageOrImageFile;
+      skillDir = imageFileOrDir;
+      systemPrompt = dirOrPrompt;
+      tools = promptOrTools;
+      maxToolRounds = toolsOrRounds;
+    }
     this.name = name;
     this.description = description;
     this.capabilities = capabilities;
-    this.priceLamports = priceLamports;
+    this.priceSubunits = priceSubunits;
+    this.asset = asset;
     this.image = image;
     this.imageFile = imageFile;
     this.inner = new ScriptSkill$1({
       name,
       description,
       capabilities,
-      priceLamports: BigInt(Math.round(priceLamports)),
+      priceSubunits: BigInt(Math.round(priceSubunits)),
+      asset,
       skillDir,
       systemPrompt,
       tools,
@@ -1658,7 +1734,8 @@ function loadSkillsFromDir(skillsDir) {
           parsed.name,
           parsed.description,
           parsed.capabilities,
-          Number(parsed.priceLamports),
+          Number(parsed.priceSubunits),
+          parsed.asset,
           parsed.image,
           parsed.imageFile,
           entryPath,
@@ -1923,6 +2000,25 @@ async function cmdStart(nameArg, options = {}) {
     );
     process.exit(1);
   }
+  const llmProvider = loaded.yaml.llm.provider;
+  const keyEnvVar = llmProvider === "anthropic" ? "ANTHROPIC_API_KEY" : "OPENAI_API_KEY";
+  process.stdout.write(`  Verifying ${llmProvider} API key... `);
+  const verification = await verifyLlmApiKey(llmProvider, loaded.secrets.llm_api_key);
+  if (verification.ok) {
+    console.log("ok");
+  } else if (verification.reason === "invalid") {
+    console.log("INVALID");
+    console.error(`  ! ${llmProvider} rejected the API key (HTTP ${verification.status}).`);
+    console.error(`    Update it via \`elisym profile\` or set ${keyEnvVar} to a valid key.
+`);
+    process.exit(1);
+  } else {
+    console.log("unavailable");
+    console.warn(
+      `  ! Could not verify ${llmProvider} API key (${verification.error}). Continuing - jobs will fail if the key is invalid.
+`
+    );
+  }
   const paths = agentPaths(loaded.dir);
   const skillsDir = paths.skills;
   const allSkills = loadSkillsFromDir(skillsDir);
@@ -1937,11 +2033,11 @@ async function cmdStart(nameArg, options = {}) {
   const registry = new SkillRegistry();
   for (const skill of allSkills) {
     registry.register(skill);
-    const price = skill.priceLamports > 0 ? formatSol(skill.priceLamports) : "free";
+    const price = skill.priceSubunits > 0 ? formatAssetAmount(skill.asset, BigInt(skill.priceSubunits)) : "free";
     console.log(`  * Skill: ${skill.name} [${skill.capabilities.join(", ")}] - ${price}`);
   }
   console.log();
-  const hasPaid = allSkills.some((s) => s.priceLamports > 0);
+  const hasPaid = allSkills.some((s) => s.priceSubunits > 0);
   if (hasPaid && !solanaAddress) {
     console.error("  ! Paid skills require a Solana address. Run `elisym init` to configure.\n");
     process.exit(1);
@@ -2041,7 +2137,11 @@ async function cmdStart(nameArg, options = {}) {
         chain: "solana",
         network: walletNetwork,
         address: solanaAddress,
-        job_price: skill.priceLamports
+        job_price: skill.priceSubunits,
+        token: skill.asset.token,
+        ...skill.asset.mint ? { mint: skill.asset.mint } : {},
+        decimals: skill.asset.decimals,
+        symbol: skill.asset.symbol
       } : void 0
     };
   }
@@ -2298,6 +2398,30 @@ async function loadAgentWithPrompt(name, cwd) {
   }
   throw new Error("Unreachable");
 }
+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);
+      }
+    }
+    return total;
+  } catch {
+    return 0n;
+  }
+}
 async function cmdWallet(name) {
   const cwd = process.cwd();
   if (!name) {
@@ -2331,11 +2455,13 @@ async function cmdWallet(name) {
   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(`  Balance: ${formatSol(Number(balance))} (${balance} lamports)
+  console.log(`  SOL balance: ${formatSol(Number(balance))} (${balance} lamports)`);
+  console.log(`  USDC balance: ${formatAssetAmount(USDC_SOLANA_DEVNET, usdcBalance)}
 `);
 }
 function readPackageVersion() {