@elisym/cli 0.18.1 → 0.20.0

package/dist/index.js

@@ -1,5 +1,6 @@
 #!/usr/bin/env -S node --no-deprecation
-import { readFileSync, existsSync, readdirSync, statSync, renameSync, mkdirSync, writeFileSync } from 'node:fs';
+import { ReadableStream } from 'node:stream/web';
+import { readFileSync, existsSync, readdirSync, statSync, renameSync, chmodSync, mkdirSync, writeFileSync } from 'node:fs';
 import { dirname, join, resolve, basename, relative, sep } from 'node:path';
 import { SolanaPaymentStrategy, validateAgentName, RELAYS, ElisymIdentity, formatSol, formatAssetAmount, USDC_SOLANA_DEVNET, ElisymClient, MediaService, POLICY_D_TAG_PREFIX, KIND_LONG_FORM_ARTICLE, POLICY_T_TAG, jobRequestKind, DEFAULT_KIND_OFFSET, toDTag, DEFAULTS, makeCensor, DEFAULT_REDACT_PATHS, createSlidingWindowLimiter, getProtocolProgramId, getProtocolConfig, LIMITS, calculateProtocolFee, BoundedSet, KIND_JOB_FEEDBACK, NATIVE_SOL } from '@elisym/sdk';
 import { ElisymYamlSchema, resolveInHome, resolveInProject, createAgentDir, writeYamlInitial, writeExampleSkillTemplate, writeSecrets, listAgents, loadAgent, writeYaml, agentPaths, readMediaCache, loadPoliciesFromDir, lookupCachedUrl, newCacheEntry, writeMediaCache } from '@elisym/sdk/agent-store';
@@ -8,7 +9,7 @@ import { generateSecretKey, getPublicKey, nip19, verifyEvent } from 'nostr-tools
 import YAML from 'yaml';
 import { Command } from 'commander';
 import { createHash } from 'node:crypto';
-import { LlmHealthMonitor, startLlmRecovery, createFreeLlmLimiterSet, ScriptBillingExhaustedError, FREE_LLM_GLOBAL_KEY, freeLlmCustomerKey, LlmHealthError } from '@elisym/sdk/llm-health';
+import { LlmHealthMonitor, startLlmRecovery, createFreeLlmLimiterSet, ScriptBillingExhaustedError, ScriptExecutionError, FREE_LLM_GLOBAL_KEY, freeLlmCustomerKey, LlmHealthError } from '@elisym/sdk/llm-health';
 import { lookup } from 'node:dns/promises';
 import { Socket } from 'node:net';
 import pino from 'pino';
@@ -25,8 +26,6 @@ var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
 };
