@elisym/cli 0.22.1 → 0.22.3

package/dist/index.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env -S node --no-deprecation
 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, extname } from 'node:path';
+import { dirname, join, resolve, basename, extname, relative, sep } from 'node:path';
 import { SolanaPaymentStrategy, validateAgentName, RELAYS, ElisymIdentity, formatSol, formatAssetAmount, USDC_SOLANA_DEVNET, ElisymClient, POLICY_D_TAG_PREFIX, KIND_LONG_FORM_ARTICLE, jobRequestKind, DEFAULT_KIND_OFFSET, toDTag, DEFAULTS, createBlossomTransport, makeCensor, DEFAULT_REDACT_PATHS, POLICY_T_TAG, createSlidingWindowLimiter, getProtocolProgramId, getProtocolConfig, utf8ByteLength, LIMITS, readAcceptedTransports, calculateProtocolFee, decodeJobPayload, BoundedSet, KIND_JOB_FEEDBACK, NATIVE_SOL } from '@elisym/sdk';
 import { ElisymYamlSchema, resolveInHome, resolveInProject, createAgentDir, writeYamlInitial, writeExampleSkillTemplate, writeSecrets, listAgents, loadAgent, writeYaml, agentPaths, readMediaCache, loadPoliciesFromDir, ensureGitignoreHasIrohEntry, lookupCachedUrl, newCacheEntry, writeMediaCache } from '@elisym/sdk/agent-store';
 import { isAddress, createSolanaRpc, address } from '@solana/kit';
@@ -1865,6 +1865,9 @@ var JobLedger = class {
     if (fields.resultAttachment !== void 0) {
       entry.result_attachment = fields.resultAttachment;
     }
+    if (fields.resultAttachments !== void 0) {
+      entry.result_attachments = fields.resultAttachments;
+    }
     this.flush();
   }
   markDelivered(jobId) {
@@ -2106,9 +2109,35 @@ var ExecutionBudgetExceededError = class extends Error {
     this.name = "ExecutionBudgetExceededError";
   }
 };
