@elisym/cli 0.8.1 → 0.8.2

package/dist/index.js

@@ -1,10 +1,10 @@
 #!/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, formatAssetAmount, ElisymClient, MediaService, jobRequestKind, DEFAULT_KIND_OFFSET, toDTag, DEFAULTS, USDC_SOLANA_DEVNET, makeCensor, DEFAULT_REDACT_PATHS, createSlidingWindowLimiter, getProtocolProgramId, getProtocolConfig, LIMITS, calculateProtocolFee, BoundedSet, NATIVE_SOL } from '@elisym/sdk';
+import { SolanaPaymentStrategy, validateAgentName, RELAYS, ElisymIdentity, formatSol, formatAssetAmount, ElisymClient, MediaService, jobRequestKind, DEFAULT_KIND_OFFSET, toDTag, DEFAULTS, USDC_SOLANA_DEVNET, makeCensor, DEFAULT_REDACT_PATHS, createSlidingWindowLimiter, getProtocolProgramId, getProtocolConfig, LIMITS, calculateProtocolFee, BoundedSet, KIND_JOB_FEEDBACK, 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';
+import { generateSecretKey, getPublicKey, nip19, verifyEvent } from 'nostr-tools';
 import YAML from 'yaml';
 import { Command } from 'commander';
 import { isEncrypted } from '@elisym/sdk/node';
@@ -1146,6 +1146,7 @@ var payment = new SolanaPaymentStrategy();
 var LEDGER_GC_INTERVAL_MS = 60 * 60 * 1e3;
 var LEDGER_RETENTION_MS = 30 * 24 * 60 * 60 * 1e3;
 var TOTAL_JOB_TIMEOUT_MS = 5 * 60 * 1e3;
+var SIG_PATH_TIMEOUT_MS = 60 * 1e3;
 function resolveJobPrice(tags, skills) {
   const skill = skills.route(tags);
   return skill?.priceSubunits ?? 0;
@@ -1424,33 +1425,124 @@ var AgentRuntime = class {
       chain: "solana"
     });
     const rpc = createSolanaRpc(getRpcUrl(this.config.network));
-    let result;
+    const verifyAbort = new AbortController();
+    const onOuterAbort = () => verifyAbort.abort();
     if (signal) {
-      let abortHandler;
-      const abortPromise = new Promise((_, reject) => {
-        abortHandler = () => {
+      if (signal.aborted) {
+        verifyAbort.abort();
+      } else {
+        signal.addEventListener("abort", onOuterAbort, { once: true });
+      }
+    }
+    const deadlineMs = this.config.paymentTimeoutSecs * 1e3;
+    const sigPathTimeoutMs = Math.min(deadlineMs, SIG_PATH_TIMEOUT_MS);
+    let result;
+    try {
+      result = await new Promise((resolve3, reject) => {
+        let settled = false;
+        let pending = 2;
+        let lastResult = { verified: false };
+        const win = (verified) => {
+          if (settled) {
+            return;
+          }
+          settled = true;
+          clearTimeout(deadline);
+          resolve3(verified);
+        };
+        const lose = (verified, reason) => {
+          if (settled) {
+            return;
+          }
+          lastResult = verified;
+          pending -= 1;
+          log(`[${job.jobId.slice(0, 8)}] verify ${reason}`);
+          if (pending === 0) {
+            settled = true;
+            clearTimeout(deadline);
+            resolve3(lastResult);
+          }
+        };
+        this.transport.waitForPaymentSignature(job.jobId, job.customerId, verifyAbort.signal, sigPathTimeoutMs).then(async (sig) => {
+          if (settled) {
+            return;
+          }
+          if (!sig) {
+            lose({ verified: false }, "sig path: no payment-completed feedback");
+            return;
+          }
+          log(`[${job.jobId.slice(0, 8)}] verify sig path: got ${sig.slice(0, 8)}...`);
+          try {
+            const verified = await payment.verifyPayment(rpc, request, protocolConfig, {
+              txSignature: sig
+            });
+            if (verified.verified) {
+              win(verified);
+            } else {
+              const reason = verified.error ?? "unknown";
+              lose(verified, `sig path: not verified (${reason})`);
+            }
+          } catch (err) {
+            lose(
+              { verified: false },
+              `sig path error: ${err instanceof Error ? err.message : String(err)}`
+            );
+          }
+        }).catch(
+          (err) => lose(
+            { verified: false },
+            `sig path error: ${err instanceof Error ? err.message : String(err)}`
+          )
+        );
+        payment.verifyPayment(rpc, request, protocolConfig).then((verified) => {
+          if (verified.verified) {
+            win(verified);
+          } else {
+            const reason = verified.error ?? "unknown";
+            lose(verified, `ref path: not verified (${reason})`);
+          }
+        }).catch(
+          (err) => lose(
+            { verified: false },
+            `ref path error: ${err instanceof Error ? err.message : String(err)}`
+          )
+        );
+        const deadline = setTimeout(() => {
+          if (settled) {
+            return;
+          }
+          settled = true;
+          log(`[${job.jobId.slice(0, 8)}] verify deadline (${deadlineMs}ms) hit`);
+          resolve3(lastResult);
+        }, deadlineMs);
+        if (signal?.aborted) {
+          settled = true;
+          clearTimeout(deadline);
           const err = new Error("The operation was aborted");
           err.name = "AbortError";
           reject(err);
-        };
-        if (signal.aborted) {
-          abortHandler();
           return;
         }
-        signal.addEventListener("abort", abortHandler, { once: true });
+        signal?.addEventListener(
+          "abort",
+          () => {
+            if (settled) {
+              return;
+            }
+            settled = true;
+            clearTimeout(deadline);
+            const err = new Error("The operation was aborted");
+            err.name = "AbortError";
+            reject(err);
+          },
+          { once: true }
+        );
       });
-      try {
-        result = await Promise.race([
-          payment.verifyPayment(rpc, request, protocolConfig),
-          abortPromise
-        ]);
-      } finally {
-        if (abortHandler) {
-          signal.removeEventListener("abort", abortHandler);
-        }
+    } finally {
+      verifyAbort.abort();
+      if (signal) {
+        signal.removeEventListener("abort", onOuterAbort);
       }
-    } else {
-      result = await payment.verifyPayment(rpc, request, protocolConfig);
     }
     if (result.verified) {
       return { netAmount, paymentRequest: requestJson };
@@ -1998,6 +2090,76 @@ var NostrTransport = class {
       }
     );
   }
+  /**
+   * Wait for the customer's `payment-completed` feedback for a specific job
+   * and return the on-chain Solana tx signature it carries.
+   *
+   * The customer publishes this event right after `confirmTransaction(... 'confirmed')`
+   * succeeds (see packages/app/app/hooks/useBuyCapability.ts), so receiving it
+   * lets the provider verify the payment with a single targeted
+   * `getTransaction(sig, commitment: 'confirmed')` call instead of the
+   * heavyweight `getSignaturesForAddress(reference)` index lookup. This is
+   * dramatically more reliable on the public devnet RPC, which throttles and
+   * lags the address index.
+   *
+   * Resolves with `null` if `signal` aborts or `timeoutMs` elapses before a
+   * valid signature arrives. The timeout exists so a customer that disappears
+   * after job submission does not hold a `p-limit` slot for the full payment
+   * expiry window - without it this path waits forever on the relay.
+   */
+  waitForPaymentSignature(jobId, customerPubkey, signal, timeoutMs) {
+    return new Promise((resolve3) => {
+      let settled = false;
+      const filter = {
+        kinds: [KIND_JOB_FEEDBACK],
+        "#e": [jobId],
+        authors: [customerPubkey],
+        "#t": ["elisym"],
+        since: Math.floor(Date.now() / 1e3) - 5
+      };
+      const finish = (sig) => {
+        if (settled) {
+          return;
+        }
+        settled = true;
+        if (timer) {
+          clearTimeout(timer);
+        }
+        signal.removeEventListener("abort", onAbort);
+        sub.close();
+        resolve3(sig);
+      };
+      const sub = this.client.pool.subscribe(filter, (event) => {
+        if (settled) {
+          return;
+        }
+        if (!verifyEvent(event)) {
+          return;
+        }
+        const status = event.tags.find((t) => t[0] === "status")?.[1];
+        if (status !== "payment-completed") {
+          return;
+        }
+        const txTag = event.tags.find((t) => t[0] === "tx");
+        const sig = txTag?.[1];
+        const chain = txTag?.[2];
+        if (typeof sig !== "string" || sig.length === 0) {
+          return;
+        }
+        if (chain !== void 0 && chain !== "solana") {
+          return;
+        }
+        finish(sig);
+      });
+      const onAbort = () => finish(null);
+      const timer = timeoutMs !== void 0 && timeoutMs > 0 ? setTimeout(() => finish(null), timeoutMs) : null;
+      if (signal.aborted) {
+        onAbort();
+        return;
+      }
+      signal.addEventListener("abort", onAbort, { once: true });
+    });
+  }
   /** Send job feedback to customer. */
   async sendFeedback(job, status) {
     if (status.type === "payment-required") {
@@ -2240,13 +2402,22 @@ async function cmdStart(nameArg, options = {}) {
   const hasLlmSkill = allSkills.some((skill) => skill.mode === "llm");
   let llm;
   if (hasLlmSkill) {
+    const llmSkillNames = allSkills.filter((skill) => skill.mode === "llm").map((skill) => skill.name);
     if (!loaded.yaml.llm) {
-      console.error("  ! No LLM configured. Run `npx @elisym/cli init` to set up LLM.\n");
+      console.error(
+        `  ! No LLM configured, but ${llmSkillNames.length} skill(s) require it: ${llmSkillNames.join(", ")}.`
+      );
+      console.error(
+        `    Add an LLM provider via \`npx @elisym/cli profile ${agentName}\`, or remove those skills from ${skillsDir}.
+`
+      );
       process.exit(1);
     }
     if (!loaded.secrets.llm_api_key) {
+      const keyEnvVar2 = loaded.yaml.llm.provider === "anthropic" ? "ANTHROPIC_API_KEY" : "OPENAI_API_KEY";
+      console.error(`  ! No LLM API key (required by skill(s): ${llmSkillNames.join(", ")}).`);
       console.error(
-        `  ! No LLM API key. Set ${loaded.yaml.llm.provider === "anthropic" ? "ANTHROPIC_API_KEY" : "OPENAI_API_KEY"} env var or update the agent's secrets.
+        `    Set ${keyEnvVar2} or update the agent's secrets via \`npx @elisym/cli profile ${agentName}\`.
 `
       );
       process.exit(1);