-
-// src/llm/providers/http.ts
 function resolveLlmTimeoutMs() {
   const raw = process.env.ELISYM_LLM_TIMEOUT_MS;
   if (raw === void 0) {
@@ -71,12 +70,53 @@ async function fetchWithTimeout(url, init, signal) {
   const timer = setTimeout(() => controller.abort(), LLM_TIMEOUT_MS);
   const onAbort = () => controller.abort();
   signal?.addEventListener("abort", onAbort, { once: true });
-  try {
-    return await fetch(url, { ...init, signal: controller.signal });
-  } finally {
+  let toreDown = false;
+  const teardown = () => {
+    if (toreDown) {
+      return;
+    }
+    toreDown = true;
     clearTimeout(timer);
     signal?.removeEventListener("abort", onAbort);
+  };
+  let response;
+  try {
+    response = await fetch(url, { ...init, signal: controller.signal });
+  } catch (error) {
+    teardown();
+    throw error;
   }
+  const body = response.body;
+  if (!body || typeof body.getReader !== "function") {
+    teardown();
+    return response;
+  }
+  const reader = body.getReader();
+  const tappedStream = new ReadableStream({
+    async pull(streamController) {
+      try {
+        const { done, value } = await reader.read();
+        if (done) {
+          teardown();
+          streamController.close();
+          return;
+        }
+        streamController.enqueue(value);
+      } catch (error) {
+        teardown();
+        streamController.error(error);
+      }
+    },
+    cancel(reason) {
+      teardown();
+      return reader.cancel(reason);
+    }
+  });
+  return new Response(tappedStream, {
+    status: response.status,
+    statusText: response.statusText,
+    headers: response.headers
+  });
 }
 async function fetchWithRetry(url, init, signal) {
   for (let attempt = 0; ; attempt++) {
@@ -1721,6 +1761,8 @@ async function fetchUsdcBalance(rpc, owner) {
     return 0n;
   }
 }
+var LEDGER_DIR_MODE = 448;
+var LEDGER_FILE_MODE = 384;
 var VALID_TRANSITIONS = {
   paid: ["executed", "failed"],
   executed: ["delivered", "failed"],
@@ -1750,7 +1792,9 @@ var JobLedger = class {
       if (e?.code !== "ENOENT") {
         console.warn(`  ! Ledger load warning: ${e?.message ?? "unknown error"}`);
         try {
-          renameSync(this.path, this.path + ".corrupt." + Date.now());
+          const backupPath = this.path + ".corrupt." + Date.now();
+          renameSync(this.path, backupPath);
+          chmodSync(backupPath, LEDGER_FILE_MODE);
         } catch {
         }
       }
@@ -1758,11 +1802,12 @@ var JobLedger = class {
   }
   flush() {
     const dir = dirname(this.path);
-    mkdirSync(dir, { recursive: true });
+    mkdirSync(dir, { recursive: true, mode: LEDGER_DIR_MODE });
     const obj = Object.fromEntries(this.entries);
     const tmp = this.path + ".tmp";
-    writeFileSync(tmp, JSON.stringify(obj, null, 2));
+    writeFileSync(tmp, JSON.stringify(obj, null, 2), { mode: LEDGER_FILE_MODE });
     renameSync(tmp, this.path);
+    chmodSync(this.path, LEDGER_FILE_MODE);
   }
   recordPaid(entry) {
     if (this.entries.has(entry.job_id)) {
@@ -2026,6 +2071,22 @@ var ExecutionBudgetExceededError = class extends Error {
     this.name = "ExecutionBudgetExceededError";
   }
 };
+var CUSTOMER_SAFE_MESSAGE_PREFIXES = ["Input too long", "No skill matched", "Payment timeout"];
+function customerSafeMessage(error) {
+  if (error instanceof AgentUnavailableError || error instanceof ExecutionBudgetExceededError) {
+    return error.message;
+  }
+  if (error instanceof ScriptExecutionError) {
+    return error.message;
+  }
+  if (error instanceof ScriptBillingExhaustedError) {
+    return AGENT_UNAVAILABLE_MESSAGE;
+  }
+  if (error instanceof Error && CUSTOMER_SAFE_MESSAGE_PREFIXES.some((prefix) => error.message.startsWith(prefix))) {
+    return error.message;
+  }
+  return "Internal processing error";
+}
 function bodyLooksLikeBilling3(body) {
   const lower = body.toLowerCase();
   return BILLING_BODY_MARKERS3.some((marker) => lower.includes(marker));
@@ -2208,7 +2269,14 @@ var AgentRuntime = class {
       return true;
     }
     if (skill.mode !== "llm") {
-      const message = err instanceof Error ? err.message : String(err);
+      let message;
+      if (err instanceof ScriptExecutionError) {
+        message = err.detail;
+      } else if (err instanceof Error) {
+        message = err.message;
+      } else {
+        message = String(err);
+      }
       const provider = skill.llmOverride?.provider;
       const model = skill.llmOverride?.model;
       if (!provider || !model) {
@@ -2413,15 +2481,9 @@ var AgentRuntime = class {
           `[${job.jobId.slice(0, 8)}] Keeping status=paid; recovery will re-execute when LLM pair recovers (24h cutoff).`
         );
       }
-      this.callbacks.onJobError?.(job.jobId, e.message);
-      let safeMessage;
-      if (e instanceof AgentUnavailableError) {
-        safeMessage = e.message;
-      } else if (e.message?.includes("API")) {
-        safeMessage = "Internal processing error";
-      } else {
-        safeMessage = e.message ?? "Unknown error";
-      }
+      const operatorMessage = e instanceof ScriptExecutionError ? `${e.message}: ${e.detail}` : e.message ?? "Unknown error";
+      this.callbacks.onJobError?.(job.jobId, operatorMessage);
+      const safeMessage = customerSafeMessage(e);
       await this.transport.sendFeedback(job, { type: "error", message: safeMessage }).catch(() => {
       });
     } finally {
@@ -2497,12 +2559,9 @@ var AgentRuntime = class {
         signal.addEventListener("abort", onOuterAbort);
       }
     }
-    const budgetTimer = budgetMs > 0 ? setTimeout(() => {
-      budgetExceeded = true;
-      execAbort.abort();
-    }, budgetMs) : void 0;
+    let budgetTimer;
     try {
-      output = await skill.execute(
+      const execPromise = skill.execute(
         {
           data: job.input,
           inputType: job.inputType,
@@ -2511,6 +2570,22 @@ var AgentRuntime = class {
         },
         { ...this.skillCtx, signal: execAbort.signal }
       );
+      execPromise.catch(() => {
+      });
+      if (budgetMs > 0) {
+        output = await Promise.race([
+          execPromise,
+          new Promise((_resolve, reject) => {
+            budgetTimer = setTimeout(() => {
+              budgetExceeded = true;
+              execAbort.abort();
+              reject(new ExecutionBudgetExceededError(budgetMs));
+            }, budgetMs);
+          })
+        ]);
+      } else {
+        output = await execPromise;
+      }
     } catch (err) {
       if (budgetExceeded) {
         log(`[${job.jobId.slice(0, 8)}] Execution exceeded budget (${budgetMs / 1e3}s)`);
@@ -2832,10 +2907,10 @@ var AgentRuntime = class {
           }
         }
         const recoveryBudgetMs = this.resolveExecutionBudgetMs(skill);
-        const budgetTimer = recoveryBudgetMs > 0 ? setTimeout(() => recoveryAbort.abort(), recoveryBudgetMs) : void 0;
+        let budgetTimer;
         let output;
         try {
-          output = await skill.execute(
+          const execPromise = skill.execute(
             {
               data: entry.input,
               inputType: entry.input_type,
@@ -2844,6 +2919,21 @@ var AgentRuntime = class {
             },
             { ...this.skillCtx, signal: recoveryAbort.signal }
           );
+          execPromise.catch(() => {
+          });
+          if (recoveryBudgetMs > 0) {
+            output = await Promise.race([
+              execPromise,
+              new Promise((_resolve, reject) => {
+                budgetTimer = setTimeout(() => {
+                  recoveryAbort.abort();
+                  reject(new ExecutionBudgetExceededError(recoveryBudgetMs));
+                }, recoveryBudgetMs);
+              })
+            ]);
+          } else {
+            output = await execPromise;
+          }
         } finally {
           if (budgetTimer) {
             clearTimeout(budgetTimer);
@@ -3580,7 +3670,7 @@ async function cmdStart(nameArg, options = {}) {
       console.log(`     Network  ${walletNetwork}`);
       console.log(`     Address  ${solanaAddress}`);
       if (process.env.SOLANA_RPC_URL) {
-        console.log(`     RPC      ${process.env.SOLANA_RPC_URL} (custom)`);
+        console.log(`     RPC      ${stripRpcSecrets(process.env.SOLANA_RPC_URL)} (custom)`);
       }
       console.log(`     SOL      ${formatSol(balance)} (${balance} lamports)`);
       console.log(`     USDC     ${formatAssetAmount(USDC_SOLANA_DEVNET, usdcBalance)}`);
@@ -4066,11 +4156,19 @@ async function cmdStart(nameArg, options = {}) {
   console.log("  * Running. Press Ctrl+C to stop.\n");
   await runtime.run();
 }
+var PUBLIC_SOLANA_RPC_HOSTS = /* @__PURE__ */ new Set([
+  "api.devnet.solana.com",
+  "api.mainnet-beta.solana.com",
+  "api.testnet.solana.com"
+]);
 function stripRpcSecrets(raw) {
   try {
     const parsed = new URL(raw);
     parsed.username = "";
     parsed.password = "";
+    if (!PUBLIC_SOLANA_RPC_HOSTS.has(parsed.hostname)) {
+      return `${parsed.protocol}//${parsed.host}/***`;
+    }
     const marker = parsed.search.length > 0 ? "?***" : "";
     parsed.search = "";
     return `${parsed.toString()}${marker}`;