+var SeedFailedError = class extends Error {
+  constructor(cause) {
+    super("Result is ready - delivery is retrying and will arrive shortly.", { cause });
+    this.name = "SeedFailedError";
+  }
+};
+var MIME_EXTENSIONS = {
+  "image/png": ".png",
+  "image/jpeg": ".jpg",
+  "image/webp": ".webp",
+  "image/gif": ".gif",
+  "image/svg+xml": ".svg",
+  "application/pdf": ".pdf",
+  "text/plain": ".txt",
+  "text/markdown": ".md",
+  "application/json": ".json",
+  "audio/mpeg": ".mp3",
+  "audio/wav": ".wav",
+  "video/mp4": ".mp4",
+  "video/webm": ".webm",
+  "application/zip": ".zip"
+};
+function extensionForMime(mime) {
+  return mime ? MIME_EXTENSIONS[mime] ?? "" : "";
+}
+var SLOW_SEED_LOG_MS = 5e3;
 var CUSTOMER_SAFE_MESSAGE_PREFIXES = ["Input too long", "No skill matched", "Payment timeout"];
 function customerSafeMessage(error) {
-  if (error instanceof AgentUnavailableError || error instanceof ExecutionBudgetExceededError) {
+  if (error instanceof AgentUnavailableError || error instanceof ExecutionBudgetExceededError || error instanceof SeedFailedError) {
     return error.message;
   }
   if (error instanceof ScriptExecutionError) {
@@ -2515,14 +2544,12 @@ var AgentRuntime = class {
       const log = this.callbacks.onLog ?? console.log;
       log(`[${job.jobId.slice(0, 8)}] Error: ${e.message}`);
       const currentStatus = this.ledger.getStatus(job.jobId);
-      const keepPaidForRecovery = e instanceof AgentUnavailableError && currentStatus === "paid";
+      const keepPaidForRecovery = (e instanceof AgentUnavailableError || e instanceof SeedFailedError) && currentStatus === "paid";
       if (currentStatus !== "executed" && !keepPaidForRecovery) {
         this.ledger.markFailed(job.jobId);
       }
       if (keepPaidForRecovery) {
-        log(
-          `[${job.jobId.slice(0, 8)}] Keeping status=paid; recovery will re-execute when LLM pair recovers (24h cutoff).`
-        );
+        log(`[${job.jobId.slice(0, 8)}] Keeping status=paid; recovery will retry (24h cutoff).`);
       }
       const operatorMessage = e instanceof ScriptExecutionError ? `${e.message}: ${e.detail}` : e.message ?? "Unknown error";
       this.callbacks.onJobError?.(job.jobId, operatorMessage);
@@ -2660,7 +2687,7 @@ var AgentRuntime = class {
         });
       }
     }
-    const { attachment, deliveredContent } = await this.buildResultAttachment(
+    const { attachments, deliveredContent } = await this.buildResultAttachment(
       job.jobId,
       output,
       job.customerId,
@@ -2672,12 +2699,36 @@ var AgentRuntime = class {
       job,
       deliveredContent,
       netAmount,
-      attachment
+      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);
   }
+  /**
+   * Seed a result blob through iroh, timing it and converting any failure (incl. the
+   * transport's seed timeout, which also resets the wedged node) into a
+   * `SeedFailedError` so the post-execute catch keeps the job `paid` for recovery
+   * rather than losing the customer's paid job.
+   */
+  async seedGuarded(jobId, kind, run) {
+    const log = this.callbacks.onLog ?? console.log;
+    const started = Date.now();
+    try {
+      const seeded = await run();
+      const elapsed = Date.now() - started;
+      if (elapsed > SLOW_SEED_LOG_MS) {
+        log(`[${jobId.slice(0, 8)}] iroh seed (${kind}) slow: ${elapsed}ms`);
+      }
+      return seeded;
+    } catch (error) {
+      const detail = error instanceof Error ? error.message : String(error);
+      log(
+        `[${jobId.slice(0, 8)}] iroh seed (${kind}) failed after ${Date.now() - started}ms: ${detail}`
+      );
+      throw new SeedFailedError(error);
+    }
+  }
   /**
    * Decide how a skill's result travels: inline text, a seeded file, or seeded
    * large text. Returns the attachment descriptor (if any) PLUS the content to
@@ -2694,31 +2745,25 @@ var AgentRuntime = class {
    */
   async buildResultAttachment(jobId, output, customerPubkey, acceptedTransports) {
     const wantBlossom = acceptedTransports === void 0 || acceptedTransports.includes("blossom");
-    if (output.filePath !== void 0) {
+    const filePaths = output.filePaths ?? (output.filePath !== void 0 ? [output.filePath] : []);
+    if (filePaths.length > 0) {
       try {
-        if (!this.irohTransport) {
-          throw new Error("Skill produced a file result but iroh transport is unavailable.");
-        }
-        const seeded = await this.irohTransport.seedPath(output.filePath);
-        const transports = [{ kind: "iroh", ticket: seeded.ticket }];
-        if (wantBlossom) {
-          const blossomMember = await this.seedBlossomFromPath(
-            output.filePath,
-            seeded.size,
-            customerPubkey
+        const attachments = [];
+        for (const filePath of filePaths) {
+          attachments.push(
+            await this.seedFileToAttachment(
+              jobId,
+              filePath,
+              output.outputMime,
+              customerPubkey,
+              wantBlossom
+            )
           );
-          if (blossomMember !== void 0) {
-            transports.unshift(blossomMember);
-          }
         }
-        const attachment = {
-          name: basename(output.filePath),
-          size: seeded.size,
-          mime: output.outputMime ?? "application/octet-stream",
-          transports
-        };
-        this.ledger.recordAttachment(jobId, { resultAttachment: JSON.stringify(attachment) });
-        return { attachment, deliveredContent: output.data };
+        this.ledger.recordAttachment(jobId, {
+          resultAttachments: attachments.map((a) => JSON.stringify(a))
+        });
+        return { attachments, deliveredContent: output.data };
       } finally {
         await output.cleanup?.().catch(() => {
         });
@@ -2728,8 +2773,9 @@ var AgentRuntime = class {
       if (!this.irohTransport) {
         throw new Error("Result is too large to deliver inline and iroh transport is unavailable.");
       }
+      const iroh = this.irohTransport;
       const dataBytes = Buffer.from(output.data, "utf8");
-      const seeded = await this.irohTransport.seedBytes(dataBytes);
+      const seeded = await this.seedGuarded(jobId, "large-text", () => iroh.seedBytes(dataBytes));
       const transports = [{ kind: "iroh", ticket: seeded.ticket }];
       if (wantBlossom) {
         const blossomMember = await this.seedBlossomMember(dataBytes, customerPubkey);
@@ -2743,10 +2789,32 @@ var AgentRuntime = class {
         mime: "text/plain",
         transports
       };
-      this.ledger.recordAttachment(jobId, { resultAttachment: JSON.stringify(attachment) });
-      return { attachment, deliveredContent: "" };
+      this.ledger.recordAttachment(jobId, { resultAttachments: [JSON.stringify(attachment)] });
+      return { attachments: [attachment], deliveredContent: "" };
+    }
+    return { attachments: [], deliveredContent: output.data };
+  }
+  /**
+   * Seed ONE result file to iroh (+ encrypted Blossom when wanted) and build its
+   * FileAttachment. A seed timeout throws SeedFailedError (job stays `paid` for
+   * recovery). Shared by the single- and multi-file result paths.
+   */
+  async seedFileToAttachment(jobId, filePath, outputMime, customerPubkey, wantBlossom) {
+    if (!this.irohTransport) {
+      throw new Error("Skill produced a file result but iroh transport is unavailable.");
     }
-    return { attachment: void 0, deliveredContent: output.data };
+    const iroh = this.irohTransport;
+    const seeded = await this.seedGuarded(jobId, "file", () => iroh.seedPath(filePath));
+    const transports = [{ kind: "iroh", ticket: seeded.ticket }];
+    if (wantBlossom) {
+      const blossomMember = await this.seedBlossomFromPath(filePath, seeded.size, customerPubkey);
+      if (blossomMember !== void 0) {
+        transports.unshift(blossomMember);
+      }
+    }
+    const producedName = basename(filePath);
+    const name = extname(producedName) ? producedName : `${producedName}${extensionForMime(outputMime)}`;
+    return { name, size: seeded.size, mime: outputMime ?? "application/octet-stream", transports };
   }
   /**
    * Encrypt `bytes` to `recipientPubkey` and seed them to Blossom, returning a `blossom` transport
@@ -2808,6 +2876,23 @@ var AgentRuntime = class {
     );
     return { ...stored, transports };
   }
+  /**
+   * Re-share ALL of a recovered job's result attachments (multi-file aware). Prefers
+   * the `result_attachments` array; falls back to the legacy single `result_attachment`.
+   * A failure on ANY attachment throws (the caller marks the whole job failed - a
+   * partial multi-file delivery is not a valid paid result).
+   */
+  async reShareResultAttachments(entry) {
+    const stored = entry.result_attachments ?? (entry.result_attachment !== void 0 ? [entry.result_attachment] : []);
+    const out = [];
+    for (const serialized of stored) {
+      const attachment = await this.reShareResultAttachment(serialized);
+      if (attachment !== void 0) {
+        out.push(attachment);
+      }
+    }
+    return out;
+  }
   /**
    * Resolve a job's file/large-text input (when it carries an attachment) via iroh.
    * Only called post-payment - free + attachment is rejected in the `executeJob`
@@ -3160,15 +3245,20 @@ var AgentRuntime = class {
       };
       if (entry.status === "executed" && entry.result !== void 0) {
         this.ledger.incrementRetry(entry.job_id);
-        let attachment;
+        let attachments;
         try {
-          attachment = await this.reShareResultAttachment(entry.result_attachment);
+          attachments = await this.reShareResultAttachments(entry);
         } catch {
           log(`[${entry.job_id.slice(0, 8)}] Recovery: result blob unavailable, marking failed`);
           this.ledger.markFailed(entry.job_id);
           return;
         }
-        await this.transport.deliverResult(fakeJob, entry.result, entry.net_amount, attachment);
+        await this.transport.deliverResult(
+          fakeJob,
+          entry.result,
+          entry.net_amount,
+          attachments.length > 0 ? attachments : void 0
+        );
         this.ledger.markDelivered(entry.job_id);
         log(`[${entry.job_id.slice(0, 8)}] Recovery: re-delivered`);
       } else if (entry.status === "paid") {
@@ -3260,7 +3350,7 @@ var AgentRuntime = class {
             });
           }
         }
-        const { attachment: resultAttachment, deliveredContent } = await this.buildResultAttachment(
+        const { attachments: resultAttachments, deliveredContent } = await this.buildResultAttachment(
           entry.job_id,
           output,
           entry.customer_id,
@@ -3271,7 +3361,7 @@ var AgentRuntime = class {
           fakeJob,
           deliveredContent,
           entry.net_amount,
-          resultAttachment
+          resultAttachments.length > 0 ? resultAttachments : void 0
         );
         this.ledger.markDelivered(entry.job_id);
         log(`[${entry.job_id.slice(0, 8)}] Recovery: re-executed and delivered`);
@@ -3464,8 +3554,9 @@ var DynamicScriptSkill = class {
   llmOverride;
   // Discovery hints surfaced in the published capability card (buildCard).
   // `outputMime` is also forwarded to the inner SDK runner (it labels the file
-  // result); `inputMime` is publish-time metadata only.
+  // result); `inputMime`/`inputText` are publish-time metadata only.
   inputMime;
+  inputText;
   outputMime;
   inner;
   constructor(params) {
@@ -3479,6 +3570,7 @@ var DynamicScriptSkill = class {
     this.dir = params.dir;
     this.llmOverride = params.llmOverride;
     this.inputMime = params.inputMime;
+    this.inputText = params.inputText;
     this.outputMime = params.outputMime;
     this.inner = new DynamicScriptSkill$1({
       name: params.name,
@@ -3647,7 +3739,8 @@ function buildCliSkill(parsed, entryPath, scriptEnv) {
       skill = parsed.mode === "dynamic-script" ? new DynamicScriptSkill({
         ...scriptParams,
         outputMime: parsed.outputMime,
-        inputMime: parsed.inputMime
+        inputMime: parsed.inputMime,
+        inputText: parsed.inputText
       }) : new StaticScriptSkill(scriptParams);
       break;
     }
@@ -3856,7 +3949,7 @@ var NostrTransport = class {
     }
   }
   /** Deliver result to customer. Retries with exponential backoff via SDK. */
-  async deliverResult(job, content, amount, attachment, retries = 3) {
+  async deliverResult(job, content, amount, attachments, retries = 3) {
     return this.client.marketplace.submitJobResultWithRetry(
       this.identity,
       job.rawEvent,
@@ -3864,7 +3957,7 @@ var NostrTransport = class {
       amount,
       retries,
       void 0,
-      attachment
+      attachments
     );
   }
   /** Returns true if an event was received within the given idle window. */
@@ -4417,9 +4510,10 @@ async function cmdStart(nameArg, options = {}) {
       capabilities: skill.capabilities,
       image: skill.image,
       ...isStatic ? { static: true } : {},
-      // File-exchange hints (dynamic-script only). `inputMime` lets clients that
-      // cannot send files (the web app) gate the Buy button before payment.
+      // File-exchange hints (dynamic-script only). `inputMime` flags a file input;
+      // `inputText` tells the web whether to also show its text box for that file job.
       ...skill.inputMime ? { inputMime: skill.inputMime } : {},
+      ...skill.inputText ? { inputText: skill.inputText } : {},
       ...skill.outputMime ? { outputMime: skill.outputMime } : {},
       payment: solanaAddress ? {
         chain: "solana",