@elisym/cli 0.21.3 → 0.22.0

package/dist/index.js

@@ -1,8 +1,8 @@
 #!/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 } from 'node:path';
-import { SolanaPaymentStrategy, validateAgentName, RELAYS, ElisymIdentity, formatSol, formatAssetAmount, USDC_SOLANA_DEVNET, ElisymClient, MediaService, POLICY_D_TAG_PREFIX, KIND_LONG_FORM_ARTICLE, jobRequestKind, DEFAULT_KIND_OFFSET, toDTag, DEFAULTS, makeCensor, DEFAULT_REDACT_PATHS, POLICY_T_TAG, createSlidingWindowLimiter, getProtocolProgramId, getProtocolConfig, utf8ByteLength, LIMITS, calculateProtocolFee, decodeJobPayload, BoundedSet, KIND_JOB_FEEDBACK, NATIVE_SOL } from '@elisym/sdk';
+import { dirname, join, resolve, basename, relative, sep, extname } 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, makeCensor, DEFAULT_REDACT_PATHS, POLICY_T_TAG, createSlidingWindowLimiter, getProtocolProgramId, getProtocolConfig, utf8ByteLength, LIMITS, 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';
 import { generateSecretKey, getPublicKey, nip19, verifyEvent } from 'nostr-tools';
@@ -2051,6 +2051,18 @@ function createLogger(options = {}) {
     bannerLog: logWithIndent
   };
 }
+var MIME_BY_EXT = {
+  ".png": "image/png",
+  ".jpg": "image/jpeg",
+  ".jpeg": "image/jpeg",
+  ".gif": "image/gif",
+  ".webp": "image/webp",
+  ".svg": "image/svg+xml",
+  ".avif": "image/avif"
+};
+function mimeFromPath(path) {
+  return MIME_BY_EXT[extname(path).toLowerCase()] ?? "application/octet-stream";
+}
 var payment = new SolanaPaymentStrategy();
 var LEDGER_GC_INTERVAL_MS = 60 * 60 * 1e3;
 var LEDGER_RETENTION_MS = 30 * 24 * 60 * 60 * 1e3;
@@ -4163,14 +4175,13 @@ async function cmdStart(nameArg, options = {}) {
       }
     }
   }
-  const media = new MediaService();
   const mediaCache = await readMediaCache(loaded.dir);
   let mediaCacheDirty = false;
   const pictureUrl = await resolveMediaField(
     loaded.yaml.picture,
     loaded.dir,
     mediaCache,
-    media,
+    client.blossom,
     identity,
     (updated) => mediaCacheDirty = mediaCacheDirty || updated
   );
@@ -4178,7 +4189,7 @@ async function cmdStart(nameArg, options = {}) {
     loaded.yaml.banner,
     loaded.dir,
     mediaCache,
-    media,
+    client.blossom,
     identity,
     (updated) => mediaCacheDirty = mediaCacheDirty || updated
   );
@@ -4194,7 +4205,7 @@ async function cmdStart(nameArg, options = {}) {
       cacheKey,
       absPath,
       mediaCache,
-      media,
+      client.blossom,
       identity,
       () => mediaCacheDirty = true
     );
@@ -4490,7 +4501,7 @@ function stripRpcSecrets(raw) {
     return "[unparseable RPC URL]";
   }
 }
-async function resolveMediaField(value, agentDir, cache, media, identity, onCacheUpdate) {
+async function resolveMediaField(value, agentDir, cache, blossom, identity, onCacheUpdate) {
   if (!value) {
     return void 0;
   }
@@ -4502,7 +4513,7 @@ async function resolveMediaField(value, agentDir, cache, media, identity, onCach
     console.warn(`  ! Skipping media field "${value}": path must stay inside the agent directory.`);
     return void 0;
   }
-  return uploadOrReuse(value, absPath, cache, media, identity, () => onCacheUpdate(true));
+  return uploadOrReuse(value, absPath, cache, blossom, identity, () => onCacheUpdate(true));
 }
 function resolveInsideAgentDir(value, agentDir) {
   const agentRoot = resolve(agentDir);
@@ -4513,7 +4524,7 @@ function resolveInsideAgentDir(value, agentDir) {
   }
   return candidate;
 }
-async function uploadOrReuse(cacheKey, absPath, cache, media, identity, onCacheUpdate) {
+async function uploadOrReuse(cacheKey, absPath, cache, blossom, identity, onCacheUpdate) {
   try {
     const cached = await lookupCachedUrl(cache, cacheKey, absPath);
     if (cached) {
@@ -4522,12 +4533,12 @@ async function uploadOrReuse(cacheKey, absPath, cache, media, identity, onCacheU
     console.log(`  Uploading ${basename(absPath)}...`);
     const data = readFileSync(absPath);
     const sha256 = createHash("sha256").update(data).digest("hex");
-    const blob = new Blob([data]);
-    const url = await media.upload(identity, blob, basename(absPath));
-    cache[cacheKey] = newCacheEntry(url, sha256);
+    const blob = new Blob([data], { type: mimeFromPath(absPath) });
+    const descriptor = await blossom.upload(identity, blob);
+    cache[cacheKey] = newCacheEntry(descriptor.url, sha256);
     onCacheUpdate();
-    console.log(`  Uploaded: ${url}`);
-    return url;
+    console.log(`  Uploaded: ${descriptor.url}`);
+    return descriptor.url;
   } catch (e) {
     console.warn(`  ! Failed to upload ${basename(absPath)}: ${e.message}`);
     return void 0;